Resolves: coverity#705366 Mixing enum types

and

coverity#705367 Mixing enum types
coverity#705371 Mixing enum types
coverity#982694 Mixing enum types
coverity#1027717 Mixing enum types
coverity#1371228 Mixing enum types
coverity#1371242 Mixing enum types
coverity#1371280 Mixing enum types
coverity#1371310 Mixing enum types

MapUnit and SfxMapUnit share the same values and
are freely cast from one to the other.

Now that

commit d30a4298bdb5ba53cd1fe659f2b742f218a2e527
Date:   Thu Aug 11 15:02:19 2016 +0200

loplugin:unusedenumconstants in package..svtools

removed the SfxMapUnit entries that were directly unused, they
don't match anymore and casting from one to the other is dangerous.

Why there was two of these anyway escapes me, get rid of SfxMapUnit
and just use MapUnit universally

Change-Id: I4db5dcd04b59be2f85b62b728f96c90afe00c57e
Reviewed-on: https://gerrit.libreoffice.org/28234
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

69 files changed, 220 insertions, 222 deletions

diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx
index d2b0d8ddf5fa..335040eb09ca 100644
--- a/include/svx/algitem.hxx
+++ b/include/svx/algitem.hxx
@@ -41,9 +41,9 @@ public:
         const sal_uInt16 nId );
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
 
     virtual bool            QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
     virtual bool            PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
@@ -82,9 +82,9 @@ public:
     SvxMarginItem( const SvxMarginItem& );
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
 
     virtual bool             operator==( const SfxPoolItem& ) const override;
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = nullptr ) const override;
diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx
index 3fcb8312807e..330533874b5f 100644
--- a/include/svx/chrtitem.hxx
+++ b/include/svx/chrtitem.hxx
@@ -213,9 +213,9 @@ public:
 
     OUString GetValueText() const;
     virtual bool GetPresentation(SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr) const override;
+                                 MapUnit eCoreMetric,
+                                 MapUnit ePresMetric,
+                                 OUString &rText, const IntlWrapper * = nullptr) const override;
 
     virtual bool             operator == (const SfxPoolItem&) const override;
     virtual SfxPoolItem* Clone(SfxItemPool *pPool = nullptr) const override;
diff --git a/include/svx/drawitem.hxx b/include/svx/drawitem.hxx
index 905b5aec8a9e..8444ee1f887f 100644
--- a/include/svx/drawitem.hxx
+++ b/include/svx/drawitem.hxx
@@ -37,9 +37,9 @@ public:
                             SvxColorListItem( const SvxColorListItem& );
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
 
     virtual bool            operator==( const SfxPoolItem& ) const override;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = nullptr ) const override;
@@ -62,9 +62,9 @@ public:
                             SvxGradientListItem( const SvxGradientListItem& );
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
 
     virtual bool            operator==( const SfxPoolItem& ) const override;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = nullptr ) const override;
@@ -86,9 +86,9 @@ public:
                             SvxHatchListItem( const SvxHatchListItem& );
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
 
     virtual bool            operator==( const SfxPoolItem& ) const override;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = nullptr ) const override;
@@ -111,9 +111,9 @@ public:
                             SvxBitmapListItem( const SvxBitmapListItem& );
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
 
     virtual bool            operator==( const SfxPoolItem& ) const override;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = nullptr ) const override;
@@ -136,9 +136,9 @@ public:
                             SvxPatternListItem( const SvxPatternListItem& );
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                   SfxMapUnit eCoreMetric,
-                                   SfxMapUnit ePresMetric,
-                                   OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
     virtual bool            operator==( const SfxPoolItem& ) const override;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = nullptr ) const override;
     virtual bool            QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
@@ -160,9 +160,9 @@ public:
                             SvxDashListItem( const SvxDashListItem& );
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
 
     virtual bool            operator==( const SfxPoolItem& ) const override;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = nullptr ) const override;
@@ -185,9 +185,9 @@ public:
                             SvxLineEndListItem( const SvxLineEndListItem& );
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
 
     virtual bool            operator==( const SfxPoolItem& ) const override;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = nullptr ) const override;
diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx
index c395e75161eb..91634273b78d 100644
--- a/include/svx/float3d.hxx
+++ b/include/svx/float3d.hxx
@@ -180,7 +180,7 @@ private:
     SvxConvertTo3DItem*         pConvertTo3DLatheItem;
 
     std::unique_ptr<Svx3DWinImpl>        mpImpl;
-    SfxMapUnit          ePoolUnit;
+    MapUnit             ePoolUnit;
     FieldUnit           eFUnit;
 
     // ItemSet used to remember set 2d attributes
diff --git a/include/svx/grfcrop.hxx b/include/svx/grfcrop.hxx
index 2092902adf6c..721e5047250d 100644
--- a/include/svx/grfcrop.hxx
+++ b/include/svx/grfcrop.hxx
@@ -41,10 +41,10 @@ public:
     virtual SfxPoolItem*        Create(SvStream &, sal_uInt16 nVer) const override;
     virtual SvStream&           Store(SvStream &, sal_uInt16 nIVer) const override;
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText,
-                                    const IntlWrapper* pIntl = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText,
+                                  const IntlWrapper* pIntl = nullptr ) const override;
     virtual bool QueryValue( css::uno::Any& rVal,
                              sal_uInt8 nMemberId = 0 ) const override;
     virtual bool PutValue( const css::uno::Any& rVal,
diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx
index d5f96cf178d4..450a51155599 100644
--- a/include/svx/itemwin.hxx
+++ b/include/svx/itemwin.hxx
@@ -66,7 +66,7 @@ class SVX_DLLPUBLIC SvxMetricField : public MetricField
     using Window::Update;
 
     OUString        aCurTxt;
-    SfxMapUnit      ePoolUnit;
+    MapUnit         ePoolUnit;
     FieldUnit       eDlgUnit;
     Size            aLogicalSize;
     css::uno::Reference< css::frame::XFrame > mxFrame;
@@ -86,7 +86,7 @@ public:
                     WinBits nBits = WB_BORDER | WB_SPIN | WB_REPEAT );
 
     void            Update( const XLineWidthItem* pItem );
