i#115391 better support for MinTextSize settings

... for TextShapes and CustomShapes

Conflicts:
include/svx/svdotext.hxx
svx/source/sdr/properties/customshapeproperties.cxx
svx/source/svdraw/svdoashp.cxx
svx/source/svdraw/svdotext.cxx
svx/source/svdraw/svdotxdr.cxx
svx/source/svdraw/svdotxtr.cxx

Change-Id: Ie6f490801b6887568135ed5f83c8bbe7ab6daa08

3 files changed, 18 insertions, 2 deletions

diff --git a/include/svx/sdr/properties/customshapeproperties.hxx b/include/svx/sdr/properties/customshapeproperties.hxx
index 23a0181e7432..d92db87fe39a 100644
--- a/include/svx/sdr/properties/customshapeproperties.hxx
+++ b/include/svx/sdr/properties/customshapeproperties.hxx
@@ -45,6 +45,10 @@ namespace sdr
             // react on Item change
             virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem);
 
+            // Called after ItemChange() is done for all items. Allows local reactions on
+            // specific item changes
+            virtual void PostItemChange(const sal_uInt16 nWhich);
+
             // clear single item
             virtual void ClearObjectItem(const sal_uInt16 nWhich = 0);
 
diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx
index be3c7a753761..00b4afebf714 100644
--- a/include/svx/svdoashp.hxx
+++ b/include/svx/svdoashp.hxx
@@ -130,6 +130,10 @@ public:
     static basegfx::B2DPolyPolygon GetLineGeometry( const SdrObjCustomShape* pCustomShape, const bool bBezierAllowed );
 
 protected:
+    // #115391# new method for SdrObjCustomShape and SdrTextObj to correctly handle and set
+    // SdrTextMinFrameWidthItem and SdrTextMinFrameHeightItem based on all settings, necessities
+    // and object sizes
+    virtual void AdaptTextMinSize();
 
     OUString      aName;
 
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 91a935c83c33..8e184c3aec8d 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -290,8 +290,16 @@ protected:
     virtual void SaveGeoData(SdrObjGeoData& rGeo) const;
     virtual void RestGeoData(const SdrObjGeoData& rGeo);
     bool NbcSetEckenradius(long nRad);
-    bool NbcSetMinTextFrameHeight(long nHgt);
-    bool NbcSetMinTextFrameWidth(long nWdt);
+    bool NbcSetAutoGrowHeight(bool bAuto);
+    bool NbcSetMaxTextFrameHeight(long nHgt);
+    bool NbcSetAutoGrowWidth(bool bAuto);
+    bool NbcSetMaxTextFrameWidth(long nWdt);
+    bool NbcSetFitToSize(SdrFitToSizeType eFit);
+
+    // #115391# new method for SdrObjCustomShape and SdrTextObj to correctly handle and set
+    // SdrTextMinFrameWidthItem and SdrTextMinFrameHeightItem based on all settings, necessities
+    // and object sizes
+    virtual void AdaptTextMinSize();
 
     // Konstruktoren fuer beschriftete Zeichenobjekte
     SdrTextObj();