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>

1 files changed, 15 insertions, 15 deletions

diff --git a/vcl/source/gdi/mapmod.cxx b/vcl/source/gdi/mapmod.cxx
index 06523e0ead4c..e981a5d26253 100644
--- a/vcl/source/gdi/mapmod.cxx
+++ b/vcl/source/gdi/mapmod.cxx
@@ -49,7 +49,7 @@ MapMode::ImplMapMode::ImplMapMode() :
     maScaleX( 1, 1 ),
     maScaleY( 1, 1 )
 {
-    meUnit      = MAP_PIXEL;
+    meUnit      = MapUnit::MapPixel;
     mbSimple    = true;
 }
 
@@ -134,38 +134,38 @@ double MapMode::GetUnitMultiplier() const
     double  nMul;
     switch ( GetMapUnit() )
     {
-        case MAP_PIXEL :
-        case MAP_SYSFONT :
-        case MAP_APPFONT :
+        case MapUnit::MapPixel :
+        case MapUnit::MapSysFont :
+        case MapUnit::MapAppFont :
 
-        case MAP_100TH_MM :
+        case MapUnit::Map100thMM :
             nMul = 1;
             break;
-        case MAP_10TH_MM :
+        case MapUnit::Map10thMM :
             nMul = 10;
             break;
-        case MAP_MM :
+        case MapUnit::MapMM :
             nMul = 100;
             break;
-        case MAP_CM :
+        case MapUnit::MapCM :
             nMul = 1000;
             break;
-        case MAP_1000TH_INCH :
+        case MapUnit::Map1000thInch :
             nMul = 2.54;
             break;
-        case MAP_100TH_INCH :
+        case MapUnit::Map100thInch :
             nMul = 25.4;
             break;
-        case MAP_10TH_INCH :
+        case MapUnit::Map10thInch :
             nMul = 254;
             break;
-        case MAP_INCH :
+        case MapUnit::MapInch :
             nMul = 2540;
             break;
-        case MAP_TWIP :
+        case MapUnit::MapTwip :
             nMul = 1.76388889;
             break;
-        case MAP_POINT :
+        case MapUnit::MapPoint :
             nMul = 35.27777778;
             break;
         default:
@@ -215,7 +215,7 @@ SvStream& WriteMapMode( SvStream& rOStm, const MapMode& rMapMode )
 {
     VersionCompat aCompat( rOStm, StreamMode::WRITE, 1 );
 
-    rOStm.WriteUInt16( rMapMode.mpImplMapMode->meUnit );
+    rOStm.WriteUInt16( (sal_uInt16)rMapMode.mpImplMapMode->meUnit );
     WritePair( rOStm, rMapMode.mpImplMapMode->maOrigin );
     WriteFraction( rOStm, rMapMode.mpImplMapMode->maScaleX );
     WriteFraction( rOStm, rMapMode.mpImplMapMode->maScaleY );