[Libreoffice-commits] core.git: sw/source
Mark Hung
marklh9 at gmail.com
Tue Aug 25 04:58:28 PDT 2015
sw/source/core/text/itrpaint.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b14861e1dfb9f83d26d6032ae96b664845528f2a
Author: Mark Hung <marklh9 at gmail.com>
Date: Sat Aug 1 22:48:39 2015 +0800
Fix tdf#77514 CJK ruby text in RTL( vertical ) base line issue.
Change-Id: Id670e83db01efe6bcd5fb6bb374ab9cb92898f88
Reviewed-on: https://gerrit.libreoffice.org/17460
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index 903301e..56d155b 100644
--- a/sw/source/core/text/itrpaint.cxx
+++ b/sw/source/core/text/itrpaint.cxx
@@ -236,7 +236,7 @@ void SwTextPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
// we calculate Y value for the whole line
SwTextGridItem const*const pGrid(GetGridItem(GetTextFrm()->FindPageFrm()));
const bool bAdjustBaseLine =
- GetLineInfo().HasSpecialAlign( GetTextFrm()->IsVertical() ) ||
+ ( !GetTextFrm()->IsVertical() || GetLineInfo().HasSpecialAlign( true ) ) && (! GetTextFrm()->IsInFly()) &&
( 0 != pGrid );
const SwTwips nLineBaseLine = GetInfo().GetPos().Y() + nTmpAscent;
if ( ! bAdjustBaseLine )
More information about the Libreoffice-commits
mailing list