convert ANTIALIASING constants to scoped enum

Change-Id: I175b8ea4e8bc01c3cdd3dd90506eba01b35e0085

30 files changed, 104 insertions, 96 deletions

diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx
index e9ae26121a45..c46a49ffda25 100644
--- a/canvas/source/directx/dx_textlayout_drawhelper.cxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx
@@ -91,7 +91,7 @@ namespace dxcanvas
         // disable font antialiasing - GDI does not handle alpha
         // surfaces properly.
         if( bAlphaSurface )
-            aVirtualDevice.SetAntialiasing(ANTIALIASING_DISABLE_TEXT);
+            aVirtualDevice.SetAntialiasing(AntialiasingFlags::DisableText);
 
         if(rText.Length)
         {
diff --git a/canvas/source/vcl/backbuffer.cxx b/canvas/source/vcl/backbuffer.cxx
index 356caa9254e7..8f3a98054ed7 100644
--- a/canvas/source/vcl/backbuffer.cxx
+++ b/canvas/source/vcl/backbuffer.cxx
@@ -33,12 +33,12 @@ namespace vclcanvas
             // #i95645#
 #if defined( MACOSX )
             // use AA on VCLCanvas for Mac
-            maVDev->SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW | maVDev->GetAntialiasing() );
+            maVDev->SetAntialiasing( AntialiasingFlags::EnableB2dDraw | maVDev->GetAntialiasing() );
 #else
             // switch off AA for WIN32 and UNIX, the VCLCanvas does not look good with it and
             // is not required to do AA. It would need to be adapted to use it correctly
             // (especially gradient painting). This will need extra work.
-            maVDev->SetAntialiasing( maVDev->GetAntialiasing() & ~ANTIALIASING_ENABLE_B2DDRAW);
+            maVDev->SetAntialiasing( maVDev->GetAntialiasing() & ~AntialiasingFlags::EnableB2dDraw);
 #endif
         }
     }
diff --git a/canvas/source/vcl/bitmapbackbuffer.cxx b/canvas/source/vcl/bitmapbackbuffer.cxx
index bd01d71b5c54..4fd79bc2df33 100644
--- a/canvas/source/vcl/bitmapbackbuffer.cxx
+++ b/canvas/source/vcl/bitmapbackbuffer.cxx
@@ -77,7 +77,7 @@ namespace vclcanvas
         {
             // VDev content is more current than bitmap - copy contents before!
             mpVDev->EnableMapMode( false );
-            mpVDev->SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
+            mpVDev->SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
             const Point aEmptyPoint;
             *maBitmap = mpVDev->GetBitmapEx( aEmptyPoint,
                                              mpVDev->GetOutputSizePixel() );
@@ -98,7 +98,7 @@ namespace vclcanvas
         if( mbVDevContentIsCurrent && mpVDev )
         {
             mpVDev->EnableMapMode( false );
-            mpVDev->SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
+            mpVDev->SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
             aSize = mpVDev->GetOutputSizePixel();
         }
 
@@ -123,12 +123,12 @@ namespace vclcanvas
             // #i95645#
 #if defined( MACOSX )
             // use AA on VCLCanvas for Mac
-            mpVDev->SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW | mpVDev->GetAntialiasing() );
+            mpVDev->SetAntialiasing( AntialiasingFlags::EnableB2dDraw | mpVDev->GetAntialiasing() );
 #else
             // switch off AA for WIN32 and UNIX, the VCLCanvas does not look good with it and
             // is not required to do AA. It would need to be adapted to use it correctly
             // (especially gradient painting). This will need extra work.
-            mpVDev->SetAntialiasing(mpVDev->GetAntialiasing() & ~ANTIALIASING_ENABLE_B2DDRAW);
+            mpVDev->SetAntialiasing(mpVDev->GetAntialiasing() & ~AntialiasingFlags::EnableB2dDraw);
 #endif
         }
     }
@@ -142,7 +142,7 @@ namespace vclcanvas
         {
             // fill with bitmap content
             mpVDev->EnableMapMode( false );
-            mpVDev->SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
+            mpVDev->SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
             const Point aEmptyPoint;
             mpVDev->DrawBitmapEx( aEmptyPoint, *maBitmap );
         }
diff --git a/canvas/source/vcl/canvascustomsprite.cxx b/canvas/source/vcl/canvascustomsprite.cxx
index cb8833696bc7..030c603be189 100644
--- a/canvas/source/vcl/canvascustomsprite.cxx
+++ b/canvas/source/vcl/canvascustomsprite.cxx
@@ -83,8 +83,8 @@ namespace vclcanvas
         // antialiasing again, then)
 
         // disable font antialiasing (causes ugly shadows otherwise)
-        pBackBuffer->getOutDev().SetAntialiasing( ANTIALIASING_DISABLE_TEXT );
-        pBackBufferMask->getOutDev().SetAntialiasing( ANTIALIASING_DISABLE_TEXT );
+        pBackBuffer->getOutDev().SetAntialiasing( AntialiasingFlags::DisableText );
+        pBackBufferMask->getOutDev().SetAntialiasing( AntialiasingFlags::DisableText );
 
         // set mask vdev drawmode, such that everything is painted
         // black. That leaves us with a binary image, white for
diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx
index 84ba5465b3e2..5f3ee58f21a3 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -155,7 +155,7 @@ namespace vclcanvas
     {
         mp2ndOutDev = rOutDev;
         mp2ndOutDev->getOutDev().EnableMapMode( false );
-        mp2ndOutDev->getOutDev().SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
+        mp2ndOutDev->getOutDev().SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
     }
 
     void CanvasHelper::clear()
@@ -167,7 +167,7 @@ namespace vclcanvas
             tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDev );
 
             rOutDev.EnableMapMode( false );
