diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-06-08 14:07:13 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2012-06-08 14:08:23 +0200 |
| commit | 11a54814be785766d797cc83cfdacd2368ea642c (patch) | |
| tree | 24aed7f14b22659ff474d8f5b3d328561c1ac26f | |
| parent | e8c290f48f3f0396e278c7664ec84ff06aeb00b7 (diff) | |
Related: i#3952 SwLineLayout::CalcLine: fix regression
Commit 563df5d0c3c696912f211e74dd4dbda1aa720ae7 broke the layout of the
bugdoc, fix this.
Change-Id: I7965e9507d4ba130a4f7bea844cdd893ef42ba4a
| -rw-r--r-- | sw/source/core/text/porlay.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx index 3e76d1f08ad9..06a71d2f69ad 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 |