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>

6 files changed, 45 insertions, 45 deletions

diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx
index a0c7d305f156..7ec45d791f51 100644
--- a/toolkit/source/awt/vclxcontainer.cxx
+++ b/toolkit/source/awt/vclxcontainer.cxx
@@ -244,7 +244,7 @@ throw(css::uno::RuntimeException, std::exception)
             Value >>= nVal;
             Size aSize( nVal, nVal );
             vcl::Window* pWindow = GetWindow();
-            MapMode aMode( MAP_APPFONT );
+            MapMode aMode( MapUnit::MapAppFont );
             toolkit::ScrollableInterface* pScrollable = dynamic_cast< toolkit::ScrollableInterface* >( pWindow );
             if ( pWindow && pScrollable )
             {
diff --git a/toolkit/source/awt/vclxdevice.cxx b/toolkit/source/awt/vclxdevice.cxx
index 63ccd601e244..9e4ec71462be 100644
--- a/toolkit/source/awt/vclxdevice.cxx
+++ b/toolkit/source/awt/vclxdevice.cxx
@@ -149,7 +149,7 @@ css::awt::DeviceInfo VCLXDevice::getInfo() throw(css::uno::RuntimeException, std
         aInfo.Width = aDevSz.Width();
         aInfo.Height = aDevSz.Height();
 
-        Size aTmpSz = mpOutputDevice->LogicToPixel( Size( 1000, 1000 ), MapMode( MAP_CM ) );
+        Size aTmpSz = mpOutputDevice->LogicToPixel( Size( 1000, 1000 ), MapMode( MapUnit::MapCM ) );
         aInfo.PixelPerMeterX = aTmpSz.Width()/10;
         aInfo.PixelPerMeterY = aTmpSz.Height()/10;
 
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 540d63677b7c..2d72a2fffcbc 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -1382,7 +1382,7 @@ void ControlContainerBase::ImplSetPosSize( Reference< XControl >& rxCtrl )
     xP->getPropertyValue("PositionY") >>= nY;
     xP->getPropertyValue("Width") >>= nWidth;
     xP->getPropertyValue("Height") >>= nHeight;
-    MapMode aMode( MAP_APPFONT );
+    MapMode aMode( MapUnit::MapAppFont );
     OutputDevice*pOutDev = Application::GetDefaultDevice();
     if ( pOutDev )
     {
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index 490b644faa81..896037750be1 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -495,7 +495,7 @@ void UnoDialogControl::setMenuBar( const Reference< XMenuBar >& rxMenuBar ) thro
 }
 static ::Size ImplMapPixelToAppFont( OutputDevice* pOutDev, const ::Size& aSize )
 {
-    ::Size aTmp = pOutDev->PixelToLogic( aSize, MAP_APPFONT );
+    ::Size aTmp = pOutDev->PixelToLogic( aSize, MapUnit::MapAppFont );
     return aTmp;
 }
 // css::awt::XWindowListener
@@ -506,7 +506,7 @@ throw (css::uno::RuntimeException, std::exception)
     DBG_ASSERT( pOutDev, "Missing Default Device!" );
     if ( pOutDev && !mbSizeModified )
     {
-        // Currentley we are simply using MAP_APPFONT
+        // Currentley we are simply using MapUnit::MapAppFont
         ::Size aAppFontSize( e.Width, e.Height );
 
         Reference< XControl > xDialogControl( *this, UNO_QUERY_THROW );
@@ -547,7 +547,7 @@ throw (css::uno::RuntimeException, std::exception)
     DBG_ASSERT( pOutDev, "Missing Default Device!" );
     if ( pOutDev && !mbPosModified )
     {
-        // Currentley we are simply using MAP_APPFONT
+        // Currentley we are simply using MapUnit::MapAppFont
         ::Size aTmp( e.X, e.Y );
         aTmp = ImplMapPixelToAppFont( pOutDev, aTmp );
 
diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx
index c2353f0a7cd7..488d72a325ed 100644
--- a/toolkit/source/controls/tabpagemodel.cxx
+++ b/toolkit/source/controls/tabpagemodel.cxx
@@ -234,7 +234,7 @@ void UnoControlTabPage::createPeer( const Reference< XToolkit > & rxToolkit, con
 
 static ::Size ImplMapPixelToAppFont( OutputDevice* pOutDev, const ::Size& aSize )
 {
-    ::Size aTmp = pOutDev->PixelToLogic( aSize, MAP_APPFONT );
+    ::Size aTmp = pOutDev->PixelToLogic( aSize, MapUnit::MapAppFont );
     return aTmp;
 }
 // css::awt::XWindowListener
@@ -245,7 +245,7 @@ throw (css::uno::RuntimeException, std::exception)
     DBG_ASSERT( pOutDev, "Missing Default Device!" );
     if ( pOutDev && !mbSizeModified )
     {
-        // Currentley we are simply using MAP_APPFONT
+        // Currentley we are simply using MapUnit::MapAppFont
         ::Size aAppFontSize( e.Width, e.Height );
 
         Reference< XControl > xDialogControl( *this, UNO_QUERY_THROW );
@@ -283,7 +283,7 @@ throw (css::uno::RuntimeException, std::exception)
     DBG_ASSERT( pOutDev, "Missing Default Device!" );
     if ( pOutDev && !mbPosModified )
     {
-        // Currentley we are simply using MAP_APPFONT
+        // Currentley we are simply using MapUnit::MapAppFont
         ::Size aTmp( e.X, e.Y );
         aTmp = ImplMapPixelToAppFont( pOutDev, aTmp );
 
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx
index dda017297fb2..e6c8dfcbcdac 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -448,58 +448,58 @@ MapUnit VCLUnoHelper::UnoEmbed2VCLMapUnit( sal_Int32 nUnoEmbedMapUnit )
     switch( nUnoEmbedMapUnit )
     {
         case css::embed::EmbedMapUnits::ONE_100TH_MM:
-            return MAP_100TH_MM;
+            return MapUnit::Map100thMM;
         case css::embed::EmbedMapUnits::ONE_10TH_MM:
-            return MAP_10TH_MM;
+            return MapUnit::Map10thMM;
         case css::embed::EmbedMapUnits::ONE_MM:
-            return MAP_MM;
+            return MapUnit::MapMM;
         case css::embed::EmbedMapUnits::ONE_CM:
-            return MAP_CM;
+            return MapUnit::MapCM;
         case css::embed::EmbedMapUnits::ONE_1000TH_INCH:
-            return MAP_1000TH_INCH;
+            return MapUnit::Map1000thInch;
         case css::embed::EmbedMapUnits::ONE_100TH_INCH:
-            return MAP_100TH_INCH;
+            return MapUnit::Map100thInch;
         case css::embed::EmbedMapUnits::ONE_10TH_INCH:
-            return MAP_10TH_INCH;
+            return MapUnit::Map10thInch;
         case css::embed::EmbedMapUnits::ONE_INCH:
-            return MAP_INCH;
+            return MapUnit::MapInch;
         case css::embed::EmbedMapUnits::POINT:
-            return MAP_POINT;
+            return MapUnit::MapPoint;
         case css::embed::EmbedMapUnits::TWIP:
-            return MAP_TWIP;
+            return MapUnit::MapTwip;
         case css::embed::EmbedMapUnits::PIXEL:
-            return MAP_PIXEL;
+            return MapUnit::MapPixel;
     }
 
     OSL_FAIL( "Unexpected UNO map mode is provided!\n" );
-    return MAP_LASTENUMDUMMY;
+    return MapUnit::LASTENUMDUMMY;
 }
 
 sal_Int32 VCLUnoHelper::VCL2UnoEmbedMapUnit( MapUnit nVCLMapUnit )
 {
     switch( nVCLMapUnit )
     {
-        case MAP_100TH_MM:
+        case MapUnit::Map100thMM:
             return css::embed::EmbedMapUnits::ONE_100TH_MM;
-        case MAP_10TH_MM:
+        case MapUnit::Map10thMM:
             return css::embed::EmbedMapUnits::ONE_10TH_MM;
-        case MAP_MM:
+        case MapUnit::MapMM:
             return css::embed::EmbedMapUnits::ONE_MM;
-        case MAP_CM:
+        case MapUnit::MapCM:
             return css::embed::EmbedMapUnits::ONE_CM;
-        case MAP_1000TH_INCH:
+        case MapUnit::Map1000thInch:
             return css::embed::EmbedMapUnits::ONE_1000TH_INCH;
-        case MAP_100TH_INCH:
+        case MapUnit::Map100thInch:
             return css::embed::EmbedMapUnits::ONE_100TH_INCH;
-        case MAP_10TH_INCH:
+        case MapUnit::Map10thInch:
             return css::embed::EmbedMapUnits::ONE_10TH_INCH;
-        case MAP_INCH:
+        case MapUnit::MapInch:
             return css::embed::EmbedMapUnits::ONE_INCH;
-        case MAP_POINT:
+        case MapUnit::MapPoint:
             return css::embed::EmbedMapUnits::POINT;
-        case MAP_TWIP:
+        case MapUnit::MapTwip:
             return css::embed::EmbedMapUnits::TWIP;
-        case MAP_PIXEL:
+        case MapUnit::MapPixel:
             return css::embed::EmbedMapUnits::PIXEL;
         default: ; // avoid compiler warning
     }
@@ -589,55 +589,55 @@ MapUnit /* MapModeUnit */ VCLUnoHelper::ConvertToMapModeUnit(sal_Int16 /* com.su
     switch(_nMeasureUnit)
     {
     case css::util::MeasureUnit::MM_100TH:
-        eMode = MAP_100TH_MM;
+        eMode = MapUnit::Map100thMM;
         break;
 
     case css::util::MeasureUnit::MM_10TH:
-        eMode = MAP_10TH_MM;
+        eMode = MapUnit::Map10thMM;
         break;
 
     case css::util::MeasureUnit::MM:
-        eMode = MAP_MM;
+        eMode = MapUnit::MapMM;
         break;
 
     case css::util::MeasureUnit::CM:
-        eMode = MAP_CM;
+        eMode = MapUnit::MapCM;
         break;
 
     case css::util::MeasureUnit::INCH_1000TH:
-        eMode = MAP_1000TH_INCH;
+        eMode = MapUnit::Map1000thInch;
         break;
 
     case css::util::MeasureUnit::INCH_100TH:
-        eMode = MAP_100TH_INCH;
+        eMode = MapUnit::Map100thInch;
         break;
 
     case css::util::MeasureUnit::INCH_10TH:
-        eMode = MAP_10TH_INCH;
+        eMode = MapUnit::Map10thInch;
         break;
 
     case css::util::MeasureUnit::INCH:
-        eMode = MAP_INCH;
+        eMode = MapUnit::MapInch;
         break;
 
     case css::util::MeasureUnit::POINT:
-        eMode = MAP_POINT;
+        eMode = MapUnit::MapPoint;
         break;
 
     case css::util::MeasureUnit::TWIP:
-        eMode = MAP_TWIP;
+        eMode = MapUnit::MapTwip;
         break;
 
     case css::util::MeasureUnit::PIXEL:
-        eMode = MAP_PIXEL;
+        eMode = MapUnit::MapPixel;
         break;
 
     case css::util::MeasureUnit::APPFONT:
-        eMode = MAP_APPFONT;
+        eMode = MapUnit::MapAppFont;
         break;
 
     case css::util::MeasureUnit::SYSFONT:
-        eMode = MAP_SYSFONT;
+        eMode = MapUnit::MapSysFont;
         break;
 
     default: