9 files changed, 12 insertions, 9 deletions
diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx
index 0db44415c6f3..34f26acc33c1 100644
--- a/include/svx/svdoashp.hxx
+++ b/include/svx/svdoashp.hxx
@@ -179,7 +179,7 @@ public:
     virtual void NbcMirror(const Point& rRef1, const Point& rRef2) override;
     virtual void NbcShear(const Point& rRef, Degree100 nAngle, double tn, bool bVShear) override;
     virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override;
-    virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override;
+    virtual void NbcSetLogicRect(const tools::Rectangle& rRect, bool bAdaptTextMinSize = true) override;
 
     virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const override;
 
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 127bf5c051e5..5519b7ff4493 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -564,7 +564,9 @@ public:
     // Logic Rect: for the Rect for instance without regard to rotation angle, shear, ...
     virtual const tools::Rectangle& GetLogicRect() const;
     virtual void SetLogicRect(const tools::Rectangle& rRect);
-    virtual void NbcSetLogicRect(const tools::Rectangle& rRect);
+    // @param bAdaptTextMinSize pass false if you know it it safe to avoid the cost of doing
+    //              text layout right now.
+    virtual void NbcSetLogicRect(const tools::Rectangle& rRect, bool bAdaptTextMinSize = true);
 
     // the default is to set the logic rect to the given rectangle rMaxRect. If the shape
     // has an intrinsic aspect ratio it may set the logic rect so the aspect
diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx
index ffd8d4036f69..aa431b57aa53 100644
--- a/include/svx/svdocapt.hxx
+++ b/include/svx/svdocapt.hxx
@@ -124,7 +124,7 @@ public:
     SAL_DLLPRIVATE virtual Point GetRelativePos() const override;
 
     virtual const tools::Rectangle& GetLogicRect() const override;
-    SAL_DLLPRIVATE virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override;
+    virtual void NbcSetLogicRect(const tools::Rectangle& rRect, bool bAdaptTextMinSize = true) override;
 
     SAL_DLLPRIVATE virtual sal_uInt32 GetSnapPointCount() const override;
     SAL_DLLPRIVATE virtual Point GetSnapPoint(sal_uInt32 i) const override;
diff --git a/include/svx/svdogrp.hxx b/include/svx/svdogrp.hxx
index e5e1203ed5b7..32a7750e90d4 100644
--- a/include/svx/svdogrp.hxx
+++ b/include/svx/svdogrp.hxx
@@ -107,7 +107,7 @@ public:
     virtual void NbcSetAnchorPos(const Point& rPnt) override;
     virtual void NbcSetRelativePos(const Point& rPnt) override;
     virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override;
-    virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override;
+    virtual void NbcSetLogicRect(const tools::Rectangle& rRect, bool bAdaptTextMinSize = true) override;
 
     virtual void NbcReformatText() override;
 
diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx
index ec9a0f6b4d0e..1f89c237c1e8 100644
--- a/include/svx/svdoole2.hxx
+++ b/include/svx/svdoole2.hxx
@@ -146,7 +146,7 @@ public:
     virtual void NbcMove(const Size& rSize) override;
     virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override;
     virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override;
-    virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override;
+    virtual void NbcSetLogicRect(const tools::Rectangle& rRect, bool bAdaptTextMinSize = true) override;
     virtual void SetGeoData(const SdrObjGeoData& rGeo) override;
 
     static bool CanUnloadRunningObj( const css::uno::Reference< css::embed::XEmbeddedObject >& xObj,
diff --git a/include/svx/svdorect.hxx b/include/svx/svdorect.hxx
index af02a907aa36..7b1c1fca7629 100644
--- a/include/svx/svdorect.hxx
+++ b/include/svx/svdorect.hxx
@@ -95,7 +95,7 @@ public:
     virtual rtl::Reference<SdrObject> CloneSdrObject(SdrModel& rTargetModel) const override;
     virtual void RecalcSnapRect() override;
     virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override;
-    virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override;
+    virtual void NbcSetLogicRect(const tools::Rectangle& rRect, bool bAdaptTextMinSize = true) override;
     virtual basegfx::B2DPolyPolygon TakeXorPoly() const override;
 
     virtual sal_uInt32 GetHdlCount() const override;
diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx
index 3f3573466651..4a7e8ad792b6 100644
--- a/include/svx/svdotable.hxx
+++ b/include/svx/svdotable.hxx
@@ -210,7 +210,7 @@ public:
     virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override;
 
     virtual const tools::Rectangle& GetLogicRect() const override;
-    virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override;
+    virtual void NbcSetLogicRect(const tools::Rectangle& rRect, bool bAdaptTextMinSize = true) override;
     virtual void AdjustToMaxRect( const tools::Rectangle& rMaxRect, bool bShrinkOnly = false ) override;
 
     virtual sal_uInt32 GetHdlCount() const override;
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 201f17a70cdf..ba9e9783e146 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -481,7 +481,7 @@ public:
     virtual basegfx::B2DPolyPolygon TakeContour() const override;
     virtual void RecalcSnapRect() override;
     virtual void NbcSetSnapRect(const tools::Rectangle& rRect) override;
-    virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override;
+    virtual void NbcSetLogicRect(const tools::Rectangle& rRect, bool bAdaptTextMinSize = true) override;
     virtual const tools::Rectangle& GetLogicRect() const override;
     virtual Degree100 GetRotateAngle() const override;
     virtual Degree100 GetShearAngle(bool bVertical = false) const override;
diff --git a/include/svx/svdovirt.hxx b/include/svx/svdovirt.hxx
index ca5f6858ecaa..2b47f25cbc57 100644
--- a/include/svx/svdovirt.hxx
+++ b/include/svx/svdovirt.hxx
@@ -133,7 +133,8 @@ public:
 
     virtual const tools::Rectangle& GetLogicRect() const override;
     virtual void SetLogicRect(const tools::Rectangle& rRect) override;
-    virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override;
+    virtual void NbcSetLogicRect(const tools::Rectangle& rRect,
+                                 bool bAdaptTextMinSize = true) override;
 
     virtual Degree100 GetRotateAngle() const override;
     virtual Degree100 GetShearAngle(bool bVertical = false) const override;