-    void            SetCoreUnit( SfxMapUnit eUnit );
+    void            SetCoreUnit( MapUnit eUnit );
     void            RefreshDlgUnit();
 };
 
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index d75d163c05f5..217f7e761643 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -185,7 +185,7 @@ class SVX_DLLPUBLIC NBOTypeMgrBase
         NBOType         eType;
     private:
         const SfxItemSet*   pSet;
-        SfxMapUnit      eCoreUnit;
+        MapUnit         eCoreUnit;
         // store the attributes passed from pSet
         OUString        aNumCharFmtName;
         void            StoreBulCharFmtName_impl();
@@ -195,7 +195,7 @@ class SVX_DLLPUBLIC NBOTypeMgrBase
         NBOTypeMgrBase(const NBOType aType)
             : eType(aType)
             , pSet(nullptr)
-            , eCoreUnit(SFX_MAPUNIT_TWIP)
+            , eCoreUnit(MAP_TWIP)
             , aNumCharFmtName(OUString())
             , bIsLoading(false)
         {}
@@ -219,7 +219,7 @@ class SVX_DLLPUBLIC NBOTypeMgrBase
         void SetItems(const SfxItemSet* pArg) { pSet = pArg;StoreBulCharFmtName_impl();StoreMapUnit_impl();}
     protected:
         const OUString& GetBulCharFmtName() { return aNumCharFmtName;}
-        SfxMapUnit GetMapUnit() { return eCoreUnit;}
+        MapUnit GetMapUnit() { return eCoreUnit;}
     protected:
         bool    bIsLoading;
         void    ImplLoad(const OUString& filename);
diff --git a/include/svx/numinf.hxx b/include/svx/numinf.hxx
index 626f7ebf0dc9..10314678d2af 100644
--- a/include/svx/numinf.hxx
+++ b/include/svx/numinf.hxx
@@ -53,9 +53,9 @@ public:
     virtual SvStream&        Store( SvStream& , sal_uInt16 nItemVersion ) const override;
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
 
     SvNumberFormatter*      GetNumberFormatter() const { return pFormatter; }
     const OUString&         GetValueString() const { return aStringVal; }
diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx
index 64d28a9a0334..da7e37a73446 100644
--- a/include/svx/optgrid.hxx
+++ b/include/svx/optgrid.hxx
@@ -86,9 +86,9 @@ public:
     virtual bool            operator==( const SfxPoolItem& ) const override;
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
 
 };
 
diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx
index f31107848663..8aa95584f40b 100644
--- a/include/svx/pageitem.hxx
+++ b/include/svx/pageitem.hxx
@@ -78,9 +78,9 @@ public:
     virtual bool             operator==( const SfxPoolItem& ) const override;
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
 
     virtual bool             QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
     virtual bool             PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
@@ -117,9 +117,9 @@ public:
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = nullptr ) const override;
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
 
     virtual SfxPoolItem*    Create( SvStream&, sal_uInt16 nVersion ) const override;
     virtual SvStream&       Store( SvStream&, sal_uInt16 nItemVersion ) const override;
diff --git a/include/svx/postattr.hxx b/include/svx/postattr.hxx
index 8d929c9aba50..2c1c2466d7c2 100644
--- a/include/svx/postattr.hxx
+++ b/include/svx/postattr.hxx
@@ -38,9 +38,9 @@ public:
 
     SvxPostItAuthorItem( const OUString& rAuthor, sal_uInt16 nWhich  );
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = nullptr ) const override;
 
@@ -68,9 +68,9 @@ public:
 
     SvxPostItDateItem( const OUString& rDate, sal_uInt16 nWhich  );
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = nullptr ) const override;
 
@@ -99,9 +99,9 @@ public:
     SvxPostItTextItem( const OUString& rText, sal_uInt16 nWhich  );
     // "pure virtual methods" from SfxPoolItem
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
 
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = nullptr ) const override;
 
diff --git a/include/svx/rotmodit.hxx b/include/svx/rotmodit.hxx
index 9604b4a54e8a..9dd5e2f57624 100644
--- a/include/svx/rotmodit.hxx
+++ b/include/svx/rotmodit.hxx
@@ -48,9 +48,9 @@ public:
     virtual SfxPoolItem*        Create(SvStream &, sal_uInt16) const override;
     virtual sal_uInt16          GetVersion( sal_uInt16 nFileVersion ) const override;
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                                 SfxMapUnit eCoreMetric,
-                                                 SfxMapUnit ePresMetric,
-                                                 OUString& rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString& rText, const IntlWrapper * = nullptr ) const override;
     virtual bool                QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
     virtual bool                PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 };
diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx
index bce67342519d..3eab85cd6877 100644
--- a/include/svx/rulritem.hxx
+++ b/include/svx/rulritem.hxx
@@ -36,9 +36,9 @@ class SVX_DLLPUBLIC SvxLongLRSpaceItem : public SfxPoolItem
     virtual bool             PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = nullptr ) const override;
 
@@ -69,9 +69,9 @@ class SVX_DLLPUBLIC SvxLongULSpaceItem : public SfxPoolItem
     virtual bool             PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = nullptr ) const override;
 
