incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o..@apache.org
Subject svn commit: r1359607 - /incubator/ooo/trunk/main/sw/source/core/layout/fly.cxx
Date Tue, 10 Jul 2012 11:34:44 GMT
Author: orw
Date: Tue Jul 10 11:34:43 2012
New Revision: 1359607

URL: http://svn.apache.org/viewvc?rev=1359607&view=rev
Log:
#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

Modified:
    incubator/ooo/trunk/main/sw/source/core/layout/fly.cxx

Modified: incubator/ooo/trunk/main/sw/source/core/layout/fly.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/source/core/layout/fly.cxx?rev=1359607&r1=1359606&r2=1359607&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/source/core/layout/fly.cxx (original)
+++ incubator/ooo/trunk/main/sw/source/core/layout/fly.cxx Tue Jul 10 11:34:43 2012
@@ -2691,7 +2691,8 @@ SwTwips lcl_CalcAutoWidth( const SwLayou
             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() )
         {



Mime
View raw message