commit b14861e1dfb9f83d26d6032ae96b664845528f2a
author Mark Hung <marklh9@gmail.com> Sat Aug 01 22:48:39 2015 +0800
committer Norbert Thiebaud <nthiebaud@gmail.com> Tue Aug 25 11:58:06 2015 +0000
tree 878043c49f62342b193db8114232f1ee593d8c1e
parent 43679f94b45f4d9e120c64a3fb5cc3ee77f12b11

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>

sw/source/core/text/itrpaint.cxx

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 )