mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: #i120864# Text is overlapped by the drawing object...

Browse Source 
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>
(cherry picked from commit 182062bbeb5a5a34d2bc59791b1d20ff565a1bb8)

Change-Id: Iaabb457ade39ef7bfd5b8d07e97c8a98b678a163
This commit is contained in:
Jian Hong Cheng
2012-09-12 05:25:24 +00:00
committed by Caolán McNamara
parent b41f03049c
commit 05bd5b46ea
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sw/source/core/text/itrform2.cxx
View File

@@ -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 );