diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2012-07-10 10:34:43 +0000 |
|---|---|---|
| committer | Oliver-Rainer Wittmann <orw@apache.org> | 2012-07-10 10:34:43 +0000 |
| commit | 6cecd60ceff2c5064bcca677514d06d6e410654d (patch) | |
| tree | f5546bea8fddff122af70fbf8cb7f790d832c5b0 /sw | |
| parent | 5a4ae152af799f4f6d1313b53af86a61cbe109b2 (diff) | |
#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
Notes
Notes:
merged as: 6ab3d3d906fe6d5a871d64ace6db32e13e664661
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 fc6a709c6fa4..1ac3cfc6a6f1 100644 --- a/sw/source/core/layout/fly.cxx +++ b/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() ) { |