sw/source/core/text/itrpaint.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f0a149fe1c3224cef17f15e574b0a818923b57f6
Author: Mark Hung <mark...@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 <c...@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthieb...@gmail.com>
(cherry picked from commit b14861e1dfb9f83d26d6032ae96b664845528f2a)
Reviewed-on: https://gerrit.libreoffice.org/17994
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index 1a6c3d0..4608248 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 )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