@@ -101,9 +101,9 @@ protected:
     virtual bool             PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = nullptr ) const override;
 
@@ -169,10 +169,10 @@ protected:
     virtual bool operator==( const SfxPoolItem& ) const override;
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                                 SfxMapUnit eCoreMetric,
-                                                 SfxMapUnit ePresMetric,
-                                                 OUString &rText,
-                                                 const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText,
+                                  const IntlWrapper * = nullptr ) const override;
 
     virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
     virtual bool         QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
@@ -225,9 +225,9 @@ protected:
     virtual bool             operator==( const SfxPoolItem& ) const override;
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = nullptr ) const override;
     virtual bool             QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
diff --git a/include/svx/sdangitm.hxx b/include/svx/sdangitm.hxx
index 60d886bfe05e..869e25478d0f 100644
--- a/include/svx/sdangitm.hxx
+++ b/include/svx/sdangitm.hxx
@@ -33,11 +33,11 @@ public:
     virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override;
 
     virtual bool GetPresentation(SfxItemPresentation ePres,
-                                                SfxMapUnit eCoreMetric,
-                                                SfxMapUnit ePresMetric,
-                                                OUString& rText,
-                                                const IntlWrapper *
-                                                 pIntlWrapper = nullptr) const override;
+                                 MapUnit eCoreMetric,
+                                 MapUnit ePresMetric,
+                                 OUString& rText,
+                                 const IntlWrapper *
+                                 pIntlWrapper = nullptr) const override;
 };
 
 
diff --git a/include/svx/sdasaitm.hxx b/include/svx/sdasaitm.hxx
index 2dea1c4e2030..a43d8790f4d2 100644
--- a/include/svx/sdasaitm.hxx
+++ b/include/svx/sdasaitm.hxx
@@ -43,8 +43,8 @@ class SVX_DLLPUBLIC SdrCustomShapeAdjustmentItem : public SfxPoolItem
 
             virtual bool                operator==( const SfxPoolItem& ) const override;
             virtual bool GetPresentation(SfxItemPresentation ePresentation,
-                                            SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric,
-                                            OUString &rText, const IntlWrapper * = nullptr) const override;
+                                         MapUnit eCoreMetric, MapUnit ePresentationMetric,
+                                         OUString &rText, const IntlWrapper * = nullptr) const override;
             virtual SfxPoolItem*        Create( SvStream&, sal_uInt16 nItem ) const override;
             virtual SvStream&           Store( SvStream&, sal_uInt16 nVersion ) const override;
             virtual SfxPoolItem*        Clone( SfxItemPool* pPool = nullptr ) const override;
diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx
index 6e19e3f59160..e7cfc76be8f9 100644
--- a/include/svx/sdasitm.hxx
+++ b/include/svx/sdasitm.hxx
@@ -59,8 +59,8 @@ private:
 
             virtual bool                operator==( const SfxPoolItem& ) const override;
             virtual bool GetPresentation(SfxItemPresentation ePresentation,
-                                            SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric,
-                                            OUString &rText, const IntlWrapper * = nullptr) const override;
+                                         MapUnit eCoreMetric, MapUnit ePresentationMetric,
+                                         OUString &rText, const IntlWrapper * = nullptr) const override;
 
             virtual SfxPoolItem*        Create( SvStream&, sal_uInt16 nItem ) const override;
             virtual SvStream&           Store( SvStream&, sal_uInt16 nVersion ) const override;
diff --git a/include/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx
index 3722511c17bc..411266a9fc17 100644
--- a/include/svx/sdgmoitm.hxx
+++ b/include/svx/sdgmoitm.hxx
@@ -44,10 +44,9 @@ public:
 
     virtual OUString   GetValueTextByPos( sal_uInt16 nPos ) const override;
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                                 SfxMapUnit eCoreMetric,
-                                                 SfxMapUnit ePresMetric,
-                                                 OUString& rText, const IntlWrapper * = nullptr) const override;
-
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString& rText, const IntlWrapper * = nullptr) const override;
 };
 
 #endif // INCLUDED_SVX_SDGMOITM_HXX
diff --git a/include/svx/sdmetitm.hxx b/include/svx/sdmetitm.hxx
index 3174cbacb797..6f8196e98819 100644
--- a/include/svx/sdmetitm.hxx
+++ b/include/svx/sdmetitm.hxx
@@ -37,9 +37,9 @@ public:
     virtual void ScaleMetrics(long nMul, long nDiv) override;
 
     virtual bool GetPresentation(SfxItemPresentation ePres,
-                                                SfxMapUnit eCoreMetric,
-                                                SfxMapUnit ePresMetric,
-                                                OUString& rText, const IntlWrapper * = nullptr) const override;
+                                 MapUnit eCoreMetric,
+                                 MapUnit ePresMetric,
+                                 OUString& rText, const IntlWrapper * = nullptr) const override;
 };
 
 
diff --git a/include/svx/sdooitm.hxx b/include/svx/sdooitm.hxx
index b17977d8027c..8d846b47bb08 100644
--- a/include/svx/sdooitm.hxx
+++ b/include/svx/sdooitm.hxx
@@ -36,7 +36,7 @@ public:
 
     virtual OUString GetValueTextByVal(bool bVal) const override;
 
-    virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
+    virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
 };
 
 
diff --git a/include/svx/sdprcitm.hxx b/include/svx/sdprcitm.hxx
index 113a41307ded..a21be90fa743 100644
--- a/include/svx/sdprcitm.hxx
+++ b/include/svx/sdprcitm.hxx
@@ -35,7 +35,7 @@ public:
     virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
     virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override;
 
