summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Hung <marklh9@gmail.com>2015-12-04 13:00:00 +0800
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2015-12-15 14:35:46 +0000
commita6b9d0e2f3508d8ac52f46a7aacec2e3043fec8e (patch)
treee825dc96604ea06dc4e95c02a06231c03de16fb2
parente7edaa1fde977384a510766b02dcb7f6d6aac9e2 (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 b14861e1dfb9f83d26d6032ae96b664845528f2a. Conflicts: sw/source/core/text/itrpaint.cxx Change-Id: I61b81016631d028ca1843533d74b5ccc7d527df2 Reviewed-on: https://gerrit.libreoffice.org/20387 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-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 81d18736ae17..79d3c5dd11e6 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 )