#119952# - method <lcl_CalcAutoWidth(..)> - do not provide width of text frame…

#119952# - method <lcl_CalcAutoWidth(..)> - do not provide width of text frame inclusive margins, if text frame is in its formatting.

Found by: Yan Ji
Patch by: qiuhuaidong at gmail dot com
Review by: Oliver-Rainer Wittmann

sw/source/core/layout/fly.cxx

@@ -2691,7 +2691,8 @@ SwTwips lcl_CalcAutoWidth( const SwLayoutFrm& rFrm )
             nMin = ((SwTxtFrm*)pFrm)->CalcFitToContent();
             const SvxLRSpaceItem &rSpace =
                 ((SwTxtFrm*)pFrm)->GetTxtNode()->GetSwAttrSet().GetLRSpace();
-            nMin += rSpace.GetRight() + rSpace.GetTxtLeft() + rSpace.GetTxtFirstLineOfst();
+            if (!((SwTxtFrm*)pFrm)->IsLocked())
+                nMin += rSpace.GetRight() + rSpace.GetTxtLeft() + rSpace.GetTxtFirstLineOfst();
         }
         else if ( pFrm->IsTabFrm() )
         {