-    virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
+    virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
 };
 
 
@@ -51,7 +51,7 @@ public:
     virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override;
     virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override;
 
-    virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr ) const override;
+    virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr ) const override;
 };
 
 
diff --git a/include/svx/sdtaaitm.hxx b/include/svx/sdtaaitm.hxx
index 3083e2f33262..ab997452ee9c 100644
--- a/include/svx/sdtaaitm.hxx
+++ b/include/svx/sdtaaitm.hxx
@@ -32,7 +32,7 @@ public:
     virtual bool HasMetrics() const override;
     virtual void ScaleMetrics(long nMul, long nDiv) override;
 
-    virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
+    virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
 };
 
 #endif
diff --git a/include/svx/sdtaditm.hxx b/include/svx/sdtaditm.hxx
index 57bba8f13333..2c05bde526c1 100644
--- a/include/svx/sdtaditm.hxx
+++ b/include/svx/sdtaditm.hxx
@@ -46,7 +46,7 @@ public:
 
     virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override;
 
-    virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
+    virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
 };
 
 #endif
diff --git a/include/svx/sdtaitm.hxx b/include/svx/sdtaitm.hxx
index 590df23ce2ce..e25259de9072 100644
--- a/include/svx/sdtaitm.hxx
+++ b/include/svx/sdtaitm.hxx
@@ -47,7 +47,7 @@ public:
     virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 
     virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override;
-    virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
+    virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
 };
 
 
@@ -73,7 +73,7 @@ public:
     virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 
     virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override;
-    virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
+    virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
 };
 
 #endif
diff --git a/include/svx/sdtakitm.hxx b/include/svx/sdtakitm.hxx
index b181dea967b7..2960559d69de 100644
--- a/include/svx/sdtakitm.hxx
+++ b/include/svx/sdtakitm.hxx
@@ -89,7 +89,7 @@ public:
     virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 
     virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override;
-    virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
+    virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
 };
 
 #endif
diff --git a/include/svx/sdtayitm.hxx b/include/svx/sdtayitm.hxx
index ee583952fef1..2bb331009147 100644
--- a/include/svx/sdtayitm.hxx
+++ b/include/svx/sdtayitm.hxx
@@ -29,7 +29,7 @@ public:
     SdrTextAniDelayItem(SvStream& rIn): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY,rIn)  {}
     virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
     virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override;
-    virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
+    virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
 };
 
 #endif
diff --git a/include/svx/sdtfchim.hxx b/include/svx/sdtfchim.hxx
index e4cb5e2594fe..4637a9a100d4 100644
--- a/include/svx/sdtfchim.hxx
+++ b/include/svx/sdtfchim.hxx
@@ -29,8 +29,8 @@ public:
     SVX_DLLPRIVATE SdrTextFixedCellHeightItem( SvStream & rStream, sal_uInt16 nVersion );
 
     SVX_DLLPRIVATE virtual bool GetPresentation(SfxItemPresentation ePresentation,
-                                    SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr) const override;
+                                                MapUnit eCoreMetric, MapUnit ePresentationMetric,
+                                                OUString &rText, const IntlWrapper * = nullptr) const override;
 
     SVX_DLLPRIVATE virtual SfxPoolItem*     Create( SvStream&, sal_uInt16 nItem ) const override;
     SVX_DLLPRIVATE virtual SvStream&            Store( SvStream&, sal_uInt16 nVersion ) const override;
diff --git a/include/svx/sdtfsitm.hxx b/include/svx/sdtfsitm.hxx
index 0b64a01049bc..656f1aa45331 100644
--- a/include/svx/sdtfsitm.hxx
+++ b/include/svx/sdtfsitm.hxx
@@ -56,7 +56,7 @@ public:
     virtual bool             PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 
     virtual OUString         GetValueTextByPos(sal_uInt16 nPos) const override;
-    virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
+    virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
     virtual bool             HasBoolValue() const override;
     virtual bool             GetBoolValue() const override;
     virtual void             SetBoolValue(bool bVal) override;
diff --git a/include/svx/sdynitm.hxx b/include/svx/sdynitm.hxx
index 410d5fc888b7..e7ea20f7d23b 100644
--- a/include/svx/sdynitm.hxx
+++ b/include/svx/sdynitm.hxx
@@ -34,7 +34,7 @@ public:
     virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override;
     virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const override;
     virtual OUString GetValueTextByVal(bool bVal) const override;
-    virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
+    virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
 };
 
 
diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx b/include/svx/sidebar/LinePropertyPanelBase.hxx
index 93398f80a42c..a444a33d48fb 100644
--- a/include/svx/sidebar/LinePropertyPanelBase.hxx
+++ b/include/svx/sidebar/LinePropertyPanelBase.hxx
@@ -111,7 +111,7 @@ protected:
     void SelectLineStyle();
     void ActivateControls();
 
-    void setMapUnit(SfxMapUnit eMapUnit);
+    void setMapUnit(MapUnit eMapUnit);
 
     void disableArrowHead();
 
@@ -139,7 +139,7 @@ private:
     std::unique_ptr<XLineDashItem>  mpDashItem;
 
     sal_uInt16      mnTrans;
-    SfxMapUnit      meMapUnit;
+    MapUnit         meMapUnit;
     sal_Int32       mnWidthCoreValue;
     XLineEndListRef mxLineEndList;
     XDashListRef    mxLineStyleList;
