SetObjectItemSet() eventually calls NbcAdjustTextFrameWidthAndHeight().

No need to call this (rather expensive) method twice. Change-Id: I4c0a54acd1da0b8504ae7eb96beda4a8531943c7

SetObjectItemSet() eventually calls NbcAdjustTextFrameWidthAndHeight().
No need to call this (rather expensive) method twice. Change-Id: I4c0a54acd1da0b8504ae7eb96beda4a8531943c7
c3513475 · Kohei Yoshida · 4a3e7d46 · c3513475 · c3513475
Kaydet (Commit) c3513475 authored Eki 15, 2014 tarafından Kohei Yoshida
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

svdoashp.cxx svx/source/svdraw/svdoashp.cxx +0 -3

svdotext.cxx svx/source/svdraw/svdotext.cxx +0 -1

No files found.
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -1480,10 +1480,7 @@ void SdrObjCustomShape::AdaptTextMinSize()
        }

        if(bChanged)
-        {
            SetObjectItemSet(aSet);
-            NbcAdjustTextFrameWidthAndHeight();
-        }
    }
 }


--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -600,7 +600,6 @@ void SdrTextObj::AdaptTextMinSize()
    }

    SetObjectItemSet(aSet);
-    NbcAdjustTextFrameWidthAndHeight();
 }

 void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, bool bLineWidth ) const