-            rOutDev.SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
+            rOutDev.SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
             rOutDev.SetLineColor( COL_WHITE );
             rOutDev.SetFillColor( COL_WHITE );
             rOutDev.SetClipRegion();
@@ -180,7 +180,7 @@ namespace vclcanvas
 
                 rOutDev2.SetDrawMode( DrawModeFlags::Default );
                 rOutDev2.EnableMapMode( false );
-                rOutDev2.SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
+                rOutDev2.SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
                 rOutDev2.SetLineColor( COL_WHITE );
                 rOutDev2.SetFillColor( COL_WHITE );
                 rOutDev2.SetClipRegion();
@@ -917,7 +917,7 @@ namespace vclcanvas
 
         tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDev );
         rOutDev.EnableMapMode( false );
-        rOutDev.SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
+        rOutDev.SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
 
         // TODO(F2): Support alpha vdev canvas here
         const Point aEmptyPoint(0,0);
@@ -947,7 +947,7 @@ namespace vclcanvas
 
         tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDev );
         rOutDev.EnableMapMode( false );
-        rOutDev.SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
+        rOutDev.SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
 
         Bitmap aBitmap( rOutDev.GetBitmap(aRect.TopLeft(),
                                           aRect.GetSize()) );
@@ -1000,7 +1000,7 @@ namespace vclcanvas
 
         tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDev );
         rOutDev.EnableMapMode( false );
-        rOutDev.SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
+        rOutDev.SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
 
         const Rectangle aRect( vcl::unotools::rectangleFromIntegerRectangle2D(rect) );
         const sal_uInt16    nBitCount( ::std::min( (sal_uInt16)24U,
@@ -1125,7 +1125,7 @@ namespace vclcanvas
 
         tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDev );
         rOutDev.EnableMapMode( false );
-        rOutDev.SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
+        rOutDev.SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
 
         const Size aBmpSize( rOutDev.GetOutputSizePixel() );
 
@@ -1163,7 +1163,7 @@ namespace vclcanvas
 
         tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDev );
         rOutDev.EnableMapMode( false );
-        rOutDev.SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
+        rOutDev.SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
 
         const Size aBmpSize( rOutDev.GetOutputSizePixel() );
 
@@ -1207,7 +1207,7 @@ namespace vclcanvas
         OutputDevice* p2ndOutDev = NULL;
 
         rOutDev.EnableMapMode( false );
-        rOutDev.SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
+        rOutDev.SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
 
         if( mp2ndOutDev )
             p2ndOutDev = &mp2ndOutDev->getOutDev();
diff --git a/canvas/source/vcl/impltools.hxx b/canvas/source/vcl/impltools.hxx
index c294efd89ae7..9d5e0b23b675 100644
--- a/canvas/source/vcl/impltools.hxx
+++ b/canvas/source/vcl/impltools.hxx
@@ -131,7 +131,7 @@ namespace vclcanvas
             explicit OutDevStateKeeper( const OutDevProviderSharedPtr& rOutDev ) :
                 mpOutDev( rOutDev.get() ? &(rOutDev->getOutDev()) : NULL ),
                 mbMappingWasEnabled( mpOutDev && mpOutDev->IsMapModeEnabled() ),
-                mnAntiAliasing( mpOutDev ? mpOutDev->GetAntialiasing() : 0 )
+                mnAntiAliasing( mpOutDev ? mpOutDev->GetAntialiasing() : AntialiasingFlags::NONE )
             {
                 init();
             }
@@ -154,13 +154,13 @@ namespace vclcanvas
                 {
                     mpOutDev->Push();
                     mpOutDev->EnableMapMode(false);
-                    mpOutDev->SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
+                    mpOutDev->SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
                 }
             }
 
-            VclPtr<OutputDevice> mpOutDev;
-            const bool          mbMappingWasEnabled;
-            const sal_uInt16    mnAntiAliasing;
+            VclPtr<OutputDevice>    mpOutDev;
+            const bool              mbMappingWasEnabled;
+            const AntialiasingFlags mnAntiAliasing;
         };
 
         ::Point mapRealPoint2D( const ::com::sun::star::geometry::RealPoint2D&  rPoint,
diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx
index d003736013ed..095dae6ea461 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -88,7 +88,7 @@ namespace vclcanvas
             // wouldn't save much render time, and b) will clutter
             // scrolled sprite content outside this area)
             rOutDev.EnableMapMode( false );
-            rOutDev.SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
+            rOutDev.SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
             rOutDev.SetClipRegion(vcl::Region(rRequestedArea));
 
             // repaint affected sprite directly to output device (at
@@ -329,7 +329,7 @@ namespace vclcanvas
 
             // flush to screen
             rOutDev.EnableMapMode( false );
-            rOutDev.SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
+            rOutDev.SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
             rOutDev.SetClipRegion();
             rOutDev.DrawOutDev( aEmptyPoint, aOutDevSize,
                                 aEmptyPoint, aOutDevSize,
@@ -571,7 +571,7 @@ namespace vclcanvas
 
         // paint background
         maVDev->EnableMapMode( false );
-        maVDev->SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
+        maVDev->SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
         maVDev->SetClipRegion();
         maVDev->DrawOutDev( aEmptyPoint, aOutputSize,
                             aOutputPosition, aOutputSize,
@@ -589,7 +589,7 @@ namespace vclcanvas
 
         // flush to screen
         rOutDev.EnableMapMode( false );
-        rOutDev.SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
+        rOutDev.SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
         rOutDev.DrawOutDev( aOutputPosition, aOutputSize,
                             aEmptyPoint, aOutputSize,
                             *maVDev );
diff --git a/canvas/source/vcl/spritedevicehelper.cxx b/canvas/source/vcl/spritedevicehelper.cxx
index 7fedd462c687..076cca0a9a78 100644
--- a/canvas/source/vcl/spritedevicehelper.cxx
+++ b/canvas/source/vcl/spritedevicehelper.cxx
@@ -50,12 +50,12 @@ namespace vclcanvas
         // #i95645#
 #if defined( MACOSX )
         // use AA on VCLCanvas for Mac
-        mpBackBuffer->getOutDev().SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW | mpBackBuffer->getOutDev().GetAntialiasing() );
+        mpBackBuffer->getOutDev().SetAntialiasing( AntialiasingFlags::EnableB2dDraw | mpBackBuffer->getOutDev().GetAntialiasing() );
 #else
         // switch off AA for WIN32 and UNIX, the VCLCanvas does not look good with it and
         // is not required to do AA. It would need to be adapted to use it correctly
         // (especially gradient painting). This will need extra work.
-        mpBackBuffer->getOutDev().SetAntialiasing(mpBackBuffer->getOutDev().GetAntialiasing() & ~ANTIALIASING_ENABLE_B2DDRAW);
+        mpBackBuffer->getOutDev().SetAntialiasing(mpBackBuffer->getOutDev().GetAntialiasing() & ~AntialiasingFlags::EnableB2dDraw);
 #endif
     }
 
@@ -119,7 +119,7 @@ namespace vclcanvas
 
             const ::Point aEmptyPoint;
             mpBackBuffer->getOutDev().EnableMapMode( false );
-            mpBackBuffer->getOutDev().SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW );
+            mpBackBuffer->getOutDev().SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
             WriteDIB(mpBackBuffer->getOutDev().GetBitmap(aEmptyPoint, mpBackBuffer->getOutDev().GetOutputSizePixel()), aStream, false, true);
         }
 
diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx
index 76592b4581df..f3e41c61371b 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -55,7 +55,7 @@ ChartWindow::ChartWindow( ChartController* pController, vcl::Window* pParent, Wi
     this->SetMapMode( MapMode(MAP_100TH_MM) );
     adjustHighContrastMode();
     // chart does not depend on exact pixel painting => enable antialiased drawing
-    SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW | GetAntialiasing() );
+    SetAntialiasing( AntialiasingFlags::EnableB2dDraw | GetAntialiasing() );
     EnableRTL( false );
     if( pParent )
         pParent->EnableRTL( false );// #i96215# necessary for a correct position of the context menu in rtl mode
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index b644c4fb7cf4..1240437da19b 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -94,7 +94,7 @@ namespace drawinglayer
     {
         struct VclPixelProcessor2D::Impl
         {
-            sal_uInt16 m_nOrigAntiAliasing;
+            AntialiasingFlags m_nOrigAntiAliasing;
 
             explicit Impl(OutputDevice const& rOutDev)
                 : m_nOrigAntiAliasing(rOutDev.GetAntialiasing())
@@ -116,19 +116,19 @@ namespace drawinglayer
             if(getOptionsDrawinglayer().IsAntiAliasing())
             {
                 mpOutputDevice->SetAntialiasing(
-                   m_pImpl->m_nOrigAntiAliasing | ANTIALIASING_ENABLE_B2DDRAW);
+                   m_pImpl->m_nOrigAntiAliasing | AntialiasingFlags::EnableB2dDraw);
             }
             else
             {
                 mpOutputDevice->SetAntialiasing(
-                   m_pImpl->m_nOrigAntiAliasing & ~ANTIALIASING_ENABLE_B2DDRAW);
+                   m_pImpl->m_nOrigAntiAliasing & ~AntialiasingFlags::EnableB2dDraw);
             }
         }
 
         VclPixelProcessor2D::~VclPixelProcessor2D()
         {
             // restore MapMode
-               mpOutputDevice->Pop();
+            mpOutputDevice->Pop();
 
             // restore AntiAliasing
             mpOutputDevice->SetAntialiasing(m_pImpl->m_nOrigAntiAliasing);
@@ -794,7 +794,7 @@ namespace drawinglayer
                     // Caution: This is needed in both cases (!)
                     if(mnPolygonStrokePrimitive2D
                         && getOptionsDrawinglayer().IsAntiAliasing()
-                        && (mpOutputDevice->GetAntialiasing() & ANTIALIASING_ENABLE_B2DDRAW))
+                        && (mpOutputDevice->GetAntialiasing() & AntialiasingFlags::EnableB2dDraw))
                     {
                         const basegfx::BColor aPolygonColor(maBColorModifierStack.getModifiedColor(rPolyPolygonColorPrimitive2D.getBColor()));
                         sal_uInt32 nCount(aLocalPolyPolygon.count());
@@ -821,11 +821,11 @@ namespace drawinglayer
                 {
                     // #i98289#
                     const bool bForceLineSnap(getOptionsDrawinglayer().IsAntiAliasing() && getOptionsDrawinglayer().IsSnapHorVerLinesToDiscrete());
-                    const sal_uInt16 nOldAntiAliase(mpOutputDevice->GetAntialiasing());
+                    const AntialiasingFlags nOldAntiAliase(mpOutputDevice->GetAntialiasing());
 
                     if(bForceLineSnap)
                     {
-                        mpOutputDevice->SetAntialiasing(nOldAntiAliase | ANTIALIASING_PIXELSNAPHAIRLINE);
+                        mpOutputDevice->SetAntialiasing(nOldAntiAliase | AntialiasingFlags::PixelSnapHairline);
                     }
 
                     const primitive2d::MetafilePrimitive2D& rMetafilePrimitive( static_cast< const primitive2d::MetafilePrimitive2D& >(rCandidate) );
@@ -1154,10 +1154,10 @@ namespace drawinglayer
                 {
                     // #i98404# Handle directly, especially when AA is active
                     const primitive2d::BackgroundColorPrimitive2D& rPrimitive = static_cast< const primitive2d::BackgroundColorPrimitive2D& >(rCandidate);
-                    const sal_uInt16 nOriginalAA(mpOutputDevice->GetAntialiasing());
+                    const AntialiasingFlags nOriginalAA(mpOutputDevice->GetAntialiasing());
 
                     // switch AA off in all cases
-                    mpOutputDevice->SetAntialiasing(mpOutputDevice->GetAntialiasing() & ~ANTIALIASING_ENABLE_B2DDRAW);
+                    mpOutputDevice->SetAntialiasing(mpOutputDevice->GetAntialiasing() & ~AntialiasingFlags::EnableB2dDraw);
 
                     // create color for fill
                     const basegfx::BColor aPolygonColor(maBColorModifierStack.getModifiedColor(rPrimitive.getBColor()));
@@ -1192,8 +1192,8 @@ namespace drawinglayer
                     // Set OutDev to XOR and switch AA off (XOR does not work with AA)
                     mpOutputDevice->Push();
                     mpOutputDevice->SetRasterOp( ROP_XOR );
-                    const sal_uInt16 nAntiAliasing(mpOutputDevice->GetAntialiasing());
-                    mpOutputDevice->SetAntialiasing(nAntiAliasing & ~ANTIALIASING_ENABLE_B2DDRAW);
+                    const AntialiasingFlags nAntiAliasing(mpOutputDevice->GetAntialiasing());
+                    mpOutputDevice->SetAntialiasing(nAntiAliasing & ~AntialiasingFlags::EnableB2dDraw);
 
                     // process content recursively
                     process(rCandidate.get2DDecomposition(getViewInformation2D()));
@@ -1223,8 +1223,8 @@ namespace drawinglayer
                     // process recursively, but turn off anti-aliasing. Border
                     // lines are always rectangular, and look horrible when
                     // the anti-aliasing is enabled.
-                    sal_uInt16 nAntiAliasing = mpOutputDevice->GetAntialiasing();
-                    mpOutputDevice->SetAntialiasing(nAntiAliasing & ~ANTIALIASING_ENABLE_B2DDRAW);
+                    AntialiasingFlags nAntiAliasing = mpOutputDevice->GetAntialiasing();
+                    mpOutputDevice->SetAntialiasing(nAntiAliasing & ~AntialiasingFlags::EnableB2dDraw);
 
                     const drawinglayer::primitive2d::BorderLinePrimitive2D& rBorder =
                         static_cast<const drawinglayer::primitive2d::BorderLinePrimitive2D&>(rCandidate);
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 833c9da581d8..dda1507807ea 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -254,9 +254,17 @@ namespace o3tl
 }
 
 // Antialiasing
-#define ANTIALIASING_DISABLE_TEXT       ((sal_uInt16)0x0001)
-#define ANTIALIASING_ENABLE_B2DDRAW     ((sal_uInt16)0x0002)
-#define ANTIALIASING_PIXELSNAPHAIRLINE  ((sal_uInt16)0x0004)
+enum class AntialiasingFlags
+{
+    NONE                = 0x0000,
+    DisableText         = 0x0001,
+    EnableB2dDraw       = 0x0002,
+    PixelSnapHairline  = 0x0004,
+};
+namespace o3tl
+{
+    template<> struct typed_flags<AntialiasingFlags> : is_typed_flags<AntialiasingFlags, 0x07> {};
+}
 
 // AddFontSubstitute
 #define FONT_SUBSTITUTE_ALWAYS          ((sal_uInt16)0x0001)
@@ -381,7 +389,7 @@ private:
     std::unique_ptr<AllSettings>    mxSettings;
     MapMode                         maMapMode;
     Point                           maRefPoint;
-    sal_uInt16                      mnAntialiasing;
+    AntialiasingFlags               mnAntialiasing;
     LanguageType                    meTextLanguage;
 
     /// bitfield
@@ -614,8 +622,8 @@ public:
     bool                        IsDeviceOutputNecessary() const { return (mbOutput && mbDevOutput); }
     bool                        IsOutputNecessary() const { return ((mbOutput && mbDevOutput) || (mpMetaFile != NULL)); }
 
-    void                        SetAntialiasing( sal_uInt16 nMode =  0 );
-    sal_uInt16                  GetAntialiasing() const { return mnAntialiasing; }
+    void                        SetAntialiasing( AntialiasingFlags nMode = AntialiasingFlags::NONE );
+    AntialiasingFlags           GetAntialiasing() const { return mnAntialiasing; }
 
     void                        SetDrawMode( DrawModeFlags nDrawMode );
     DrawModeFlags               GetDrawMode() const { return mnDrawMode; }
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
index 52020df71b9a..79eea5518bc7 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
@@ -74,8 +74,8 @@ void PageObjectPainter::PaintPageObject (
         PageObjectLayouter *pPageObjectLayouter = mrLayouter.GetPageObjectLayouter().get();
         // Turn off antialiasing to avoid the bitmaps from being
         // shifted by fractions of a pixel and thus show blurry edges.
-        const sal_uInt16 nSavedAntialiasingMode (rDevice.GetAntialiasing());
-        rDevice.SetAntialiasing(nSavedAntialiasingMode & ~ANTIALIASING_ENABLE_B2DDRAW);
+        const AntialiasingFlags nSavedAntialiasingMode (rDevice.GetAntialiasing());
+        rDevice.SetAntialiasing(nSavedAntialiasingMode & ~AntialiasingFlags::EnableB2dDraw);
 
         PaintBackground(pPageObjectLayouter, rDevice, rpDescriptor);
         PaintPreview(pPageObjectLayouter, rDevice, rpDescriptor);
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index e4c278d06a69..9b7bb5955e69 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -509,8 +509,8 @@ sal_uInt16 LineListBox::GetSelectEntryStyle( sal_Int32 nSelIndex ) const
 
 void lclDrawPolygon( OutputDevice& rDev, const basegfx::B2DPolygon& rPolygon, long nWidth, sal_uInt16 nDashing )
 {
-    sal_uInt16 nOldAA = rDev.GetAntialiasing();
-    rDev.SetAntialiasing( nOldAA & ~ANTIALIASING_ENABLE_B2DDRAW );
+    AntialiasingFlags nOldAA = rDev.GetAntialiasing();
+    rDev.SetAntialiasing( nOldAA & ~AntialiasingFlags::EnableB2dDraw );
 
     long nPix = rDev.PixelToLogic(Size(1, 1)).Width();
     basegfx::B2DPolyPolygon aPolygons = svtools::ApplyLineDashing(rPolygon, nDashing, nPix);
diff --git a/svtools/source/filter/DocumentToGraphicRenderer.cxx b/svtools/source/filter/DocumentToGraphicRenderer.cxx
index 6078a3a6221a..d410f4c7db34 100644
--- a/svtools/source/filter/DocumentToGraphicRenderer.cxx
+++ b/svtools/source/filter/DocumentToGraphicRenderer.cxx
@@ -119,7 +119,7 @@ Graphic DocumentToGraphicRenderer::renderToGraphic(
     GDIMetaFile aMtf;
 
     OutputDevice* pOutputDev = VCLUnoHelper::GetOutputDevice( xDevice );
-    pOutputDev->SetAntialiasing(pOutputDev->GetAntialiasing() | ANTIALIASING_ENABLE_B2DDRAW);
+    pOutputDev->SetAntialiasing(pOutputDev->GetAntialiasing() | AntialiasingFlags::EnableB2dDraw);
     MapMode mm = pOutputDev->GetMapMode();
     mm.SetScaleX( fScaleX );
     mm.SetScaleY( fScaleY );
diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx
index 585e019a472a..f54195f7241a 100644
--- a/svx/source/sdr/overlay/overlaymanager.cxx
+++ b/svx/source/sdr/overlay/overlaymanager.cxx
@@ -43,7 +43,7 @@ namespace sdr
 
             if(nSize)
             {
-                const sal_uInt16 nOriginalAA(rDestinationDevice.GetAntialiasing());
+                const AntialiasingFlags nOriginalAA(rDestinationDevice.GetAntialiasing());
                 const bool bIsAntiAliasing(getDrawinglayerOpt().IsAntiAliasing());
 
                 // create processor
@@ -68,11 +68,11 @@ namespace sdr
                                 {
                                     if(bIsAntiAliasing && rCandidate.allowsAntiAliase())
                                     {
-                                        rDestinationDevice.SetAntialiasing(nOriginalAA | ANTIALIASING_ENABLE_B2DDRAW);
+                                        rDestinationDevice.SetAntialiasing(nOriginalAA | AntialiasingFlags::EnableB2dDraw);
                                     }
                                     else
                                     {
-                                        rDestinationDevice.SetAntialiasing(nOriginalAA & ~ANTIALIASING_ENABLE_B2DDRAW);
+                                        rDestinationDevice.SetAntialiasing(nOriginalAA & ~AntialiasingFlags::EnableB2dDraw);
                                     }
 
                                     pProcessor->process(rSequence);
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 1485579ceace..d94c17966e12 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -870,10 +870,10 @@ void SwNoTxtFrm::PaintPicture( vcl::RenderContext* pOut, const SwRect &rGrfArea
     if( pGrfNd )
     {
         // Fix for bug fdo#33781
-        const sal_uInt16 nFormerAntialiasingAtOutput( pOut->GetAntialiasing() );
+        const AntialiasingFlags nFormerAntialiasingAtOutput( pOut->GetAntialiasing() );
         if (pShell->Imp()->GetDrawView()->IsAntiAliasing())
         {
-            pOut->SetAntialiasing( nFormerAntialiasingAtOutput | ANTIALIASING_ENABLE_B2DDRAW );
+            pOut->SetAntialiasing( nFormerAntialiasingAtOutput | AntialiasingFlags::EnableB2dDraw );
         }
 
         bool bContinue = true;
@@ -978,15 +978,15 @@ void SwNoTxtFrm::PaintPicture( vcl::RenderContext* pOut, const SwRect &rGrfArea
     else // bIsChart || pOLENd
     {
         // Fix for bug fdo#33781
-        const sal_uInt16 nFormerAntialiasingAtOutput( pOut->GetAntialiasing() );
+        const AntialiasingFlags nFormerAntialiasingAtOutput( pOut->GetAntialiasing() );
         if (pShell->Imp()->GetDrawView()->IsAntiAliasing())
         {
-            sal_uInt16 nNewAntialiasingAtOutput = nFormerAntialiasingAtOutput | ANTIALIASING_ENABLE_B2DDRAW;
+            AntialiasingFlags nNewAntialiasingAtOutput = nFormerAntialiasingAtOutput | AntialiasingFlags::EnableB2dDraw;
 
             // #i99665#
             // Adjust AntiAliasing mode at output device for chart OLE
             if ( pOLENd->IsChart() )
-                nNewAntialiasingAtOutput |= ANTIALIASING_PIXELSNAPHAIRLINE;
+                nNewAntialiasingAtOutput |= AntialiasingFlags::PixelSnapHairline;
 
             pOut->SetAntialiasing( nNewAntialiasingAtOutput );
         }
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index a96bb61654a9..1c62ab03e4cc 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -523,12 +523,12 @@ Bitmap ImpGraphic::ImplGetBitmap(const GraphicConversionParameters& rParameters)
             {
                 if(rParameters.getAntiAliase())
                 {
-                    aVDev->SetAntialiasing(aVDev->GetAntialiasing() | ANTIALIASING_ENABLE_B2DDRAW);
+                    aVDev->SetAntialiasing(aVDev->GetAntialiasing() | AntialiasingFlags::EnableB2dDraw);
                 }
 
                 if(rParameters.getSnapHorVerLines())
                 {
-                    aVDev->SetAntialiasing(aVDev->GetAntialiasing() | ANTIALIASING_PIXELSNAPHAIRLINE);
+                    aVDev->SetAntialiasing(aVDev->GetAntialiasing() | AntialiasingFlags::PixelSnapHairline);
                 }
 
                 ImplDraw( aVDev.get(), Point(), aDrawSize );
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index b971e1c28b4b..c861466c21ff 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -640,7 +640,7 @@ bool Printer::AcquireGraphics() const
     if ( mpGraphics )
     {
         mpGraphics->SetXORMode( (ROP_INVERT == meRasterOp) || (ROP_XOR == meRasterOp), ROP_INVERT == meRasterOp );
-        mpGraphics->setAntiAliasB2DDraw(mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW);
+        mpGraphics->setAntiAliasB2DDraw(bool(mnAntialiasing & AntialiasingFlags::EnableB2dDraw));
     }
 
     return mpGraphics != nullptr;
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index a31dc22edae7..04ac2d72a700 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -86,7 +86,7 @@ bool VirtualDevice::AcquireGraphics() const
     if ( mpGraphics )
     {
         mpGraphics->SetXORMode( (ROP_INVERT == meRasterOp) || (ROP_XOR == meRasterOp), ROP_INVERT == meRasterOp );
-        mpGraphics->setAntiAliasB2DDraw(mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW);
+        mpGraphics->setAntiAliasB2DDraw(bool(mnAntialiasing & AntialiasingFlags::EnableB2dDraw));
     }
 
     return mpGraphics != nullptr;
@@ -165,7 +165,7 @@ void VirtualDevice::ImplInitVirDev( const OutputDevice* pOutDev,
     mnAlphaDepth    = -1;
 
     if( mnBitCount < 8 )
-        SetAntialiasing( ANTIALIASING_DISABLE_TEXT );
+        SetAntialiasing( AntialiasingFlags::DisableText );
 
     if ( pOutDev->GetOutDevType() == OUTDEV_PRINTER )
         mbScreenComp = false;
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 3e7f00917d51..94d312721674 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -1493,7 +1493,7 @@ void OutputDevice::InitFont() const
     if ( mbInitFont )
     {
         // decide if antialiasing is appropriate
-        bool bNonAntialiased = (GetAntialiasing() & ANTIALIASING_DISABLE_TEXT) != 0;
+        bool bNonAntialiased(GetAntialiasing() & AntialiasingFlags::DisableText);
         const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
         bNonAntialiased |= ((rStyleSettings.GetDisplayOptions() & DISPLAY_OPTION_AA_DISABLE) != 0);
         bNonAntialiased |= (int(rStyleSettings.GetAntialiasingMinPixelHeight()) > mpFontEntry->maFontSelData.mnHeight);
diff --git a/vcl/source/outdev/line.cxx b/vcl/source/outdev/line.cxx
index 08348eb762c1..790c285439ab 100644
--- a/vcl/source/outdev/line.cxx
+++ b/vcl/source/outdev/line.cxx
@@ -110,7 +110,7 @@ void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt )
         InitLineColor();
 
     // #i101598# support AA and snap for lines, too
-    if((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW)
+    if((mnAntialiasing & AntialiasingFlags::EnableB2dDraw)
         && mpGraphics->supportsOperation(OutDevSupport_B2DDraw)
         && ROP_OVERPAINT == GetRasterOp()
         && IsLineColor())
@@ -125,7 +125,7 @@ void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt )
         aB2DPolyLine.append(basegfx::B2DPoint(rEndPt.X(), rEndPt.Y()));
         aB2DPolyLine.transform( aTransform );
 
-        if(mnAntialiasing & ANTIALIASING_PIXELSNAPHAIRLINE)
+        if(mnAntialiasing & AntialiasingFlags::PixelSnapHairline)
         {
             aB2DPolyLine = basegfx::tools::snapPointsOfHorizontalOrVerticalEdges(aB2DPolyLine);
         }
@@ -147,7 +147,7 @@ void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt )
 
 void OutputDevice::drawLine( basegfx::B2DPolyPolygon aLinePolyPolygon, const LineInfo& rInfo )
 {
-    const bool bTryAA((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW)
+    const bool bTryAA((mnAntialiasing & AntialiasingFlags::EnableB2dDraw)
         && mpGraphics->supportsOperation(OutDevSupport_B2DDraw)
         && ROP_OVERPAINT == GetRasterOp()
         && IsLineColor());
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index 5724a8647b73..2ae452e70d63 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -136,7 +136,7 @@ OutputDevice::OutputDevice() :
     maOverlineColor                 = Color( COL_TRANSPARENT );
     meTextAlign                     = maFont.GetAlign();
     meRasterOp                      = ROP_OVERPAINT;
-    mnAntialiasing                  = 0;
+    mnAntialiasing                  = AntialiasingFlags::NONE;
     meTextLanguage                  = 0;  // TODO: get default from configuration?
     mbLineColor                     = true;
     mbFillColor                     = true;
diff --git a/vcl/source/outdev/outdevstate.cxx b/vcl/source/outdev/outdevstate.cxx
index a6cf8982a48f..1f3039216164 100644
--- a/vcl/source/outdev/outdevstate.cxx
+++ b/vcl/source/outdev/outdevstate.cxx
@@ -267,7 +267,7 @@ void OutputDevice::EnableOutput( bool bEnable )
         mpAlphaVDev->EnableOutput( bEnable );
 }
 
-void OutputDevice::SetAntialiasing( sal_uInt16 nMode )
+void OutputDevice::SetAntialiasing( AntialiasingFlags nMode )
 {
     if ( mnAntialiasing != nMode )
     {
@@ -276,7 +276,7 @@ void OutputDevice::SetAntialiasing( sal_uInt16 nMode )
 
         if(mpGraphics)
         {
-            mpGraphics->setAntiAliasB2DDraw(mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW);
+            mpGraphics->setAntiAliasB2DDraw(bool(mnAntialiasing & AntialiasingFlags::EnableB2dDraw));
         }
     }
 
diff --git a/vcl/source/outdev/polygon.cxx b/vcl/source/outdev/polygon.cxx
index 36f63ac8e4ba..9741ffaac86e 100644
--- a/vcl/source/outdev/polygon.cxx
+++ b/vcl/source/outdev/polygon.cxx
@@ -59,7 +59,7 @@ void OutputDevice::DrawPolyPolygon( const tools::PolyPolygon& rPolyPoly )
         InitFillColor();
 
     // use b2dpolygon drawing if possible
-    if((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW) &&
+    if((mnAntialiasing & AntialiasingFlags::EnableB2dDraw) &&
        mpGraphics->supportsOperation(OutDevSupport_B2DDraw) &&
        ROP_OVERPAINT == GetRasterOp() &&
        (IsLineColor() || IsFillColor()))
@@ -81,7 +81,7 @@ void OutputDevice::DrawPolyPolygon( const tools::PolyPolygon& rPolyPoly )
         {
             const ::basegfx::B2DVector aB2DLineWidth( 1.0, 1.0 );
 
-            if(mnAntialiasing & ANTIALIASING_PIXELSNAPHAIRLINE)
+            if(mnAntialiasing & AntialiasingFlags::PixelSnapHairline)
             {
                 aB2DPolyPolygon = basegfx::tools::snapPointsOfHorizontalOrVerticalEdges(aB2DPolyPolygon);
             }
@@ -166,7 +166,7 @@ void OutputDevice::DrawPolygon( const Polygon& rPoly )
         InitFillColor();
 
     // use b2dpolygon drawing if possible
-    if((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW) &&
+    if((mnAntialiasing & AntialiasingFlags::EnableB2dDraw) &&
        mpGraphics->supportsOperation(OutDevSupport_B2DDraw) &&
        ROP_OVERPAINT == GetRasterOp() &&
        (IsLineColor() || IsFillColor()))
@@ -188,7 +188,7 @@ void OutputDevice::DrawPolygon( const Polygon& rPoly )
         {
             const ::basegfx::B2DVector aB2DLineWidth( 1.0, 1.0 );
 
-            if(mnAntialiasing & ANTIALIASING_PIXELSNAPHAIRLINE)
+            if(mnAntialiasing & AntialiasingFlags::PixelSnapHairline)
             {
                 aB2DPolygon = basegfx::tools::snapPointsOfHorizontalOrVerticalEdges(aB2DPolygon);
             }
@@ -265,7 +265,7 @@ void OutputDevice::ImplDrawPolyPolygonWithB2DPolyPolygon(const basegfx::B2DPolyP
     if( mbInitFillColor )
         InitFillColor();
 
-    if((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW) &&
+    if((mnAntialiasing & AntialiasingFlags::EnableB2dDraw) &&
        mpGraphics->supportsOperation(OutDevSupport_B2DDraw) &&
        ROP_OVERPAINT == GetRasterOp() &&
        (IsLineColor() || IsFillColor()))
@@ -287,7 +287,7 @@ void OutputDevice::ImplDrawPolyPolygonWithB2DPolyPolygon(const basegfx::B2DPolyP
         {
             const ::basegfx::B2DVector aB2DLineWidth( 1.0, 1.0 );
 
-            if(mnAntialiasing & ANTIALIASING_PIXELSNAPHAIRLINE)
+            if(mnAntialiasing & AntialiasingFlags::PixelSnapHairline)
             {
                 aB2DPolyPolygon = basegfx::tools::snapPointsOfHorizontalOrVerticalEdges(aB2DPolyPolygon);
             }
diff --git a/vcl/source/outdev/polyline.cxx b/vcl/source/outdev/polyline.cxx
index 2c50d7243767..b304913df1bd 100644
--- a/vcl/source/outdev/polyline.cxx
+++ b/vcl/source/outdev/polyline.cxx
@@ -62,7 +62,7 @@ void OutputDevice::DrawPolyLine( const Polygon& rPoly )
         // transform the polygon
         aB2DPolyLine.transform( aTransform );
 
-        if(mnAntialiasing & ANTIALIASING_PIXELSNAPHAIRLINE)
+        if(mnAntialiasing & AntialiasingFlags::PixelSnapHairline)
         {
             aB2DPolyLine = basegfx::tools::snapPointsOfHorizontalOrVerticalEdges(aB2DPolyLine);
         }
@@ -108,7 +108,7 @@ void OutputDevice::DrawPolyLine( const Polygon& rPoly, const LineInfo& rLineInfo
 
     // #i101491#
     // Try direct Fallback to B2D-Version of DrawPolyLine
-    if((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW) &&
+    if((mnAntialiasing & AntialiasingFlags::EnableB2dDraw) &&
        LINE_SOLID == rLineInfo.GetStyle())
     {
         DrawPolyLine( rPoly.getB2DPolygon(), (double)rLineInfo.GetWidth(), rLineInfo.GetLineJoin(), rLineInfo.GetLineCap());
@@ -192,7 +192,7 @@ void OutputDevice::DrawPolyLine( const basegfx::B2DPolygon& rB2DPolygon,
         SetFillColor(aOldFillColor);
         InitFillColor();
 
-        const bool bTryAA((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW) &&
+        const bool bTryAA((mnAntialiasing & AntialiasingFlags::EnableB2dDraw) &&
                           mpGraphics->supportsOperation(OutDevSupport_B2DDraw) &&
                           ROP_OVERPAINT == GetRasterOp() &&
                           IsLineColor());
@@ -289,7 +289,7 @@ bool OutputDevice::DrawPolyLineDirect( const basegfx::B2DPolygon& rB2DPolygon,
         InitLineColor();
 
     const bool bTryAA( bBypassAACheck ||
-                      ((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW) &&
+                      ((mnAntialiasing & AntialiasingFlags::EnableB2dDraw) &&
                       mpGraphics->supportsOperation(OutDevSupport_B2DDraw) &&
                       ROP_OVERPAINT == GetRasterOp() &&
                       IsLineColor()));
@@ -309,7 +309,7 @@ bool OutputDevice::DrawPolyLineDirect( const basegfx::B2DPolygon& rB2DPolygon,
         basegfx::B2DPolygon aB2DPolygon(rB2DPolygon);
         aB2DPolygon.transform(aTransform);
 
-        if((mnAntialiasing & ANTIALIASING_PIXELSNAPHAIRLINE) &&
+        if((mnAntialiasing & AntialiasingFlags::PixelSnapHairline) &&
            aB2DPolygon.count() < 1000)
         {
             // #i98289#, #i101491#
diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx
index 52d245d13cf0..f51bb64d96eb 100644
--- a/vcl/source/outdev/transparent.cxx
+++ b/vcl/source/outdev/transparent.cxx
@@ -237,7 +237,7 @@ void OutputDevice::DrawTransparent( const basegfx::B2DPolyPolygon& rB2DPolyPoly,
     if( mbInitFillColor )
         InitFillColor();
 
-    if((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW) &&
+    if((mnAntialiasing & AntialiasingFlags::EnableB2dDraw) &&
        mpGraphics->supportsOperation(OutDevSupport_B2DDraw) &&
        (ROP_OVERPAINT == GetRasterOp()) )
     {
@@ -690,7 +690,7 @@ void OutputDevice::DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos,
 
             if( xVDev->SetOutputSizePixel( aDstRect.GetSize() ) )
             {
-                if(GetAntialiasing())
+                if(GetAntialiasing() != AntialiasingFlags::NONE)
                 {
                     // #i102109#
                     // For MetaFile replay (see task) it may now be necessary to take
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 65afa5908434..66ada2da58bb 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -289,8 +289,8 @@ void PrintDialog::PrintPreviewWindow::preparePreviewBitmap()
     aMtf.Scale( fScale, fScale );
     aMtf.WindStart();
 
-    const sal_uInt16 nOriginalAA(maPageVDev->GetAntialiasing());
-    maPageVDev->SetAntialiasing(nOriginalAA | ANTIALIASING_ENABLE_B2DDRAW);
+    const AntialiasingFlags nOriginalAA(maPageVDev->GetAntialiasing());
+    maPageVDev->SetAntialiasing(nOriginalAA | AntialiasingFlags::EnableB2dDraw);
     aMtf.Play( maPageVDev.get(), Point( 0, 0 ), aLogicSize );
     maPageVDev->SetAntialiasing(nOriginalAA);
 
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index c6fe818c4fa4..84531924c744 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -1890,8 +1890,8 @@ void SplitWindow::ImplDrawGrip(vcl::RenderContext& rRenderContext, const Rectang
         aColor = rStyleSettings.GetFaceColor();
     }
 
-    sal_uInt16 nAA = rRenderContext.GetAntialiasing();
-    rRenderContext.SetAntialiasing(nAA | ANTIALIASING_PIXELSNAPHAIRLINE | ANTIALIASING_ENABLE_B2DDRAW);
+    AntialiasingFlags nAA = rRenderContext.GetAntialiasing();
+    rRenderContext.SetAntialiasing(nAA | AntialiasingFlags::PixelSnapHairline | AntialiasingFlags::EnableB2dDraw);
 
     long nWidth = rRect.getWidth();
     long nWidthHalf = nWidth / 2;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 9893ee41285e..17a459081cbb 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -824,7 +824,7 @@ bool Window::AcquireGraphics() const
     if ( mpGraphics )
     {
         mpGraphics->SetXORMode( (ROP_INVERT == meRasterOp) || (ROP_XOR == meRasterOp), ROP_INVERT == meRasterOp );
-        mpGraphics->setAntiAliasB2DDraw(mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW);
+        mpGraphics->setAntiAliasB2DDraw(bool(mnAntialiasing & AntialiasingFlags::EnableB2dDraw));
     }
 
     return mpGraphics != nullptr;
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index bbd135b4842a..a80409a3cbcd 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -228,8 +228,8 @@ public:
         {
             if (rCtx.meStyle == RENDER_EXPANDED)
             {
-                sal_uInt16 nOldAA = rDev.GetAntialiasing();
-                rDev.SetAntialiasing(ANTIALIASING_ENABLE_B2DDRAW);
+                AntialiasingFlags nOldAA = rDev.GetAntialiasing();
+                rDev.SetAntialiasing(AntialiasingFlags::EnableB2dDraw);
 
                 std::vector<Rectangle> aRegions(DemoRenderer::partition(rCtx, 4, 4));
                 DemoRenderer::clearRects(rDev, aRegions);