diff --git a/include/svx/sidebar/LineWidthPopup.hxx b/include/svx/sidebar/LineWidthPopup.hxx
index 79952c1f0b9f..c24ce65e9031 100644
--- a/include/svx/sidebar/LineWidthPopup.hxx
+++ b/include/svx/sidebar/LineWidthPopup.hxx
@@ -39,13 +39,13 @@ public:
     virtual void dispose() override;
     virtual ~LineWidthPopup();
 
-    void SetWidthSelect (long lValue, bool bValuable, SfxMapUnit eMapUnit);
+    void SetWidthSelect (long lValue, bool bValuable, MapUnit eMapUnit);
 
 private:
     LinePropertyPanelBase& m_rParent;
     OUString* m_pStr;
     OUString m_sPt;
-    SfxMapUnit m_eMapUnit;
+    MapUnit m_eMapUnit;
     bool m_bVSFocus;
     bool m_bCustom;
     bool m_bCloseByEdit;
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 7ac2c7ad14ba..a762127bdc79 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -700,8 +700,8 @@ protected:
     void SetObjectItemSet(const SfxItemSet& rSet);
     const SfxPoolItem& GetObjectItem(const sal_uInt16 nWhich) const;
 
-    // get SfxMapUnit the object is using
-    SfxMapUnit GetObjectMapUnit() const;
+    // get MapUnit the object is using
+    MapUnit GetObjectMapUnit() const;
 
 public:
     // syntactical sugar for ItemSet accesses
diff --git a/include/svx/svdpool.hxx b/include/svx/svdpool.hxx
index 1a5c8da77037..cbbe980f3926 100644
--- a/include/svx/svdpool.hxx
+++ b/include/svx/svdpool.hxx
@@ -39,10 +39,9 @@ public:
 
     virtual SfxItemPool* Clone() const override;
     virtual bool GetPresentation(const SfxPoolItem& rItem,
-        SfxMapUnit          ePresentationMetric,
-        OUString&             rText,
-        const IntlWrapper * pIntlWrapper
-        = nullptr) const override;
+                                 MapUnit ePresentationMetric,
+                                 OUString& rText,
+                                 const IntlWrapper * pIntlWrapper = nullptr) const override;
 
     static void TakeItemName(sal_uInt16 nWhich, OUString& rItemName);
 };
diff --git a/include/svx/sxcecitm.hxx b/include/svx/sxcecitm.hxx
index ba11540ceb16..a307d5099e51 100644
--- a/include/svx/sxcecitm.hxx
+++ b/include/svx/sxcecitm.hxx
@@ -41,7 +41,7 @@ public:
 
     virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override;
 
-    virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
+    virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
 };
 
 
diff --git a/include/svx/sxctitm.hxx b/include/svx/sxctitm.hxx
index 13cf4073ccd6..b255b95c5b66 100644
--- a/include/svx/sxctitm.hxx
+++ b/include/svx/sxctitm.hxx
@@ -37,7 +37,7 @@ public:
     virtual sal_uInt16          GetValueCount() const override; // { return 4; }
             SdrCaptionType  GetValue() const      { return (SdrCaptionType)SfxEnumItem::GetValue(); }
     virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override;
-    virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
+    virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
 };
 
 #endif
diff --git a/include/svx/sxekitm.hxx b/include/svx/sxekitm.hxx
index feeaffc7e72d..1fce19df61a8 100644
--- a/include/svx/sxekitm.hxx
+++ b/include/svx/sxekitm.hxx
@@ -42,7 +42,7 @@ public:
     virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
     virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
     virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override;
-    virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
+    virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
 };
 
 #endif
diff --git a/include/svx/sxfiitm.hxx b/include/svx/sxfiitm.hxx
index 19767c0b6137..16b3a1249863 100644
--- a/include/svx/sxfiitm.hxx
+++ b/include/svx/sxfiitm.hxx
@@ -32,7 +32,7 @@ public:
     SdrFractionItem(sal_uInt16 nId, const Fraction& rVal): SfxPoolItem(nId), nValue(rVal) {}
     SdrFractionItem(sal_uInt16 nId, SvStream& rIn);
     virtual bool             operator==(const SfxPoolItem&) const override;
-    virtual bool GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = nullptr) const override;
+    virtual bool GetPresentation(SfxItemPresentation ePresentation, MapUnit eCoreMetric,                              MapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = nullptr) const override;
     virtual SfxPoolItem*     Create(SvStream&, sal_uInt16 nVer) const override;
     virtual SvStream&        Store(SvStream&, sal_uInt16 nItemVers) const override;
     virtual SfxPoolItem*     Clone(SfxItemPool *pPool=nullptr) const override;
diff --git a/include/svx/sxmtpitm.hxx b/include/svx/sxmtpitm.hxx
index b36a70652592..c242b421437c 100644
--- a/include/svx/sxmtpitm.hxx
+++ b/include/svx/sxmtpitm.hxx
@@ -42,7 +42,7 @@ public:
     virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 
     virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override;
-    virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
+    virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
 };
 
 
@@ -61,7 +61,7 @@ public:
     virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 
     virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override;
-    virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
+    virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
 };
 
 #endif
diff --git a/include/svx/sxmuitm.hxx b/include/svx/sxmuitm.hxx
index bd333ffb55dd..47102dc98f32 100644
--- a/include/svx/sxmuitm.hxx
+++ b/include/svx/sxmuitm.hxx
@@ -39,7 +39,7 @@ public:
     virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 
     virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override;
-    virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
+    virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper * = nullptr) const override;
 };
 
 #endif
