Consistency around SdrMetricItem

...where some instances of SDRATTR_TEXT_MINFRAMEHEIGHT etc. where SdrMetricItem
while others where of trivial derived classes SdrTextMinFrameHeightItem etc.,
that appear to only existed for better-named constructors.

Change-Id: If0af79fbb803275ed09fc7b950868c5de7d61615

3 files changed, 14 insertions, 14 deletions

diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 0d6ade274ae7..cf4c6f5e1829 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -146,7 +146,7 @@ SdrItemPool::SdrItemPool(
     mppLocalPoolDefaults[SDRATTR_CAPTIONLINELEN   -SDRATTR_START]=new SdrCaptionLineLenItem   ;
     mppLocalPoolDefaults[SDRATTR_CAPTIONFITLINELEN-SDRATTR_START]=new SdrCaptionFitLineLenItem;
     mppLocalPoolDefaults[SDRATTR_ECKENRADIUS            -SDRATTR_START]=new SdrEckenradiusItem;
-    mppLocalPoolDefaults[SDRATTR_TEXT_MINFRAMEHEIGHT    -SDRATTR_START]=new SdrTextMinFrameHeightItem;
+    mppLocalPoolDefaults[SDRATTR_TEXT_MINFRAMEHEIGHT    -SDRATTR_START]=new SdrMetricItem(SDRATTR_TEXT_MINFRAMEHEIGHT, 0);
     mppLocalPoolDefaults[SDRATTR_TEXT_AUTOGROWHEIGHT    -SDRATTR_START]=new SdrTextAutoGrowHeightItem;
     mppLocalPoolDefaults[SDRATTR_TEXT_FITTOSIZE     -SDRATTR_START]=new SdrTextFitToSizeTypeItem;
     mppLocalPoolDefaults[SDRATTR_TEXT_LEFTDIST      -SDRATTR_START]=new SdrTextLeftDistItem;
@@ -154,9 +154,9 @@ SdrItemPool::SdrItemPool(
     mppLocalPoolDefaults[SDRATTR_TEXT_UPPERDIST     -SDRATTR_START]=new SdrTextUpperDistItem;
     mppLocalPoolDefaults[SDRATTR_TEXT_LOWERDIST     -SDRATTR_START]=new SdrTextLowerDistItem;
     mppLocalPoolDefaults[SDRATTR_TEXT_VERTADJUST        -SDRATTR_START]=new SdrTextVertAdjustItem;
-    mppLocalPoolDefaults[SDRATTR_TEXT_MAXFRAMEHEIGHT    -SDRATTR_START]=new SdrTextMaxFrameHeightItem;
-    mppLocalPoolDefaults[SDRATTR_TEXT_MINFRAMEWIDTH -SDRATTR_START]=new SdrTextMinFrameWidthItem;
-    mppLocalPoolDefaults[SDRATTR_TEXT_MAXFRAMEWIDTH -SDRATTR_START]=new SdrTextMaxFrameWidthItem;
+    mppLocalPoolDefaults[SDRATTR_TEXT_MAXFRAMEHEIGHT    -SDRATTR_START]=new SdrMetricItem(SDRATTR_TEXT_MAXFRAMEHEIGHT, 0);
+    mppLocalPoolDefaults[SDRATTR_TEXT_MINFRAMEWIDTH -SDRATTR_START]=new SdrMetricItem(SDRATTR_TEXT_MINFRAMEWIDTH, 0);
+    mppLocalPoolDefaults[SDRATTR_TEXT_MAXFRAMEWIDTH -SDRATTR_START]=new SdrMetricItem(SDRATTR_TEXT_MAXFRAMEWIDTH, 0);
     mppLocalPoolDefaults[SDRATTR_TEXT_AUTOGROWWIDTH -SDRATTR_START]=new SdrTextAutoGrowWidthItem;
     mppLocalPoolDefaults[SDRATTR_TEXT_HORZADJUST        -SDRATTR_START]=new SdrTextHorzAdjustItem;
     mppLocalPoolDefaults[SDRATTR_TEXT_ANIKIND           -SDRATTR_START]=new SdrTextAniKindItem;
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index c2257f279914..f6fab1311c43 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -1457,8 +1457,8 @@ void SdrObjCustomShape::AdaptTextMinSize()
         {
             // always reset MinWidthHeight to zero to only rely on text size and frame size
             // to allow resizing being completely dependent on text size only
-            aSet.Put(SdrTextMinFrameWidthItem(0));
-            aSet.Put(SdrTextMinFrameHeightItem(0));
+            aSet.Put(makeSdrTextMinFrameWidthItem(0));
+            aSet.Put(makeSdrTextMinFrameHeightItem(0));
             bChanged = true;
         }
         else
@@ -1473,8 +1473,8 @@ void SdrObjCustomShape::AdaptTextMinSize()
                 const long nTWdt(std::max(long(0), (long)(aTextBound.GetWidth() - 1 - nHDist)));
                 const long nTHgt(std::max(long(0), (long)(aTextBound.GetHeight() - 1 - nVDist)));
 
-                aSet.Put(SdrTextMinFrameWidthItem(nTWdt));
-                aSet.Put(SdrTextMinFrameHeightItem(nTHgt));
+                aSet.Put(makeSdrTextMinFrameWidthItem(nTWdt));
+                aSet.Put(makeSdrTextMinFrameHeightItem(nTHgt));
                 bChanged = true;
             }
         }
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 973ac5fd6e55..a69e188321cd 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -566,7 +566,7 @@ void SdrTextObj::AdaptTextMinSize()
                 const long nDist(GetTextLeftDistance() + GetTextRightDistance());
                 const long nW(std::max(long(0), (long)(aRect.GetWidth() - 1 - nDist)));
 
