Consistency around SdrMetricItem in svx/sdtditm.hxx

...similar to what has been done for svx/sdtmfitm.hxx in
6a2ea81ca1622d2c2ad55bea8ddc28167fcc2794 "Remove unused ctors" and
68969cc61adecac481ae9656978ef952f435b310 "Consistency around SdrMetricItem."

Change-Id: Ib0234883d441be668700df5ccd0e855973dc5426

2 files changed, 17 insertions, 17 deletions

diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 0fe240bfa227..c5bdd59f5758 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -1496,10 +1496,10 @@ void DffPropertyReader::ApplyCustomShapeTextAttributes( SfxItemSet& rSet ) const
     rSet.Put( SdrTextVertAdjustItem( eTVA ) );
     rSet.Put( SdrTextHorzAdjustItem( eTHA ) );
 
-    rSet.Put( SdrTextLeftDistItem( nTextLeft ) );
-    rSet.Put( SdrTextRightDistItem( nTextRight ) );
-    rSet.Put( SdrTextUpperDistItem( nTextTop ) );
-    rSet.Put( SdrTextLowerDistItem( nTextBottom ) );
+    rSet.Put( makeSdrTextLeftDistItem( nTextLeft ) );
+    rSet.Put( makeSdrTextRightDistItem( nTextRight ) );
+    rSet.Put( makeSdrTextUpperDistItem( nTextTop ) );
+    rSet.Put( makeSdrTextLowerDistItem( nTextBottom ) );
 
     rSet.Put( SdrTextWordWrapItem( (MSO_WrapMode)GetPropertyValue( DFF_Prop_WrapText, mso_wrapSquare ) != mso_wrapNone ? sal_True : sal_False ) );
     rSet.Put( SdrTextAutoGrowHeightItem( ( GetPropertyValue( DFF_Prop_FitTextToShape ) & 2 ) != 0 ) );
@@ -5152,10 +5152,10 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
             }
 
             // set margins at the border of the textbox
-            aSet.Put( SdrTextLeftDistItem( nTextLeft ) );
-            aSet.Put( SdrTextRightDistItem( nTextRight ) );
-            aSet.Put( SdrTextUpperDistItem( nTextTop ) );
-            aSet.Put( SdrTextLowerDistItem( nTextBottom ) );
+            aSet.Put( makeSdrTextLeftDistItem( nTextLeft ) );
+            aSet.Put( makeSdrTextRightDistItem( nTextRight ) );
+            aSet.Put( makeSdrTextUpperDistItem( nTextTop ) );
+            aSet.Put( makeSdrTextLowerDistItem( nTextBottom ) );
             pTextImpRec->nDxTextLeft    = nTextLeft;
             pTextImpRec->nDyTextTop     = nTextTop;
             pTextImpRec->nDxTextRight   = nTextRight;
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 475713517d64..bd869b2c1e5a 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1096,10 +1096,10 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
                 pTObj->SetMergedItem( makeSdrTextMinFrameWidthItem( nMinFrameWidth ) );
 
             // set margins at the borders of the textbox
-            pTObj->SetMergedItem( SdrTextLeftDistItem( nTextLeft ) );
-            pTObj->SetMergedItem( SdrTextRightDistItem( nTextRight ) );
-            pTObj->SetMergedItem( SdrTextUpperDistItem( nTextTop ) );
-            pTObj->SetMergedItem( SdrTextLowerDistItem( nTextBottom ) );
+            pTObj->SetMergedItem( makeSdrTextLeftDistItem( nTextLeft ) );
+            pTObj->SetMergedItem( makeSdrTextRightDistItem( nTextRight ) );
+            pTObj->SetMergedItem( makeSdrTextUpperDistItem( nTextTop ) );
+            pTObj->SetMergedItem( makeSdrTextLowerDistItem( nTextBottom ) );
             pTObj->SetMergedItem( SdrTextFixedCellHeightItem( true ) );
 
             if ( !pTObj->ISA( SdrObjCustomShape ) )
@@ -7234,10 +7234,10 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell )
     {
         Reference< XPropertySet > xPropSet( xCell, UNO_QUERY_THROW );
 
-        const sal_Int32 nLeftDist(((const SdrTextLeftDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_LEFTDIST)).GetValue());
-        const sal_Int32 nRightDist(((const SdrTextRightDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_RIGHTDIST)).GetValue());
-        const sal_Int32 nUpperDist(((const SdrTextUpperDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_UPPERDIST)).GetValue());
-        const sal_Int32 nLowerDist(((const SdrTextLowerDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_LOWERDIST)).GetValue());
+        const sal_Int32 nLeftDist(((const SdrMetricItem&)pObj->GetMergedItem(SDRATTR_TEXT_LEFTDIST)).GetValue());
+        const sal_Int32 nRightDist(((const SdrMetricItem&)pObj->GetMergedItem(SDRATTR_TEXT_RIGHTDIST)).GetValue());
+        const sal_Int32 nUpperDist(((const SdrMetricItem&)pObj->GetMergedItem(SDRATTR_TEXT_UPPERDIST)).GetValue());
+        const sal_Int32 nLowerDist(((const SdrMetricItem&)pObj->GetMergedItem(SDRATTR_TEXT_LOWERDIST)).GetValue());
         static const OUString  sTopBorder( "TextUpperDistance" );
         static const OUString  sBottomBorder( "TextLowerDistance" );
         static const OUString  sLeftBorder( "TextLeftDistance" );
@@ -7257,7 +7257,7 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell )
         xPropSet->setPropertyValue( sTextVerticalAdjust, Any( eVA ) );
 
         //set textHorizontalAdjust and TextWritingMode attr
-        const sal_Int32 eHA(((const SdrTextLeftDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_HORZADJUST)).GetValue());
+        const sal_Int32 eHA(((const SdrMetricItem&)pObj->GetMergedItem(SDRATTR_TEXT_HORZADJUST)).GetValue());
         const SvxFrameDirection eDirection = (const SvxFrameDirection)((( const SvxFrameDirectionItem&)pObj->GetMergedItem(EE_PARA_WRITINGDIR)).GetValue());
         static const OUString  sHorizontalAdjust( "TextHorizontalAdjust" );
         static const OUString  sWritingMode( "TextWritingMode" );