diff --git a/include/svx/sxsiitm.hxx b/include/svx/sxsiitm.hxx
index 69aad0c01319..8e840369334a 100644
--- a/include/svx/sxsiitm.hxx
+++ b/include/svx/sxsiitm.hxx
@@ -25,7 +25,7 @@ class SdrScaleItem: public SdrFractionItem {
 public:
     SdrScaleItem(sal_uInt16 nId, const Fraction& rVal): SdrFractionItem(nId,rVal) {}
     SdrScaleItem(sal_uInt16 nId, SvStream& rIn): SdrFractionItem(nId,rIn) {}
-    virtual bool GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = nullptr) const override;
+    virtual bool GetPresentation(SfxItemPresentation ePresentation, MapUnit eCoreMetric, MapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = nullptr) const override;
     virtual SfxPoolItem*     Create(SvStream&, sal_uInt16 nVer) const override;
     virtual SfxPoolItem*     Clone(SfxItemPool *pPool=nullptr) const override;
 };
diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx
index 24782f7b2c91..646206d34db0 100644
--- a/include/svx/xbtmpit.hxx
+++ b/include/svx/xbtmpit.hxx
@@ -59,9 +59,9 @@ public:
     virtual bool            PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
 
     const GraphicObject& GetGraphicObject() const { return maGraphicObject;}
     void SetGraphicObject(const GraphicObject& rGraphicObject);
diff --git a/include/svx/xfillit0.hxx b/include/svx/xfillit0.hxx
index 9604f97057a8..54495aa87677 100644
--- a/include/svx/xfillit0.hxx
+++ b/include/svx/xfillit0.hxx
@@ -46,9 +46,9 @@ public:
     virtual bool            PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
     virtual sal_uInt16          GetValueCount() const override;
     css::drawing::FillStyle GetValue() const { return (css::drawing::FillStyle) SfxEnumItem::GetValue(); }
 
diff --git a/include/svx/xflbckit.hxx b/include/svx/xflbckit.hxx
index 2cc31a82b8fc..4b0c154a978e 100644
--- a/include/svx/xflbckit.hxx
+++ b/include/svx/xflbckit.hxx
@@ -41,9 +41,9 @@ public:
     SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const override;
 
     SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                                 MapUnit eCoreMetric,
+                                                 MapUnit ePresMetric,
+                                                 OUString &rText, const IntlWrapper * = nullptr ) const override;
 };
 
 #endif
diff --git a/include/svx/xflbmpit.hxx b/include/svx/xflbmpit.hxx
index b59053569a75..280f40c9b618 100644
--- a/include/svx/xflbmpit.hxx
+++ b/include/svx/xflbmpit.hxx
@@ -35,9 +35,9 @@ public:
     SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const override;
 
     SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                                 MapUnit eCoreMetric,
+                                                 MapUnit ePresMetric,
+                                                 OUString &rText, const IntlWrapper * = nullptr ) const override;
 
     SVX_DLLPRIVATE virtual sal_uInt16           GetValueCount() const override;
     SVX_DLLPRIVATE RECT_POINT               GetValue() const { return (RECT_POINT) SfxEnumItem::GetValue(); }
diff --git a/include/svx/xflbmsli.hxx b/include/svx/xflbmsli.hxx
index 687f084d5841..efea81423a4e 100644
--- a/include/svx/xflbmsli.hxx
+++ b/include/svx/xflbmsli.hxx
@@ -34,9 +34,9 @@ public:
     SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const override;
 
     SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                                 MapUnit eCoreMetric,
+                                                 MapUnit ePresMetric,
+                                                 OUString &rText, const IntlWrapper * = nullptr ) const override;
 };
 
 #endif
diff --git a/include/svx/xflbmsxy.hxx b/include/svx/xflbmsxy.hxx
index ce5a91d36795..8abf813a180d 100644
--- a/include/svx/xflbmsxy.hxx
+++ b/include/svx/xflbmsxy.hxx
@@ -34,9 +34,9 @@ public:
     SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const override;
 
     SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                                 MapUnit eCoreMetric,
+                                                 MapUnit ePresMetric,
+                                                 OUString &rText, const IntlWrapper * = nullptr ) const override;
     // This item records both metrical and percentage quotation (negative);
     // We have to consider that.
     SVX_DLLPRIVATE virtual bool HasMetrics() const override;
@@ -53,9 +53,9 @@ public:
     SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const override;
 
     SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                                 MapUnit eCoreMetric,
+                                                 MapUnit ePresMetric,
+                                                 OUString &rText, const IntlWrapper * = nullptr ) const override;
     // This item records both metrical and percentage quotation (negative);
     // We have to consider that.
     SVX_DLLPRIVATE virtual bool HasMetrics() const override;
diff --git a/include/svx/xflbmtit.hxx b/include/svx/xflbmtit.hxx
index c218578e8cfe..607461bb400a 100644
--- a/include/svx/xflbmtit.hxx
+++ b/include/svx/xflbmtit.hxx
@@ -34,9 +34,9 @@ public:
     virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const override;
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
     void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
 };
 
diff --git a/include/svx/xflboxy.hxx b/include/svx/xflboxy.hxx
index c8a01426bdd7..551e608617e0 100644
--- a/include/svx/xflboxy.hxx
+++ b/include/svx/xflboxy.hxx
@@ -34,9 +34,9 @@ public:
     SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const override;
 
     SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                                 MapUnit eCoreMetric,
+                                                 MapUnit ePresMetric,
+                                                 OUString &rText, const IntlWrapper * = nullptr ) const override;
 };
 
 class SVX_DLLPUBLIC XFillBmpPosOffsetYItem : public SfxUInt16Item
@@ -50,9 +50,9 @@ public:
     SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const override;
 
     SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                                 MapUnit eCoreMetric,
