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>

20 files changed, 71 insertions, 71 deletions

diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index a2187f3eceaf..e9461d1e5f6a 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -55,7 +55,7 @@ Bitmap::Bitmap(const Bitmap& rBitmap)
 
 Bitmap::Bitmap(SalBitmap* pSalBitmap)
     : mxImpBmp(new ImpBitmap(pSalBitmap))
-    , maPrefMapMode(MapMode(MAP_PIXEL))
+    , maPrefMapMode(MapMode(MapUnit::MapPixel))
     , maPrefSize(mxImpBmp->ImplGetSize())
 {
 }
@@ -1531,7 +1531,7 @@ bool Bitmap::Replace( const Color& rSearchColor, const Color& rReplaceColor, sal
         if (xImpBmp->ImplCreate(*mxImpBmp) && xImpBmp->ImplReplace(rSearchColor, rReplaceColor, nTol))
         {
             ImplSetImpBitmap(xImpBmp);
-            maPrefMapMode = MapMode( MAP_PIXEL );
+            maPrefMapMode = MapMode( MapUnit::MapPixel );
             maPrefSize = xImpBmp->ImplGetSize();
             return true;
         }
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index f4223fe385a8..acc6c4baeac0 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -904,7 +904,7 @@ bool Bitmap::Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag n
         {
             ImplSetImpBitmap(xImpBmp);
             SAL_INFO( "vcl.opengl", "Ref count: " << mxImpBmp.use_count() );
-            maPrefMapMode = MapMode( MAP_PIXEL );
+            maPrefMapMode = MapMode( MapUnit::MapPixel );
             maPrefSize = xImpBmp->ImplGetSize();
             return true;
         }
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index a3e6a07015db..ebe9d895e20f 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -943,7 +943,7 @@ bool ImplReadDIBBody( SvStream& rIStm, Bitmap& rBmp, AlphaMask* pBmpAlpha, sal_u
             if(bRet && aHeader.nXPelsPerMeter && aHeader.nYPelsPerMeter)
             {
                 MapMode aMapMode(
-                    MAP_MM,
+                    MapUnit::MapMM,
                     Point(),
                     Fraction(1000, aHeader.nXPelsPerMeter),
                     Fraction(1000, aHeader.nYPelsPerMeter));
@@ -1358,7 +1358,7 @@ bool ImplWriteDIBBits(SvStream& rOStm, BitmapReadAccess& rAcc, BitmapReadAccess*
 
 bool ImplWriteDIBBody(const Bitmap& rBitmap, SvStream& rOStm, BitmapReadAccess& rAcc, BitmapReadAccess* pAccAlpha, bool bCompressed)
 {
-    const MapMode aMapPixel(MAP_PIXEL);
+    const MapMode aMapPixel(MapUnit::MapPixel);
     DIBV5Header aHeader;
     sal_uLong nImageSizePos(0);
     sal_uLong nEndPos(0);
@@ -1421,7 +1421,7 @@ bool ImplWriteDIBBody(const Bitmap& rBitmap, SvStream& rOStm, BitmapReadAccess&
         // MapMode is integer-based, and suffers from roundoffs,
         // especially if maPrefSize is small. Trying to circumvent
         // that by performing part of the math in floating point.
-        const Size aScale100000(OutputDevice::LogicToLogic(Size(100000, 100000), MAP_100TH_MM, rBitmap.GetPrefMapMode()));
+        const Size aScale100000(OutputDevice::LogicToLogic(Size(100000, 100000), MapUnit::Map100thMM, rBitmap.GetPrefMapMode()));
         const double fBmpWidthM((double)rBitmap.GetPrefSize().Width() / aScale100000.Width());
         const double fBmpHeightM((double)rBitmap.GetPrefSize().Height() / aScale100000.Height());
 
diff --git a/vcl/source/gdi/gdimetafiletools.cxx b/vcl/source/gdi/gdimetafiletools.cxx
index b8adfdf18109..877ca9a302f1 100644
--- a/vcl/source/gdi/gdimetafiletools.cxx
+++ b/vcl/source/gdi/gdimetafiletools.cxx
@@ -276,7 +276,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource)
     // start with empty region
     aClips.push_back(basegfx::B2DPolyPolygon());
 
-    // start with default MapMode (MAP_PIXEL)
+    // start with default MapMode (MapUnit::MapPixel)
     aMapModes.push_back(MapMode());
 
     for(sal_uLong i(0); i < nObjCount; ++i)
@@ -715,7 +715,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource)
                     // combination with the current MapMode
                     Size aLogicalSize(rBitmapEx.GetPrefSize());
 
-                    if(MAP_PIXEL == rBitmapEx.GetPrefMapMode().GetMapUnit())
+                    if(MapUnit::MapPixel == rBitmapEx.GetPrefMapMode().GetMapUnit())
                     {
                         aLogicalSize = Application::GetDefaultDevice()->PixelToLogic(aLogicalSize, aMapModes.back().GetMapUnit());
                     }
@@ -742,7 +742,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource)
                     // combination with the current MapMode
                     Size aLogicalSize(rBitmap.GetPrefSize());
 
-                    if(MAP_PIXEL == rBitmap.GetPrefMapMode().GetMapUnit())
+                    if(MapUnit::MapPixel == rBitmap.GetPrefMapMode().GetMapUnit())
                     {
                         aLogicalSize = Application::GetDefaultDevice()->PixelToLogic(aLogicalSize, aMapModes.back().GetMapUnit());
                     }
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 7954574c6a7a..74bdd0747026 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -419,7 +419,7 @@ bool GDIMetaFile::ImplPlayWithRenderer( OutputDevice* pOut, const Point& rPos, S
                 BitmapEx aBitmapEx;
                 if( aBitmapEx.Create( xBitmapCanvas, aSize ) )
                 {
-                    if ( pOut->GetMapMode() == MAP_PIXEL )
+                    if ( pOut->GetMapMode() == MapUnit::MapPixel )
                         pOut->DrawBitmapEx( rPos, aBitmapEx );
                     else
                         pOut->DrawBitmapEx( rPos, rLogicDestSize, aBitmapEx );
@@ -706,7 +706,7 @@ void GDIMetaFile::Move( long nX, long nY, long nDPIX, long nDPIY )
             ( MetaActionType::POP == nType ) )
         {
             pModAct->Execute( aMapVDev.get() );
-            if( aMapVDev->GetMapMode().GetMapUnit() == MAP_PIXEL )
+            if( aMapVDev->GetMapMode().GetMapUnit() == MapUnit::MapPixel )
             {
                 aOffset = aMapVDev->LogicToPixel( aBaseOffset, GetPrefMapMode() );
                 MapMode aMap( aMapVDev->GetMapMode() );
diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx
index 791a65971294..77c8fad22fa1 100644
--- a/vcl/source/gdi/graph.cxx
+++ b/vcl/source/gdi/graph.cxx
@@ -92,7 +92,7 @@ static void ImplDrawDefault( OutputDevice* pOutDev, const OUString* pText,
     if ( aSize.Width() > 0 && aSize.Height() > 0 && pFont && pText && pText->getLength()
          && !(!pOutDev->IsOutputEnabled() /*&& pOutDev->GetConnectMetaFile() */) )
     {
-        MapMode aMapMode( MAP_POINT );
+        MapMode aMapMode( MapUnit::MapPoint );
         Size    aSz = pOutDev->LogicToLogic( Size( 0, 12 ), &aMapMode, nullptr );
         long    nThreshold = aSz.Height() / 2;
         long    nStep = nThreshold / 3;
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 2a7dce6480fc..ce3b42c4f681 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -696,7 +696,7 @@ MapMode ImpGraphic::ImplGetPrefMapMode() const
                 if(maSvgData.get() && maEx.IsEmpty())
                 {
                     // svg not yet buffered in maEx, return default PrefMapMode
-                    aMapMode = MapMode(MAP_100TH_MM);
+                    aMapMode = MapMode(MapUnit::Map100thMM);
                 }
                 else
                 {
@@ -1075,7 +1075,7 @@ bool ImpGraphic::ImplWriteEmbedded( SvStream& rOStm )
             rOStm.WriteInt32( 0 );
             rOStm.WriteInt32( aSize.Width() );
             rOStm.WriteInt32( aSize.Height() );
-            rOStm.WriteInt32( aMapMode.GetMapUnit() );
+            rOStm.WriteInt32( (sal_uInt16)aMapMode.GetMapUnit() );
             rOStm.WriteInt32( aMapMode.GetScaleX().GetNumerator() );
             rOStm.WriteInt32( aMapMode.GetScaleX().GetDenominator() );
             rOStm.WriteInt32( aMapMode.GetScaleY().GetNumerator() );
diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx
index 26a4c6d520d2..d3b97e9ec35a 100644
--- a/vcl/source/gdi/impvect.cxx
+++ b/vcl/source/gdi/impvect.cxx
@@ -713,7 +713,7 @@ bool ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf,
 
         if( rMtf.GetActionSize() )
         {
-            MapMode         aMap( MAP_100TH_MM );
+            MapMode         aMap( MapUnit::Map100thMM );
             ScopedVclPtrInstance< VirtualDevice > aVDev;
             const Size      aLogSize1( aVDev->PixelToLogic( Size( 1, 1 ), aMap ) );
 
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 );
diff --git a/vcl/source/gdi/oldprintadaptor.cxx b/vcl/source/gdi/oldprintadaptor.cxx
index 2c0fedd478a8..1f354febbd25 100644
--- a/vcl/source/gdi/oldprintadaptor.cxx
+++ b/vcl/source/gdi/oldprintadaptor.cxx
@@ -57,7 +57,7 @@ OldStylePrintAdaptor::~OldStylePrintAdaptor()
 
 void OldStylePrintAdaptor::StartPage()
 {
-    Size aPaperSize( getPrinter()->PixelToLogic( getPrinter()->GetPaperSizePixel(), MapMode( MAP_100TH_MM ) ) );
+    Size aPaperSize( getPrinter()->PixelToLogic( getPrinter()->GetPaperSizePixel(), MapMode( MapUnit::Map100thMM ) ) );
     mpData->maPages.push_back( AdaptorPage() );
     mpData->maPages.back().maPageSize.Width = aPaperSize.getWidth();
     mpData->maPages.back().maPageSize.Height = aPaperSize.getHeight();
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 66b79c0785c4..8a662bc01546 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -177,7 +177,7 @@ void doTestCode()
     aWriter.BeginStructureElement( PDFWriter::Document );
     // set duration of 3 sec for first page
     aWriter.SetAutoAdvanceTime( 3 );
-    aWriter.SetMapMode( MapMode( MAP_100TH_MM ) );
+    aWriter.SetMapMode( MapMode( MapUnit::Map100thMM ) );
 
     aWriter.SetFillColor( Color( COL_LIGHTRED ) );
     aWriter.SetLineColor( Color( COL_LIGHTGREEN ) );
@@ -229,7 +229,7 @@ void doTestCode()
     aWriter.AddStream( "text/plain", new PDFTestOutputStream(), true );
     // set transitional mode
     aWriter.SetPageTransition( PDFWriter::WipeRightToLeft, 1500 );
-    aWriter.SetMapMode( MapMode( MAP_100TH_MM ) );
+    aWriter.SetMapMode( MapMode( MapUnit::Map100thMM ) );
     aWriter.SetTextColor( Color( COL_BLACK ) );
     aWriter.SetFont( Font( OUString( "Times" ), Size( 0, 500 ) ) );
     aWriter.DrawText( Rectangle( Point( 4500, 1500 ), Size( 12000, 3000 ) ),
@@ -301,7 +301,7 @@ void doTestCode()
         for( int nY = 0; nY < 256; nY++ )
             pAcc->SetPixel( nX, nY, BitmapColor( (sal_uInt8)((nX+nY)/2) ) );
     aTransMask.ReleaseAccess( pAcc );
-    aTransMask.SetPrefMapMode( MAP_MM );
+    aTransMask.SetPrefMapMode( MapUnit::MapMM );
     aTransMask.SetPrefSize( Size( 10, 10 ) );
 
     aWriter.DrawBitmap( Point( 600, 13500 ), Size( 3000, 3000 ), aTransMask );
@@ -349,13 +349,13 @@ void doTestCode()
     aWriter.DrawPolyLine( aLIPoly, aLI );
 
     aWriter.NewPage( 595, 842 );
-    aWriter.SetMapMode( MapMode( MAP_100TH_MM ) );
+    aWriter.SetMapMode( MapMode( MapUnit::Map100thMM ) );
     Wallpaper aWall( aTransMask );
     aWall.SetStyle( WallpaperStyle::Tile );
     aWriter.DrawWallpaper( Rectangle( Point( 4400, 4200 ), Size( 10200, 6300 ) ), aWall );
 
     aWriter.NewPage( 595, 842 );
-    aWriter.SetMapMode( MapMode( MAP_100TH_MM ) );
+    aWriter.SetMapMode( MapMode( MapUnit::Map100thMM ) );
     aWriter.SetFont( Font( OUString( "Times" ), Size( 0, 500 ) ) );
     aWriter.SetTextColor( Color( COL_BLACK ) );
     aRect = Rectangle( Point( 4500, 6000 ), Size( 6000, 1500 ) );
@@ -1370,7 +1370,7 @@ template < class GEOMETRY >
 GEOMETRY lcl_convert( const MapMode& _rSource, const MapMode& _rDest, OutputDevice* _pPixelConversion, const GEOMETRY& _rObject )
 {
     GEOMETRY aPoint;
-    if ( MAP_PIXEL == _rSource.GetMapUnit() )
+    if ( MapUnit::MapPixel == _rSource.GetMapUnit() )
     {
         aPoint = _pPixelConversion->PixelToLogic( _rObject, _rDest );
     }
@@ -1713,7 +1713,7 @@ void PDFWriterImpl::PDFPage::appendWaveLine( sal_Int32 nWidth, sal_Int32 nY, sal
                                PDFWriter& i_rOuterFace)
         :
         m_pReferenceDevice( nullptr ),
-        m_aMapMode( MAP_POINT, Point(), Fraction( 1, pointToPixel(1) ), Fraction( 1, pointToPixel(1) ) ),
+        m_aMapMode( MapUnit::MapPoint, Point(), Fraction( 1, pointToPixel(1) ), Fraction( 1, pointToPixel(1) ) ),
         m_nCurrentStructElement( 0 ),
         m_bEmitStructure( true ),
         m_nNextFID( 1 ),
@@ -2206,7 +2206,7 @@ OutputDevice* PDFWriterImpl::getReferenceDevice()
             pVDev->SetReferenceDevice( m_aContext.DPIx, m_aContext.DPIy );
 
         pVDev->SetOutputSizePixel( Size( 640, 480 ) );
-        pVDev->SetMapMode( MAP_MM );
+        pVDev->SetMapMode( MapUnit::MapMM );
 
         m_pReferenceDevice->mpPDFWriter = this;
         m_pReferenceDevice->ImplUpdateFontData();
@@ -3571,7 +3571,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const Physical
 
                 OutputDevice* pRef = getReferenceDevice();
                 pRef->Push( PushFlags::FONT | PushFlags::MAPMODE );
-                pRef->SetMapMode( MapMode( MAP_PIXEL ) );
+                pRef->SetMapMode( MapMode( MapUnit::MapPixel ) );
                 Font aFont( pFont->GetFamilyName(), pFont->GetStyleName(), Size( 0, 1000 ) );
                 aFont.SetWeight( pFont->GetWeight() );
                 aFont.SetItalic( pFont->GetItalic() );
@@ -10792,7 +10792,7 @@ bool PDFWriterImpl::writeGradientFunction( GradientEmit& rObject )
 
     ScopedVclPtrInstance< VirtualDevice > aDev;
     aDev->SetOutputSizePixel( rObject.m_aSize );
-    aDev->SetMapMode( MapMode( MAP_PIXEL ) );
+    aDev->SetMapMode( MapMode( MapUnit::MapPixel ) );
     if( m_aContext.ColorMode == PDFWriter::DrawGreyscale )
         aDev->SetDrawMode( aDev->GetDrawMode() |
                           ( DrawModeFlags::GrayLine | DrawModeFlags::GrayFill | DrawModeFlags::GrayText |
@@ -11546,7 +11546,7 @@ void PDFWriterImpl::drawBitmap( const Point& rDestPoint, const Size& rDestSize,
 sal_Int32 PDFWriterImpl::createGradient( const Gradient& rGradient, const Size& rSize )
 {
     Size aPtSize( lcl_convert( m_aGraphicsStack.front().m_aMapMode,
-                               MapMode( MAP_POINT ),
+                               MapMode( MapUnit::MapPoint ),
                                getReferenceDevice(),
                                rSize ) );
     // check if we already have this gradient
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index f72a4a1a3cb1..e7feb6ba99a3 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -107,7 +107,7 @@ void PDFWriterImpl::implWriteBitmapEx( const Point& i_rPoint, const Size& i_rSiz
         if( i_rContext.m_nMaxImageResolution > 50 )
         {
             // do downsampling if necessary
-            const Size      aDstSizeTwip( i_pDummyVDev->PixelToLogic( i_pDummyVDev->LogicToPixel( aSize ), MAP_TWIP ) );
+            const Size      aDstSizeTwip( i_pDummyVDev->PixelToLogic( i_pDummyVDev->LogicToPixel( aSize ), MapUnit::MapTwip ) );
             const Size      aBmpSize( aBitmapEx.GetSizePixel() );
             const double    fBmpPixelX = aBmpSize.Width();
             const double    fBmpPixelY = aBmpSize.Height();
@@ -427,7 +427,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa
                     }
                     else
                     {
-                        const Size  aDstSizeTwip( pDummyVDev->PixelToLogic( pDummyVDev->LogicToPixel( rSize ), MAP_TWIP ) );
+                        const Size  aDstSizeTwip( pDummyVDev->PixelToLogic( pDummyVDev->LogicToPixel( rSize ), MapUnit::MapTwip ) );
 
                         // i#115962# Always use at least 300 DPI for bitmap conversion of transparence gradients,
                         // else the quality is not acceptable (see bugdoc as example)
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index 00497a337b0a..c26a84129de4 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -90,7 +90,7 @@ private:
     sal_Int32           mnChunkLen;     // Length of current PNG chunk
     Size                maOrigSize;     // pixel size of the full image
     Size                maTargetSize;   // pixel size of the result image
-    Size                maPhysSize;     // preferred size in MAP_100TH_MM units
+    Size                maPhysSize;     // preferred size in MapUnit::Map100thMM units
     sal_uInt32          mnBPP;          // number of bytes per pixel
     sal_uInt32          mnScansize;     // max size of scanline
     sal_uInt32          mnYpos;         // latest y position in full image
@@ -408,7 +408,7 @@ BitmapEx PNGReaderImpl::GetBitmapEx( const Size& rPreviewSizeHint )
                     {
                         mbpHYs = true;
 
-                        // convert into MAP_100TH_MM
+                        // convert into MapUnit::Map100thMM
                         maPhysSize.Width()  = (sal_Int32)( (100000.0 * maOrigSize.Width()) / nXPixelPerMeter );
                         maPhysSize.Height() = (sal_Int32)( (100000.0 * maOrigSize.Height()) / nYPixelPerMeter );
                     }
@@ -455,7 +455,7 @@ BitmapEx PNGReaderImpl::GetBitmapEx( const Size& rPreviewSizeHint )
 
         if ( mbpHYs && maPhysSize.Width() && maPhysSize.Height() )
         {
-            aRet.SetPrefMapMode( MAP_100TH_MM );
+            aRet.SetPrefMapMode( MapUnit::Map100thMM );
             aRet.SetPrefSize( maPhysSize );
         }
     }
diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx
index a55cf09bd784..eddcaf7c81bb 100644
--- a/vcl/source/gdi/pngwrite.cxx
+++ b/vcl/source/gdi/pngwrite.cxx
@@ -358,7 +358,7 @@ void PNGWriterImpl::ImplWriteTransparent()
 
 void PNGWriterImpl::ImplWritepHYs(const BitmapEx& rBmpEx)
 {
-    if (rBmpEx.GetPrefMapMode() == MAP_100TH_MM)
+    if (rBmpEx.GetPrefMapMode() == MapUnit::Map100thMM)
     {
         Size aPrefSize(rBmpEx.GetPrefSize());
 
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 3574c5100f40..45c771a037fe 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -253,7 +253,7 @@ void Printer::EmulateDrawTransparent ( const tools::PolyPolygon& rPolyPoly,
     mpAlphaVDev = pOldAlphaVDev;
 
     Rectangle       aPolyRect( LogicToPixel( rPolyPoly ).GetBoundRect() );
-    const Size      aDPISize( LogicToPixel( Size( 1, 1 ), MAP_INCH ) );
+    const Size      aDPISize( LogicToPixel( Size( 1, 1 ), MapUnit::MapInch ) );
     const long      nBaseExtent = std::max( FRound( aDPISize.Width() / 300. ), 1L );
     long            nMove;
     const sal_uInt16    nTrans = ( nTransparencePercent < 13 ) ? 0 :
@@ -1449,7 +1449,7 @@ bool Printer::SetPaperSizeUser( const Size& rSize, bool bMatchNearest )
         return false;
 
     const Size aPixSize = LogicToPixel( rSize );
-    const Size aPageSize = PixelToLogic( aPixSize, MAP_100TH_MM );
+    const Size aPageSize = PixelToLogic( aPixSize, MapUnit::Map100thMM );
     bool bNeedToChange(maJobSetup.ImplGetConstData().GetPaperWidth() != aPageSize.Width() ||
         maJobSetup.ImplGetConstData().GetPaperHeight() != aPageSize.Height());
 
@@ -1542,7 +1542,7 @@ OUString Printer::GetPaperName( Paper ePaper )
 
 OUString Printer::GetPaperName() const
 {
-    Size  aPageSize = PixelToLogic( GetPaperSizePixel(), MAP_100TH_MM );
+    Size  aPageSize = PixelToLogic( GetPaperSizePixel(), MapUnit::Map100thMM );
     Paper ePaper    = ImplGetPaperFormat( aPageSize.Width(), aPageSize.Height() );
     if( ePaper == PAPER_USER )
         ePaper = ImplGetPaperFormat( aPageSize.Height(), aPageSize.Width() );
diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx
index 22cf699f7b2e..dbd07513906f 100644
--- a/vcl/source/gdi/print2.cxx
+++ b/vcl/source/gdi/print2.cxx
@@ -1111,7 +1111,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
         if( mpPDFWriter )
         {
             aTmpSize = mpPDFWriter->getCurPageSize();
-            aTmpSize = LogicToPixel( aTmpSize, MapMode( MAP_POINT ) );
+            aTmpSize = LogicToPixel( aTmpSize, MapMode( MapUnit::MapPoint ) );
 
             // also add error code to PDFWriter
             mpPDFWriter->insertError( vcl::PDFWriter::Warning_Transparency_Converted );
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 741038d77b6c..b9de9928cc76 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -434,7 +434,7 @@ bool Printer::PreparePrintJob(std::shared_ptr<PrinterController> xController,
             aMPS.nVerticalSpacing = nValue;
         aMPS.bDrawBorder = xController->getBoolProperty( "NUpDrawBorder", aMPS.bDrawBorder );
         aMPS.nOrder = static_cast<NupOrderType>(xController->getIntProperty( "NUpSubPageOrder", (sal_Int32)aMPS.nOrder ));
-        aMPS.aPaperSize = xController->getPrinter()->PixelToLogic( xController->getPrinter()->GetPaperSizePixel(), MapMode( MAP_100TH_MM ) );
+        aMPS.aPaperSize = xController->getPrinter()->PixelToLogic( xController->getPrinter()->GetPaperSizePixel(), MapMode( MapUnit::Map100thMM ) );
         css::beans::PropertyValue* pPgSizeVal = xController->getValue( OUString( "NUpPaperSize" ) );
         css::awt::Size aSizeVal;
         if( pPgSizeVal && (pPgSizeVal->Value >>= aSizeVal) )
@@ -782,7 +782,7 @@ void PrinterController::setPrinter( const VclPtr<Printer>& i_rPrinter )
               css::uno::makeAny( OUString( i_rPrinter->GetName() ) ) );
     mpImplData->mnDefaultPaperBin = mpImplData->mxPrinter->GetPaperBin();
     mpImplData->mxPrinter->Push();
-    mpImplData->mxPrinter->SetMapMode(MapMode(MAP_100TH_MM));
+    mpImplData->mxPrinter->SetMapMode(MapMode(MapUnit::Map100thMM));
     mpImplData->maDefaultPageSize = mpImplData->mxPrinter->GetPaperSize();
     mpImplData->mxPrinter->Pop();
     mpImplData->mnFixedPaperBin = -1;
@@ -801,7 +801,7 @@ bool PrinterController::setupPrinter( vcl::Window* i_pParent )
     if( mpImplData->mxPrinter.get() )
     {
         mpImplData->mxPrinter->Push();
-        mpImplData->mxPrinter->SetMapMode(MapMode(MAP_100TH_MM));
+        mpImplData->mxPrinter->SetMapMode(MapMode(MapUnit::Map100thMM));
 
         // get current data
         Size aPaperSize(mpImplData->mxPrinter->GetPaperSize());
@@ -928,7 +928,7 @@ PrinterController::PageSize vcl::ImplPrinterControllerData::modifyJobSetup( cons
 void vcl::ImplPrinterControllerData::resetPaperToLastConfigured()
 {
     mxPrinter->Push();
-    mxPrinter->SetMapMode(MapMode(MAP_100TH_MM));
+    mxPrinter->SetMapMode(MapMode(MapUnit::Map100thMM));
     Size aCurSize(mxPrinter->GetPaperSize());
     if (aCurSize != maDefaultPageSize)
         mxPrinter->SetPaperSizeUser(maDefaultPageSize, !isFixedPageSize());
@@ -937,7 +937,7 @@ void vcl::ImplPrinterControllerData::resetPaperToLastConfigured()
 
 int PrinterController::getPageCountProtected() const
 {
-    const MapMode aMapMode( MAP_100TH_MM );
+    const MapMode aMapMode( MapUnit::Map100thMM );
 
     mpImplData->mxPrinter->Push();
     mpImplData->mxPrinter->SetMapMode( aMapMode );
@@ -948,7 +948,7 @@ int PrinterController::getPageCountProtected() const
 
 css::uno::Sequence< css::beans::PropertyValue > PrinterController::getPageParametersProtected( int i_nPage ) const
 {
-    const MapMode aMapMode( MAP_100TH_MM );
+    const MapMode aMapMode( MapUnit::Map100thMM );
 
     mpImplData->mxPrinter->Push();
     mpImplData->mxPrinter->SetMapMode( aMapMode );
@@ -984,7 +984,7 @@ PrinterController::PageSize PrinterController::getPageFile( int i_nUnfilteredPag
 
     // get page parameters
     css::uno::Sequence< css::beans::PropertyValue > aPageParm( getPageParametersProtected( i_nUnfilteredPage ) );
-    const MapMode aMapMode( MAP_100TH_MM );
+    const MapMode aMapMode( MapUnit::Map100thMM );
 
     mpImplData->mxPrinter->Push();
     mpImplData->mxPrinter->SetMapMode( aMapMode );
@@ -1038,7 +1038,7 @@ static void appendSubPage( GDIMetaFile& o_rMtf, const Rectangle& i_rClipRect, GD
     {
         // save gstate
         o_rMtf.AddAction( new MetaPushAction( PushFlags::LINECOLOR | PushFlags::FILLCOLOR | PushFlags::CLIPREGION | PushFlags::MAPMODE ) );
-        o_rMtf.AddAction( new MetaMapModeAction( MapMode( MAP_100TH_MM ) ) );
+        o_rMtf.AddAction( new MetaMapModeAction( MapMode( MapUnit::Map100thMM ) ) );
 
         Rectangle aBorderRect( i_rClipRect );
         o_rMtf.AddAction( new MetaLineColorAction( Color( COL_BLACK ), true ) );
@@ -1077,7 +1077,7 @@ PrinterController::PageSize PrinterController::getFilteredPageFile( int i_nFilte
             return PrinterController::PageSize();
         }
         Size aPaperSize = mpImplData->getRealPaperSize( aPageSize.aSize, true );
-        mpImplData->mxPrinter->SetMapMode( MapMode( MAP_100TH_MM ) );
+        mpImplData->mxPrinter->SetMapMode( MapMode( MapUnit::Map100thMM ) );
         mpImplData->mxPrinter->SetPaperSizeUser( aPaperSize, ! mpImplData->isFixedPageSize() );
         if( aPaperSize != aPageSize.aSize )
         {
@@ -1117,8 +1117,8 @@ PrinterController::PageSize PrinterController::getFilteredPageFile( int i_nFilte
 
     o_rMtf.Clear();
     o_rMtf.SetPrefSize( aPaperSize );
-    o_rMtf.SetPrefMapMode( MapMode( MAP_100TH_MM ) );
-    o_rMtf.AddAction( new MetaMapModeAction( MapMode( MAP_100TH_MM ) ) );
+    o_rMtf.SetPrefMapMode( MapMode( MapUnit::Map100thMM ) );
+    o_rMtf.AddAction( new MetaMapModeAction( MapMode( MapUnit::Map100thMM ) ) );
 
     int nDocPages = getPageCountProtected();
     if (mpImplData->meJobState != css::view::PrintableState_JOB_STARTED)
@@ -1187,7 +1187,7 @@ PrinterController::PageSize PrinterController::getFilteredPageFile( int i_nFilte
     o_rMtf.WindStart();
 
     // subsequent getPageFile calls have changed the paper, reset it to current value
-    mpImplData->mxPrinter->SetMapMode( MapMode( MAP_100TH_MM ) );
+    mpImplData->mxPrinter->SetMapMode( MapMode( MapUnit::Map100thMM ) );
     mpImplData->mxPrinter->SetPaperSizeUser( aPaperSize, ! mpImplData->isFixedPageSize() );
 
     return PrinterController::PageSize( aPaperSize, true );
@@ -1287,7 +1287,7 @@ void PrinterController::printFilteredPage( int i_nPage )
     }
 
     // in N-Up printing set the correct page size
-    mpImplData->mxPrinter->SetMapMode( MAP_100TH_MM );
+    mpImplData->mxPrinter->SetMapMode( MapUnit::Map100thMM );
     // aPageSize was filtered through mpImplData->getRealPaperSize already by getFilteredPageFile()
     mpImplData->mxPrinter->SetPaperSizeUser( aPageSize.aSize, ! mpImplData->isFixedPageSize() );
     if( mpImplData->mnFixedPaperBin != -1 &&
diff --git a/vcl/source/gdi/svgdata.cxx b/vcl/source/gdi/svgdata.cxx
index 1e08433bf83d..cf85eeb6be8e 100644
--- a/vcl/source/gdi/svgdata.cxx
+++ b/vcl/source/gdi/svgdata.cxx
@@ -58,7 +58,7 @@ BitmapEx convertPrimitive2DSequenceToBitmapEx(
             aRealRect.Y2 = rTargetRange.getMaxY();
 
             // get system DPI
-            const Size aDPI(Application::GetDefaultDevice()->LogicToPixel(Size(1, 1), MAP_INCH));
+            const Size aDPI(Application::GetDefaultDevice()->LogicToPixel(Size(1, 1), MapUnit::MapInch));
 
             const uno::Reference< rendering::XBitmap > xBitmap(
                 xPrimitive2DRenderer->rasterize(
diff --git a/vcl/source/gdi/svmconverter.cxx b/vcl/source/gdi/svmconverter.cxx
index 37bcd08af1c2..0ed8e5f94cef 100644
--- a/vcl/source/gdi/svmconverter.cxx
+++ b/vcl/source/gdi/svmconverter.cxx
@@ -146,7 +146,7 @@ void ImplReadMapMode( SvStream& rIStm, MapMode& rMapMode )
 
 void ImplWriteMapMode( SvStream& rOStm, const MapMode& rMapMode )
 {
-    rOStm.WriteInt16( rMapMode.GetMapUnit() );
+    rOStm.WriteInt16( (sal_uInt16)rMapMode.GetMapUnit() );
     WritePair( rOStm, rMapMode.GetOrigin() );
     rOStm.WriteInt32( rMapMode.GetScaleX().GetNumerator() );
     rOStm.WriteInt32( rMapMode.GetScaleX().GetDenominator() );
diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx
index 6129fa0fa1d5..4d9783e188b9 100644
--- a/vcl/source/gdi/textlayout.cxx
+++ b/vcl/source/gdi/textlayout.cxx
@@ -129,26 +129,26 @@ namespace vcl
 
         // also, use a higher-resolution map unit than "pixels", which should save us some rounding errors when
         // translating coordinates between the reference device and the target device.
-        OSL_ENSURE( aTargetMapMode.GetMapUnit() == MAP_PIXEL,
+        OSL_ENSURE( aTargetMapMode.GetMapUnit() == MapUnit::MapPixel,
             "ReferenceDeviceTextLayout::ReferenceDeviceTextLayout: this class is not expected to work with such target devices!" );
             // we *could* adjust all the code in this class to handle this case, but at the moment, it's not necessary
         const MapUnit eTargetMapUnit = m_rReferenceDevice.GetMapMode().GetMapUnit();
         aTargetMapMode.SetMapUnit( eTargetMapUnit );
-        OSL_ENSURE( aTargetMapMode.GetMapUnit() != MAP_PIXEL,
+        OSL_ENSURE( aTargetMapMode.GetMapUnit() != MapUnit::MapPixel,
             "ReferenceDeviceTextLayout::ReferenceDeviceTextLayout: a reference device which has map mode PIXEL?!" );
 
         m_rTargetDevice.SetMapMode( aTargetMapMode );
 
         // now that the Zoom is part of the map mode, reset the target device's font to the "unzoomed" version
         Font aDrawFont( m_aUnzoomedPointFont );
-        aDrawFont.SetFontSize( OutputDevice::LogicToLogic( aDrawFont.GetFontSize(), MAP_POINT, eTargetMapUnit ) );
+        aDrawFont.SetFontSize( OutputDevice::LogicToLogic( aDrawFont.GetFontSize(), MapUnit::MapPoint, eTargetMapUnit ) );
         _rTargetDevice.SetFont( aDrawFont );
 
         // transfer font to the reference device
         m_rReferenceDevice.Push( PushFlags::FONT | PushFlags::TEXTLAYOUTMODE );
         Font aRefFont( m_aUnzoomedPointFont );
         aRefFont.SetFontSize( OutputDevice::LogicToLogic(
-            aRefFont.GetFontSize(), MAP_POINT, m_rReferenceDevice.GetMapMode().GetMapUnit() ) );
+            aRefFont.GetFontSize(), MapUnit::MapPoint, m_rReferenceDevice.GetMapMode().GetMapUnit() ) );
         m_rReferenceDevice.SetFont( aRefFont );
     }