sw/source/core/text/porlay.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 11a54814be785766d797cc83cfdacd2368ea642c
Author: Miklos Vajna <vmik...@suse.cz>
Date: Fri Jun 8 14:07:13 2012 +0200
Related: i#3952 SwLineLayout::CalcLine: fix regression
Commit 563df5d0c3c696912f211e74dd4dbda1aa720ae7 broke the layout of the
bugdoc, fix this.
Change-Id: I7965e9507d4ba130a4f7bea844cdd893ef42ba4a
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 3e76d1f..06a71d2 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -439,7 +439,7 @@ void SwLineLayout::CalcLine( SwTxtFormatter &rLine,
SwTxtFormatInfo &rInf )
if( Height() < nPosHeight )
{
// Height is set to 0 when Init() is called.
- if (bIgnoreBlanksAndTabsForLineHeightCalculation)
+ if (bIgnoreBlanksAndTabsForLineHeightCalculation
&& pPos->GetWhichPor() == POR_FLYCNT)
// Compat flag set: take the line height, if
it's larger.
Height(std::max(nPosHeight, nLineHeight));
else
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
