summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@collabora.com>2014-10-15 10:04:51 -0400
committerKohei Yoshida <kohei.yoshida@collabora.com>2014-10-22 18:07:30 -0400
commitc3513475e549581b8d535975bf84acf8c788d469 (patch)
tree1a920366a2836ba2498b4cfdf6ca83b0d95b50e9 /svx
parent4a3e7d46c106a8d75c399b0fc21ab3808a9b2467 (diff)
SetObjectItemSet() eventually calls NbcAdjustTextFrameWidthAndHeight().
No need to call this (rather expensive) method twice. Change-Id: I4c0a54acd1da0b8504ae7eb96beda4a8531943c7
Diffstat (limited to 'svx')
-rw-r--r--svx/source/svdraw/svdoashp.cxx3
-rw-r--r--svx/source/svdraw/svdotext.cxx1
2 files changed, 0 insertions, 4 deletions
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index be38ea99c3dc..85a4b9fcc00e 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 86893c53b825..fdb46e9159bc 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