+                                                 MapUnit ePresMetric,
+                                                 OUString &rText, const IntlWrapper * = nullptr ) const override;
 };
 
 #endif
diff --git a/include/svx/xflbstit.hxx b/include/svx/xflbstit.hxx
index 3b33a7231aac..113886e22539 100644
--- a/include/svx/xflbstit.hxx
+++ b/include/svx/xflbstit.hxx
@@ -34,9 +34,9 @@ public:
     virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const override;
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
     void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
 };
 
diff --git a/include/svx/xflbtoxy.hxx b/include/svx/xflbtoxy.hxx
index 8eb851fe5d89..d37ad82a1577 100644
--- a/include/svx/xflbtoxy.hxx
+++ b/include/svx/xflbtoxy.hxx
@@ -34,9 +34,9 @@ public:
     SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const override;
 
     SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                                 MapUnit eCoreMetric,
+                                                 MapUnit ePresMetric,
+                                                 OUString &rText, const IntlWrapper * = nullptr ) const override;
 };
 
 class SVX_DLLPUBLIC XFillBmpTileOffsetYItem : public SfxUInt16Item
@@ -50,9 +50,9 @@ public:
     SVX_DLLPRIVATE virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const override;
 
     SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                                 MapUnit eCoreMetric,
+                                                 MapUnit ePresMetric,
+                                                 OUString &rText, const IntlWrapper * = nullptr ) const override;
 };
 
 #endif
diff --git a/include/svx/xflclit.hxx b/include/svx/xflclit.hxx
index 3087d528b159..0caa9d7521f2 100644
--- a/include/svx/xflclit.hxx
+++ b/include/svx/xflclit.hxx
@@ -46,9 +46,9 @@ public:
     virtual bool            PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
 
     void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
 };
diff --git a/include/svx/xflftrit.hxx b/include/svx/xflftrit.hxx
index 27ef1c068383..a5b819251d3b 100644
--- a/include/svx/xflftrit.hxx
+++ b/include/svx/xflftrit.hxx
@@ -43,12 +43,12 @@ public:
 
     virtual bool            operator==( const SfxPoolItem& rItem ) const override;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = nullptr ) const override;
-    virtual sal_uInt16          GetVersion( sal_uInt16 nFileFormatVersion ) const override;
+    virtual sal_uInt16      GetVersion( sal_uInt16 nFileFormatVersion ) const override;
     virtual bool            QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
     virtual bool            PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 
-    virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * pIntlWrapper = nullptr ) const override;
+    virtual bool GetPresentation( SfxItemPresentation ePres, MapUnit eCoreMetric,
+                                  MapUnit ePresMetric, OUString &rText, const IntlWrapper * pIntlWrapper = nullptr ) const override;
 
     bool                    IsEnabled() const { return bEnabled; }
     void                    SetEnabled( bool bEnable ) { bEnabled = bEnable; }
diff --git a/include/svx/xflgrit.hxx b/include/svx/xflgrit.hxx
index 2dc6a7fd2f70..eae119460170 100644
--- a/include/svx/xflgrit.hxx
+++ b/include/svx/xflgrit.hxx
@@ -51,9 +51,9 @@ public:
     virtual bool            QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
     virtual bool            PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
     const XGradient&        GetGradientValue() const; // GetValue -> GetGradientValue
     void                    SetGradientValue(const XGradient& rNew) { aGradient = rNew; Detach(); } // SetValue -> SetGradientValue
 
diff --git a/include/svx/xflhtit.hxx b/include/svx/xflhtit.hxx
index b30c3f6fe229..961b941df9d8 100644
--- a/include/svx/xflhtit.hxx
+++ b/include/svx/xflhtit.hxx
@@ -49,9 +49,9 @@ public:
     virtual bool            QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
     virtual bool            PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
     virtual bool            HasMetrics() const override;
     virtual void            ScaleMetrics(long nMul, long nDiv) override;
 
diff --git a/include/svx/xfltrit.hxx b/include/svx/xfltrit.hxx
index 696127cb4466..146ca5ef32d7 100644
--- a/include/svx/xfltrit.hxx
+++ b/include/svx/xfltrit.hxx
@@ -38,9 +38,9 @@ public:
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = nullptr) const override;
     virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const override;
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
     void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
 };
 
diff --git a/include/svx/xgrscit.hxx b/include/svx/xgrscit.hxx
index d880e1591afb..dec1edd49e7d 100644
--- a/include/svx/xgrscit.hxx
+++ b/include/svx/xgrscit.hxx
@@ -38,9 +38,9 @@ public:
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = nullptr ) const override;
     virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const override;
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
 };
 
 #endif
diff --git a/include/svx/xlineit0.hxx b/include/svx/xlineit0.hxx
index 2986dcfdb9e5..ca0148afad47 100644
--- a/include/svx/xlineit0.hxx
+++ b/include/svx/xlineit0.hxx
@@ -41,9 +41,9 @@ public:
     virtual bool            PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
     virtual sal_uInt16          GetValueCount() const override;
     css::drawing::LineStyle     GetValue() const { return (css::drawing::LineStyle) SfxEnumItem::GetValue(); }
 };
diff --git a/include/svx/xlinjoit.hxx b/include/svx/xlinjoit.hxx
index cd0b4918a3aa..131c9774faff 100644
--- a/include/svx/xlinjoit.hxx
+++ b/include/svx/xlinjoit.hxx
@@ -43,8 +43,8 @@ public:
     virtual bool            QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
     virtual bool            PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric, MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
 
     virtual sal_uInt16                 GetValueCount() const override;
     css::drawing::LineJoint GetValue() const { return (css::drawing::LineJoint) SfxEnumItem::GetValue(); }
