1 files changed, 14 insertions, 14 deletions

diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 19d292c68c1e..d0abe927796a 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -233,18 +233,18 @@ void PrintDialog::PrintPreviewWindow::setPreview( const GDIMetaFile& i_rNewPrevi
 
     // use correct measurements
     const LocaleDataWrapper& rLocWrap( GetSettings().GetLocaleDataWrapper() );
-    MapUnit eUnit = MAP_MM;
+    MapUnit eUnit = MapUnit::MapMM;
     int nDigits = 0;
     if( rLocWrap.getMeasurementSystemEnum() == MEASURE_US )
     {
-        eUnit = MAP_100TH_INCH;
+        eUnit = MapUnit::Map100thInch;
         nDigits = 2;
     }
-    Size aLogicPaperSize( LogicToLogic( i_rOrigSize, MapMode( MAP_100TH_MM ), MapMode( eUnit ) ) );
+    Size aLogicPaperSize( LogicToLogic( i_rOrigSize, MapMode( MapUnit::Map100thMM ), MapMode( eUnit ) ) );
     OUString aNumText( rLocWrap.getNum( aLogicPaperSize.Width(), nDigits ) );
     aBuf.append( aNumText )
         .append( sal_Unicode( ' ' ) );
-    aBuf.appendAscii( eUnit == MAP_MM ? "mm" : "in" );
+    aBuf.appendAscii( eUnit == MapUnit::MapMM ? "mm" : "in" );
     if( !i_rPaperName.isEmpty() )
     {
         aBuf.append( " (" );
@@ -256,7 +256,7 @@ void PrintDialog::PrintPreviewWindow::setPreview( const GDIMetaFile& i_rNewPrevi
     aNumText = rLocWrap.getNum( aLogicPaperSize.Height(), nDigits );
     aBuf.append( aNumText )
         .append( sal_Unicode( ' ' ) );
-    aBuf.appendAscii( eUnit == MAP_MM ? "mm" : "in" );
+    aBuf.appendAscii( eUnit == MapUnit::MapMM ? "mm" : "in" );
     maVertDim->SetText( aBuf.makeStringAndClear() );
 
     Resize();
@@ -269,7 +269,7 @@ void PrintDialog::PrintPreviewWindow::preparePreviewBitmap()
     GDIMetaFile aMtf( maMtf );
 
     Size aVDevSize( maPageVDev->GetOutputSizePixel() );
-    const Size aLogicSize( maPageVDev->PixelToLogic( aVDevSize, MapMode( MAP_100TH_MM ) ) );
+    const Size aLogicSize( maPageVDev->PixelToLogic( aVDevSize, MapMode( MapUnit::Map100thMM ) ) );
     Size aOrigSize( maOrigSize );
     if( aOrigSize.Width() < 1 )
         aOrigSize.Width() = aLogicSize.Width();
@@ -279,7 +279,7 @@ void PrintDialog::PrintPreviewWindow::preparePreviewBitmap()
 
     maPageVDev->Erase();
     maPageVDev->Push();
-    maPageVDev->SetMapMode( MAP_100TH_MM );
+    maPageVDev->SetMapMode( MapUnit::Map100thMM );
     DrawModeFlags nOldDrawMode = maPageVDev->GetDrawMode();
     if( mbGreyscale )
         maPageVDev->SetDrawMode( maPageVDev->GetDrawMode() |
@@ -296,8 +296,8 @@ void PrintDialog::PrintPreviewWindow::preparePreviewBitmap()
 
     maPageVDev->Pop();
 
-    SetMapMode( MAP_PIXEL );
-    maPageVDev->SetMapMode( MAP_PIXEL );
+    SetMapMode( MapUnit::MapPixel );
+    maPageVDev->SetMapMode( MapUnit::MapPixel );
 
     maPreviewBitmap = Bitmap(maPageVDev->GetBitmap(Point(0, 0), aVDevSize));
 
@@ -327,7 +327,7 @@ void PrintDialog::ShowNupOrderWindow::Paint(vcl::RenderContext& rRenderContext,
 {
     Window::Paint(rRenderContext, i_rRect);
 
-    rRenderContext.SetMapMode(MAP_PIXEL);
+    rRenderContext.SetMapMode(MapUnit::MapPixel);
     rRenderContext.SetTextColor(rRenderContext.GetSettings().GetStyleSettings().GetFieldTextColor());
 
     int nPages = mnRows * mnColumns;
@@ -653,7 +653,7 @@ PrintDialog::PrintDialog( vcl::Window* i_pParent, const std::shared_ptr<PrinterC
 
     // setup sizes for N-Up
     Size aNupSize( maPController->getPrinter()->PixelToLogic(
-                         maPController->getPrinter()->GetPaperSizePixel(), MapMode( MAP_100TH_MM ) ) );
+                         maPController->getPrinter()->GetPaperSizePixel(), MapMode( MapUnit::Map100thMM ) ) );
     if( maPController->getPrinter()->GetOrientation() == Orientation::Landscape )
     {
         maNupLandscapeSize = aNupSize;
@@ -1328,7 +1328,7 @@ void PrintDialog::preparePreview( bool i_bNewPage, bool i_bMayUseCache )
 
     if( i_bNewPage )
     {
-        const MapMode aMapMode( MAP_100TH_MM );
+        const MapMode aMapMode( MapUnit::Map100thMM );
         GDIMetaFile aMtf;
         VclPtr<Printer> aPrt( maPController->getPrinter() );
         if( nPages > 0 )
@@ -1342,7 +1342,7 @@ void PrintDialog::preparePreview( bool i_bNewPage, bool i_bMayUseCache )
             }
         }
 
-        Size aCurPageSize = aPrt->PixelToLogic( aPrt->GetPaperSizePixel(), MapMode( MAP_100TH_MM ) );
+        Size aCurPageSize = aPrt->PixelToLogic( aPrt->GetPaperSizePixel(), MapMode( MapUnit::Map100thMM ) );
         mpPreviewWindow->setPreview( aMtf, aCurPageSize,
                                     aPrt->GetPaperName(),
                                     nPages > 0 ? OUString() : maNoPageStr,
@@ -1916,7 +1916,7 @@ PrintProgressDialog::PrintProgressDialog(vcl::Window* i_pParent, int i_nMax)
     mpText->set_width_request(mpText->get_preferred_size().Width());
 
     //Pick a useful max width
-    mpProgress->set_width_request(mpProgress->LogicToPixel(Size(100, 0), MapMode(MAP_APPFONT)).Width());
+    mpProgress->set_width_request(mpProgress->LogicToPixel(Size(100, 0), MapMode(MapUnit::MapAppFont)).Width());
 
     mpButton->SetClickHdl( LINK( this, PrintProgressDialog, ClickHdl ) );