From a51c423743835793bf132c925ad962283fd2dc22 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 18 Aug 2014 10:55:03 +0200
Subject: Consistency around SdrMetricItem in svx/sdsxyitm.hxx

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

Change-Id: I3734cb14b6ed8f556af85b234968682a55ac8a4c
---
 sw/source/core/attr/swatrset.cxx                | 4 ++--
 sw/source/core/doc/DocumentDrawModelManager.cxx | 4 ++--
 sw/source/filter/ww8/ww8graf.cxx                | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'sw')

diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx
index 6eee57dd9c67..20c787446cdd 100644
--- a/sw/source/core/attr/swatrset.cxx
+++ b/sw/source/core/attr/swatrset.cxx
@@ -96,8 +96,8 @@ void SwAttrPool::createAndAddSecondaryPools()
         pSdrPool->SetPoolDefaultItem(SdrEdgeNode2VertDistItem(nDefEdgeDist));
 
         // #i33700# // Set shadow distance defaults as PoolDefaultItems
-        pSdrPool->SetPoolDefaultItem(SdrShadowXDistItem((300 * 72) / 127));
-        pSdrPool->SetPoolDefaultItem(SdrShadowYDistItem((300 * 72) / 127));
+        pSdrPool->SetPoolDefaultItem(makeSdrShadowXDistItem((300 * 72) / 127));
+        pSdrPool->SetPoolDefaultItem(makeSdrShadowYDistItem((300 * 72) / 127));
     }
 
     SfxItemPool *pEEgPool = EditEngine::CreatePool(false);
diff --git a/sw/source/core/doc/DocumentDrawModelManager.cxx b/sw/source/core/doc/DocumentDrawModelManager.cxx
index ce0155554808..95f7bfad4018 100644
--- a/sw/source/core/doc/DocumentDrawModelManager.cxx
+++ b/sw/source/core/doc/DocumentDrawModelManager.cxx
@@ -86,8 +86,8 @@ void DocumentDrawModelManager::InitDrawModel()
 //
 //      // #i33700#
 //      // Set shadow distance defaults as PoolDefaultItems. Details see bug.
-//      pSdrPool->SetPoolDefaultItem(SdrShadowXDistItem((300 * 72) / 127));
-//      pSdrPool->SetPoolDefaultItem(SdrShadowYDistItem((300 * 72) / 127));
+//      pSdrPool->SetPoolDefaultItem(makeSdrShadowXDistItem((300 * 72) / 127));
+//      pSdrPool->SetPoolDefaultItem(makeSdrShadowYDistItem((300 * 72) / 127));
 //  }
 //  SfxItemPool *pEEgPool = EditEngine::CreatePool( false );
 //  pSdrPool->SetSecondaryPool( pEEgPool );
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 4a0141450a96..bbaf439f436e 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -232,8 +232,8 @@ static void SetStdAttr( SfxItemSet& rSet, WW8_DP_LINETYPE& rL,
     }
     if( SVBT16ToShort( rSh.shdwpi ) ){                  // shadow
         rSet.Put(makeSdrShadowItem(true));
-        rSet.Put( SdrShadowXDistItem( SVBT16ToShort( rSh.xaOffset ) ) );
-        rSet.Put( SdrShadowYDistItem( SVBT16ToShort( rSh.yaOffset ) ) );
+        rSet.Put( makeSdrShadowXDistItem( SVBT16ToShort( rSh.xaOffset ) ) );
+        rSet.Put( makeSdrShadowYDistItem( SVBT16ToShort( rSh.yaOffset ) ) );
     }
 }
 
@@ -1701,9 +1701,9 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* pSdrObj,
         const Color aShdColor = static_cast< SdrShadowColorItem const & >(
             rOldSet.Get(SDRATTR_SHADOWCOLOR)).GetColorValue();
         const sal_Int32 nShdDistX = WW8ITEMVALUE(rOldSet, SDRATTR_SHADOWXDIST,
-            SdrShadowXDistItem);
+            SdrMetricItem);
         const sal_Int32 nShdDistY = WW8ITEMVALUE(rOldSet, SDRATTR_SHADOWYDIST,
-            SdrShadowYDistItem);
+            SdrMetricItem);
 
         aShadow.SetColor( Color( aShdColor ) );
 
-- 
cgit