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>

2 files changed, 4 insertions, 4 deletions

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;