convert DRAWMODE constants to scoped enum

Change-Id: I36cbe8057d09226f8b302963bdd94dc5600b686f

4 files changed, 15 insertions, 15 deletions

diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx
index 6a3d9d5ef785..e8b3a69d1112 100644
--- a/sc/source/ui/miscdlgs/autofmt.cxx
+++ b/sc/source/ui/miscdlgs/autofmt.cxx
@@ -485,7 +485,7 @@ void ScAutoFmtPreview::NotifyChange( ScAutoFormatData* pNewData )
 
 void ScAutoFmtPreview::DoPaint(vcl::RenderContext& rRenderContext, const Rectangle& /*rRect*/)
 {
-    sal_uInt32 nOldDrawMode = aVD->GetDrawMode();
+    DrawModeFlags nOldDrawMode = aVD->GetDrawMode();
 
     Size aWndSize(GetSizePixel());
     vcl::Font aFont(aVD->GetFont());
diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx
index 2ed269a242a1..64b63ac11034 100644
--- a/sc/source/ui/view/notemark.cxx
+++ b/sc/source/ui/view/notemark.cxx
@@ -116,11 +116,11 @@ static void lcl_DrawWin( SdrObject* pObject, vcl::RenderContext* pWindow, const
     MapMode aOld = pWindow->GetMapMode();
     pWindow->SetMapMode( rMap );
 
-    sal_uLong nOldDrawMode = pWindow->GetDrawMode();
+    DrawModeFlags nOldDrawMode = pWindow->GetDrawMode();
     if ( Application::GetSettings().GetStyleSettings().GetHighContrastMode() )
     {
-        pWindow->SetDrawMode( nOldDrawMode | DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL |
-                            DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT );
+        pWindow->SetDrawMode( nOldDrawMode | DrawModeFlags::SettingsLine | DrawModeFlags::SettingsFill |
+                            DrawModeFlags::SettingsText | DrawModeFlags::SettingsGradient );
     }
 
     pObject->SingleObjectPainter( *pWindow ); // #110094#-17
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 14298826f7fb..9dfc3b7eb4d8 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -1279,7 +1279,7 @@ size_t lclGetArrayColFromCellInfoX( sal_uInt16 nCellInfoX, sal_uInt16 nCellInfoF
 
 void ScOutputData::DrawFrame()
 {
-    sal_uLong nOldDrawMode = mpDev->GetDrawMode();
+    DrawModeFlags nOldDrawMode = mpDev->GetDrawMode();
 
     Color aSingleColor;
     bool bUseSingleColor = false;
@@ -1291,16 +1291,16 @@ void ScOutputData::DrawFrame()
     //  that are drawn with DrawRect, so if the line/background bits are set, the DrawMode
     //  must be reset and the border colors handled here.
 
-    if ( ( nOldDrawMode & DRAWMODE_WHITEFILL ) && ( nOldDrawMode & DRAWMODE_BLACKLINE ) )
+    if ( ( nOldDrawMode & DrawModeFlags::WhiteFill ) && ( nOldDrawMode & DrawModeFlags::BlackLine ) )
     {
-        mpDev->SetDrawMode( nOldDrawMode & (~DRAWMODE_WHITEFILL) );
+        mpDev->SetDrawMode( nOldDrawMode & (~DrawModeFlags::WhiteFill) );
         aSingleColor.SetColor( COL_BLACK );
         bUseSingleColor = true;
     }
-    else if ( ( nOldDrawMode & DRAWMODE_SETTINGSFILL ) && ( nOldDrawMode & DRAWMODE_SETTINGSLINE ) )
+    else if ( ( nOldDrawMode & DrawModeFlags::SettingsFill ) && ( nOldDrawMode & DrawModeFlags::SettingsLine ) )
     {
-        mpDev->SetDrawMode( nOldDrawMode & (~DRAWMODE_SETTINGSFILL) );
-        aSingleColor = rStyleSettings.GetWindowTextColor();     // same as used in VCL for DRAWMODE_SETTINGSLINE
+        mpDev->SetDrawMode( nOldDrawMode & (~DrawModeFlags::SettingsFill) );
+        aSingleColor = rStyleSettings.GetWindowTextColor();     // same as used in VCL for DrawModeFlags::SettingsLine
         bUseSingleColor = true;
     }
     else if ( bCellContrast )
@@ -2442,12 +2442,12 @@ void ScOutputData::DrawClipMarks()
 
     Color aArrowFillCol( COL_LIGHTRED );
 
-    sal_uLong nOldDrawMode = mpDev->GetDrawMode();
+    DrawModeFlags nOldDrawMode = mpDev->GetDrawMode();
     const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
     if ( mbUseStyleColor && rStyleSettings.GetHighContrastMode() )
     {
         //  use DrawMode to change the arrow's outline color
-        mpDev->SetDrawMode( nOldDrawMode | DRAWMODE_SETTINGSLINE );
+        mpDev->SetDrawMode( nOldDrawMode | DrawModeFlags::SettingsLine );
         //  use text color also for the fill color
         aArrowFillCol.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor );
     }
diff --git a/sc/source/ui/view/output3.cxx b/sc/source/ui/view/output3.cxx
index f2b0a051c9fa..4b56c47421ab 100644
--- a/sc/source/ui/view/output3.cxx
+++ b/sc/source/ui/view/output3.cxx
@@ -189,11 +189,11 @@ void ScOutputData::DrawSelectiveObjects(const sal_uInt16 nLayer)
 
     pModel->UseHyphenator();
 
-    sal_uLong nOldDrawMode = mpDev->GetDrawMode();
+    DrawModeFlags nOldDrawMode = mpDev->GetDrawMode();
     if ( mbUseStyleColor && Application::GetSettings().GetStyleSettings().GetHighContrastMode() )
     {
-        mpDev->SetDrawMode( nOldDrawMode | DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL |
-                            DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT );
+        mpDev->SetDrawMode( nOldDrawMode | DrawModeFlags::SettingsLine | DrawModeFlags::SettingsFill |
+                            DrawModeFlags::SettingsText | DrawModeFlags::SettingsGradient );
     }
 
     // #109985#