summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Hung <marklh9@gmail.com>2015-08-01 22:48:39 +0800
committerCaolán McNamara <caolanm@redhat.com>2015-08-25 20:05:50 +0000
commitf0a149fe1c3224cef17f15e574b0a818923b57f6 (patch)
tree5a5aefd30fcf629026601eda7d420fe484f7457a
parent4c8bba9a8e7488b268fc4f6c9e06195b42565375 (diff)
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@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> (cherry picked from commit b14861e1dfb9f83d26d6032ae96b664845528f2a) Reviewed-on: https://gerrit.libreoffice.org/17994 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sw/source/core/text/itrpaint.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index 1a6c3d0b58aa..4608248ebab4 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 )