-                aSet.Put(SdrTextMinFrameWidthItem(nW));
+                aSet.Put(makeSdrTextMinFrameWidthItem(nW));
 
                 if(!IsVerticalWriting() && bDisableAutoWidthOnDragging)
                 {
@@ -580,7 +580,7 @@ void SdrTextObj::AdaptTextMinSize()
                 const long nDist(GetTextUpperDistance() + GetTextLowerDistance());
                 const long nH(std::max(long(0), (long)(aRect.GetHeight() - 1 - nDist)));
 
-                aSet.Put(SdrTextMinFrameHeightItem(nH));
+                aSet.Put(makeSdrTextMinFrameHeightItem(nH));
 
                 if(IsVerticalWriting() && bDisableAutoWidthOnDragging)
                 {
@@ -1761,22 +1761,22 @@ long SdrTextObj::GetEckenradius() const
 
 long SdrTextObj::GetMinTextFrameHeight() const
 {
-    return ((SdrTextMinFrameHeightItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_MINFRAMEHEIGHT))).GetValue();
+    return ((SdrMetricItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_MINFRAMEHEIGHT))).GetValue();
 }
 
 long SdrTextObj::GetMaxTextFrameHeight() const
 {
-    return ((SdrTextMaxFrameHeightItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_MAXFRAMEHEIGHT))).GetValue();
+    return ((SdrMetricItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_MAXFRAMEHEIGHT))).GetValue();
 }
 
 long SdrTextObj::GetMinTextFrameWidth() const
 {
-    return ((SdrTextMinFrameWidthItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_MINFRAMEWIDTH))).GetValue();
+    return ((SdrMetricItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_MINFRAMEWIDTH))).GetValue();
 }
 
 long SdrTextObj::GetMaxTextFrameWidth() const
 {
-    return ((SdrTextMaxFrameWidthItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_MAXFRAMEWIDTH))).GetValue();
+    return ((SdrMetricItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_MAXFRAMEWIDTH))).GetValue();
 }
 
 bool SdrTextObj::IsFontwork() const