vcl: make MapMode constructor explicit

Insert constructor everywhere, except a couple places that apparently
want to compare GetMapUnit().

Change-Id: I1910deb60562e5e949203435e827057f70a3f988

53 files changed, 106 insertions, 106 deletions

diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 9d4faa31e5aa..68f796178d8a 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -167,7 +167,7 @@ void CalculateHorizontalScalingFactor( const SdrObject* pCustomShape,
     // initializing virtual device
 
     ScopedVclPtrInstance< VirtualDevice > pVirDev(DeviceFormat::BITMASK);
-    pVirDev->SetMapMode( MapUnit::Map100thMM );
+    pVirDev->SetMapMode(MapMode(MapUnit::Map100thMM));
     pVirDev->SetFont( aFont );
 
     if ( nOutlinesCount2d & 1 )
@@ -261,7 +261,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F
 
             // initializing virtual device
             ScopedVclPtrInstance< VirtualDevice > pVirDev(DeviceFormat::BITMASK);
-            pVirDev->SetMapMode( MapUnit::Map100thMM );
+            pVirDev->SetMapMode(MapMode(MapUnit::Map100thMM));
             pVirDev->SetFont( aFont );
             pVirDev->EnableRTL();
             if ( aParagraphIter->nFrameDirection == SvxFrameDirection::Horizontal_RL_TB )
diff --git a/svx/source/dialog/ClassificationEditView.cxx b/svx/source/dialog/ClassificationEditView.cxx
index bfb0a159dccc..1c602a2f2343 100644
--- a/svx/source/dialog/ClassificationEditView.cxx
+++ b/svx/source/dialog/ClassificationEditView.cxx
@@ -48,7 +48,7 @@ ClassificationEditView::ClassificationEditView(vcl::Window* pParent, WinBits nBi
     const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
     Color aBgColor = rStyleSettings.GetWindowColor();
 
-    SetMapMode(MapUnit::MapTwip);
+    SetMapMode(MapMode(MapUnit::MapTwip));
     SetPointer(PointerStyle::Text);
     SetBackground(aBgColor);
 
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index 5ad9ab460727..dd7e274087f5 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -77,7 +77,7 @@ public:
 
     virtual Size GetOptimalSize() const override
     {
-        return LogicToPixel(Size(43, 14), MapUnit::MapAppFont);
+        return LogicToPixel(Size(43, 14), MapMode(MapUnit::MapAppFont));
     }
 };
 
@@ -94,7 +94,7 @@ public:
     virtual void GetFocus() override;
     virtual Size GetOptimalSize() const override
     {
-        return LogicToPixel(Size(24, 12), MapUnit::MapAppFont);
+        return LogicToPixel(Size(24, 12), MapMode(MapUnit::MapAppFont));
     }
 
     void onEditColor();
diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx
index 32be4f4838b2..77ce8cdfc868 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -191,7 +191,7 @@ void CompressGraphicsDialog::Update()
     pDummyVDev->SetMapMode( m_aGraphic.GetPrefMapMode() );
 
     Size aPixelSize = m_aGraphic.GetSizePixel();
-    Size aOriginalSize100mm( pDummyVDev->PixelToLogic( m_aGraphic.GetSizePixel(), MapUnit::Map100thMM ) );
+    Size aOriginalSize100mm(pDummyVDev->PixelToLogic(m_aGraphic.GetSizePixel(), MapMode(MapUnit::Map100thMM)));
 
     OUString aBitmapSizeString = SvxResId(STR_IMAGE_ORIGINAL_SIZE);
     OUString aWidthString  = GetUnitString( aOriginalSize100mm.Width(),  eFieldUnit, cSeparator );
diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx
index 909c70e7e034..0391efac9314 100644
--- a/svx/source/dialog/connctrl.cxx
+++ b/svx/source/dialog/connctrl.cxx
@@ -42,7 +42,7 @@ SvxXConnectionPreview::SvxXConnectionPreview( vcl::Window* pParent, WinBits nSty
     , pObjList(nullptr)
     , pView(nullptr)
 {
-    SetMapMode( MapUnit::Map100thMM );
+    SetMapMode(MapMode(MapUnit::Map100thMM));
     SetStyles();
 }
 
@@ -78,7 +78,7 @@ void SvxXConnectionPreview::AdaptSize()
     // Adapt size
     if( pObjList )
     {
-        SetMapMode( MapUnit::Map100thMM );
+        SetMapMode(MapMode(MapUnit::Map100thMM));
 
         OutputDevice* pOD = pView->GetFirstOutputDevice(); // GetWin( 0 );
         tools::Rectangle aRect = pObjList->GetAllObjBoundRect();
diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx
index 23b92b927ff7..9ae5d524a1fb 100644
--- a/svx/source/dialog/contwnd.cxx
+++ b/svx/source/dialog/contwnd.cxx
@@ -252,7 +252,7 @@ void ContourWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Recta
 
 Size ContourWindow::GetOptimalSize() const
 {
-    return LogicToPixel(Size(270, 170), MapUnit::MapAppFont);
+    return LogicToPixel(Size(270, 170), MapMode(MapUnit::MapAppFont));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index b51229a6f687..e7432febfd80 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -380,7 +380,7 @@ SvxTPView::SvxTPView(vcl::Window *pParent, VclBuilderContainer *pTopLevel)
 
     SvSimpleTableContainer* pTable = get<SvSimpleTableContainer>("changes");
     Size aControlSize(80, 65);
-    aControlSize = LogicToPixel(aControlSize, MapUnit::MapAppFont);
+    aControlSize = LogicToPixel(aControlSize, MapMode(MapUnit::MapAppFont));
     pTable->set_width_request(aControlSize.Width());
     pTable->set_height_request(aControlSize.Height());
     m_pViewData = VclPtr<SvxRedlinTable>::Create(*pTable, 0);
diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx
index 7808f1735b8b..c2bad056f7ec 100644
--- a/svx/source/dialog/dialcontrol.cxx
+++ b/svx/source/dialog/dialcontrol.cxx
@@ -377,7 +377,7 @@ sal_Int32 DialControl::GetRotation() const
 
 Size DialControl::GetOptimalSize() const
 {
-    return LogicToPixel(Size(42 , 43), MapUnit::MapAppFont);
+    return LogicToPixel(Size(42, 43), MapMode(MapUnit::MapAppFont));
 }
 
 void DialControl::SetRotation( sal_Int32 nAngle )
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index 60c2f4161358..cab2f5443e98 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -59,7 +59,7 @@ Svx3DPreviewControl::Svx3DPreviewControl(vcl::Window* pParent, WinBits nStyle)
 
 Size Svx3DPreviewControl::GetOptimalSize() const
 {
-    return LogicToPixel(Size(80, 100), MapUnit::MapAppFont);
+    return LogicToPixel(Size(80, 100), MapMode(MapUnit::MapAppFont));
 }
 
 VCL_BUILDER_FACTORY(Svx3DPreviewControl)
@@ -81,7 +81,7 @@ void Svx3DPreviewControl::Construct()
     // Do never mirror the preview window.  This explicitly includes right
     // to left writing environments.
     EnableRTL (false);
-    SetMapMode( MapUnit::Map100thMM );
+    SetMapMode(MapMode(MapUnit::Map100thMM));
 
     // Model
     mpModel = new FmFormModel();
@@ -947,7 +947,7 @@ SvxLightCtl3D::SvxLightCtl3D( vcl::Window* pParent)
 
 Size SvxLightCtl3D::GetOptimalSize() const
 {
-    return LogicToPixel(Size(80, 100), MapUnit::MapAppFont);
+    return LogicToPixel(Size(80, 100), MapMode(MapUnit::MapAppFont));
 }
 
 VCL_BUILDER_FACTORY(SvxLightCtl3D)
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 6cfcb037a11f..34f71b8b7c33 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -79,7 +79,7 @@ SvxRectCtl::SvxRectCtl(vcl::Window* pParent, RectPoint eRpt,
     , mbUpdateForeground(true)
     , mbUpdateBackground(true)
 {
-    SetMapMode(MapUnit::Map100thMM);
+    SetMapMode(MapMode(MapUnit::Map100thMM));
     Resize_Impl();
 }
 
@@ -93,7 +93,7 @@ void SvxRectCtl::SetControlSettings(RectPoint eRpt, sal_uInt16 nBorder, sal_uInt
 
 Size SvxRectCtl::GetOptimalSize() const
 {
-    return LogicToPixel(Size(78, 39), MapUnit::MapAppFont);
+    return LogicToPixel(Size(78, 39), MapMode(MapUnit::MapAppFont));
 }
 
 VCL_BUILDER_FACTORY(SvxRectCtl)
@@ -746,7 +746,7 @@ void SvxPixelCtl::Resize()
 
 Size SvxPixelCtl::GetOptimalSize() const
 {
-    return LogicToPixel(Size(72, 72), MapUnit::MapAppFont);
+    return LogicToPixel(Size(72, 72), MapMode(MapUnit::MapAppFont));
 }
 
 VCL_BUILDER_FACTORY_ARGS(SvxPixelCtl, 8)
@@ -1337,7 +1337,7 @@ SvxPreviewBase::SvxPreviewBase(vcl::Window* pParent)
     //  Draw the control's border as a flat thin black line.
     SetBorderStyle(WindowBorderStyle::MONO);
     SetDrawMode( GetSettings().GetStyleSettings().GetHighContrastMode() ? OUTPUT_DRAWMODE_CONTRAST : OUTPUT_DRAWMODE_COLOR );
-    SetMapMode(MapUnit::Map100thMM);
+    SetMapMode(MapMode(MapUnit::Map100thMM));
 
     // init model
     mpModel->GetItemPool().FreezeIdRanges();
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 6306beaaf566..35a82a04ea57 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -855,7 +855,7 @@ RecoveryDialog::RecoveryDialog(vcl::Window* pParent, RecoveryCore* pCore)
 
     constexpr int RECOV_CONTROLWIDTH = 278;
     SvSimpleTableContainer* pFileListLBContainer = get<SvSimpleTableContainer>("filelist");
-    Size aSize(LogicToPixel(Size(RECOV_CONTROLWIDTH, 68), MapUnit::MapAppFont));
+    Size aSize(LogicToPixel(Size(RECOV_CONTROLWIDTH, 68), MapMode(MapUnit::MapAppFont)));
     pFileListLBContainer->set_height_request(aSize.Height());
     m_pFileListLB = VclPtr<RecovDocList>::Create(*pFileListLBContainer);
 
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index af41b254815d..e3a6b6a9f8ba 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -1278,7 +1278,7 @@ void FrameSelector::Resize()
 
 Size FrameSelector::GetOptimalSize() const
 {
-    return LogicToPixel(Size(61, 65), MapUnit::MapAppFont);
+    return LogicToPixel(Size(61, 65), MapMode(MapUnit::MapAppFont));
 }
 
 
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index 0fdf35cd8430..732abec9865a 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -83,7 +83,7 @@ void IMapWindow::dispose()
 
 Size IMapWindow::GetOptimalSize() const
 {
-    return LogicToPixel(Size(270, 170), MapUnit::MapAppFont);
+    return LogicToPixel(Size(270, 170), MapMode(MapUnit::MapAppFont));
 }
 
 void IMapWindow::SetImageMap( const ImageMap& rImageMap )
diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx
index a2c3997eb3bf..9831067cc812 100644
--- a/svx/source/dialog/measctrl.cxx
+++ b/svx/source/dialog/measctrl.cxx
@@ -30,7 +30,7 @@
 SvxXMeasurePreview::SvxXMeasurePreview(vcl::Window* pParent, WinBits nStyle)
     : Control(pParent, nStyle)
 {
-    SetMapMode(MapUnit::Map100thMM);
+    SetMapMode(MapMode(MapUnit::Map100thMM));
 
     // Scale: 1:2
     MapMode aMapMode = GetMapMode();
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 9dc96987cc18..f66d635f0db9 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -776,7 +776,7 @@ void RubyPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang
 {
     rRenderContext.Push(PushFlags::MAPMODE);
 
-    rRenderContext.SetMapMode(MapUnit::MapTwip);
+    rRenderContext.SetMapMode(MapMode(MapUnit::MapTwip));
 
     Size aWinSize = rRenderContext.GetOutputSize();
 
diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx
index ec7e38747d17..895cb993afaa 100644
--- a/svx/source/dialog/swframeexample.cxx
+++ b/svx/source/dialog/swframeexample.cxx
@@ -472,7 +472,7 @@ tools::Rectangle SvxSwFrameExample::DrawInnerFrame_Impl(vcl::RenderContext& rRen
 
 void SvxSwFrameExample::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&)
 {
-    rRenderContext.SetMapMode(MapUnit::MapPixel);
+    rRenderContext.SetMapMode(MapMode(MapUnit::MapPixel));
 
     InitAllRects_Impl(rRenderContext);
 
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index f31996e29fb2..9a4834847dbe 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -194,7 +194,7 @@ Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* p
 
     get(m_pCtlPreview, "preview");
     get(m_pCtlLightPreview, "lightpreview");
-    Size aSize(LogicToPixel(Size(83, 76), MapUnit::MapAppFont));
+    Size aSize(LogicToPixel(Size(83, 76), MapMode(MapUnit::MapAppFont)));
     m_pCtlPreview->set_width_request(aSize.Width());
     m_pCtlLightPreview->set_width_request(aSize.Width());
     m_pCtlPreview->set_height_request(aSize.Height());
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index a93864bf1b70..57af471fda3f 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -1478,7 +1478,7 @@ bool FmGridControl::isColumnMarked(sal_uInt16 nId) const
 long FmGridControl::QueryMinimumRowHeight()
 {
     long const nMinimalLogicHeight = 20; // 0.2 cm
-    long nMinimalPixelHeight = LogicToPixel( Point( 0, nMinimalLogicHeight ), MapUnit::Map10thMM ).Y();
+    long nMinimalPixelHeight = LogicToPixel(Point(0, nMinimalLogicHeight), MapMode(MapUnit::Map10thMM)).Y();
     return CalcZoom( nMinimalPixelHeight );
 }
 
@@ -1493,7 +1493,7 @@ void FmGridControl::RowHeightChanged()
         try
         {
             sal_Int32 nUnzoomedPixelHeight = CalcReverseZoom( GetDataRowHeight() );
-            Any aProperty = makeAny( (sal_Int32)PixelToLogic( Point( 0, nUnzoomedPixelHeight ), MapUnit::Map10thMM ).Y() );
+            Any aProperty = makeAny( static_cast<sal_Int32>(PixelToLogic( Point(0, nUnzoomedPixelHeight), MapMode(MapUnit::Map10thMM)).Y()) );
             xModel->setPropertyValue( FM_PROP_ROWHEIGHT, aProperty );
         }
         catch( const Exception& )
@@ -1516,7 +1516,7 @@ void FmGridControl::ColumnResized(sal_uInt16 nId)
         sal_Int32 nColumnWidth = GetColumnWidth(nId);
         nColumnWidth = CalcReverseZoom(nColumnWidth);
         // convert to 10THMM
-        aWidth <<= (sal_Int32)PixelToLogic(Point(nColumnWidth,0),MapUnit::Map10thMM).X();
+        aWidth <<= (sal_Int32)PixelToLogic(Point(nColumnWidth, 0), MapMode(MapUnit::Map10thMM)).X();
         xColModel->setPropertyValue(FM_PROP_WIDTH, aWidth);
     }
 }
@@ -1609,7 +1609,7 @@ void FmGridControl::InitColumnsByModels(const Reference< css::container::XIndexC
         aWidth = xCol->getPropertyValue(FM_PROP_WIDTH);
         sal_Int32 nWidth = 0;
         if (aWidth >>= nWidth)
-            nWidth = LogicToPixel(Point(nWidth,0),MapUnit::Map10thMM).X();
+            nWidth = LogicToPixel(Point(nWidth, 0), MapMode(MapUnit::Map10thMM)).X();
 
         AppendColumn(aName, (sal_uInt16)nWidth);
         DbGridColumn* pCol = DbGridControl::GetColumns().at( i );
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 8237fdf34f8e..b88e4cd9afe2 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -1411,7 +1411,7 @@ void FmXGridPeer::propertyChange(const PropertyChangeEvent& evt)
                 sal_Int32 nTest = 0;
                 if (evt.NewValue >>= nTest)
                 {
-                    nWidth = pGrid->LogicToPixel(Point(nTest,0),MapUnit::Map10thMM).X();
+                    nWidth = pGrid->LogicToPixel(Point(nTest, 0), MapMode(MapUnit::Map10thMM)).X();
                     // take the zoom factor into account
                     nWidth = pGrid->CalcZoom(nWidth);
                 }
@@ -1726,7 +1726,7 @@ void FmXGridPeer::elementInserted(const ContainerEvent& evt)
     Any aWidth = xNewColumn->getPropertyValue(FM_PROP_WIDTH);
     sal_Int32 nWidth = 0;
     if (aWidth >>= nWidth)
-        nWidth = pGrid->LogicToPixel(Point(nWidth,0),MapUnit::Map10thMM).X();
+        nWidth = pGrid->LogicToPixel(Point(nWidth, 0), MapMode(MapUnit::Map10thMM)).X();
 
     pGrid->AppendColumn(aName, (sal_uInt16)nWidth, (sal_Int16)::comphelper::getINT32(evt.Accessor));
 
@@ -1769,7 +1769,7 @@ void FmXGridPeer::elementReplaced(const ContainerEvent& evt)
     Any aWidth = xNewColumn->getPropertyValue(FM_PROP_WIDTH);
     sal_Int32 nWidth = 0;
     if (aWidth >>= nWidth)
-        nWidth = pGrid->LogicToPixel(Point(nWidth,0),MapUnit::Map10thMM).X();
+        nWidth = pGrid->LogicToPixel(Point(nWidth, 0), MapMode(MapUnit::Map10thMM)).X();
     sal_uInt16 nNewId = pGrid->AppendColumn(aName, (sal_uInt16)nWidth, (sal_Int16)::comphelper::getINT32(evt.Accessor));
     sal_uInt16 nNewPos = pGrid->GetModelColumnPos(nNewId);
 
@@ -1960,7 +1960,7 @@ void FmXGridPeer::setProperty( const OUString& PropertyName, const Any& Value)
         sal_Int32 nLogHeight(0);
         if (Value >>= nLogHeight)
         {
-            sal_Int32 nHeight = pGrid->LogicToPixel(Point(0,nLogHeight),MapUnit::Map10thMM).Y();
+            sal_Int32 nHeight = pGrid->LogicToPixel(Point(0, nLogHeight), MapMode(MapUnit::Map10thMM)).Y();
             // take the zoom factor into account
             nHeight = pGrid->CalcZoom(nHeight);
             pGrid->SetDataRowHeight(nHeight);
@@ -2052,7 +2052,7 @@ Any FmXGridPeer::getProperty( const OUString& _rPropertyName )
             sal_Int32 nPixelHeight = pGrid->GetDataRowHeight();
             // take the zoom factor into account
             nPixelHeight = pGrid->CalcReverseZoom(nPixelHeight);
-            aProp <<= (sal_Int32)pGrid->PixelToLogic(Point(0,nPixelHeight),MapUnit::Map10thMM).Y();
+            aProp <<= (sal_Int32)pGrid->PixelToLogic(Point(0, nPixelHeight), MapMode(MapUnit::Map10thMM)).Y();
         }
         else if ( _rPropertyName == FM_PROP_HASNAVIGATION )
         {
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 55d374de2025..e688ef251705 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -427,7 +427,7 @@ sal_uInt16 DbGridControl::NavigationBar::ArrangeControls()
     tools::Rectangle   aRect(static_cast<DbGridControl*>(GetParent())->GetControlArea());
     long nH = aRect.GetSize().Height();
     long nW = GetParent()->GetOutputSizePixel().Width();
-    Size aBorder = LogicToPixel(Size(2, 2),MapUnit::MapAppFont);
+    Size aBorder = LogicToPixel(Size(2, 2), MapMode(MapUnit::MapAppFont));
     aBorder = Size(CalcZoom(aBorder.Width()), CalcZoom(aBorder.Height()));
     sal_uInt16      nX = 1;
     sal_uInt16      nY = 0;
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 55fc1004e21e..076a4c35c291 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -325,7 +325,7 @@ namespace svxform
     {
         get(m_pToolBox, "toolbar");
         get(m_pItemList, "items");
-        Size aSize(LogicToPixel(Size(63, 100), MapUnit::MapAppFont));
+        Size aSize(LogicToPixel(Size(63, 100), MapMode(MapUnit::MapAppFont)));
         m_pItemList->set_width_request(aSize.Width());
         m_pItemList->set_height_request(aSize.Height());
 
@@ -2143,7 +2143,7 @@ namespace svxform
         SetText( SvxResId( RID_STR_DATANAVIGATOR ) );
 
         Size aSize = m_aDataWin->GetOutputSizePixel();
-        Size aLogSize = PixelToLogic( aSize, MapUnit::MapAppFont );
+        Size aLogSize = PixelToLogic(aSize, MapMode(MapUnit::MapAppFont));
         SfxDockingWindow::SetFloatingSize( aLogSize );
 
         m_aDataWin->Show();
@@ -2195,13 +2195,13 @@ namespace svxform
     {
         SfxDockingWindow::Resize();
 
-        Size aLogOutputSize = PixelToLogic( GetOutputSizePixel(), MapUnit::MapAppFont );
+        Size aLogOutputSize = PixelToLogic(GetOutputSizePixel(), MapMode(MapUnit::MapAppFont));
         Size aLogExplSize = aLogOutputSize;
         aLogExplSize.Width() -= 2;
         aLogExplSize.Height() -= 2;
 
-        Point aExplPos = LogicToPixel( Point(1,1), MapUnit::MapAppFont );
-        Size aExplSize = LogicToPixel( aLogExplSize, MapUnit::MapAppFont );
+        Point aExplPos = LogicToPixel(Point(1,1), MapMode(MapUnit::MapAppFont));
+        Size aExplSize = LogicToPixel(aLogExplSize, MapMode(MapUnit::MapAppFont));
 
         m_aDataWin->SetPosSizePixel( aExplPos, aExplSize );
     }
@@ -2612,7 +2612,7 @@ namespace svxform
                     SAL_WARN( "svx.form", "AddDataItemDialog::InitFromNode(): exception caught" );
                 }
 
-                Size a3and1Sz = LogicToPixel( Size( 3, 1 ), MapUnit::MapAppFont );
+                Size a3and1Sz = LogicToPixel( Size(3, 1), MapMode(MapUnit::MapAppFont));
                 Size aNewSz = m_pDefaultED->GetSizePixel();
                 Point aNewPnt = m_pDefaultED->GetPosPixel();
                 aNewPnt.Y() += a3and1Sz.Height();
@@ -2876,7 +2876,7 @@ namespace svxform
         SvSimpleTableContainer* pNamespacesListContainer =
             get<SvSimpleTableContainer>("namespaces");
         Size aControlSize(175, 72);
-        aControlSize = LogicToPixel(aControlSize, MapUnit::MapAppFont);
+        aControlSize = LogicToPixel(aControlSize, MapMode(MapUnit::MapAppFont));
         pNamespacesListContainer->set_width_request(aControlSize.Width());
         pNamespacesListContainer->set_height_request(aControlSize.Height());
         m_pNamespacesList = VclPtr<SvSimpleTable>::Create(*pNamespacesListContainer, 0);
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 10b47ae09f61..989019e0a702 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1918,13 +1918,13 @@ void FmFilterNavigatorWin::Resize()
 {
     SfxDockingWindow::Resize();
 
-    Size aLogOutputSize = PixelToLogic( GetOutputSizePixel(), MapUnit::MapAppFont );
+    Size aLogOutputSize = PixelToLogic(GetOutputSizePixel(), MapMode(MapUnit::MapAppFont));
     Size aLogExplSize = aLogOutputSize;
     aLogExplSize.Width() -= 6;
     aLogExplSize.Height() -= 6;
 
-    Point aExplPos = LogicToPixel( Point(3,3), MapUnit::MapAppFont );
-    Size aExplSize = LogicToPixel( aLogExplSize, MapUnit::MapAppFont );
+    Point aExplPos = LogicToPixel(Point(3,3), MapMode(MapUnit::MapAppFont));
+    Size aExplSize = LogicToPixel(aLogExplSize, MapMode(MapUnit::MapAppFont));
 
     m_pNavigator->SetPosSizePixel( aExplPos, aExplSize );
 }
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 7c0377254b1a..c798bd28b9fd 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -558,13 +558,13 @@ namespace svxform
     {
         SfxDockingWindow::Resize();
 
-        Size aLogOutputSize = PixelToLogic( GetOutputSizePixel(), MapUnit::MapAppFont );
+        Size aLogOutputSize = PixelToLogic(GetOutputSizePixel(), MapMode(MapUnit::MapAppFont));
         Size aLogExplSize = aLogOutputSize;
         aLogExplSize.Width() -= 6;
         aLogExplSize.Height() -= 6;
 
-        Point aExplPos = LogicToPixel( Point(3,3), MapUnit::MapAppFont );
-        Size aExplSize = LogicToPixel( aLogExplSize, MapUnit::MapAppFont );
+        Point aExplPos = LogicToPixel(Point(3, 3), MapMode(MapUnit::MapAppFont));
+        Size aExplSize = LogicToPixel(aLogExplSize, MapMode(MapUnit::MapAppFont));
 
         m_pNavigatorTree->SetPosSizePixel( aExplPos, aExplSize );
     }
diff --git a/svx/source/gallery2/GalleryControl.cxx b/svx/source/gallery2/GalleryControl.cxx
index aafa1161ce4d..8fec8739b291 100644
--- a/svx/source/gallery2/GalleryControl.cxx
+++ b/svx/source/gallery2/GalleryControl.cxx
@@ -131,7 +131,7 @@ void GalleryControl::Resize()
     }
     mbIsInitialResize = false;
 
-    const long nFrameLen = LogicToPixel( Size( 3, 0 ), MapUnit::MapAppFont ).Width();
+    const long nFrameLen = LogicToPixel(Size(3, 0), MapMode(MapUnit::MapAppFont)).Width();
     const long nFrameLen2 = nFrameLen << 1;
 
     if(bNewLayoutHorizontal)
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index cd34c6397357..447c26dd7c72 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -181,7 +181,7 @@ sal_uIntPtr GalleryBrowser1::ImplInsertThemeEntry( const GalleryThemeEntry* pEnt
 void GalleryBrowser1::ImplAdjustControls()
 {
     const Size  aOutSize( GetOutputSizePixel() );
-    const long  nNewThemeHeight = LogicToPixel( Size( 0, 14 ), MapUnit::MapAppFont ).Height();
+    const long  nNewThemeHeight = LogicToPixel(Size(0, 14), MapMode(MapUnit::MapAppFont)).Height();
     const long  nStartY = nNewThemeHeight + 4;
 
     maNewTheme->SetPosSizePixel( Point(),
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 0c156cd165d5..b711cbe21244 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -54,7 +54,7 @@ VCL_BUILDER_FACTORY_CONSTRUCTOR(GalleryPreview, WB_TABSTOP)
 
 Size GalleryPreview::GetOptimalSize() const
 {
-    return LogicToPixel(Size(70, 88), MapUnit::MapAppFont);
+    return LogicToPixel(Size(70, 88), MapMode(MapUnit::MapAppFont));
 }
 
 bool GalleryPreview::SetGraphic( const INetURLObject& _aURL )
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index d5fe56acde82..52ec75aafea0 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -105,7 +105,7 @@ bool SgaObject::CreateThumb( const Graphic& rGraphic )
                 aBmpEx.GetPrefSize().Width() > 0 &&
                 aBmpEx.GetPrefSize().Height() > 0 )
             {
-                Size aLogSize( OutputDevice::LogicToLogic( aBmpEx.GetPrefSize(), aBmpEx.GetPrefMapMode(), MapUnit::Map100thMM ) );
+                Size aLogSize( OutputDevice::LogicToLogic(aBmpEx.GetPrefSize(), aBmpEx.GetPrefMapMode(), MapMode(MapUnit::Map100thMM)) );
 
                 if( aLogSize.Width() > 0 && aLogSize.Height() > 0 )
                 {
diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx
index 40a88daa4962..7b202510c75a 100644
--- a/svx/source/sdr/contact/viewcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx
@@ -109,11 +109,11 @@ namespace sdr
 
             if(MapUnit::MapPixel == GetGrafObject().GetGrafPrefMapMode().GetMapUnit())
             {
-                aPrefSize = Application::GetDefaultDevice()->PixelToLogic(aPrefSize, MapUnit::Map100thMM);
+                aPrefSize = Application::GetDefaultDevice()->PixelToLogic(aPrefSize, MapMode(MapUnit::Map100thMM));
             }
             else
             {
-                aPrefSize = OutputDevice::LogicToLogic(aPrefSize, GetGrafObject().GetGrafPrefMapMode(), MapUnit::Map100thMM);
+                aPrefSize = OutputDevice::LogicToLogic(aPrefSize, GetGrafObject().GetGrafPrefMapMode(), MapMode(MapUnit::Map100thMM));
             }
 
             // decompose object matrix to get single values
@@ -201,11 +201,11 @@ namespace sdr
 
                 if(MapUnit::MapPixel == aDraftBitmap.GetPrefMapMode().GetMapUnit())
                 {
-                    aPrefSize = Application::GetDefaultDevice()->PixelToLogic(aDraftBitmap.GetSizePixel(), MapUnit::Map100thMM);
+                    aPrefSize = Application::GetDefaultDevice()->PixelToLogic(aDraftBitmap.GetSizePixel(), MapMode(MapUnit::Map100thMM));
                 }
                 else
                 {
-                    aPrefSize = OutputDevice::LogicToLogic(aPrefSize, aDraftBitmap.GetPrefMapMode(), MapUnit::Map100thMM);
+                    aPrefSize = OutputDevice::LogicToLogic(aPrefSize, aDraftBitmap.GetPrefMapMode(), MapMode(MapUnit::Map100thMM));
                 }
 
                 const double fBitmapScaling(2.0);
diff --git a/svx/source/sdr/overlay/overlayobjectlist.cxx b/svx/source/sdr/overlay/overlayobjectlist.cxx
index 27baa4853df6..813a01205b90 100644
--- a/svx/source/sdr/overlay/overlayobjectlist.cxx
+++ b/svx/source/sdr/overlay/overlayobjectlist.cxx
@@ -76,7 +76,7 @@ namespace sdr
                         {
                             aSizeLogic = Size(DEFAULT_VALUE_FOR_HITTEST_TWIP, DEFAULT_VALUE_FOR_HITTEST_TWIP);
                             if (pManager->getOutputDevice().GetMapMode().GetMapUnit() == MapUnit::Map100thMM)
-                                aSizeLogic = OutputDevice::LogicToLogic(aSizeLogic, MapUnit::MapTwip, MapUnit::Map100thMM);
+                                aSizeLogic = OutputDevice::LogicToLogic(aSizeLogic, MapMode(MapUnit::MapTwip), MapMode(MapUnit::Map100thMM));
                         }
 
                         fLogicTolerance = aSizeLogic.Width();
diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index f0903f5d6b15..e68d05fb673e 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -643,7 +643,7 @@ namespace drawinglayer
                 if(GraphicType::Bitmap == aGraphic.GetType())
                 {
                     aGraphic.SetPrefSize(aGraphic.GetBitmapEx().GetSizePixel());
-                    aGraphic.SetPrefMapMode(MapUnit::MapPixel);
+                    aGraphic.SetPrefMapMode(MapMode(MapUnit::MapPixel));
                 }
             }
 
@@ -658,7 +658,7 @@ namespace drawinglayer
             const MapUnit aDestinationMapUnit(rSet.GetPool()->GetMetric(0));
             basegfx::B2DVector aGraphicLogicSize(aGraphic.GetPrefSize().Width(), aGraphic.GetPrefSize().Height());
 
-            if(aGraphic.GetPrefMapMode() != aDestinationMapUnit)
+            if (aGraphic.GetPrefMapMode().GetMapUnit() != aDestinationMapUnit)
             {
                 // #i100360# for MapUnit::MapPixel, LogicToLogic will not work properly,
                 // so fallback to Application::GetDefaultDevice()
@@ -668,14 +668,14 @@ namespace drawinglayer
                 {
                     aNewSize = Application::GetDefaultDevice()->PixelToLogic(
                         aGraphic.GetPrefSize(),
-                        aDestinationMapUnit);
+                        MapMode(aDestinationMapUnit));
                 }
                 else
                 {
                     aNewSize = OutputDevice::LogicToLogic(
                         aGraphic.GetPrefSize(),
                         aGraphic.GetPrefMapMode(),
-                        aDestinationMapUnit);
+                        MapMode(aDestinationMapUnit));
                 }
 
                 // #i124002# do not set new size using SetPrefSize at the graphic, this will lead to problems.
diff --git a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
index ff77dad9b9bb..fae9ccfdfc1e 100644
--- a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
@@ -74,11 +74,11 @@ namespace drawinglayer
 
                     if(MapUnit::MapPixel == aGraphic.GetPrefMapMode().GetMapUnit())
                     {
-                        aPrefSize = Application::GetDefaultDevice()->PixelToLogic(aPrefSize, MapUnit::Map100thMM);
+                        aPrefSize = Application::GetDefaultDevice()->PixelToLogic(aPrefSize, MapMode(MapUnit::Map100thMM));
                     }
                     else
                     {
-                        aPrefSize = OutputDevice::LogicToLogic(aPrefSize, aGraphic.GetPrefMapMode(), MapUnit::Map100thMM);
+                        aPrefSize = OutputDevice::LogicToLogic(aPrefSize, aGraphic.GetPrefMapMode(), MapMode(MapUnit::Map100thMM));
                     }
 
                     const double fOffsetX((aScale.getX() - aPrefSize.getWidth()) / 2.0);
diff --git a/svx/source/sidebar/line/LineWidthValueSet.cxx b/svx/source/sidebar/line/LineWidthValueSet.cxx
index 9c31541f46e0..6ed3d9edf2d1 100644
--- a/svx/source/sidebar/line/LineWidthValueSet.cxx
+++ b/svx/source/sidebar/line/LineWidthValueSet.cxx
@@ -173,7 +173,7 @@ void  LineWidthValueSet::UserDraw( const UserDrawEvent& rUDEvt )
 
 Size LineWidthValueSet::GetOptimalSize() const
 {
-    return LogicToPixel(Size(80, 12 * 9), MapUnit::MapAppFont);
+    return LogicToPixel(Size(80, 12 * 9), MapMode(MapUnit::MapAppFont));
 }
 
 } } // end of namespace svx::sidebar
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 629f4ba26523..ac757f1a351d 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -851,7 +851,7 @@ void OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
                             aSize = SvxNumberFormat::GetGraphicSizeMM100( pGrf );
                         }
                     }
-                    aSize = OutputDevice::LogicToLogic(aSize, MapUnit::Map100thMM, GetMapUnit());
+                    aSize = OutputDevice::LogicToLogic(aSize, MapMode(MapUnit::Map100thMM), MapMode(GetMapUnit()));
                     aFmt.SetGraphicBrush( pLevelSettings->pBrushItem, &aSize, &eOrient );
             }
         } else
diff --git a/svx/source/sidebar/possize/SidebarDialControl.cxx b/svx/source/sidebar/possize/SidebarDialControl.cxx
index 831fcbca1266..a934a9a08ebb 100644
--- a/svx/source/sidebar/possize/SidebarDialControl.cxx
+++ b/svx/source/sidebar/possize/SidebarDialControl.cxx
@@ -34,7 +34,7 @@ VCL_BUILDER_FACTORY_ARGS(SidebarDialControl, WB_TABSTOP)
 
 Size SidebarDialControl::GetOptimalSize() const
 {
-    return LogicToPixel(Size(10, 10), MapUnit::MapAppFont);
+    return LogicToPixel(Size(10, 10), MapMode(MapUnit::MapAppFont));
 }
 
 void SidebarDialControl::MouseButtonDown( const MouseEvent& rMEvt )
diff --git a/svx/source/styles/CommonStylePreviewRenderer.cxx b/svx/source/styles/CommonStylePreviewRenderer.cxx
index ab1d05fb94ed..9928960034e1 100644
--- a/svx/source/styles/CommonStylePreviewRenderer.cxx
+++ b/svx/source/styles/CommonStylePreviewRenderer.cxx
@@ -148,7 +148,7 @@ bool CommonStylePreviewRenderer::recalculate()
     {
         const SvxFontHeightItem* pFontHeightItem = static_cast<const SvxFontHeightItem*>(pItem);
         Size aFontSize(0, pFontHeightItem->GetHeight());
-        maPixelSize = mrOutputDev.LogicToPixel(aFontSize, mrShell.GetMapUnit());
+        maPixelSize = mrOutputDev.LogicToPixel(aFontSize, MapMode(mrShell.GetMapUnit()));
         pFont->SetFontSize(maPixelSize);
 
         vcl::Font aOldFont(mrOutputDev.GetFont());
diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx
index b727cfdccdc0..bd839fa6dcef 100644
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -444,7 +444,7 @@ void SdrPageWindow::InvalidatePageWindow(const basegfx::B2DRange& rRange)
             static_cast<long>(ceil(rRange.getMaxX())),
             static_cast<long>(ceil(rRange.getMaxY())));
 
-        const tools::Rectangle aRectTwips = OutputDevice::LogicToLogic(aRect100thMM, MapUnit::Map100thMM, MapUnit::MapTwip);
+        const tools::Rectangle aRectTwips = OutputDevice::LogicToLogic(aRect100thMM, MapMode(MapUnit::Map100thMM), MapMode(MapUnit::MapTwip));
 
         if (SfxViewShell* pViewShell = SfxViewShell::Current())
             SfxLokHelper::notifyInvalidation(pViewShell, aRectTwips.toString());
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index e44ece39364f..072b0ca84478 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -229,7 +229,7 @@ void SdrMarkView::ModelHasChanged()
                 if (OutputDevice* pOutputDevice = mpMarkedPV->GetView().GetFirstOutputDevice())
                 {
                     if (pOutputDevice->GetMapMode().GetMapUnit() == MapUnit::Map100thMM)
-                        aSelection = OutputDevice::LogicToLogic(aSelection, MapUnit::Map100thMM, MapUnit::MapTwip);
+                        aSelection = OutputDevice::LogicToLogic(aSelection, MapMode(MapUnit::Map100thMM), MapMode(MapUnit::MapTwip));
                 }
             }
 
@@ -790,7 +790,7 @@ void SdrMarkView::SetMarkHandles(SfxViewShell* pOtherShell)
                     if (OutputDevice* pOutputDevice = mpMarkedPV->GetView().GetFirstOutputDevice())
                     {
                         if (pOutputDevice->GetMapMode().GetMapUnit() == MapUnit::Map100thMM)
-                            aSelection = OutputDevice::LogicToLogic(aSelection, MapUnit::Map100thMM, MapUnit::MapTwip);
+                            aSelection = OutputDevice::LogicToLogic(aSelection, MapMode(MapUnit::Map100thMM), MapMode(MapUnit::MapTwip));
                     }
                 }
 
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index d34c02ed9f9e..9745cd84b632 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -591,9 +591,9 @@ Size SdrGrafObj::getOriginalSize() const
     }
 
     if ( GetGrafPrefMapMode().GetMapUnit() == MapUnit::MapPixel )
-        aSize = Application::GetDefaultDevice()->PixelToLogic( aSize, GetModel()->GetScaleUnit() );
+        aSize = Application::GetDefaultDevice()->PixelToLogic(aSize, MapMode(GetModel()->GetScaleUnit()));
     else
-        aSize = OutputDevice::LogicToLogic( aSize, GetGrafPrefMapMode(), GetModel()->GetScaleUnit() );
+        aSize = OutputDevice::LogicToLogic(aSize, GetGrafPrefMapMode(), MapMode(GetModel()->GetScaleUnit()));
 
     return aSize;
 }
