[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sw/source

[Mark Hung]

 sw/source/core/text/itrpaint.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a6b9d0e2f3508d8ac52f46a7aacec2e3043fec8e
Author: Mark Hung <marklh9 at gmail.com>
Date:   Fri Dec 4 13:00:00 2015 +0800

    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 b14861e1dfb9f83d26d6032ae96b664845528f2a.
    
    Conflicts:
    	sw/source/core/text/itrpaint.cxx
    
    Change-Id: I61b81016631d028ca1843533d74b5ccc7d527df2
    Reviewed-on: https://gerrit.libreoffice.org/20387
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index 81d1873..79d3c5d 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(GetTextFrame()->FindPageFrame()));
     const bool bAdjustBaseLine =
-        ( !GetTextFrame()->IsVertical() || GetLineInfo().HasSpecialAlign( true ) ) && (! GetTextFrame()->IsInFly()) &&
+        GetLineInfo().HasSpecialAlign( GetTextFrame()->IsVertical() ) ||
         ( nullptr != pGrid );
     const SwTwips nLineBaseLine = GetInfo().GetPos().Y() + nTmpAscent;
     if ( ! bAdjustBaseLine )