Avoid infinite loop caused by vertical content alignment

In some case invalidations makes the program to go
into an infinite loop.
Move InvalidateContentPos() call upper in the
SwCntntFrm::MakeAll method so it won't be called
when size invalidation is made inside this
method.

Change-Id: I25deccb1760b82a764cad3e90aafb092631a1533

1 files changed, 8 insertions, 8 deletions

diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index 88be7b681d74..da97bcfab084 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -1266,6 +1266,14 @@ void SwCntntFrm::MakeAll()
             }
 
             (Frm().*fnRect->fnSetWidth)( nNewFrmWidth );
+
+            // When a lower of a vertically aligned fly frame changes it's size we need to recalculate content pos.
+            if( GetUpper() && GetUpper()->IsFlyFrm() &&
+                GetUpper()->GetFmt()->GetTextVertAdjust().GetValue() != SDRTEXTVERTADJUST_TOP )
+            {
+                static_cast<SwFlyFrm*>(GetUpper())->InvalidateContentPos();
+                GetUpper()->SetCompletePaint();
+            }
         }
         if ( !mbValidPrtArea )
         {
@@ -1340,14 +1348,6 @@ void SwCntntFrm::MakeAll()
             if ( nConsequetiveFormatsWithoutChange <= cnStopFormat )
             {
                 Format();
-
-                // When a lower of a vertically aligned fly frame changes it's size we need to recalculate content pos.
-                if( GetUpper() && GetUpper()->IsFlyFrm() &&
-                    GetUpper()->GetFmt()->GetTextVertAdjust().GetValue() != SDRTEXTVERTADJUST_TOP )
-                {
-                    static_cast<SwFlyFrm*>(GetUpper())->InvalidateContentPos();
-                    GetUpper()->SetCompletePaint();
-                }
             }
 #if OSL_DEBUG_LEVEL > 0
             else