sw/source/core/text/itrpaint.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit b71814f180bcefad6dcb3ff02c42b3cb31315bc5 Author: Mark Hung <[email protected]> Date: Thu Dec 3 00:17:13 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: I4b7f7437014032566227f745e5e81b6a01ba022f Reviewed-on: https://gerrit.libreoffice.org/20358 Tested-by: Jenkins <[email protected]> Reviewed-by: Christian Lohmaier <[email protected]> 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 ) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
