summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Hung <marklh9@gmail.com>2015-12-02 23:22:54 +0800
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2015-12-15 14:38:33 +0000
commit307fcbf0ad716244210b4da75bbc947f1d5e26de (patch)
tree1804f411f7af04eb391e7b9182112a4f4439a70e
parent30ce44f8595fad67a5f8d4156135a762ce2c3c73 (diff)
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 <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.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 fa9716e9b9f6..2461b8b4af25 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 )