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>

3 files changed, 6 insertions, 6 deletions

diff --git a/canvas/source/cairo/cairo_devicehelper.cxx b/canvas/source/cairo/cairo_devicehelper.cxx
index d2ea8416a149..eae148187671 100644
--- a/canvas/source/cairo/cairo_devicehelper.cxx
+++ b/canvas/source/cairo/cairo_devicehelper.cxx
@@ -104,7 +104,7 @@ namespace cairocanvas
     {
         // Map a one-by-one millimeter box to pixel
         const MapMode aOldMapMode( mpRefDevice->GetMapMode() );
-        mpRefDevice->SetMapMode( MapMode(MAP_MM) );
+        mpRefDevice->SetMapMode( MapMode(MapUnit::MapMM) );
         const Size aPixelSize( mpRefDevice->LogicToPixel(Size(1,1)) );
         mpRefDevice->SetMapMode( aOldMapMode );
 
@@ -118,7 +118,7 @@ namespace cairocanvas
 
         // Map the pixel dimensions of the output window to millimeter
         const MapMode aOldMapMode( mpRefDevice->GetMapMode() );
-        mpRefDevice->SetMapMode( MapMode(MAP_MM) );
+        mpRefDevice->SetMapMode( MapMode(MapUnit::MapMM) );
         const Size aLogSize( mpRefDevice->PixelToLogic(mpRefDevice->GetOutputSizePixel()) );
         mpRefDevice->SetMapMode( aOldMapMode );
 
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx
index 0ccf5b7df17f..50bf7142e9a4 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -160,7 +160,7 @@ namespace oglcanvas
         // Map a one-by-one millimeter box to pixel
         SystemChildWindow* pChildWindow = mxContext->getChildWindow();
         const MapMode aOldMapMode( pChildWindow->GetMapMode() );
-        pChildWindow->SetMapMode( MapMode(MAP_MM) );
+        pChildWindow->SetMapMode( MapMode(MapUnit::MapMM) );
         const Size aPixelSize( pChildWindow->LogicToPixel(Size(1,1)) );
         pChildWindow->SetMapMode( aOldMapMode );
 
@@ -175,7 +175,7 @@ namespace oglcanvas
         // Map the pixel dimensions of the output window to millimeter
         SystemChildWindow* pChildWindow = mxContext->getChildWindow();
         const MapMode aOldMapMode( pChildWindow->GetMapMode() );
-        pChildWindow->SetMapMode( MapMode(MAP_MM) );
+        pChildWindow->SetMapMode( MapMode(MapUnit::MapMM) );
         const Size aLogSize( pChildWindow->PixelToLogic(pChildWindow->GetOutputSizePixel()) );
         pChildWindow->SetMapMode( aOldMapMode );
 
diff --git a/canvas/source/vcl/devicehelper.cxx b/canvas/source/vcl/devicehelper.cxx
index 7447cef2f2ad..a278273bf048 100644
--- a/canvas/source/vcl/devicehelper.cxx
+++ b/canvas/source/vcl/devicehelper.cxx
@@ -54,7 +54,7 @@ namespace vclcanvas
         // Map a one-by-one millimeter box to pixel
         OutputDevice& rOutDev = mpOutDev->getOutDev();
         const MapMode aOldMapMode( rOutDev.GetMapMode() );
-        rOutDev.SetMapMode( MapMode(MAP_MM) );
+        rOutDev.SetMapMode( MapMode(MapUnit::MapMM) );
         const Size aPixelSize( rOutDev.LogicToPixel(Size(1,1)) );
         rOutDev.SetMapMode( aOldMapMode );
 
@@ -69,7 +69,7 @@ namespace vclcanvas
         // Map the pixel dimensions of the output window to millimeter
         OutputDevice& rOutDev = mpOutDev->getOutDev();
         const MapMode aOldMapMode( rOutDev.GetMapMode() );
-        rOutDev.SetMapMode( MapMode(MAP_MM) );
+        rOutDev.SetMapMode( MapMode(MapUnit::MapMM) );
         const Size aLogSize( rOutDev.PixelToLogic(rOutDev.GetOutputSizePixel()) );
         rOutDev.SetMapMode( aOldMapMode );