diff options
| author | Mark Hung <marklh9@gmail.com> | 2015-12-03 00:17:13 +0800 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-12-15 14:39:10 +0000 |
| commit | b71814f180bcefad6dcb3ff02c42b3cb31315bc5 (patch) | |
| tree | 27ec55a2a77dfc62e3a074efbe33d37700f25cdd | |
| parent | ea4c75dcc9c3e53e7ef40bd273ea18a48ea9b18d (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: I4b7f7437014032566227f745e5e81b6a01ba022f
Reviewed-on: https://gerrit.libreoffice.org/20358
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
| -rw-r--r-- | sw/source/core/text/itrpaint.cxx | 2 |
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 ) |