@@ -1275,7 +1275,7 @@ void SdrGrafObj::AdjustToMaxRect( const tools::Rectangle& rMaxRect, bool bShrink
     Size aSize;
     Size aMaxSize( rMaxRect.GetSize() );
     if ( pGraphic->GetPrefMapMode().GetMapUnit() == MapUnit::MapPixel )
-        aSize = Application::GetDefaultDevice()->PixelToLogic( pGraphic->GetPrefSize(), MapUnit::Map100thMM );
+        aSize = Application::GetDefaultDevice()->PixelToLogic( pGraphic->GetPrefSize(), MapMode(MapUnit::Map100thMM));
     else
         aSize = OutputDevice::LogicToLogic( pGraphic->GetPrefSize(),
                                             pGraphic->GetPrefMapMode(),
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index 1dc58e0e258b..204d6d9a84f3 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -186,7 +186,7 @@ void SdrMediaObj::AdjustToMaxRect( const tools::Rectangle& rMaxRect, bool bShrin
 {
     Size aSize( Application::GetDefaultDevice()->PixelToLogic(
                     static_cast< sdr::contact::ViewContactOfSdrMediaObj& >( GetViewContact() ).getPreferredSize(),
-                    MapUnit::Map100thMM ) );
+                    MapMode(MapUnit::Map100thMM)) );
     Size aMaxSize( rMaxRect.GetSize() );
 
     if( aSize.Height() != 0 && aSize.Width() != 0 )
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index a6141cbdbfde..a43c341193db 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -245,7 +245,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::notifyEvent( const document::EventObj
             }
 
             aVisArea.SetSize( Size( aSz.Width, aSz.Height ) );
-            aVisArea = OutputDevice::LogicToLogic( aVisArea, aObjMapUnit, aContainerMapUnit );
+            aVisArea = OutputDevice::LogicToLogic(aVisArea, MapMode(aObjMapUnit), MapMode(aContainerMapUnit));
             Size aScaledSize( static_cast< long >( m_aScaleWidth * Fraction( aVisArea.GetWidth() ) ),
                                 static_cast< long >( m_aScaleHeight * Fraction( aVisArea.GetHeight() ) ) );
             tools::Rectangle aLogicRect( mpObj->GetLogicRect() );
@@ -255,7 +255,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::notifyEvent( const document::EventObj
                 Application::GetDefaultDevice()->LogicToPixel(
                     Size( aLogicRect.GetWidth() - aScaledSize.Width(),
                           aLogicRect.GetHeight() - aScaledSize.Height() ),
-                    aContainerMapUnit );
+                    MapMode(aContainerMapUnit));
             if( aPixelDiff.Width() || aPixelDiff.Height() )
             {
                 mpObj->SetLogicRect( tools::Rectangle( aLogicRect.TopLeft(), aScaledSize ) );
@@ -437,7 +437,7 @@ awt::Rectangle SAL_CALL SdrLightEmbeddedClient_Impl::getPlacement()
     if ( xParentVis.is() )
         aContainerMapUnit = VCLUnoHelper::UnoEmbed2VCLMapUnit( xParentVis->getMapUnit( mpObj->GetAspect() ) );
 
-    aLogicRect = Application::GetDefaultDevice()->LogicToPixel(aLogicRect,aContainerMapUnit);
+    aLogicRect = Application::GetDefaultDevice()->LogicToPixel(aLogicRect, MapMode(aContainerMapUnit));
     return AWTRectangle( aLogicRect );
 }
 
@@ -476,7 +476,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::changedPlacement( const awt::Rectangl
     if ( xParentVis.is() )
         aContainerMapUnit = VCLUnoHelper::UnoEmbed2VCLMapUnit( xParentVis->getMapUnit( mpObj->GetAspect() ) );
 
-    tools::Rectangle aNewLogicRect = Application::GetDefaultDevice()->PixelToLogic(aNewPixelRect,aContainerMapUnit);
+    tools::Rectangle aNewLogicRect = Application::GetDefaultDevice()->PixelToLogic(aNewPixelRect, MapMode(aContainerMapUnit));
     tools::Rectangle aLogicRect = impl_getScaledRect_nothrow();
 
     if ( aNewLogicRect != aLogicRect )
@@ -496,7 +496,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::changedPlacement( const awt::Rectangl
             Application::GetDefaultDevice()->LogicToPixel(
                 Size( aLogicRect.GetWidth() - aNewObjSize.Width(),
                       aLogicRect.GetHeight() - aNewObjSize.Height() ),
-                aContainerMapUnit );
+                MapMode(aContainerMapUnit));
         if( aPixelDiff.Width() || aPixelDiff.Height() )
         {
             mpObj->SetLogicRect( tools::Rectangle( aLogicRect.TopLeft(), aNewObjSize ) );
@@ -1531,7 +1531,7 @@ void SdrOle2Obj::ImpSetVisAreaSize()
                 Size aVisSize( (long)( Fraction( maRect.GetWidth() ) / aScaleWidth ),
                                 (long)( Fraction( maRect.GetHeight() ) / aScaleHeight ) );
 
-                aVisSize = OutputDevice::LogicToLogic( aVisSize, pModel->GetScaleUnit(), aMapUnit);
+                aVisSize = OutputDevice::LogicToLogic(aVisSize, MapMode(pModel->GetScaleUnit()), MapMode(aMapUnit));
                 awt::Size aSz;
                 aSz.Width = aVisSize.Width();
                 aSz.Height = aVisSize.Height();
@@ -1552,7 +1552,7 @@ void SdrOle2Obj::ImpSetVisAreaSize()
                     // server changed VisArea to its liking and the VisArea is different than the suggested one
                     // store the new value as given by the object
                     MapUnit aNewMapUnit = VCLUnoHelper::UnoEmbed2VCLMapUnit( mpImpl->mxObjRef->getMapUnit( GetAspect() ) );
-                    maRect.SetSize(OutputDevice::LogicToLogic( aAcceptedVisArea.GetSize(), aNewMapUnit, pModel->GetScaleUnit()));
+                    maRect.SetSize(OutputDevice::LogicToLogic(aAcceptedVisArea.GetSize(), MapMode(aNewMapUnit), MapMode(pModel->GetScaleUnit())));
                 }
 
                 // make the new object area known to the client
@@ -1601,8 +1601,8 @@ void SdrOle2Obj::ImpSetVisAreaSize()
                 MapUnit aMapUnit = VCLUnoHelper::UnoEmbed2VCLMapUnit( mpImpl->mxObjRef->getMapUnit( GetAspect() ) );
                 Point aTL( maRect.TopLeft() );
                 Point aBR( maRect.BottomRight() );
-                Point aTL2( OutputDevice::LogicToLogic( aTL, pModel->GetScaleUnit(), aMapUnit) );
-                Point aBR2( OutputDevice::LogicToLogic( aBR, pModel->GetScaleUnit(), aMapUnit) );
+                Point aTL2(OutputDevice::LogicToLogic(aTL, MapMode(pModel->GetScaleUnit()), MapMode(aMapUnit)));
+                Point aBR2(OutputDevice::LogicToLogic(aBR, MapMode(pModel->GetScaleUnit()), MapMode(aMapUnit)));
                 tools::Rectangle aNewRect( aTL2, aBR2 );
                 xVisualObject->setVisualAreaSize( GetAspect(), awt::Size( aNewRect.GetWidth(), aNewRect.GetHeight() ) );
             }
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 2ffa6c6b1f83..f12b7b1d4e67 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -2130,9 +2130,9 @@ void SvxTableController::updateSelectionOverlay()
 
                 if (pOutDev->GetMapMode().GetMapUnit() == MapUnit::Map100thMM)
                 {
-                    aSelectionStart = OutputDevice::LogicToLogic(aSelectionStart, MapUnit::Map100thMM, MapUnit::MapTwip);
-                    aSelectionEnd = OutputDevice::LogicToLogic(aSelectionEnd, MapUnit::Map100thMM, MapUnit::MapTwip);
-                    aSelection = OutputDevice::LogicToLogic(aSelection, MapUnit::Map100thMM, MapUnit::MapTwip);
+                    aSelectionStart = OutputDevice::LogicToLogic(aSelectionStart, MapMode(MapUnit::Map100thMM), MapMode(MapUnit::MapTwip));
+                    aSelectionEnd = OutputDevice::LogicToLogic(aSelectionEnd, MapMode(MapUnit::Map100thMM), MapMode(MapUnit::MapTwip));
+                    aSelection = OutputDevice::LogicToLogic(aSelection, MapMode(MapUnit::Map100thMM), MapMode(MapUnit::MapTwip));
                 }
 
                 if(SfxViewShell* pViewShell = SfxViewShell::Current())
diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx
index 1ca937bed72d..07f48303600f 100644
--- a/svx/source/tbxctrls/bulletsnumbering.cxx
+++ b/svx/source/tbxctrls/bulletsnumbering.cxx
@@ -92,7 +92,7 @@ NumberingPopup::NumberingPopup( NumberingToolBoxControl& rController,
         }
     }
 
-    Size aItemSize( LogicToPixel( Size( 30, 42 ), MapUnit::MapAppFont ) );
+    Size aItemSize(LogicToPixel(Size(30, 42), MapMode(MapUnit::MapAppFont)));
     mpValueSet->SetExtraSpacing( 2 );
     mpValueSet->SetOutputSizePixel( mpValueSet->CalcWindowSizePixel( aItemSize ) );
     mpValueSet->SetColor( GetSettings().GetStyleSettings().GetFieldColor() );
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index 00ff498e3b63..f763b7869825 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -890,7 +890,7 @@ void FillControl::Resize()
 void FillControl::SetOptimalSize()
 {
     const Size aLogicalAttrSize(50,0);
-    Size aSize(LogicToPixel(aLogicalAttrSize,MapUnit::MapAppFont));
+    Size aSize(LogicToPixel(aLogicalAttrSize, MapMode(MapUnit::MapAppFont)));
 
     Point aAttrPnt = mpLbFillAttr->GetPosPixel();
 
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index e57e9b624a3a..45bca9404639 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -77,7 +77,7 @@ FontWorkGalleryDialog::FontWorkGalleryDialog( SdrView* pSdrView, vcl::Window* pP
 {
     get(mpOKButton, "ok");
     get(mpCtlFavorites, "ctlFavorites");
-    Size aSize(LogicToPixel(Size(200, 200), MapUnit::MapAppFont));
+    Size aSize(LogicToPixel(Size(200, 200), MapMode(MapUnit::MapAppFont)));
     mpCtlFavorites->set_width_request(aSize.Width());
     mpCtlFavorites->set_height_request(aSize.Height());
 
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index c59cd6721944..2bc48400da49 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -60,7 +60,7 @@ SvxLineBox::SvxLineBox( vcl::Window* pParent, const Reference< XFrame >& rFrame
     mpSh        ( nullptr ),
     mxFrame     ( rFrame )
 {
-    SetSizePixel( LogicToPixel( aLogicalSize, MapUnit::MapAppFont ));
+    SetSizePixel(LogicToPixel(aLogicalSize, MapMode(MapUnit::MapAppFont)));
     Show();
 
     aDelayTimer.SetTimeout( DELAY_TIMEOUT );
@@ -221,7 +221,7 @@ void SvxLineBox::DataChanged( const DataChangedEvent& rDCEvt )
     if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) &&
          (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
     {
-        SetSizePixel(LogicToPixel(aLogicalSize, MapUnit::MapAppFont));
+        SetSizePixel(LogicToPixel(aLogicalSize, MapMode(MapUnit::MapAppFont)));
     }
 
     LineLB::DataChanged( rDCEvt );
@@ -250,7 +250,7 @@ SvxMetricField::SvxMetricField(
 {
     Size aSize( CalcMinimumSize() );
     SetSizePixel( aSize );
-    aLogicalSize = PixelToLogic(aSize, MapUnit::MapAppFont);
+    aLogicalSize = PixelToLogic(aSize, MapMode(MapUnit::MapAppFont));
     SetUnit( FUNIT_MM );
     SetDecimalDigits( 2 );
     SetMax( 5000 );
@@ -374,7 +374,7 @@ void SvxMetricField::DataChanged( const DataChangedEvent& rDCEvt )
     if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) &&
          (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
     {
-        SetSizePixel(LogicToPixel(aLogicalSize, MapUnit::MapAppFont));
+        SetSizePixel(LogicToPixel(aLogicalSize, MapMode(MapUnit::MapAppFont)));
     }
 
     MetricField::DataChanged( rDCEvt );
@@ -385,7 +385,7 @@ SvxFillTypeBox::SvxFillTypeBox( vcl::Window* pParent ) :
     nCurPos ( 0 ),
     bSelect ( false )
 {
-    SetSizePixel( LogicToPixel( Size(40, 40 ),MapUnit::MapAppFont ));
+    SetSizePixel(LogicToPixel(Size(40, 40), MapMode(MapUnit::MapAppFont)));
     Fill();
     SelectEntryPos( (sal_Int32)drawing::FillStyle_SOLID );
     Show();
@@ -464,7 +464,7 @@ SvxFillAttrBox::SvxFillAttrBox( vcl::Window* pParent ) :
     nCurPos( 0 )
 {
     SetPosPixel( Point( 90, 0 ) );
-    SetSizePixel( LogicToPixel( Size(50, 80 ), MapUnit::MapAppFont ));
+    SetSizePixel(LogicToPixel(Size(50, 80), MapMode(MapUnit::MapAppFont)));
     Show();
 }
 
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index 1f5df981716e..8209c41e8f28 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -81,7 +81,7 @@ SvxPopupWindowListBox::SvxPopupWindowListBox(sal_uInt16 nSlotId, const OUString&
     WinBits nBits(m_pListBox->GetStyle());
     nBits &= ~WB_SIMPLEMODE;
     m_pListBox->SetStyle(nBits);
-    Size aSize(LogicToPixel(Size(100, 85), MapUnit::MapAppFont));
+    Size aSize(LogicToPixel(Size(100, 85), MapMode(MapUnit::MapAppFont)));
     m_pListBox->set_width_request(aSize.Width());
     m_pListBox->set_height_request(aSize.Height());
     m_pListBox->EnableMultiSelection( true, true );
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index f5194489338b..b23170484d7b 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -620,7 +620,7 @@ bool SvxStyleBox_Impl::AdjustFontForItemHeight(OutputDevice* pDevice, tools::Rec
 
 void SvxStyleBox_Impl::SetOptimalSize()
 {
-    Size aSize(LogicToPixel(aLogicalSize, MapUnit::MapAppFont));
+    Size aSize(LogicToPixel(aLogicalSize, MapMode(MapUnit::MapAppFont)));
     set_width_request(aSize.Width());
     set_height_request(aSize.Height());
     SetSizePixel(aSize);
@@ -683,7 +683,7 @@ void SvxStyleBox_Impl::SetupEntry(vcl::RenderContext& rRenderContext, vcl::Windo
             if ( pFontItem && pFontHeightItem )
             {
                 Size aFontSize( 0, pFontHeightItem->GetHeight() );
-                Size aPixelSize(rRenderContext.LogicToPixel(aFontSize, pShell->GetMapUnit()));
+                Size aPixelSize(rRenderContext.LogicToPixel(aFontSize, MapMode(pShell->GetMapUnit())));
 
                 // setup the font properties
                 SvxFont aFont;
@@ -1098,7 +1098,7 @@ bool SvxFontNameBox_Impl::EventNotify( NotifyEvent& rNEvt )
 
 void SvxFontNameBox_Impl::SetOptimalSize()
 {
-    Size aSize(LogicToPixel(aLogicalSize, MapUnit::MapAppFont));
+    Size aSize(LogicToPixel(aLogicalSize, MapMode(MapUnit::MapAppFont)));
     set_width_request(aSize.Width());
     set_height_request(aSize.Height());
     SetSizePixel(aSize);
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx
index acdf84fbd6f5..cca2876053f9 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -245,7 +245,7 @@ bool SvxFontSizeBox_Impl::EventNotify( NotifyEvent& rNEvt )
 
 void SvxFontSizeBox_Impl::SetOptimalSize()
 {
-    Size aPrefSize(LogicToPixel(m_aLogicalSize, MapUnit::MapAppFont));
+    Size aPrefSize(LogicToPixel(m_aLogicalSize, MapMode(MapUnit::MapAppFont)));
     aPrefSize.Width() = get_preferred_size().Width();
     SetSizePixel(aPrefSize);
 }
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 0c0da807f5e2..4386f9a59d7d 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -98,7 +98,7 @@ bool SvxOle2Shape::setPropertyValueImpl( const OUString& rName, const SfxItemPro
                 {
                     // the API handles with MapUnit::Map100thMM map mode
                     MapUnit aObjUnit = VCLUnoHelper::UnoEmbed2VCLMapUnit( xObj->getMapUnit( embed::Aspects::MSOLE_CONTENT ) );
-                    aTmp = OutputDevice::LogicToLogic( aTmp, MapUnit::Map100thMM, aObjUnit );
+                    aTmp = OutputDevice::LogicToLogic(aTmp, MapMode(MapUnit::Map100thMM), MapMode(aObjUnit));
                     xObj->setVisualAreaSize( embed::Aspects::MSOLE_CONTENT, awt::Size( aTmp.Width(), aTmp.Height() ) );
                 }
                 catch( uno::Exception& )
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 4ab0f675625f..9b32265423c5 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -702,7 +702,7 @@ uno::Any SvxShape::GetBitmap( bool bMetaFile /* = false */ ) const
     {
         Graphic aGraph(aMtf);
         aGraph.SetPrefSize(aSize);
-        aGraph.SetPrefMapMode(MapUnit::Map100thMM);
+        aGraph.SetPrefMapMode(MapMode(MapUnit::Map100thMM));
 
         Reference< awt::XBitmap > xBmp( aGraph.GetXGraphic(), UNO_QUERY );
         aAny <<= xBmp;
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 60f809d566fe..bd16f0113c65 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -280,7 +280,7 @@ ErrCode XOutBitmap::WriteGraphic( const Graphic& rGraphic, OUString& rFileName,
                         if( pMtfSize_100TH_MM && ( rGraphic.GetType() != GraphicType::Bitmap ) )
                         {
                             ScopedVclPtrInstance< VirtualDevice > pVDev;
-                            const Size    aSize( pVDev->LogicToPixel( *pMtfSize_100TH_MM, MapUnit::Map100thMM ) );
+                            const Size aSize(pVDev->LogicToPixel(*pMtfSize_100TH_MM, MapMode(MapUnit::Map100thMM)));
 
                             if( pVDev->SetOutputSizePixel( aSize ) )
                             {
@@ -313,7 +313,7 @@ ErrCode XOutBitmap::WriteGraphic( const Graphic& rGraphic, OUString& rFileName,
                     if( pMtfSize_100TH_MM && ( rGraphic.GetType() != GraphicType::Bitmap ) )
                     {
                         ScopedVclPtrInstance< VirtualDevice > pVDev;
-                        const Size      aSize( pVDev->LogicToPixel( *pMtfSize_100TH_MM, MapUnit::Map100thMM ) );
+                        const Size aSize(pVDev->LogicToPixel(*pMtfSize_100TH_MM, MapMode(MapUnit::Map100thMM)));
 
                         if( pVDev->SetOutputSizePixel( aSize ) )
                         {
diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx
index 815f0b1105f5..492731d52fa6 100644
--- a/svx/source/xoutdev/xtabdash.cxx
+++ b/svx/source/xoutdev/xtabdash.cxx
@@ -101,7 +101,7 @@ Bitmap XDashList::ImpCreateBitmapForXDash(const XDash* pDash)
 
     if(pDash && (pDash->GetDots() || pDash->GetDashes()))
     {
-        const basegfx::B2DHomMatrix aScaleMatrix(OutputDevice::LogicToLogic(MapUnit::Map100thMM, MapUnit::MapPixel));
+        const basegfx::B2DHomMatrix aScaleMatrix(OutputDevice::LogicToLogic(MapMode(MapUnit::Map100thMM), MapMode(MapUnit::MapPixel)));
         const basegfx::B2DVector aScaleVector(aScaleMatrix * basegfx::B2DVector(1.0, 0.0));
         const double fScaleValue(aScaleVector.getLength() * (nFactor * (1.4 / 2.0)));
         const double fLineWidthInUnits(fLineWidth / fScaleValue);
diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx
index 97dd8fd76ee9..8d0dcaeb9800 100644
--- a/svx/source/xoutdev/xtabhtch.cxx
+++ b/svx/source/xoutdev/xtabhtch.cxx
@@ -112,7 +112,7 @@ Bitmap XHatchList::CreateBitmap( long nIndex, const Size& rSize) const
             }
         }
 
-        const basegfx::B2DHomMatrix aScaleMatrix(OutputDevice::LogicToLogic(MapUnit::Map100thMM, MapUnit::MapPixel));
+        const basegfx::B2DHomMatrix aScaleMatrix(OutputDevice::LogicToLogic(MapMode(MapUnit::Map100thMM), MapMode(MapUnit::MapPixel)));
         const basegfx::B2DVector aScaleVector(aScaleMatrix * basegfx::B2DVector(1.0, 0.0));
         const double fScaleValue(aScaleVector.getLength());