diff --git a/include/svx/xlncapit.hxx b/include/svx/xlncapit.hxx
index 12e5750bc6f9..80bf211626c8 100644
--- a/include/svx/xlncapit.hxx
+++ b/include/svx/xlncapit.hxx
@@ -43,8 +43,8 @@ public:
     virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
     virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric, MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
 
     virtual sal_uInt16          GetValueCount() const override;
     css::drawing::LineCap GetValue() const;
diff --git a/include/svx/xlnclit.hxx b/include/svx/xlnclit.hxx
index 85591c429d9f..921fdbeb7898 100644
--- a/include/svx/xlnclit.hxx
+++ b/include/svx/xlnclit.hxx
@@ -42,9 +42,9 @@ public:
     virtual bool            PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
 };
 
 #endif
diff --git a/include/svx/xlndsit.hxx b/include/svx/xlndsit.hxx
index 04bfa03d0bb1..6d47aa257372 100644
--- a/include/svx/xlndsit.hxx
+++ b/include/svx/xlndsit.hxx
@@ -51,9 +51,9 @@ public:
     virtual bool            PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
     virtual bool            HasMetrics() const override;
     virtual void            ScaleMetrics(long nMul, long nDiv) override;
 
diff --git a/include/svx/xlnedcit.hxx b/include/svx/xlnedcit.hxx
index c912b37a732c..bd53b8a3c60b 100644
--- a/include/svx/xlnedcit.hxx
+++ b/include/svx/xlnedcit.hxx
@@ -39,9 +39,9 @@ public:
     virtual bool            PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
 };
 
 #endif
diff --git a/include/svx/xlnedit.hxx b/include/svx/xlnedit.hxx
index 24c579fd2f2c..240065f6efdf 100644
--- a/include/svx/xlnedit.hxx
+++ b/include/svx/xlnedit.hxx
@@ -50,9 +50,9 @@ public:
     virtual bool            PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
 
     const basegfx::B2DPolyPolygon& GetLineEndValue() const { return maPolyPolygon;}
     void SetLineEndValue(const basegfx::B2DPolyPolygon& rPolyPolygon) { maPolyPolygon = rPolyPolygon; Detach(); }
diff --git a/include/svx/xlnedwit.hxx b/include/svx/xlnedwit.hxx
index 5a3286d1d022..d3c65ce25f9b 100644
--- a/include/svx/xlnedwit.hxx
+++ b/include/svx/xlnedwit.hxx
@@ -42,8 +42,8 @@ public:
     virtual bool            PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
                                     OUString &rText, const IntlWrapper * = nullptr ) const override;
 };
 
diff --git a/include/svx/xlnstcit.hxx b/include/svx/xlnstcit.hxx
index bef563ee00a4..f51e5f96903f 100644
--- a/include/svx/xlnstcit.hxx
+++ b/include/svx/xlnstcit.hxx
@@ -39,9 +39,9 @@ public:
     virtual bool            PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
 };
 
 #endif
diff --git a/include/svx/xlnstit.hxx b/include/svx/xlnstit.hxx
index 50bba7b9547d..4d67374bfceb 100644
--- a/include/svx/xlnstit.hxx
+++ b/include/svx/xlnstit.hxx
@@ -50,9 +50,9 @@ public:
     virtual bool            PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
 
     const basegfx::B2DPolyPolygon& GetLineStartValue() const { return maPolyPolygon;}
     void SetLineStartValue(const basegfx::B2DPolyPolygon& rPolyPolygon) { maPolyPolygon = rPolyPolygon; Detach(); }
diff --git a/include/svx/xlnstwit.hxx b/include/svx/xlnstwit.hxx
index ecd29aed3afc..df889455b73d 100644
--- a/include/svx/xlnstwit.hxx
+++ b/include/svx/xlnstwit.hxx
@@ -41,9 +41,9 @@ public:
     virtual bool            PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
 
 };
 
diff --git a/include/svx/xlntrit.hxx b/include/svx/xlntrit.hxx
index aac2a2934410..1540c2b1e823 100644
--- a/include/svx/xlntrit.hxx
+++ b/include/svx/xlntrit.hxx
@@ -38,9 +38,9 @@ public:
     virtual SfxPoolItem*    Clone(SfxItemPool* pPool = nullptr) const override;
     virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const override;
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
 };
 
 #endif
diff --git a/include/svx/xlnwtit.hxx b/include/svx/xlnwtit.hxx
index fa46c5ece9ee..609660d856f0 100644
--- a/include/svx/xlnwtit.hxx
+++ b/include/svx/xlnwtit.hxx
@@ -39,9 +39,9 @@ public:
     virtual bool            PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 
     virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    OUString &rText, const IntlWrapper * = nullptr ) const override;
+                                  MapUnit eCoreMetric,
+                                  MapUnit ePresMetric,
+                                  OUString &rText, const IntlWrapper * = nullptr ) const override;
 };
 
 #endif
diff --git a/include/svx/xsflclit.hxx b/include/svx/xsflclit.hxx
index 7d064643c39d..c6456bc8f5d8 100644
--- a/include/svx/xsflclit.hxx
+++ b/include/svx/xsflclit.hxx
@@ -37,8 +37,8 @@ public:
     SVX_DLLPRIVATE virtual SfxPoolItem*    Create(SvStream& rIn, sal_uInt16 nVer) const override;
 
     SVX_DLLPRIVATE virtual bool GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
+                                    MapUnit eCoreMetric,
+                                    MapUnit ePresMetric,
                                     OUString &rText, const IntlWrapper * = nullptr ) const override;
 
     SVX_DLLPRIVATE virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const override;