From 768d32cf5b7dc35ab1b93e898e1bb5beab43c27c Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 4 Aug 2014 11:29:51 +0200
Subject: 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
---
 sw/source/filter/ww8/ww8graf.cxx | 16 ++++++++--------
 sw/source/filter/ww8/ww8par.cxx  |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'sw')

diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 2af7e71f5831..c8af5bfaa18a 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -1201,10 +1201,10 @@ SdrObject* SwWW8ImplReader::ReadTxtBox( WW8_DPHEAD* pHd, const WW8_DO* pDo,
     rSet.Put( SdrTextFitToSizeTypeItem( SDRTEXTFIT_NONE ) );
     rSet.Put( SdrTextAutoGrowWidthItem(false));
     rSet.Put( SdrTextAutoGrowHeightItem(false));
-    rSet.Put( SdrTextLeftDistItem(  MIN_BORDER_DIST*2 ) );
-    rSet.Put( SdrTextRightDistItem( MIN_BORDER_DIST*2 ) );
-    rSet.Put( SdrTextUpperDistItem( MIN_BORDER_DIST ) );
-    rSet.Put( SdrTextLowerDistItem( MIN_BORDER_DIST ) );
+    rSet.Put( makeSdrTextLeftDistItem(  MIN_BORDER_DIST*2 ) );
+    rSet.Put( makeSdrTextRightDistItem( MIN_BORDER_DIST*2 ) );
+    rSet.Put( makeSdrTextUpperDistItem( MIN_BORDER_DIST ) );
+    rSet.Put( makeSdrTextLowerDistItem( MIN_BORDER_DIST ) );
 
     return pObj;
 }
@@ -2800,10 +2800,10 @@ SwFrmFmt* SwWW8ImplReader::MungeTextIntoDrawBox(SdrObject* pTrueObject,
             // ww8-default Randabstand einsetzen
             SfxItemSet aItemSet(pDrawModel->GetItemPool(),
                 SDRATTR_TEXT_LEFTDIST, SDRATTR_TEXT_LOWERDIST);
-            aItemSet.Put( SdrTextLeftDistItem( pRecord->nDxTextLeft ) );
-            aItemSet.Put( SdrTextRightDistItem( pRecord->nDxTextRight  ) );
-            aItemSet.Put( SdrTextUpperDistItem( pRecord->nDyTextTop    ) );
-            aItemSet.Put( SdrTextLowerDistItem( pRecord->nDyTextBottom ) );
+            aItemSet.Put( makeSdrTextLeftDistItem( pRecord->nDxTextLeft ) );
+            aItemSet.Put( makeSdrTextRightDistItem( pRecord->nDxTextRight  ) );
+            aItemSet.Put( makeSdrTextUpperDistItem( pRecord->nDyTextTop    ) );
+            aItemSet.Put( makeSdrTextLowerDistItem( pRecord->nDyTextBottom ) );
             pSdrTextObj->SetMergedItemSetAndBroadcast(aItemSet);
         }
     }
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 8545c52d8aee..75241b7f1166 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -862,10 +862,10 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
             }
 
             // Set distances on Textbox's margins
-            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 ) );
             pImpRec->nDxTextLeft    = nTextLeft;
             pImpRec->nDyTextTop     = nTextTop;
             pImpRec->nDxTextRight   = nTextRight;
-- 
cgit