Kaydet (Commit) 6cef73c3 authored tarafından Mark Hung's avatar Mark Hung Kaydeden (comit) Andras Timar

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 f0a149fe.

Change-Id: I0a5b9ec2ea0225bf2ef587549e97c9c7b0541253
Reviewed-on: https://gerrit.libreoffice.org/20356Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>
(cherry picked from commit 307fcbf0)
üst de488459
...@@ -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(GetTextFrm()->FindPageFrm())); SwTextGridItem const*const pGrid(GetGridItem(GetTextFrm()->FindPageFrm()));
const bool bAdjustBaseLine = const bool bAdjustBaseLine =
( !GetTextFrm()->IsVertical() || GetLineInfo().HasSpecialAlign( true ) ) && (! GetTextFrm()->IsInFly()) && GetLineInfo().HasSpecialAlign( GetTextFrm()->IsVertical() ) ||
( 0 != pGrid ); ( 0 != 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