diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2012-07-10 10:34:43 +0000 |
|---|---|---|
| committer | Xisco Fauli <anistenis@gmail.com> | 2013-03-13 01:25:44 +0100 |
| commit | c083e0f22e2d5bcd7d3e686b18be5f415ffebdc6 (patch) | |
| tree | d159d9c01673ac7ed53ad8f91d07756317596902 /sw | |
| parent | fdo#34800 Comments added to footer are placed at the right top of the page. (diff) | |
| download | core-c083e0f22e2d5bcd7d3e686b18be5f415ffebdc6.tar.gz core-c083e0f22e2d5bcd7d3e686b18be5f415ffebdc6.zip | |
#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
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/layout/fly.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index 77c469216c68..42890b9d051b 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -2559,7 +2559,8 @@ static 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() ) { |