From 954f752cf10fc6a8777af2a6a93e496688464687 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Tue, 20 Sep 2016 16:41:39 +0200
Subject: convert MapUnit to scoped enum

I left a prefix on the names "Map" so that I would not have to re-arrange
each name too much, since I can't start identifiers with digits like "100thMM"

And remove RSC_EXTRAMAPUNIT, which doesn't seem to be doing anything anymore.

Change-Id: I5187824aa87e30caf5357b51b5384b5ab919d224
Reviewed-on: https://gerrit.libreoffice.org/29096
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 writerfilter/source/dmapper/SdtHelper.cxx      | 2 +-
 writerfilter/source/rtftok/rtfdocumentimpl.cxx | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'writerfilter')

diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx
index c096f7011a8d..2c126928bc10 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -33,7 +33,7 @@ awt::Size lcl_getOptimalWidth(const StyleSheetTablePtr& pStyleSheet, OUString& r
         if (rItem.getLength() > aLongest.getLength())
             aLongest = rItem;
 
-    MapMode aMap(MAP_100TH_MM);
+    MapMode aMap(MapUnit::Map100thMM);
     OutputDevice* pOut = Application::GetDefaultDevice();
     pOut->Push(PushFlags::FONT | PushFlags::MAPMODE);
 
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 92b9b96f8c86..01c0c0ce397f 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -846,8 +846,8 @@ void RTFDocumentImpl::resolvePict(bool const bInline, uno::Reference<drawing::XS
         {
             Graphic aGraphic = GraphicObject(aURLBS.copy(RTL_CONSTASCII_LENGTH(aURLBegin))).GetTransformedGraphic();
             Size aSize(aGraphic.GetPrefSize());
-            MapMode aMap(MAP_100TH_MM);
-            if (aGraphic.GetPrefMapMode().GetMapUnit() == MAP_PIXEL)
+            MapMode aMap(MapUnit::Map100thMM);
+            if (aGraphic.GetPrefMapMode().GetMapUnit() == MapUnit::MapPixel)
                 aSize = Application::GetDefaultDevice()->PixelToLogic(aSize, aMap);
             else
                 aSize = OutputDevice::LogicToLogic(aSize, aGraphic.GetPrefMapMode(), aMap);
-- 
cgit