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,<kangjane2012@gmail.com>
Found by: Yan Ji,<yanji.yj@gmail.com>
Review by: Jian Hong Cheng,<chengjh@apache.org>
(cherry picked from commit 182062bb)

Change-Id: Iaabb457ade39ef7bfd5b8d07e97c8a98b678a163

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