diff options
| author | Armin Le Grand <alg@apache.org> | 2013-09-19 11:34:41 +0000 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-03-25 09:29:56 +0100 |
| commit | 9ee0cf63a1dafebb673fbee9ccfc82a56fd050d4 (patch) | |
| tree | 648f34616bb0602bbca1dbc61910eddb9e3b611a /svx/source/svdraw/svdotext.cxx | |
| parent | f9cc7509855c2e9efc1b7a37259919131e04da2c (diff) | |
i115391 corected from isLocked to IsPasteResize which was used in modifiers for CustomShape and TextShape
(cherry picked from commit 473a118a62842270b85713d0ab0dc247b5778439)
Diffstat (limited to 'svx/source/svdraw/svdotext.cxx')
| -rw-r--r-- | svx/source/svdraw/svdotext.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 170c5ec6884c..32705458f282 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -566,7 +566,7 @@ bool SdrTextObj::NbcSetMaxTextFrameHeight(long nHgt) // states of IsAutoGrowWidth/Height to correctly set TextMinFrameWidth/Height void SdrTextObj::AdaptTextMinSize() { - if(bTextFrame && (!pModel || !pModel->isLocked())) + if(bTextFrame && (!pModel || !pModel->IsPasteResize())) { const bool bW(IsAutoGrowWidth()); const bool bH(IsAutoGrowHeight()); |