Kaydet (Commit) b71814f1 authored tarafından Mark Hung's avatar Mark Hung Kaydeden (comit) Christian Lohmaier

tdf#96125 Fix broken Writer paragraph text-to-text alignment feature.

Revert "Fix tdf#77514 CJK ruby text in RTL( vertical ) base line issue."

This reverts commit b14861e1.

Conflicts:
	sw/source/core/text/itrpaint.cxx

Change-Id: I4b7f7437014032566227f745e5e81b6a01ba022f
Reviewed-on: https://gerrit.libreoffice.org/20358Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>
üst ea4c75dc
...@@ -236,7 +236,7 @@ void SwTextPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip, ...@@ -236,7 +236,7 @@ void SwTextPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
// we calculate Y value for the whole line // we calculate Y value for the whole line
SwTextGridItem const*const pGrid(GetGridItem(GetTextFrame()->FindPageFrame())); SwTextGridItem const*const pGrid(GetGridItem(GetTextFrame()->FindPageFrame()));
const bool bAdjustBaseLine = const bool bAdjustBaseLine =
( !GetTextFrame()->IsVertical() || GetLineInfo().HasSpecialAlign( true ) ) && (! GetTextFrame()->IsInFly()) && GetLineInfo().HasSpecialAlign( GetTextFrame()->IsVertical() ) ||
( nullptr != pGrid ); ( nullptr != pGrid );
const SwTwips nLineBaseLine = GetInfo().GetPos().Y() + nTmpAscent; const SwTwips nLineBaseLine = GetInfo().GetPos().Y() + nTmpAscent;
if ( ! bAdjustBaseLine ) if ( ! bAdjustBaseLine )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment