sw/source/core/text/itrform2.cxx | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 05bd5b46ea659df95fb6f0c895c090629b541e0f
Author: Jian Hong Cheng <chen...@apache.org>
Date: Wed Sep 12 05:25:24 2012 +0000
Resolves: #i120864# Text is overlapped by the drawing object...
when open the .doc file
* sw/source/core/text/itrform2.cxx
Core function
Patch by: Jane Kang,<kangjane2...@gmail.com>
Found by: Yan Ji,<yanji...@gmail.com>
Review by: Jian Hong Cheng,<chen...@apache.org>
(cherry picked from commit 182062bbeb5a5a34d2bc59791b1d20ff565a1bb8)
Change-Id: Iaabb457ade39ef7bfd5b8d07e97c8a98b678a163
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index fcd49c1..4c7f958 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -1553,7 +1553,11 @@ xub_StrLen SwTxtFormatter::FormatLine( const xub_StrLen
nStartPos )
pCurr->CalcLine( *this, GetInfo() );
CalcRealHeight( GetInfo().IsNewLine() );
- if ( IsFlyInCntBase() && !IsQuick() )
+ //#i120864# For Special case that at the first calculation couldn't get
+ //correct height. And need to recalculate for the right height.
+ SwLinePortion* pPorTmp = pCurr->GetPortion();
+ if ( IsFlyInCntBase() && (!IsQuick() || (pPorTmp &&
pPorTmp->IsFlyCntPortion() && !pPorTmp->GetPortion() &&
+ pCurr->Height() > pPorTmp->Height())))
{
KSHORT nTmpAscent, nTmpHeight;
CalcAscentAndHeight( nTmpAscent, nTmpHeight );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
