Kaydet (Commit) 182062bb authored tarafından Jian Hong Cheng's avatar Jian Hong Cheng

Fix issue #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,<kangjane2012@gmail.com>
Found by: Yan Ji,<yanji.yj@gmail.com>
Review by: Jian Hong Cheng,<chengjh@apache.org>
üst 6b6ccbca
...@@ -1572,7 +1572,11 @@ xub_StrLen SwTxtFormatter::FormatLine( const xub_StrLen nStartPos ) ...@@ -1572,7 +1572,11 @@ xub_StrLen SwTxtFormatter::FormatLine( const xub_StrLen nStartPos )
pCurr->CalcLine( *this, GetInfo() ); pCurr->CalcLine( *this, GetInfo() );
CalcRealHeight( GetInfo().IsNewLine() ); CalcRealHeight( GetInfo().IsNewLine() );
if ( IsFlyInCntBase() && !IsQuick() ) //Bug 120864:For Special case that at the first caculation couldn't get correct height. And need to recaculate for the right height.
SwLinePortion* pPorTmp = pCurr->GetPortion();
if ( IsFlyInCntBase() && (!IsQuick() || (pPorTmp && pPorTmp->IsFlyCntPortion() && !pPorTmp->GetPortion() &&
pCurr->Height() > pPorTmp->Height())))
//Bug 120864(End)
{ {
KSHORT nTmpAscent, nTmpHeight; KSHORT nTmpAscent, nTmpHeight;
CalcAscentAndHeight( nTmpAscent, nTmpHeight ); CalcAscentAndHeight( nTmpAscent, nTmpHeight );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment