sw/source/core/text/itrpaint.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 307fcbf0ad716244210b4da75bbc947f1d5e26de
Author: Mark Hung <mark...@gmail.com>
Date: Wed Dec 2 23:22:54 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 f0a149fe1c3224cef17f15e574b0a818923b57f6.
Change-Id: I0a5b9ec2ea0225bf2ef587549e97c9c7b0541253
Reviewed-on: https://gerrit.libreoffice.org/20356
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index fa9716e..2461b8b 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 =
- ( !GetTextFrm()->IsVertical() || GetLineInfo().HasSpecialAlign( true )
) && (! GetTextFrm()->IsInFly()) &&
+ GetLineInfo().HasSpecialAlign( GetTextFrm()->IsVertical() ) ||
( 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
