[Libreoffice-commits] core.git: Branch 'feature/perfwork2' - svx/source

[Kohei Yoshida]

 svx/source/svdraw/svdoashp.cxx |    3 ---
 svx/source/svdraw/svdotext.cxx |    1 -
 2 files changed, 4 deletions(-)

New commits:
commit 27dd0cd6ccdb9f42f778b66e40cf522694d1ed64
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Wed Oct 15 10:04:51 2014 -0400

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

diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 858772c..7f17a11 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -1480,10 +1480,7 @@ void SdrObjCustomShape::AdaptTextMinSize()
         }
 
         if(bChanged)
-        {
             SetObjectItemSet(aSet);
-            NbcAdjustTextFrameWidthAndHeight();
-        }
     }
 }
 
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index a96efe9..ca79e62 100644
--- 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