Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code

Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274

82 files changed, 1364 insertions, 1364 deletions

diff --git a/vcl/inc/ResampleKernel.hxx b/vcl/inc/ResampleKernel.hxx
index 20f0dfa820d5..225336a48011 100644
--- a/vcl/inc/ResampleKernel.hxx
+++ b/vcl/inc/ResampleKernel.hxx
@@ -41,8 +41,8 @@ class Lanczos3Kernel : public Kernel
 public:
     Lanczos3Kernel() : Kernel () {}
 
-    virtual double  GetWidth() const SAL_OVERRIDE { return 3.0; }
-    virtual double  Calculate (double x) const SAL_OVERRIDE
+    virtual double  GetWidth() const override { return 3.0; }
+    virtual double  Calculate (double x) const override
     {
         return (-3.0 <= x && x < 3.0) ? SincFilter(x) * SincFilter( x / 3.0 ) : 0.0;
     }
@@ -68,8 +68,8 @@ public:
     BicubicKernel() : Kernel () {}
 
 private:
-    virtual double  GetWidth() const SAL_OVERRIDE { return 2.0; }
-    virtual double  Calculate (double x) const SAL_OVERRIDE
+    virtual double  GetWidth() const override { return 2.0; }
+    virtual double  Calculate (double x) const override
     {
         if (x < 0.0)
         {
@@ -94,8 +94,8 @@ public:
     BilinearKernel() : Kernel () {}
 
 private:
-    virtual double  GetWidth() const SAL_OVERRIDE { return 1.0; }
-    virtual double  Calculate (double x) const SAL_OVERRIDE
+    virtual double  GetWidth() const override { return 1.0; }
+    virtual double  Calculate (double x) const override
     {
         if (x < 0.0)
         {
@@ -115,8 +115,8 @@ public:
     BoxKernel() : Kernel () {}
 
 private:
-    virtual double  GetWidth() const SAL_OVERRIDE { return 0.5; }
-    virtual double  Calculate (double x) const SAL_OVERRIDE
+    virtual double  GetWidth() const override { return 0.5; }
+    virtual double  Calculate (double x) const override
     {
         if (-0.5 <= x && x < 0.5)
             return 1.0;
diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx
index 7832b216167d..13233e604c72 100644
--- a/vcl/inc/brdwin.hxx
+++ b/vcl/inc/brdwin.hxx
@@ -123,18 +123,18 @@ public:
                             ImplBorderWindow( vcl::Window* pParent, WinBits nStyle = 0,
                                               sal_uInt16 nTypeStyle = 0 );
     virtual                 ~ImplBorderWindow();
-    virtual void            dispose() SAL_OVERRIDE;
-
-    virtual void            MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
-    virtual void            MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
-    virtual void            Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE;
-    virtual void            Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE;
-    virtual void            Activate() SAL_OVERRIDE;
-    virtual void            Deactivate() SAL_OVERRIDE;
-    virtual void            Resize() SAL_OVERRIDE;
-    virtual void            RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE;
-    virtual void            StateChanged( StateChangedType nType ) SAL_OVERRIDE;
-    virtual void            DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
+    virtual void            dispose() override;
+
+    virtual void            MouseMove( const MouseEvent& rMEvt ) override;
+    virtual void            MouseButtonDown( const MouseEvent& rMEvt ) override;
+    virtual void            Tracking( const TrackingEvent& rTEvt ) override;
+    virtual void            Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override;
+    virtual void            Activate() override;
+    virtual void            Deactivate() override;
+    virtual void            Resize() override;
+    virtual void            RequestHelp( const HelpEvent& rHEvt ) override;
+    virtual void            StateChanged( StateChangedType nType ) override;
+    virtual void            DataChanged( const DataChangedEvent& rDCEvt ) override;
 
     void                    InitView();
     void                    UpdateView( bool bNewView, const Size& rNewOutSize );
@@ -169,7 +169,7 @@ public:
 
     Rectangle               GetMenuRect() const;
 
-    virtual Size            GetOptimalSize() const SAL_OVERRIDE;
+    virtual Size            GetOptimalSize() const override;
 };
 
 struct ImplBorderFrameData
@@ -242,11 +242,11 @@ class ImplNoBorderWindowView : public ImplBorderWindowView
 public:
                             ImplNoBorderWindowView( ImplBorderWindow* pBorderWindow );
 
-    virtual void            Init( OutputDevice* pDev, long nWidth, long nHeight ) SAL_OVERRIDE;
+    virtual void            Init( OutputDevice* pDev, long nWidth, long nHeight ) override;
     virtual void            GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
-                                       sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const SAL_OVERRIDE;
-    virtual long            CalcTitleWidth() const SAL_OVERRIDE;
-    virtual void            DrawWindow(vcl::RenderContext& rRenderContext, sal_uInt16 nDrawFlags, const Point* pOffset) SAL_OVERRIDE;
+                                       sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const override;
+    virtual long            CalcTitleWidth() const override;
+    virtual void            DrawWindow(vcl::RenderContext& rRenderContext, sal_uInt16 nDrawFlags, const Point* pOffset) override;
 };
 
 class ImplSmallBorderWindowView : public ImplBorderWindowView
@@ -264,11 +264,11 @@ class ImplSmallBorderWindowView : public ImplBorderWindowView
 public:
                             ImplSmallBorderWindowView( ImplBorderWindow* pBorderWindow );
 
-    virtual void            Init( OutputDevice* pOutDev, long nWidth, long nHeight ) SAL_OVERRIDE;
+    virtual void            Init( OutputDevice* pOutDev, long nWidth, long nHeight ) override;
     virtual void            GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
-                                       sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const SAL_OVERRIDE;
-    virtual long            CalcTitleWidth() const SAL_OVERRIDE;
-    virtual void            DrawWindow(vcl::RenderContext& rRenderContext, sal_uInt16 nDrawFlags, const Point* pOffset) SAL_OVERRIDE;
+                                       sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const override;
+    virtual long            CalcTitleWidth() const override;
+    virtual void            DrawWindow(vcl::RenderContext& rRenderContext, sal_uInt16 nDrawFlags, const Point* pOffset) override;
 };
 
 class ImplStdBorderWindowView : public ImplBorderWindowView
@@ -281,17 +281,17 @@ public:
                             ImplStdBorderWindowView( ImplBorderWindow* pBorderWindow );
                             virtual ~ImplStdBorderWindowView();
 
-    virtual bool        MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
-    virtual bool        MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
-    virtual bool        Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE;
-    virtual OUString        RequestHelp( const Point& rPos, Rectangle& rHelpRect ) SAL_OVERRIDE;
-    virtual Rectangle       GetMenuRect() const SAL_OVERRIDE;
+    virtual bool        MouseMove( const MouseEvent& rMEvt ) override;
+    virtual bool        MouseButtonDown( const MouseEvent& rMEvt ) override;
+    virtual bool        Tracking( const TrackingEvent& rTEvt ) override;
+    virtual OUString        RequestHelp( const Point& rPos, Rectangle& rHelpRect ) override;
+    virtual Rectangle       GetMenuRect() const override;
 
-    virtual void            Init( OutputDevice* pDev, long nWidth, long nHeight ) SAL_OVERRIDE;
+    virtual void            Init( OutputDevice* pDev, long nWidth, long nHeight ) override;
     virtual void            GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
-                                       sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const SAL_OVERRIDE;
-    virtual long            CalcTitleWidth() const SAL_OVERRIDE;
-    virtual void            DrawWindow(vcl::RenderContext& rRenderContext, sal_uInt16 nDrawFlags, const Point* pOffset) SAL_OVERRIDE;
+                                       sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const override;
+    virtual long            CalcTitleWidth() const override;
+    virtual void            DrawWindow(vcl::RenderContext& rRenderContext, sal_uInt16 nDrawFlags, const Point* pOffset) override;
 };
 
 #endif // INCLUDED_VCL_INC_BRDWIN_HXX
diff --git a/vcl/inc/cairotextrender.hxx b/vcl/inc/cairotextrender.hxx
index 26ab3c98bc28..aad3220ff3a2 100644
--- a/vcl/inc/cairotextrender.hxx
+++ b/vcl/inc/cairotextrender.hxx
@@ -89,14 +89,14 @@ public:
                                 CairoTextRender();
 
 
-    virtual void                SetTextColor( SalColor nSalColor ) SAL_OVERRIDE;
-    virtual sal_uInt16          SetFont( FontSelectPattern*, int nFallbackLevel ) SAL_OVERRIDE;
-    virtual void                GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) SAL_OVERRIDE;
-    virtual const FontCharMapPtr GetFontCharMap() const SAL_OVERRIDE;
-    virtual bool                GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const SAL_OVERRIDE;
-    virtual void                GetDevFontList( PhysicalFontCollection* ) SAL_OVERRIDE;
-    virtual void                ClearDevFontCache() SAL_OVERRIDE;
-    virtual bool                AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ) SAL_OVERRIDE;
+    virtual void                SetTextColor( SalColor nSalColor ) override;
+    virtual sal_uInt16          SetFont( FontSelectPattern*, int nFallbackLevel ) override;
+    virtual void                GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) override;
+    virtual const FontCharMapPtr GetFontCharMap() const override;
+    virtual bool                GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const override;
+    virtual void                GetDevFontList( PhysicalFontCollection* ) override;
+    virtual void                ClearDevFontCache() override;
+    virtual bool                AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ) override;
     virtual bool                CreateFontSubset(
                                     const OUString& rToFile,
                                     const PhysicalFontFace*,
@@ -104,29 +104,29 @@ public:
                                     const sal_uInt8* pEncoding,
                                     sal_Int32* pWidths,
                                     int nGlyphs,
-                                    FontSubsetInfo& rInfo) SAL_OVERRIDE;
+                                    FontSubsetInfo& rInfo) override;
 
-    virtual const Ucs2SIntMap*  GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded, std::set<sal_Unicode> const**) SAL_OVERRIDE;
+    virtual const Ucs2SIntMap*  GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded, std::set<sal_Unicode> const**) override;
     virtual const void*         GetEmbedFontData(
                                     const PhysicalFontFace*,
                                     const sal_Ucs* pUnicodes,
                                     sal_Int32* pWidths,
                                     size_t nLen,
                                     FontSubsetInfo& rInfo,
-                                    long* pDataLen ) SAL_OVERRIDE;
+                                    long* pDataLen ) override;
 
-    virtual void                FreeEmbedFontData( const void* pData, long nDataLen ) SAL_OVERRIDE;
+    virtual void                FreeEmbedFontData( const void* pData, long nDataLen ) override;
     virtual void                GetGlyphWidths(
                                     const PhysicalFontFace*,
                                     bool bVertical,
                                     Int32Vector& rWidths,
-                                    Ucs2UIntMap& rUnicodeEnc ) SAL_OVERRIDE;
+                                    Ucs2UIntMap& rUnicodeEnc ) override;
 
-    virtual bool                GetGlyphBoundRect( sal_GlyphId nIndex, Rectangle& ) SAL_OVERRIDE;
-    virtual bool                GetGlyphOutline( sal_GlyphId nIndex, ::basegfx::B2DPolyPolygon& ) SAL_OVERRIDE;
-    virtual SalLayout*          GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) SAL_OVERRIDE;
-    virtual void                DrawServerFontLayout( const ServerFontLayout& ) SAL_OVERRIDE;
-    virtual SystemFontData      GetSysFontData( int nFallbackLevel ) const SAL_OVERRIDE;
+    virtual bool                GetGlyphBoundRect( sal_GlyphId nIndex, Rectangle& ) override;
+    virtual bool                GetGlyphOutline( sal_GlyphId nIndex, ::basegfx::B2DPolyPolygon& ) override;
+    virtual SalLayout*          GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) override;
+    virtual void                DrawServerFontLayout( const ServerFontLayout& ) override;
+    virtual SystemFontData      GetSysFontData( int nFallbackLevel ) const override;
 };
 
 #endif
diff --git a/vcl/inc/canvasbitmap.hxx b/vcl/inc/canvasbitmap.hxx
index 7b9174abb360..77dc3069fafe 100644
--- a/vcl/inc/canvasbitmap.hxx
+++ b/vcl/inc/canvasbitmap.hxx
@@ -63,45 +63,45 @@ namespace unotools
 
     public:
         // XBitmap
-        virtual com::sun::star::geometry::IntegerSize2D SAL_CALL getSize() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual sal_Bool SAL_CALL hasAlpha(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual com::sun::star::uno::Reference< com::sun::star::rendering::XBitmap > SAL_CALL getScaledBitmap( const com::sun::star::geometry::RealSize2D& newSize, sal_Bool beFast ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual com::sun::star::geometry::IntegerSize2D SAL_CALL getSize() throw (com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL hasAlpha(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual com::sun::star::uno::Reference< com::sun::star::rendering::XBitmap > SAL_CALL getScaledBitmap( const com::sun::star::geometry::RealSize2D& newSize, sal_Bool beFast ) throw (com::sun::star::uno::RuntimeException, std::exception) override;
 
         // XIntegerReadOnlyBitmap
-        virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getData( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, const ::com::sun::star::geometry::IntegerRectangle2D& rect ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, const ::com::sun::star::geometry::IntegerPoint2D& pos ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getData( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, const ::com::sun::star::geometry::IntegerRectangle2D& rect ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, const ::com::sun::star::geometry::IntegerPoint2D& pos ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException, std::exception) override;
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapPalette > SAL_CALL getPalette(  ) throw (::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual ::com::sun::star::rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
 
         // XBitmapPalette
-        virtual sal_Int32 SAL_CALL getNumberOfEntries() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual sal_Bool SAL_CALL getIndex( ::com::sun::star::uno::Sequence< double >& entry, ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual sal_Bool SAL_CALL setIndex( const ::com::sun::star::uno::Sequence< double >& color, sal_Bool transparency, ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XColorSpace > SAL_CALL getColorSpace(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual sal_Int32 SAL_CALL getNumberOfEntries() throw (com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL getIndex( ::com::sun::star::uno::Sequence< double >& entry, ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL setIndex( const ::com::sun::star::uno::Sequence< double >& color, sal_Bool transparency, ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XColorSpace > SAL_CALL getColorSpace(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
 
         // XIntegerBitmapColorSpace
-        virtual ::sal_Int8 SAL_CALL getType(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getComponentTags(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual ::sal_Int8 SAL_CALL getRenderingIntent(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getProperties(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual ::com::sun::star::uno::Sequence< double > SAL_CALL convertColorSpace( const ::com::sun::star::uno::Sequence< double >& deviceColor, const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XColorSpace >& targetColorSpace ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::RGBColor > SAL_CALL convertToRGB( const ::com::sun::star::uno::Sequence< double >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor > SAL_CALL convertToARGB( const ::com::sun::star::uno::Sequence< double >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor > SAL_CALL convertToPARGB( const ::com::sun::star::uno::Sequence< double >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual ::com::sun::star::uno::Sequence< double > SAL_CALL convertFromRGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::RGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual ::com::sun::star::uno::Sequence< double > SAL_CALL convertFromARGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual ::com::sun::star::uno::Sequence< double > SAL_CALL convertFromPARGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual ::sal_Int32 SAL_CALL getBitsPerPixel(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual ::com::sun::star::uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual ::sal_Int8 SAL_CALL getEndianness(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual ::com::sun::star::uno::Sequence<double> SAL_CALL convertFromIntegerColorSpace( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& deviceColor, const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XColorSpace >& targetColorSpace ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& deviceColor, const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XIntegerBitmapColorSpace >& targetColorSpace ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::RGBColor > SAL_CALL convertIntegerToRGB( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::RGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual ::sal_Int8 SAL_CALL getType(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getComponentTags(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual ::sal_Int8 SAL_CALL getRenderingIntent(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getProperties(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual ::com::sun::star::uno::Sequence< double > SAL_CALL convertColorSpace( const ::com::sun::star::uno::Sequence< double >& deviceColor, const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XColorSpace >& targetColorSpace ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::RGBColor > SAL_CALL convertToRGB( const ::com::sun::star::uno::Sequence< double >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor > SAL_CALL convertToARGB( const ::com::sun::star::uno::Sequence< double >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor > SAL_CALL convertToPARGB( const ::com::sun::star::uno::Sequence< double >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual ::com::sun::star::uno::Sequence< double > SAL_CALL convertFromRGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::RGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual ::com::sun::star::uno::Sequence< double > SAL_CALL convertFromARGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual ::com::sun::star::uno::Sequence< double > SAL_CALL convertFromPARGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual ::sal_Int32 SAL_CALL getBitsPerPixel(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual ::com::sun::star::uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual ::sal_Int8 SAL_CALL getEndianness(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual ::com::sun::star::uno::Sequence<double> SAL_CALL convertFromIntegerColorSpace( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& deviceColor, const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XColorSpace >& targetColorSpace ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& deviceColor, const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XIntegerBitmapColorSpace >& targetColorSpace ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::RGBColor > SAL_CALL convertIntegerToRGB( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& deviceColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::RGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::ARGBColor >& rgbColor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
 
         /** Create API wrapper for given BitmapEx
 
diff --git a/vcl/inc/cupsmgr.hxx b/vcl/inc/cupsmgr.hxx
index 96b1c80098d1..2f49fb81a62d 100644
--- a/vcl/inc/cupsmgr.hxx
+++ b/vcl/inc/cupsmgr.hxx
@@ -78,7 +78,7 @@ class CUPSManager : public PrinterInfoManager
     CUPSManager();
     virtual ~CUPSManager();
 
-    virtual void initialize() SAL_OVERRIDE;
+    virtual void initialize() override;
 
     static void getOptionsFromDocumentSetup( const JobData& rJob, bool bBanner, int& rNumOptions, void** rOptions );
     void runDests();
@@ -96,26 +96,26 @@ public:
 
     const char* authenticateUser( const char* );
 
-    virtual FILE* startSpool( const OUString& rPrinterName, bool bQuickCommand ) SAL_OVERRIDE;
-    virtual bool endSpool( const OUString& rPrinterName, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner, const OUString& rFaxNumber ) SAL_OVERRIDE;
-    virtual void setupJobContextData( JobData& rData ) SAL_OVERRIDE;
+    virtual FILE* startSpool( const OUString& rPrinterName, bool bQuickCommand ) override;
+    virtual bool endSpool( const OUString& rPrinterName, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner, const OUString& rFaxNumber ) override;
+    virtual void setupJobContextData( JobData& rData ) override;
 
-    virtual bool startBatchPrint() SAL_OVERRIDE;
-    virtual bool flushBatchPrint() SAL_OVERRIDE;
-    virtual bool supportsBatchPrint() const SAL_OVERRIDE;
+    virtual bool startBatchPrint() override;
+    virtual bool flushBatchPrint() override;
+    virtual bool supportsBatchPrint() const override;
 
     /// changes the info about a named printer
-    virtual void changePrinterInfo( const OUString& rPrinter, const PrinterInfo& rNewInfo ) SAL_OVERRIDE;
+    virtual void changePrinterInfo( const OUString& rPrinter, const PrinterInfo& rNewInfo ) override;
 
     /// check if the printer configuration has changed
-    virtual bool checkPrintersChanged( bool bWait ) SAL_OVERRIDE;
+    virtual bool checkPrintersChanged( bool bWait ) override;
 
     // members for administration
     // disable for CUPS
-    virtual bool addPrinter( const OUString& rPrinterName, const OUString& rDriverName ) SAL_OVERRIDE;
-    virtual bool removePrinter( const OUString& rPrinterName, bool bCheckOnly = false ) SAL_OVERRIDE;
-    virtual bool writePrinterConfig() SAL_OVERRIDE;
-    virtual bool setDefaultPrinter( const OUString& rPrinterName ) SAL_OVERRIDE;
+    virtual bool addPrinter( const OUString& rPrinterName, const OUString& rDriverName ) override;
+    virtual bool removePrinter( const OUString& rPrinterName, bool bCheckOnly = false ) override;
+    virtual bool writePrinterConfig() override;
+    virtual bool setDefaultPrinter( const OUString& rPrinterName ) override;
 };
 
 } // namespace psp
diff --git a/vcl/inc/dndevdis.hxx b/vcl/inc/dndevdis.hxx
index 915f83bcc7ca..24d63fe7e686 100644
--- a/vcl/inc/dndevdis.hxx
+++ b/vcl/inc/dndevdis.hxx
@@ -74,30 +74,30 @@ public:
      * XDropTargetDragContext
      */
 
-    virtual void SAL_CALL acceptDrag( sal_Int8 dropAction ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL rejectDrag() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL acceptDrag( sal_Int8 dropAction ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL rejectDrag() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
 
     /*
      * XDropTargetListener
      */
 
-    virtual void SAL_CALL drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
 
     /*
      * XDragGestureListener
      */
 
-    virtual void SAL_CALL dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
 
     /*
      * XEventListener
      */
 
-    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& eo ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& eo ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
 };
 
 #endif
diff --git a/vcl/inc/dndlcon.hxx b/vcl/inc/dndlcon.hxx
index d6e3cab13433..5d4cc963a26b 100644
--- a/vcl/inc/dndlcon.hxx
+++ b/vcl/inc/dndlcon.hxx
@@ -76,35 +76,35 @@ public:
      * XDragGestureRecognizer
      */
 
-    virtual void SAL_CALL addDragGestureListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureListener >& dgl ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL removeDragGestureListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureListener >& dgl ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL resetRecognizer(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL addDragGestureListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureListener >& dgl ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeDragGestureListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureListener >& dgl ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL resetRecognizer(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
 
        /*
      * XDropTargetDragContext
      */
 
-    virtual void SAL_CALL acceptDrag( sal_Int8 dragOperation ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL rejectDrag(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL acceptDrag( sal_Int8 dragOperation ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL rejectDrag(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
 
        /*
      * XDropTargetDropContext
      */
 
-    virtual void SAL_CALL acceptDrop( sal_Int8 dropOperation ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL rejectDrop(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL dropComplete( sal_Bool success ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL acceptDrop( sal_Int8 dropOperation ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL rejectDrop(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL dropComplete( sal_Bool success ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
 
     /*
      * XDropTarget
      */
 
-    virtual void SAL_CALL addDropTargetListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& dtl ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL removeDropTargetListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& dtl ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual sal_Bool SAL_CALL isActive(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL setActive( sal_Bool active ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual sal_Int8 SAL_CALL getDefaultActions(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL addDropTargetListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& dtl ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeDropTargetListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& dtl ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isActive(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setActive( sal_Bool active ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Int8 SAL_CALL getDefaultActions(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
 };
 
 #endif
diff --git a/vcl/inc/fontmanager.hxx b/vcl/inc/fontmanager.hxx
index c96e2e7bd272..f2839de68616 100644
--- a/vcl/inc/fontmanager.hxx
+++ b/vcl/inc/fontmanager.hxx
@@ -228,7 +228,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
 
         Type1FontFile() : PrintFont( fonttype::Type1 ), m_nDirectory( 0 ) {}
         virtual ~Type1FontFile();
-        virtual bool queryMetricPage( int nPage, utl::MultiAtomProvider* pProvider ) SAL_OVERRIDE;
+        virtual bool queryMetricPage( int nPage, utl::MultiAtomProvider* pProvider ) override;
     };
 
     struct TrueTypeFontFile : public PrintFont
@@ -240,7 +240,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
 
         TrueTypeFontFile();
         virtual ~TrueTypeFontFile();
-        virtual bool queryMetricPage( int nPage, utl::MultiAtomProvider* pProvider ) SAL_OVERRIDE;
+        virtual bool queryMetricPage( int nPage, utl::MultiAtomProvider* pProvider ) override;
     };
 
     fontID                                      m_nNextFontID;
diff --git a/vcl/inc/generic/geninst.h b/vcl/inc/generic/geninst.h
index 7e3a75dd641a..0ebfd67f3957 100644
--- a/vcl/inc/generic/geninst.h
+++ b/vcl/inc/generic/geninst.h
@@ -58,9 +58,9 @@ public:
                         SalYieldMutex();
                         virtual ~SalYieldMutex();
 
-    virtual void        acquire() SAL_OVERRIDE;
-    virtual void        release() SAL_OVERRIDE;
-    virtual bool        tryToAcquire() SAL_OVERRIDE;
+    virtual void        acquire() override;
+    virtual void        release() override;
+    virtual bool        tryToAcquire() override;
 
     sal_uIntPtr GetAcquireCount() const { return mnCount; }
     oslThreadIdentifier GetThreadId() const { return mnThreadId; }
@@ -83,25 +83,25 @@ public:
     virtual ~SalGenericInstance();
 
     // Yield mutex
-    virtual comphelper::SolarMutex* GetYieldMutex() SAL_OVERRIDE;
-    virtual sal_uIntPtr         ReleaseYieldMutex() SAL_OVERRIDE;
-    virtual void                AcquireYieldMutex( sal_uIntPtr nCount ) SAL_OVERRIDE;
-    virtual bool                CheckYieldMutex() SAL_OVERRIDE;
+    virtual comphelper::SolarMutex* GetYieldMutex() override;
+    virtual sal_uIntPtr         ReleaseYieldMutex() override;
+    virtual void                AcquireYieldMutex( sal_uIntPtr nCount ) override;
+    virtual bool                CheckYieldMutex() override;
 
     // Printing
     virtual SalInfoPrinter*     CreateInfoPrinter      ( SalPrinterQueueInfo* pQueueInfo,
-                                                         ImplJobSetup* pSetupData ) SAL_OVERRIDE;
-    virtual void                DestroyInfoPrinter     ( SalInfoPrinter* pPrinter ) SAL_OVERRIDE;
-    virtual SalPrinter*         CreatePrinter          ( SalInfoPrinter* pInfoPrinter ) SAL_OVERRIDE;
-    virtual void                DestroyPrinter         ( SalPrinter* pPrinter ) SAL_OVERRIDE;
-    virtual void                GetPrinterQueueInfo    ( ImplPrnQueueList* pList ) SAL_OVERRIDE;
-    virtual void                GetPrinterQueueState   ( SalPrinterQueueInfo* pInfo ) SAL_OVERRIDE;
-    virtual void                DeletePrinterQueueInfo ( SalPrinterQueueInfo* pInfo ) SAL_OVERRIDE;
-    virtual OUString            GetDefaultPrinter() SAL_OVERRIDE;
+                                                         ImplJobSetup* pSetupData ) override;
+    virtual void                DestroyInfoPrinter     ( SalInfoPrinter* pPrinter ) override;
+    virtual SalPrinter*         CreatePrinter          ( SalInfoPrinter* pInfoPrinter ) override;
+    virtual void                DestroyPrinter         ( SalPrinter* pPrinter ) override;
+    virtual void                GetPrinterQueueInfo    ( ImplPrnQueueList* pList ) override;
+    virtual void                GetPrinterQueueState   ( SalPrinterQueueInfo* pInfo ) override;
+    virtual void                DeletePrinterQueueInfo ( SalPrinterQueueInfo* pInfo ) override;
+    virtual OUString            GetDefaultPrinter() override;
     virtual void                PostPrintersChanged() = 0;
-    virtual void                updatePrinterUpdate() SAL_OVERRIDE;
-    virtual void                jobStartedPrinterUpdate() SAL_OVERRIDE;
-    virtual void                jobEndedPrinterUpdate() SAL_OVERRIDE;
+    virtual void                updatePrinterUpdate() override;
+    virtual void                jobStartedPrinterUpdate() override;
+    virtual void                jobEndedPrinterUpdate() override;
     bool isPrinterInit() const { return mbPrinterInit; }
     virtual GenPspGraphics     *CreatePrintGraphics() = 0;
 
diff --git a/vcl/inc/generic/genprn.h b/vcl/inc/generic/genprn.h
index 00639d336fc5..5914784ba7c5 100644
--- a/vcl/inc/generic/genprn.h
+++ b/vcl/inc/generic/genprn.h
@@ -38,20 +38,20 @@ public:
     virtual ~PspSalInfoPrinter();
 
     // override all pure virtual methods
-    virtual SalGraphics*            AcquireGraphics() SAL_OVERRIDE;
-    virtual void                    ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE;
-    virtual bool                    Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ) SAL_OVERRIDE;
-    virtual bool                    SetPrinterData( ImplJobSetup* pSetupData ) SAL_OVERRIDE;
-    virtual bool                    SetData( sal_uIntPtr nFlags, ImplJobSetup* pSetupData ) SAL_OVERRIDE;
+    virtual SalGraphics*            AcquireGraphics() override;
+    virtual void                    ReleaseGraphics( SalGraphics* pGraphics ) override;
+    virtual bool                    Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ) override;
+    virtual bool                    SetPrinterData( ImplJobSetup* pSetupData ) override;
+    virtual bool                    SetData( sal_uIntPtr nFlags, ImplJobSetup* pSetupData ) override;
     virtual void                    GetPageInfo( const ImplJobSetup* pSetupData,
                                                  long& rOutWidth, long& rOutHeight,
                                                  long& rPageOffX, long& rPageOffY,
-                                                 long& rPageWidth, long& rPageHeight ) SAL_OVERRIDE;
-    virtual sal_uIntPtr             GetCapabilities( const ImplJobSetup* pSetupData, PrinterCapType nType ) SAL_OVERRIDE;
-    virtual sal_uIntPtr             GetPaperBinCount( const ImplJobSetup* pSetupData ) SAL_OVERRIDE;
-    virtual OUString                GetPaperBinName( const ImplJobSetup* pSetupData, sal_uIntPtr nPaperBin ) SAL_OVERRIDE;
-    virtual void                    InitPaperFormats( const ImplJobSetup* pSetupData ) SAL_OVERRIDE;
-    virtual int                     GetLandscapeAngle( const ImplJobSetup* pSetupData ) SAL_OVERRIDE;
+                                                 long& rPageWidth, long& rPageHeight ) override;
+    virtual sal_uIntPtr             GetCapabilities( const ImplJobSetup* pSetupData, PrinterCapType nType ) override;
+    virtual sal_uIntPtr             GetPaperBinCount( const ImplJobSetup* pSetupData ) override;
+    virtual OUString                GetPaperBinName( const ImplJobSetup* pSetupData, sal_uIntPtr nPaperBin ) override;
+    virtual void                    InitPaperFormats( const ImplJobSetup* pSetupData ) override;
+    virtual int                     GetLandscapeAngle( const ImplJobSetup* pSetupData ) override;
 };
 
 class VCL_DLLPUBLIC PspSalPrinter : public SalPrinter
@@ -79,16 +79,16 @@ public:
                                               sal_uIntPtr nCopies,
                                               bool bCollate,
                                               bool bDirect,
-                                              ImplJobSetup* pSetupData ) SAL_OVERRIDE;
+                                              ImplJobSetup* pSetupData ) override;
     virtual bool                    StartJob( const OUString*,
                                               const OUString&,
                                               const OUString&,
                                               ImplJobSetup*,
-                                              vcl::PrinterController& i_rController ) SAL_OVERRIDE;
-    virtual bool                    EndJob() SAL_OVERRIDE;
-    virtual SalGraphics*            StartPage( ImplJobSetup* pSetupData, bool bNewJobData ) SAL_OVERRIDE;
-    virtual bool                    EndPage() SAL_OVERRIDE;
-    virtual sal_uIntPtr                 GetErrorCode() SAL_OVERRIDE;
+                                              vcl::PrinterController& i_rController ) override;
+    virtual bool                    EndJob() override;
+    virtual SalGraphics*            StartPage( ImplJobSetup* pSetupData, bool bNewJobData ) override;
+    virtual bool                    EndPage() override;
+    virtual sal_uIntPtr                 GetErrorCode() override;
 };
 
 #endif // INCLUDED_VCL_INC_GENERIC_GENPRN_H
diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/generic/genpspgraphics.h
index 68bc0fb7543f..4c01b88a128d 100644
--- a/vcl/inc/generic/genpspgraphics.h
+++ b/vcl/inc/generic/genpspgraphics.h
@@ -74,33 +74,33 @@ public:
                                            const psp::FastPrintFontInfo& );
 
     // override all pure virtual methods
-    virtual SalGraphicsImpl*GetImpl() const SAL_OVERRIDE { return NULL; };
-    virtual void            GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) SAL_OVERRIDE;
-    virtual sal_uInt16      GetBitCount() const SAL_OVERRIDE;
-    virtual long            GetGraphicsWidth() const SAL_OVERRIDE;
-
-    virtual void            ResetClipRegion() SAL_OVERRIDE;
-    virtual bool            setClipRegion( const vcl::Region& ) SAL_OVERRIDE;
-
-    virtual void            SetLineColor() SAL_OVERRIDE;
-    virtual void            SetLineColor( SalColor nSalColor ) SAL_OVERRIDE;
-    virtual void            SetFillColor() SAL_OVERRIDE;
-    virtual void            SetFillColor( SalColor nSalColor ) SAL_OVERRIDE;
-    virtual void            SetXORMode( bool bSet, bool ) SAL_OVERRIDE;
-    virtual void            SetROPLineColor( SalROPColor nROPColor ) SAL_OVERRIDE;
-    virtual void            SetROPFillColor( SalROPColor nROPColor ) SAL_OVERRIDE;
-
-    virtual void            SetTextColor( SalColor nSalColor ) SAL_OVERRIDE;
-    virtual sal_uInt16      SetFont( FontSelectPattern*, int nFallbackLevel ) SAL_OVERRIDE;
-    virtual void            GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) SAL_OVERRIDE;
-    virtual const FontCharMapPtr GetFontCharMap() const SAL_OVERRIDE;
-    virtual bool            GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const SAL_OVERRIDE;
-    virtual void            GetDevFontList( PhysicalFontCollection* ) SAL_OVERRIDE;
+    virtual SalGraphicsImpl*GetImpl() const override { return NULL; };
+    virtual void            GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) override;
+    virtual sal_uInt16      GetBitCount() const override;
+    virtual long            GetGraphicsWidth() const override;
+
+    virtual void            ResetClipRegion() override;
+    virtual bool            setClipRegion( const vcl::Region& ) override;
+
+    virtual void            SetLineColor() override;
+    virtual void            SetLineColor( SalColor nSalColor ) override;
+    virtual void            SetFillColor() override;
+    virtual void            SetFillColor( SalColor nSalColor ) override;
+    virtual void            SetXORMode( bool bSet, bool ) override;
+    virtual void            SetROPLineColor( SalROPColor nROPColor ) override;
+    virtual void            SetROPFillColor( SalROPColor nROPColor ) override;
+
+    virtual void            SetTextColor( SalColor nSalColor ) override;
+    virtual sal_uInt16      SetFont( FontSelectPattern*, int nFallbackLevel ) override;
+    virtual void            GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) override;
+    virtual const FontCharMapPtr GetFontCharMap() const override;
+    virtual bool            GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const override;
+    virtual void            GetDevFontList( PhysicalFontCollection* ) override;
     // graphics must drop any cached font info
-    virtual void            ClearDevFontCache() SAL_OVERRIDE;
+    virtual void            ClearDevFontCache() override;
     virtual bool            AddTempDevFont( PhysicalFontCollection*,
                                             const OUString& rFileURL,
-                                            const OUString& rFontName ) SAL_OVERRIDE;
+                                            const OUString& rFontName ) override;
     static bool             AddTempDevFontHelper( PhysicalFontCollection* pFontCollection,
                                                   const OUString& rFileURL,
                                                   const OUString& rFontName,
@@ -112,53 +112,53 @@ public:
                                               const sal_uInt8* pEncoding,
                                               sal_Int32* pWidths,
                                               int nGlyphs,
-                                              FontSubsetInfo& rInfo ) SAL_OVERRIDE;
+                                              FontSubsetInfo& rInfo ) override;
     virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*,
                                                       const Ucs2OStrMap** ppNonEncoded,
-                                                      std::set<sal_Unicode> const** ppPriority) SAL_OVERRIDE;
+                                                      std::set<sal_Unicode> const** ppPriority) override;
     virtual const void*     GetEmbedFontData( const PhysicalFontFace*,
                                               const sal_Ucs* pUnicodes,
                                               sal_Int32* pWidths,
                                               size_t nLen,
                                               FontSubsetInfo& rInfo,
-                                              long* pDataLen ) SAL_OVERRIDE;
-    virtual void            FreeEmbedFontData( const void* pData, long nDataLen ) SAL_OVERRIDE;
+                                              long* pDataLen ) override;
+    virtual void            FreeEmbedFontData( const void* pData, long nDataLen ) override;
     virtual void            GetGlyphWidths( const PhysicalFontFace*,
                                             bool bVertical,
                                             Int32Vector& rWidths,
-                                            Ucs2UIntMap& rUnicodeEnc ) SAL_OVERRIDE;
-    virtual bool            GetGlyphBoundRect( sal_GlyphId, Rectangle& ) SAL_OVERRIDE;
-    virtual bool            GetGlyphOutline( sal_GlyphId, basegfx::B2DPolyPolygon& ) SAL_OVERRIDE;
-    virtual SalLayout*      GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) SAL_OVERRIDE;
-    virtual void            DrawServerFontLayout( const ServerFontLayout& ) SAL_OVERRIDE;
-    virtual bool            supportsOperation( OutDevSupportType ) const SAL_OVERRIDE;
-    virtual void            drawPixel( long nX, long nY ) SAL_OVERRIDE;
-    virtual void            drawPixel( long nX, long nY, SalColor nSalColor ) SAL_OVERRIDE;
-    virtual void            drawLine( long nX1, long nY1, long nX2, long nY2 ) SAL_OVERRIDE;
-    virtual void            drawRect( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual void            drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) SAL_OVERRIDE;
-    virtual void            drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) SAL_OVERRIDE;
+                                            Ucs2UIntMap& rUnicodeEnc ) override;
+    virtual bool            GetGlyphBoundRect( sal_GlyphId, Rectangle& ) override;
+    virtual bool            GetGlyphOutline( sal_GlyphId, basegfx::B2DPolyPolygon& ) override;
+    virtual SalLayout*      GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) override;
+    virtual void            DrawServerFontLayout( const ServerFontLayout& ) override;
+    virtual bool            supportsOperation( OutDevSupportType ) const override;
+    virtual void            drawPixel( long nX, long nY ) override;
+    virtual void            drawPixel( long nX, long nY, SalColor nSalColor ) override;
+    virtual void            drawLine( long nX1, long nY1, long nX2, long nY2 ) override;
+    virtual void            drawRect( long nX, long nY, long nWidth, long nHeight ) override;
+    virtual void            drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) override;
+    virtual void            drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) override;
     virtual void            drawPolyPolygon( sal_uInt32 nPoly,
                                              const sal_uInt32* pPoints,
-                                             PCONSTSALPOINT* pPtAry ) SAL_OVERRIDE;
+                                             PCONSTSALPOINT* pPtAry ) override;
     virtual bool            drawPolyPolygon( const basegfx::B2DPolyPolygon&,
-                                             double fTransparency ) SAL_OVERRIDE;
+                                             double fTransparency ) override;
     virtual bool            drawPolyLine( const basegfx::B2DPolygon&,
                                           double fTransparency,
                                           const basegfx::B2DVector& rLineWidths,
                                           basegfx::B2DLineJoin,
-                                          css::drawing::LineCap) SAL_OVERRIDE;
+                                          css::drawing::LineCap) override;
     virtual bool            drawPolyLineBezier( sal_uInt32 nPoints,
                                                 const SalPoint* pPtAry,
-                                                const sal_uInt8* pFlgAry ) SAL_OVERRIDE;
+                                                const sal_uInt8* pFlgAry ) override;
     virtual bool            drawPolygonBezier( sal_uInt32 nPoints,
                                                const SalPoint* pPtAry,
-                                               const sal_uInt8* pFlgAry ) SAL_OVERRIDE;
+                                               const sal_uInt8* pFlgAry ) override;
     virtual bool            drawPolyPolygonBezier( sal_uInt32 nPoly,
                                                    const sal_uInt32* pPoints,
                                                    const SalPoint* const* pPtAry,
-                                                   const sal_uInt8* const* pFlgAry ) SAL_OVERRIDE;
-    virtual bool            drawGradient( const tools::PolyPolygon&, const Gradient& ) SAL_OVERRIDE { return false; };
+                                                   const sal_uInt8* const* pFlgAry ) override;
+    virtual bool            drawGradient( const tools::PolyPolygon&, const Gradient& ) override { return false; };
 
     virtual void            copyArea( long nDestX,
                                       long nDestY,
@@ -166,53 +166,53 @@ public:
                                       long nSrcY,
                                       long nSrcWidth,
                                       long nSrcHeight,
-                                      sal_uInt16 nFlags ) SAL_OVERRIDE;
+                                      sal_uInt16 nFlags ) override;
     virtual void            copyBits( const SalTwoRect& rPosAry,
-                                      SalGraphics* pSrcGraphics ) SAL_OVERRIDE;
+                                      SalGraphics* pSrcGraphics ) override;
     virtual void            drawBitmap( const SalTwoRect& rPosAry,
-                                        const SalBitmap& rSalBitmap ) SAL_OVERRIDE;
+                                        const SalBitmap& rSalBitmap ) override;
     virtual void            drawBitmap( const SalTwoRect& rPosAry,
                                         const SalBitmap& rSalBitmap,
-                                        const SalBitmap& rTransparentBitmap ) SAL_OVERRIDE;
+                                        const SalBitmap& rTransparentBitmap ) override;
     virtual void            drawMask( const SalTwoRect& rPosAry,
                                       const SalBitmap& rSalBitmap,
-                                      SalColor nMaskColor ) SAL_OVERRIDE;
-    virtual SalBitmap*      getBitmap( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual SalColor        getPixel( long nX, long nY ) SAL_OVERRIDE;
+                                      SalColor nMaskColor ) override;
+    virtual SalBitmap*      getBitmap( long nX, long nY, long nWidth, long nHeight ) override;
+    virtual SalColor        getPixel( long nX, long nY ) override;
     virtual void            invert( long nX, long nY, long nWidth, long nHeight,
-                                    SalInvert nFlags ) SAL_OVERRIDE;
+                                    SalInvert nFlags ) override;
     virtual void            invert( sal_uInt32 nPoints, const SalPoint* pPtAry,
-                                    SalInvert nFlags ) SAL_OVERRIDE;
+                                    SalInvert nFlags ) override;
 
     virtual bool            drawEPS( long nX, long nY, long nWidth, long nHeight,
-                                     void* pPtr, sal_uIntPtr nSize ) SAL_OVERRIDE;
+                                     void* pPtr, sal_uIntPtr nSize ) override;
     virtual bool            blendBitmap( const SalTwoRect&,
-                                         const SalBitmap& rBitmap ) SAL_OVERRIDE;
+                                         const SalBitmap& rBitmap ) override;
     virtual bool            blendAlphaBitmap( const SalTwoRect&,
                                               const SalBitmap& rSrcBitmap,
                                               const SalBitmap& rMaskBitmap,
-                                              const SalBitmap& rAlphaBitmap ) SAL_OVERRIDE;
+                                              const SalBitmap& rAlphaBitmap ) override;
     virtual bool            drawAlphaBitmap( const SalTwoRect&,
                                              const SalBitmap& rSourceBitmap,
-                                             const SalBitmap& rAlphaBitmap ) SAL_OVERRIDE;
+                                             const SalBitmap& rAlphaBitmap ) override;
     virtual bool            drawTransformedBitmap( const basegfx::B2DPoint& rNull,
                                                    const basegfx::B2DPoint& rX,
                                                    const basegfx::B2DPoint& rY,
                                                    const SalBitmap& rSourceBitmap,
-                                                   const SalBitmap* pAlphaBitmap) SAL_OVERRIDE;
+                                                   const SalBitmap* pAlphaBitmap) override;
     virtual bool            drawAlphaRect( long nX, long nY, long nWidth, long nHeight,
-                                           sal_uInt8 nTransparency ) SAL_OVERRIDE;
+                                           sal_uInt8 nTransparency ) override;
 
-    virtual SystemGraphicsData GetGraphicsData() const SAL_OVERRIDE;
+    virtual SystemGraphicsData GetGraphicsData() const override;
 
 #if ENABLE_CAIRO_CANVAS
-    virtual bool            SupportsCairo() const SAL_OVERRIDE;
-    virtual cairo::SurfaceSharedPtr CreateSurface(const cairo::CairoSurfaceSharedPtr& rSurface) const SAL_OVERRIDE;
-    virtual cairo::SurfaceSharedPtr CreateSurface(const OutputDevice& rRefDevice, int x, int y, int width, int height) const SAL_OVERRIDE;
-    virtual cairo::SurfaceSharedPtr CreateBitmapSurface(const OutputDevice& rRefDevice, const BitmapSystemData& rData, const Size& rSize) const SAL_OVERRIDE;
-    virtual css::uno::Any   GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& rSurface, const basegfx::B2ISize& rSize) const SAL_OVERRIDE;
+    virtual bool            SupportsCairo() const override;
+    virtual cairo::SurfaceSharedPtr CreateSurface(const cairo::CairoSurfaceSharedPtr& rSurface) const override;
+    virtual cairo::SurfaceSharedPtr CreateSurface(const OutputDevice& rRefDevice, int x, int y, int width, int height) const override;
+    virtual cairo::SurfaceSharedPtr CreateBitmapSurface(const OutputDevice& rRefDevice, const BitmapSystemData& rData, const Size& rSize) const override;
+    virtual css::uno::Any   GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& rSurface, const basegfx::B2ISize& rSize) const override;
 
-    virtual SystemFontData  GetSysFontData( int nFallbacklevel ) const SAL_OVERRIDE;
+    virtual SystemFontData  GetSysFontData( int nFallbacklevel ) const override;
 #endif // ENABLE_CAIRO_CANVAS
 };
 
diff --git a/vcl/inc/generic/gensys.h b/vcl/inc/generic/gensys.h
index b22347555a59..6e935f5642cf 100644
--- a/vcl/inc/generic/gensys.h
+++ b/vcl/inc/generic/gensys.h
@@ -41,7 +41,7 @@ class VCL_DLLPUBLIC SalGenericSystem : public SalSystem
     virtual int ShowNativeMessageBox( const OUString& rTitle,
                                       const OUString& rMessage,
                                       int nButtonCombination,
-                                      int nDefaultButton, bool bUseResources) SAL_OVERRIDE;
+                                      int nDefaultButton, bool bUseResources) override;
 
 #if !defined(ANDROID) && !defined(IOS)
     // Simple helpers for X11 WM_CLASS hints
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index 198da6ee76e0..61c9bcc76140 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -288,9 +288,9 @@ class VCL_DLLPUBLIC ServerFontLayout : public GenericSalLayout
 public:
                             ServerFontLayout( ServerFont& );
 
-    virtual bool            LayoutText( ImplLayoutArgs& ) SAL_OVERRIDE;
-    virtual void            AdjustLayout( ImplLayoutArgs& ) SAL_OVERRIDE;
-    virtual void            DrawText( SalGraphics& ) const SAL_OVERRIDE;
+    virtual bool            LayoutText( ImplLayoutArgs& ) override;
+    virtual void            AdjustLayout( ImplLayoutArgs& ) override;
+    virtual void            DrawText( SalGraphics& ) const override;
 
     void                    SetNeedFallback(
                                 ImplLayoutArgs& rArgs,
@@ -300,7 +300,7 @@ public:
     ServerFont&             GetServerFont() const   { return mrServerFont; }
 
     virtual std::shared_ptr<vcl::TextLayoutCache>
-        CreateTextLayoutCache(OUString const&) const SAL_OVERRIDE;
+        CreateTextLayoutCache(OUString const&) const override;
 
 private:
     ServerFont&             mrServerFont;
diff --git a/vcl/inc/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx
index 6ab6d6fe3e93..a51ff4acab9b 100644
--- a/vcl/inc/graphite_layout.hxx
+++ b/vcl/inc/graphite_layout.hxx
@@ -108,30 +108,30 @@ public:
         const grutils::GrFeatureParser * features = NULL) throw();
 
     // used by upper layers
-    virtual bool  LayoutText( ImplLayoutArgs& ) SAL_OVERRIDE;    // first step of layout
+    virtual bool  LayoutText( ImplLayoutArgs& ) override;    // first step of layout
     // split into two stages to allow dc to be restored on the segment
 
-    virtual void  AdjustLayout( ImplLayoutArgs& ) SAL_OVERRIDE;  // adjusting positions
+    virtual void  AdjustLayout( ImplLayoutArgs& ) override;  // adjusting positions
 
     // methods using string indexing
-    virtual sal_Int32 GetTextBreak(DeviceCoordinate nMaxWidth, DeviceCoordinate nCharExtra=0, int nFactor=1) const SAL_OVERRIDE;
-    virtual DeviceCoordinate FillDXArray( DeviceCoordinate* pDXArray ) const SAL_OVERRIDE;
+    virtual sal_Int32 GetTextBreak(DeviceCoordinate nMaxWidth, DeviceCoordinate nCharExtra=0, int nFactor=1) const override;
+    virtual DeviceCoordinate FillDXArray( DeviceCoordinate* pDXArray ) const override;
     void  ApplyDXArray(ImplLayoutArgs &rArgs, std::vector<int> & rDeltaWidth);
 
-    virtual void  GetCaretPositions( int nArraySize, long* pCaretXArray ) const SAL_OVERRIDE;
+    virtual void  GetCaretPositions( int nArraySize, long* pCaretXArray ) const override;
 
     // methods using glyph indexing
     virtual int   GetNextGlyphs(int nLen, sal_GlyphId* pGlyphIdxAry, ::Point & rPos, int&,
             long* pGlyphAdvAry = NULL, int* pCharPosAry = NULL,
-            const PhysicalFontFace** pFallbackFonts = NULL ) const SAL_OVERRIDE;
+            const PhysicalFontFace** pFallbackFonts = NULL ) const override;
 
     // used by glyph+font+script fallback
-    virtual void    MoveGlyph( int nStart, long nNewXPos ) SAL_OVERRIDE;
-    virtual void    DropGlyph( int nStart ) SAL_OVERRIDE;
-    virtual void    Simplify( bool bIsBase ) SAL_OVERRIDE;
+    virtual void    MoveGlyph( int nStart, long nNewXPos ) override;
+    virtual void    DropGlyph( int nStart ) override;
+    virtual void    Simplify( bool bIsBase ) override;
 
     // Dummy implementation so layout can be shared between Linux/Windows
-    virtual void    DrawText(SalGraphics&) const SAL_OVERRIDE {};
+    virtual void    DrawText(SalGraphics&) const override {};
 
     virtual ~GraphiteLayout() throw();
     void SetFont(gr_font * pFont) { mpFont = pFont; }
diff --git a/vcl/inc/graphite_serverfont.hxx b/vcl/inc/graphite_serverfont.hxx
index 63dc900d1024..6bf33aea8279 100644
--- a/vcl/inc/graphite_serverfont.hxx
+++ b/vcl/inc/graphite_serverfont.hxx
@@ -39,7 +39,7 @@ public:
                        ServerFont & rServerFont) throw()
     : GraphiteLayout(pFace), mrServerFont(rServerFont) {};
     virtual ~GraphiteLayoutImpl() throw() {};
-    virtual sal_GlyphId getKashidaGlyph(int & width) SAL_OVERRIDE;
+    virtual sal_GlyphId getKashidaGlyph(int & width) override;
 private:
     ServerFont & mrServerFont;
 };
@@ -56,31 +56,31 @@ private:
 public:
         GraphiteServerFontLayout(ServerFont& pServerFont) throw();
 
-        virtual bool  LayoutText( ImplLayoutArgs& rArgs) SAL_OVERRIDE
+        virtual bool  LayoutText( ImplLayoutArgs& rArgs) override
         {
             SalLayout::AdjustLayout(rArgs);
             return maImpl.LayoutText(rArgs);
         };    // first step of layout
-        virtual void  AdjustLayout( ImplLayoutArgs& rArgs) SAL_OVERRIDE
+        virtual void  AdjustLayout( ImplLayoutArgs& rArgs) override
         {
             SalLayout::AdjustLayout(rArgs);
             maImpl.DrawBase() = maDrawBase;
             maImpl.DrawOffset() = maDrawOffset;
             maImpl.AdjustLayout(rArgs);
         };
-        virtual DeviceCoordinate GetTextWidth() const SAL_OVERRIDE
+        virtual DeviceCoordinate GetTextWidth() const override
         {
             return maImpl.GetTextWidth();
         }
-        virtual DeviceCoordinate FillDXArray( DeviceCoordinate* dxa ) const SAL_OVERRIDE
+        virtual DeviceCoordinate FillDXArray( DeviceCoordinate* dxa ) const override
         {
             return maImpl.FillDXArray(dxa);
         }
-        virtual sal_Int32 GetTextBreak(DeviceCoordinate max_width, DeviceCoordinate extra, int factor) const SAL_OVERRIDE
+        virtual sal_Int32 GetTextBreak(DeviceCoordinate max_width, DeviceCoordinate extra, int factor) const override
         {
             return maImpl.GetTextBreak(max_width, extra, factor);
         }
-        virtual void    GetCaretPositions( int as, long* cxa ) const SAL_OVERRIDE
+        virtual void    GetCaretPositions( int as, long* cxa ) const override
         {
             maImpl.GetCaretPositions(as, cxa);
         }
@@ -88,16 +88,16 @@ public:
         // used by display layers
         virtual int     GetNextGlyphs( int l, sal_GlyphId* gia, Point& p, int& s,
                         long* gaa = NULL, int* cpa = NULL,
-                        const PhysicalFontFace** pFallbackFonts = NULL ) const SAL_OVERRIDE
+                        const PhysicalFontFace** pFallbackFonts = NULL ) const override
         {
             maImpl.DrawBase() = maDrawBase;
             maImpl.DrawOffset() = maDrawOffset;
             return maImpl.GetNextGlyphs(l, gia, p, s, gaa, cpa, pFallbackFonts);
         }
 
-        virtual void    MoveGlyph( int nStart, long nNewXPos ) SAL_OVERRIDE { maImpl.MoveGlyph(nStart, nNewXPos); };
-        virtual void    DropGlyph( int nStart ) SAL_OVERRIDE { maImpl.DropGlyph(nStart); };
-        virtual void    Simplify( bool bIsBase ) SAL_OVERRIDE { maImpl.Simplify(bIsBase); };
+        virtual void    MoveGlyph( int nStart, long nNewXPos ) override { maImpl.MoveGlyph(nStart, nNewXPos); };
+        virtual void    DropGlyph( int nStart ) override { maImpl.DropGlyph(nStart); };
+        virtual void    Simplify( bool bIsBase ) override { maImpl.Simplify(bIsBase); };
 
         virtual ~GraphiteServerFontLayout() throw();
 
diff --git a/vcl/inc/headless/svpbmp.hxx b/vcl/inc/headless/svpbmp.hxx
index 9cf373974141..006ef49a2057 100644
--- a/vcl/inc/headless/svpbmp.hxx
+++ b/vcl/inc/headless/svpbmp.hxx
@@ -42,25 +42,25 @@ public:
     // SalBitmap
     virtual bool            Create( const Size& rSize,
                                     sal_uInt16 nBitCount,
-                                    const BitmapPalette& rPal ) SAL_OVERRIDE;
-    virtual bool            Create( const SalBitmap& rSalBmp ) SAL_OVERRIDE;
+                                    const BitmapPalette& rPal ) override;
+    virtual bool            Create( const SalBitmap& rSalBmp ) override;
     virtual bool            Create( const SalBitmap& rSalBmp,
-                                    SalGraphics* pGraphics ) SAL_OVERRIDE;
+                                    SalGraphics* pGraphics ) override;
     virtual bool            Create( const SalBitmap& rSalBmp,
-                                    sal_uInt16 nNewBitCount ) SAL_OVERRIDE;
+                                    sal_uInt16 nNewBitCount ) override;
     virtual bool            Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas >& rBitmapCanvas,
                                     Size& rSize,
-                                    bool bMask = false ) SAL_OVERRIDE;
-    virtual void            Destroy() SAL_OVERRIDE;
-    virtual Size            GetSize() const SAL_OVERRIDE;
-    virtual sal_uInt16      GetBitCount() const SAL_OVERRIDE;
+                                    bool bMask = false ) override;
+    virtual void            Destroy() override;
+    virtual Size            GetSize() const override;
+    virtual sal_uInt16      GetBitCount() const override;
 
-    virtual BitmapBuffer*   AcquireBuffer( BitmapAccessMode nMode ) SAL_OVERRIDE;
-    virtual void            ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode ) SAL_OVERRIDE;
-    virtual bool            GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE;
+    virtual BitmapBuffer*   AcquireBuffer( BitmapAccessMode nMode ) override;
+    virtual void            ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode ) override;
+    virtual bool            GetSystemData( BitmapSystemData& rData ) override;
 
-    virtual bool            Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) SAL_OVERRIDE;
-    virtual bool            Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) SAL_OVERRIDE;
+    virtual bool            Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) override;
+    virtual bool            Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) override;
 
     static sal_uInt32 getBitCountFromScanlineFormat( basebmp::Format nFormat );
 };
diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx
index 7b13fa21760d..f2df54c92555 100644
--- a/vcl/inc/headless/svpdummies.hxx
+++ b/vcl/inc/headless/svpdummies.hxx
@@ -37,16 +37,16 @@ public:
     virtual ~SvpSalObject();
 
     // override all pure virtual methods
-     virtual void                   ResetClipRegion() SAL_OVERRIDE;
-    virtual sal_uInt16              GetClipRegionType() SAL_OVERRIDE;
-    virtual void                    BeginSetClipRegion( sal_uLong nRects ) SAL_OVERRIDE;
-    virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual void                    EndSetClipRegion() SAL_OVERRIDE;
+     virtual void                   ResetClipRegion() override;
+    virtual sal_uInt16              GetClipRegionType() override;
+    virtual void                    BeginSetClipRegion( sal_uLong nRects ) override;
+    virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) override;
+    virtual void                    EndSetClipRegion() override;
 
-    virtual void                    SetPosSize( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual void                    Show( bool bVisible ) SAL_OVERRIDE;
+    virtual void                    SetPosSize( long nX, long nY, long nWidth, long nHeight ) override;
+    virtual void                    Show( bool bVisible ) override;
 
-    virtual const SystemEnvData*    GetSystemData() const SAL_OVERRIDE;
+    virtual const SystemEnvData*    GetSystemData() const override;
 };
 
 class VCL_DLLPUBLIC SvpImeStatus : public SalI18NImeStatus
@@ -55,8 +55,8 @@ class VCL_DLLPUBLIC SvpImeStatus : public SalI18NImeStatus
         SvpImeStatus() {}
         virtual ~SvpImeStatus();
 
-        virtual bool canToggle() SAL_OVERRIDE;
-        virtual void toggle() SAL_OVERRIDE;
+        virtual bool canToggle() override;
+        virtual void toggle() override;
 };
 
 class VCL_DLLPUBLIC SvpSalSystem : public SalGenericSystem
@@ -65,13 +65,13 @@ public:
     SvpSalSystem() {}
     virtual ~SvpSalSystem();
     // get info about the display
-    virtual unsigned int GetDisplayScreenCount() SAL_OVERRIDE;
-    virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ) SAL_OVERRIDE;
+    virtual unsigned int GetDisplayScreenCount() override;
+    virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ) override;
 
     virtual int ShowNativeDialog( const OUString& rTitle,
                                   const OUString& rMessage,
                                   const std::list< OUString >& rButtons,
-                                  int nDefButton ) SAL_OVERRIDE;
+                                  int nDefButton ) override;
 };
 
 #endif // INCLUDED_VCL_INC_HEADLESS_SVPDUMMIES_HXX
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index d7e9b0189156..f64d22f7c303 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -77,53 +77,53 @@ public:
 #endif
 
     // SalFrame
-    virtual SalGraphics*        AcquireGraphics() SAL_OVERRIDE;
-    virtual void                ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE;
-
-    virtual bool                PostEvent(ImplSVEvent* pData) SAL_OVERRIDE;
-
-    virtual void                SetTitle( const OUString& rTitle ) SAL_OVERRIDE;
-    virtual void                SetIcon( sal_uInt16 nIcon ) SAL_OVERRIDE;
-    virtual void                SetMenu( SalMenu* pMenu ) SAL_OVERRIDE;
-    virtual void                DrawMenuBar() SAL_OVERRIDE;
-
-    virtual void                SetExtendedFrameStyle( SalExtStyle nExtStyle ) SAL_OVERRIDE;
-    virtual void                Show( bool bVisible, bool bNoActivate = false ) SAL_OVERRIDE;
-    virtual void                SetMinClientSize( long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual void                SetMaxClientSize( long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) SAL_OVERRIDE;
-    virtual void                GetClientSize( long& rWidth, long& rHeight ) SAL_OVERRIDE;
-    virtual void                GetWorkArea( Rectangle& rRect ) SAL_OVERRIDE;
-    virtual SalFrame*           GetParent() const SAL_OVERRIDE;
-    virtual void                SetWindowState( const SalFrameState* pState ) SAL_OVERRIDE;
-    virtual bool                GetWindowState( SalFrameState* pState ) SAL_OVERRIDE;
-    virtual void                ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) SAL_OVERRIDE;
-    virtual void                StartPresentation( bool bStart ) SAL_OVERRIDE;
-    virtual void                SetAlwaysOnTop( bool bOnTop ) SAL_OVERRIDE;
-    virtual void                ToTop( sal_uInt16 nFlags ) SAL_OVERRIDE;
-    virtual void                SetPointer( PointerStyle ePointerStyle ) SAL_OVERRIDE;
-    virtual void                CaptureMouse( bool bMouse ) SAL_OVERRIDE;
-    virtual void                SetPointerPos( long nX, long nY ) SAL_OVERRIDE;
+    virtual SalGraphics*        AcquireGraphics() override;
+    virtual void                ReleaseGraphics( SalGraphics* pGraphics ) override;
+
+    virtual bool                PostEvent(ImplSVEvent* pData) override;
+
+    virtual void                SetTitle( const OUString& rTitle ) override;
+    virtual void                SetIcon( sal_uInt16 nIcon ) override;
+    virtual void                SetMenu( SalMenu* pMenu ) override;
+    virtual void                DrawMenuBar() override;
+
+    virtual void                SetExtendedFrameStyle( SalExtStyle nExtStyle ) override;
+    virtual void                Show( bool bVisible, bool bNoActivate = false ) override;
+    virtual void                SetMinClientSize( long nWidth, long nHeight ) override;
+    virtual void                SetMaxClientSize( long nWidth, long nHeight ) override;
+    virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) override;
+    virtual void                GetClientSize( long& rWidth, long& rHeight ) override;
+    virtual void                GetWorkArea( Rectangle& rRect ) override;
+    virtual SalFrame*           GetParent() const override;
+    virtual void                SetWindowState( const SalFrameState* pState ) override;
+    virtual bool                GetWindowState( SalFrameState* pState ) override;
+    virtual void                ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) override;
+    virtual void                StartPresentation( bool bStart ) override;
+    virtual void                SetAlwaysOnTop( bool bOnTop ) override;
+    virtual void                ToTop( sal_uInt16 nFlags ) override;
+    virtual void                SetPointer( PointerStyle ePointerStyle ) override;
+    virtual void                CaptureMouse( bool bMouse ) override;
+    virtual void                SetPointerPos( long nX, long nY ) override;
     using SalFrame::Flush;
-    virtual void                Flush() SAL_OVERRIDE;
-    virtual void                Sync() SAL_OVERRIDE;
-    virtual void                SetInputContext( SalInputContext* pContext ) SAL_OVERRIDE;
-    virtual void                EndExtTextInput( EndExtTextInputFlags nFlags ) SAL_OVERRIDE;
-    virtual OUString            GetKeyName( sal_uInt16 nKeyCode ) SAL_OVERRIDE;
-    virtual bool                MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) SAL_OVERRIDE;
-    virtual LanguageType        GetInputLanguage() SAL_OVERRIDE;
-    virtual void                UpdateSettings( AllSettings& rSettings ) SAL_OVERRIDE;
-    virtual void                Beep() SAL_OVERRIDE;
-    virtual const SystemEnvData* GetSystemData() const SAL_OVERRIDE;
-    virtual SalPointerState     GetPointerState() SAL_OVERRIDE;
-    virtual KeyIndicatorState   GetIndicatorState() SAL_OVERRIDE;
-    virtual void                SimulateKeyPress( sal_uInt16 nKeyCode ) SAL_OVERRIDE;
-    virtual void                SetParent( SalFrame* pNewParent ) SAL_OVERRIDE;
-    virtual bool                SetPluginParent( SystemParentData* pNewParent ) SAL_OVERRIDE;
-    virtual void                ResetClipRegion() SAL_OVERRIDE;
-    virtual void                BeginSetClipRegion( sal_uLong nRects ) SAL_OVERRIDE;
-    virtual void                UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual void                EndSetClipRegion() SAL_OVERRIDE;
+    virtual void                Flush() override;
+    virtual void                Sync() override;
+    virtual void                SetInputContext( SalInputContext* pContext ) override;
+    virtual void                EndExtTextInput( EndExtTextInputFlags nFlags ) override;
+    virtual OUString            GetKeyName( sal_uInt16 nKeyCode ) override;
+    virtual bool                MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) override;
+    virtual LanguageType        GetInputLanguage() override;
+    virtual void                UpdateSettings( AllSettings& rSettings ) override;
+    virtual void                Beep() override;
+    virtual const SystemEnvData* GetSystemData() const override;
+    virtual SalPointerState     GetPointerState() override;
+    virtual KeyIndicatorState   GetIndicatorState() override;
+    virtual void                SimulateKeyPress( sal_uInt16 nKeyCode ) override;
+    virtual void                SetParent( SalFrame* pNewParent ) override;
+    virtual bool                SetPluginParent( SystemParentData* pNewParent ) override;
+    virtual void                ResetClipRegion() override;
+    virtual void                BeginSetClipRegion( sal_uLong nRects ) override;
+    virtual void                UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) override;
+    virtual void                EndSetClipRegion() override;
 
 #ifdef ANDROID
     // If enabled we can get damage notifications for regions immediately rendered to ...
@@ -131,8 +131,8 @@ public:
 #endif
 
     /*TODO: functional implementation */
-    virtual void                SetScreenNumber( unsigned int nScreen ) SAL_OVERRIDE { (void)nScreen; }
-    virtual void                SetApplicationID(const OUString &rApplicationID) SAL_OVERRIDE { (void) rApplicationID; }
+    virtual void                SetScreenNumber( unsigned int nScreen ) override { (void)nScreen; }
+    virtual void                SetApplicationID(const OUString &rApplicationID) override { (void) rApplicationID; }
 
     static SvpSalFrame*         GetFocusFrame() { return s_pFocusFrame; }
 
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 5a1f824a6a9c..694b888bfff4 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -74,50 +74,50 @@ protected:
     std::unique_ptr<TextRenderImpl>     m_xTextRenderImpl;
 
 protected:
-    virtual bool blendBitmap( const SalTwoRect&, const SalBitmap& rBitmap ) SAL_OVERRIDE;
+    virtual bool blendBitmap( const SalTwoRect&, const SalBitmap& rBitmap ) override;
     virtual bool blendAlphaBitmap( const SalTwoRect&,
                                    const SalBitmap& rSrcBitmap,
                                    const SalBitmap& rMaskBitmap,
-                                   const SalBitmap& rAlphaBitmap ) SAL_OVERRIDE;
-    virtual bool drawAlphaBitmap( const SalTwoRect&, const SalBitmap& rSourceBitmap, const SalBitmap& rAlphaBitmap ) SAL_OVERRIDE;
+                                   const SalBitmap& rAlphaBitmap ) override;
+    virtual bool drawAlphaBitmap( const SalTwoRect&, const SalBitmap& rSourceBitmap, const SalBitmap& rAlphaBitmap ) override;
     virtual bool drawTransformedBitmap(
         const basegfx::B2DPoint& rNull,
         const basegfx::B2DPoint& rX,
         const basegfx::B2DPoint& rY,
         const SalBitmap& rSourceBitmap,
-        const SalBitmap* pAlphaBitmap) SAL_OVERRIDE;
-    virtual bool drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency ) SAL_OVERRIDE;
+        const SalBitmap* pAlphaBitmap) override;
+    virtual bool drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency ) override;
 
 public:
     SvpSalGraphics();
     virtual ~SvpSalGraphics();
 
-    virtual SalGraphicsImpl* GetImpl() const SAL_OVERRIDE { return NULL; };
-    virtual void            GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) SAL_OVERRIDE;
-    virtual sal_uInt16      GetBitCount() const SAL_OVERRIDE;
-    virtual long            GetGraphicsWidth() const SAL_OVERRIDE;
+    virtual SalGraphicsImpl* GetImpl() const override { return NULL; };
+    virtual void            GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) override;
+    virtual sal_uInt16      GetBitCount() const override;
+    virtual long            GetGraphicsWidth() const override;
 
-    virtual void            ResetClipRegion() SAL_OVERRIDE;
-    virtual bool            setClipRegion( const vcl::Region& ) SAL_OVERRIDE;
+    virtual void            ResetClipRegion() override;
+    virtual bool            setClipRegion( const vcl::Region& ) override;
 
-    virtual void            SetLineColor() SAL_OVERRIDE;
-    virtual void            SetLineColor( SalColor nSalColor ) SAL_OVERRIDE;
-    virtual void            SetFillColor() SAL_OVERRIDE;
-    virtual void            SetFillColor( SalColor nSalColor ) SAL_OVERRIDE;
+    virtual void            SetLineColor() override;
+    virtual void            SetLineColor( SalColor nSalColor ) override;
+    virtual void            SetFillColor() override;
+    virtual void            SetFillColor( SalColor nSalColor ) override;
 
-    virtual void            SetXORMode( bool bSet, bool ) SAL_OVERRIDE;
+    virtual void            SetXORMode( bool bSet, bool ) override;
 
-    virtual void            SetROPLineColor( SalROPColor nROPColor ) SAL_OVERRIDE;
-    virtual void            SetROPFillColor( SalROPColor nROPColor ) SAL_OVERRIDE;
+    virtual void            SetROPLineColor( SalROPColor nROPColor ) override;
+    virtual void            SetROPFillColor( SalROPColor nROPColor ) override;
 
-    virtual void            SetTextColor( SalColor nSalColor ) SAL_OVERRIDE;
-    virtual sal_uInt16      SetFont( FontSelectPattern*, int nFallbackLevel ) SAL_OVERRIDE;
-    virtual void            GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) SAL_OVERRIDE;
-    virtual const FontCharMapPtr GetFontCharMap() const SAL_OVERRIDE;
-    virtual bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const SAL_OVERRIDE;
-    virtual void            GetDevFontList( PhysicalFontCollection* ) SAL_OVERRIDE;
-    virtual void ClearDevFontCache() SAL_OVERRIDE;
-    virtual bool            AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ) SAL_OVERRIDE;
+    virtual void            SetTextColor( SalColor nSalColor ) override;
+    virtual sal_uInt16      SetFont( FontSelectPattern*, int nFallbackLevel ) override;
+    virtual void            GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) override;
+    virtual const FontCharMapPtr GetFontCharMap() const override;
+    virtual bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const override;
+    virtual void            GetDevFontList( PhysicalFontCollection* ) override;
+    virtual void ClearDevFontCache() override;
+    virtual bool            AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ) override;
     virtual bool        CreateFontSubset( const OUString& rToFile,
                                               const PhysicalFontFace*,
                                               const sal_GlyphId* pGlyphIds,
@@ -125,50 +125,50 @@ public:
                                               sal_Int32* pWidths,
                                               int nGlyphs,
                                               FontSubsetInfo& rInfo
-                                              ) SAL_OVERRIDE;
-    virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded, std::set<sal_Unicode> const** ) SAL_OVERRIDE;
+                                              ) override;
+    virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded, std::set<sal_Unicode> const** ) override;
     virtual const void*     GetEmbedFontData( const PhysicalFontFace*,
                                               const sal_Ucs* pUnicodes,
                                               sal_Int32* pWidths,
                                               size_t nLen,
                                               FontSubsetInfo& rInfo,
-                                              long* pDataLen ) SAL_OVERRIDE;
-    virtual void            FreeEmbedFontData( const void* pData, long nDataLen ) SAL_OVERRIDE;
+                                              long* pDataLen ) override;
+    virtual void            FreeEmbedFontData( const void* pData, long nDataLen ) override;
     virtual void            GetGlyphWidths( const PhysicalFontFace*,
                                             bool bVertical,
                                             Int32Vector& rWidths,
-                                            Ucs2UIntMap& rUnicodeEnc ) SAL_OVERRIDE;
-    virtual bool            GetGlyphBoundRect( sal_GlyphId nIndex, Rectangle& ) SAL_OVERRIDE;
-    virtual bool            GetGlyphOutline( sal_GlyphId nIndex, ::basegfx::B2DPolyPolygon& ) SAL_OVERRIDE;
-    virtual SalLayout*      GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) SAL_OVERRIDE;
-    virtual void            DrawServerFontLayout( const ServerFontLayout& ) SAL_OVERRIDE;
-    virtual bool            supportsOperation( OutDevSupportType ) const SAL_OVERRIDE;
-    virtual void            drawPixel( long nX, long nY ) SAL_OVERRIDE;
-    virtual void            drawPixel( long nX, long nY, SalColor nSalColor ) SAL_OVERRIDE;
-    virtual void            drawLine( long nX1, long nY1, long nX2, long nY2 ) SAL_OVERRIDE;
-    virtual void            drawRect( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual bool            drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ) SAL_OVERRIDE;
+                                            Ucs2UIntMap& rUnicodeEnc ) override;
+    virtual bool            GetGlyphBoundRect( sal_GlyphId nIndex, Rectangle& ) override;
+    virtual bool            GetGlyphOutline( sal_GlyphId nIndex, ::basegfx::B2DPolyPolygon& ) override;
+    virtual SalLayout*      GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) override;
+    virtual void            DrawServerFontLayout( const ServerFontLayout& ) override;
+    virtual bool            supportsOperation( OutDevSupportType ) const override;
+    virtual void            drawPixel( long nX, long nY ) override;
+    virtual void            drawPixel( long nX, long nY, SalColor nSalColor ) override;
+    virtual void            drawLine( long nX1, long nY1, long nX2, long nY2 ) override;
+    virtual void            drawRect( long nX, long nY, long nWidth, long nHeight ) override;
+    virtual bool            drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ) override;
     virtual bool            drawPolyLine( const ::basegfx::B2DPolygon&,
                                           double fTransparency,
                                           const ::basegfx::B2DVector& rLineWidths,
                                           basegfx::B2DLineJoin,
-                                          com::sun::star::drawing::LineCap) SAL_OVERRIDE;
-    virtual void            drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) SAL_OVERRIDE;
-    virtual void            drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) SAL_OVERRIDE;
+                                          com::sun::star::drawing::LineCap) override;
+    virtual void            drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) override;
+    virtual void            drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) override;
     virtual void            drawPolyPolygon( sal_uInt32 nPoly,
                                              const sal_uInt32* pPoints,
-                                             PCONSTSALPOINT* pPtAry ) SAL_OVERRIDE;
+                                             PCONSTSALPOINT* pPtAry ) override;
     virtual bool        drawPolyLineBezier( sal_uInt32 nPoints,
                                                 const SalPoint* pPtAry,
-                                                const sal_uInt8* pFlgAry ) SAL_OVERRIDE;
+                                                const sal_uInt8* pFlgAry ) override;
     virtual bool        drawPolygonBezier( sal_uInt32 nPoints,
                                                const SalPoint* pPtAry,
-                                               const sal_uInt8* pFlgAry ) SAL_OVERRIDE;
+                                               const sal_uInt8* pFlgAry ) override;
     virtual bool        drawPolyPolygonBezier( sal_uInt32 nPoly,
                                                    const sal_uInt32* pPoints,
                                                    const SalPoint* const* pPtAry,
-                                                   const sal_uInt8* const* pFlgAry ) SAL_OVERRIDE;
-    virtual bool            drawGradient( const tools::PolyPolygon&, const Gradient& ) SAL_OVERRIDE { return false; };
+                                                   const sal_uInt8* const* pFlgAry ) override;
+    virtual bool            drawGradient( const tools::PolyPolygon&, const Gradient& ) override { return false; };
 
     virtual void            copyArea( long nDestX,
                                       long nDestY,
@@ -176,34 +176,34 @@ public:
                                       long nSrcY,
                                       long nSrcWidth,
                                       long nSrcHeight,
-                                      sal_uInt16 nFlags ) SAL_OVERRIDE;
+                                      sal_uInt16 nFlags ) override;
     virtual void            copyBits( const SalTwoRect& rPosAry,
-                                      SalGraphics* pSrcGraphics ) SAL_OVERRIDE;
+                                      SalGraphics* pSrcGraphics ) override;
     virtual void            drawBitmap( const SalTwoRect& rPosAry,
-                                        const SalBitmap& rSalBitmap ) SAL_OVERRIDE;
+                                        const SalBitmap& rSalBitmap ) override;
     virtual void            drawBitmap( const SalTwoRect& rPosAry,
                                         const SalBitmap& rSalBitmap,
-                                        const SalBitmap& rTransparentBitmap ) SAL_OVERRIDE;
+                                        const SalBitmap& rTransparentBitmap ) override;
     virtual void            drawMask( const SalTwoRect& rPosAry,
                                       const SalBitmap& rSalBitmap,
-                                      SalColor nMaskColor ) SAL_OVERRIDE;
-    virtual SalBitmap*      getBitmap( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual SalColor        getPixel( long nX, long nY ) SAL_OVERRIDE;
-    virtual void            invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags ) SAL_OVERRIDE;
-    virtual void            invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) SAL_OVERRIDE;
+                                      SalColor nMaskColor ) override;
+    virtual SalBitmap*      getBitmap( long nX, long nY, long nWidth, long nHeight ) override;
+    virtual SalColor        getPixel( long nX, long nY ) override;
+    virtual void            invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags ) override;
+    virtual void            invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) override;
 
-    virtual bool        drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ) SAL_OVERRIDE;
+    virtual bool        drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ) override;
 
-    virtual SystemGraphicsData GetGraphicsData() const SAL_OVERRIDE;
+    virtual SystemGraphicsData GetGraphicsData() const override;
 
 #if ENABLE_CAIRO_CANVAS
-    virtual bool            SupportsCairo() const SAL_OVERRIDE;
-    virtual cairo::SurfaceSharedPtr CreateSurface(const cairo::CairoSurfaceSharedPtr& rSurface) const SAL_OVERRIDE;
-    virtual cairo::SurfaceSharedPtr CreateSurface(const OutputDevice& rRefDevice, int x, int y, int width, int height) const SAL_OVERRIDE;
-    virtual cairo::SurfaceSharedPtr CreateBitmapSurface(const OutputDevice& rRefDevice, const BitmapSystemData& rData, const Size& rSize) const SAL_OVERRIDE;
-    virtual css::uno::Any   GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& rSurface, const basegfx::B2ISize& rSize) const SAL_OVERRIDE;
+    virtual bool            SupportsCairo() const override;
+    virtual cairo::SurfaceSharedPtr CreateSurface(const cairo::CairoSurfaceSharedPtr& rSurface) const override;
+    virtual cairo::SurfaceSharedPtr CreateSurface(const OutputDevice& rRefDevice, int x, int y, int width, int height) const override;
+    virtual cairo::SurfaceSharedPtr CreateBitmapSurface(const OutputDevice& rRefDevice, const BitmapSystemData& rData, const Size& rSize) const override;
+    virtual css::uno::Any   GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& rSurface, const basegfx::B2ISize& rSize) const override;
 
-    virtual SystemFontData  GetSysFontData( int nFallbacklevel ) const SAL_OVERRIDE;
+    virtual SystemFontData  GetSysFontData( int nFallbacklevel ) const override;
 
     static cairo_t*         createCairoContext(const basebmp::BitmapDeviceSharedPtr& rBuffer);
     void                    clipRegion(cairo_t* cr);
diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index e1bf136452c3..e113304df898 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -50,8 +50,8 @@ public:
     virtual ~SvpSalTimer();
 
     // override all pure virtual methods
-    virtual void Start( sal_uLong nMS ) SAL_OVERRIDE;
-    virtual void Stop() SAL_OVERRIDE;
+    virtual void Start( sal_uLong nMS ) override;
+    virtual void Stop() override;
 };
 
 class SvpSalFrame;
@@ -115,13 +115,13 @@ public:
     bool                    CheckTimeout( bool bExecuteTimers = true );
 
     // Frame
-    virtual SalFrame*       CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) SAL_OVERRIDE;
-    virtual SalFrame*       CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) SAL_OVERRIDE;
-    virtual void            DestroyFrame( SalFrame* pFrame ) SAL_OVERRIDE;
+    virtual SalFrame*       CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) override;
+    virtual SalFrame*       CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) override;
+    virtual void            DestroyFrame( SalFrame* pFrame ) override;
 
     // Object (System Child Window)
-    virtual SalObject*      CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow = true ) SAL_OVERRIDE;
-    virtual void            DestroyObject( SalObject* pObject ) SAL_OVERRIDE;
+    virtual SalObject*      CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow = true ) override;
+    virtual void            DestroyObject( SalObject* pObject ) override;
 
     // VirtualDevice
     // nDX and nDY in Pixel
@@ -129,47 +129,47 @@ public:
     // pData allows for using a system dependent graphics or device context
     virtual SalVirtualDevice*   CreateVirtualDevice( SalGraphics* pGraphics,
                                                      long &nDX, long &nDY,
-                                                     sal_uInt16 nBitCount, const SystemGraphicsData *pData = NULL ) SAL_OVERRIDE;
+                                                     sal_uInt16 nBitCount, const SystemGraphicsData *pData = NULL ) override;
 
     // Printer
     // pSetupData->mpDriverData can be 0
     // pSetupData must be updatet with the current
     // JobSetup
     virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
-                                               ImplJobSetup* pSetupData ) SAL_OVERRIDE;
-    virtual void            DestroyInfoPrinter( SalInfoPrinter* pPrinter ) SAL_OVERRIDE;
-    virtual SalPrinter*     CreatePrinter( SalInfoPrinter* pInfoPrinter ) SAL_OVERRIDE;
-    virtual void            DestroyPrinter( SalPrinter* pPrinter ) SAL_OVERRIDE;
+                                               ImplJobSetup* pSetupData ) override;
+    virtual void            DestroyInfoPrinter( SalInfoPrinter* pPrinter ) override;
+    virtual SalPrinter*     CreatePrinter( SalInfoPrinter* pInfoPrinter ) override;
+    virtual void            DestroyPrinter( SalPrinter* pPrinter ) override;
 
-    virtual void            GetPrinterQueueInfo( ImplPrnQueueList* pList ) SAL_OVERRIDE;
-    virtual void            GetPrinterQueueState( SalPrinterQueueInfo* pInfo ) SAL_OVERRIDE;
-    virtual void            DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) SAL_OVERRIDE;
-    virtual OUString        GetDefaultPrinter() SAL_OVERRIDE;
-    virtual void            PostPrintersChanged() SAL_OVERRIDE;
+    virtual void            GetPrinterQueueInfo( ImplPrnQueueList* pList ) override;
+    virtual void            GetPrinterQueueState( SalPrinterQueueInfo* pInfo ) override;
+    virtual void            DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) override;
+    virtual OUString        GetDefaultPrinter() override;
+    virtual void            PostPrintersChanged() override;
 
     // SalTimer
-    virtual SalTimer*       CreateSalTimer() SAL_OVERRIDE;
+    virtual SalTimer*       CreateSalTimer() override;
     // SalI18NImeStatus
-    virtual SalI18NImeStatus*   CreateI18NImeStatus() SAL_OVERRIDE;
+    virtual SalI18NImeStatus*   CreateI18NImeStatus() override;
     // SalSystem
-    virtual SalSystem*      CreateSalSystem() SAL_OVERRIDE;
+    virtual SalSystem*      CreateSalSystem() override;
     // SalBitmap
-    virtual SalBitmap*      CreateSalBitmap() SAL_OVERRIDE;
+    virtual SalBitmap*      CreateSalBitmap() override;
 
     // wait next event and dispatch
     // must returned by UserEvent (SalFrame::PostEvent)
     // and timer
-    virtual void            DoYield(bool bWait, bool bHandleAllCurrentEvents, sal_uLong nReleased) SAL_OVERRIDE;
-    virtual bool            AnyInput( VclInputFlags nType ) SAL_OVERRIDE;
+    virtual void            DoYield(bool bWait, bool bHandleAllCurrentEvents, sal_uLong nReleased) override;
+    virtual bool            AnyInput( VclInputFlags nType ) override;
 
     // may return NULL to disable session management
-    virtual SalSession*     CreateSalSession() SAL_OVERRIDE;
+    virtual SalSession*     CreateSalSession() override;
 
-    virtual void*           GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ) SAL_OVERRIDE;
+    virtual void*           GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ) override;
 
-    virtual void            AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService) SAL_OVERRIDE;
+    virtual void            AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService) override;
 
-    virtual GenPspGraphics *CreatePrintGraphics() SAL_OVERRIDE;
+    virtual GenPspGraphics *CreatePrintGraphics() override;
 
     // We want to be able to select colourspace, i.e. ARGB vs RGBA vs BGRA etc.
     // -- as the rest of vcl always uses bit depths, it is perhaps simplest
diff --git a/vcl/inc/headless/svpprn.hxx b/vcl/inc/headless/svpprn.hxx
index b8a3b3fa52c4..54280f60c931 100644
--- a/vcl/inc/headless/svpprn.hxx
+++ b/vcl/inc/headless/svpprn.hxx
@@ -30,7 +30,7 @@
 class SvpSalInfoPrinter : public PspSalInfoPrinter
 {
 public:
-    virtual bool Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ) SAL_OVERRIDE;
+    virtual bool Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ) override;
 };
 
 class SvpSalPrinter : public PspSalPrinter
diff --git a/vcl/inc/headless/svptextrender.hxx b/vcl/inc/headless/svptextrender.hxx
index 7c2ca03bb7b7..43fd78d2f758 100644
--- a/vcl/inc/headless/svptextrender.hxx
+++ b/vcl/inc/headless/svptextrender.hxx
@@ -36,16 +36,16 @@ private:
     ServerFont*                 m_pServerFont[ MAX_FALLBACK ];
 public:
     SvpTextRender(SvpSalGraphics& rParent);
-    virtual void setDevice(basebmp::BitmapDeviceSharedPtr& rDevice) SAL_OVERRIDE;
+    virtual void setDevice(basebmp::BitmapDeviceSharedPtr& rDevice) override;
 
-    virtual void                SetTextColor( SalColor nSalColor ) SAL_OVERRIDE;
-    virtual sal_uInt16          SetFont( FontSelectPattern*, int nFallbackLevel ) SAL_OVERRIDE;
-    virtual void                GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) SAL_OVERRIDE;
-    virtual const FontCharMapPtr GetFontCharMap() const SAL_OVERRIDE;
-    virtual bool                GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const SAL_OVERRIDE;
-    virtual void                GetDevFontList( PhysicalFontCollection* ) SAL_OVERRIDE;
-    virtual void                ClearDevFontCache() SAL_OVERRIDE;
-    virtual bool                AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ) SAL_OVERRIDE;
+    virtual void                SetTextColor( SalColor nSalColor ) override;
+    virtual sal_uInt16          SetFont( FontSelectPattern*, int nFallbackLevel ) override;
+    virtual void                GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) override;
+    virtual const FontCharMapPtr GetFontCharMap() const override;
+    virtual bool                GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const override;
+    virtual void                GetDevFontList( PhysicalFontCollection* ) override;
+    virtual void                ClearDevFontCache() override;
+    virtual bool                AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ) override;
     virtual bool                CreateFontSubset(
                                     const OUString& rToFile,
                                     const PhysicalFontFace*,
@@ -53,30 +53,30 @@ public:
                                     const sal_uInt8* pEncoding,
                                     sal_Int32* pWidths,
                                     int nGlyphs,
-                                    FontSubsetInfo& rInfo) SAL_OVERRIDE;
+                                    FontSubsetInfo& rInfo) override;
 
-    virtual const Ucs2SIntMap*  GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded, std::set<sal_Unicode> const**) SAL_OVERRIDE;
+    virtual const Ucs2SIntMap*  GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded, std::set<sal_Unicode> const**) override;
     virtual const void*         GetEmbedFontData(
                                     const PhysicalFontFace*,
                                     const sal_Ucs* pUnicodes,
                                     sal_Int32* pWidths,
                                     size_t nLen,
                                     FontSubsetInfo& rInfo,
-                                    long* pDataLen ) SAL_OVERRIDE;
+                                    long* pDataLen ) override;
 
-    virtual void                FreeEmbedFontData( const void* pData, long nDataLen ) SAL_OVERRIDE;
+    virtual void                FreeEmbedFontData( const void* pData, long nDataLen ) override;
     virtual void                GetGlyphWidths(
                                     const PhysicalFontFace*,
                                     bool bVertical,
                                     Int32Vector& rWidths,
-                                    Ucs2UIntMap& rUnicodeEnc ) SAL_OVERRIDE;
+                                    Ucs2UIntMap& rUnicodeEnc ) override;
 
-    virtual bool                GetGlyphBoundRect( sal_GlyphId nIndex, Rectangle& ) SAL_OVERRIDE;
-    virtual bool                GetGlyphOutline( sal_GlyphId nIndex, ::basegfx::B2DPolyPolygon& ) SAL_OVERRIDE;
-    virtual SalLayout*          GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) SAL_OVERRIDE;
-    virtual void                DrawServerFontLayout( const ServerFontLayout& ) SAL_OVERRIDE;
+    virtual bool                GetGlyphBoundRect( sal_GlyphId nIndex, Rectangle& ) override;
+    virtual bool                GetGlyphOutline( sal_GlyphId nIndex, ::basegfx::B2DPolyPolygon& ) override;
+    virtual SalLayout*          GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) override;
+    virtual void                DrawServerFontLayout( const ServerFontLayout& ) override;
 #if ENABLE_CAIRO_CANVAS
-    virtual SystemFontData      GetSysFontData( int nFallbackLevel ) const SAL_OVERRIDE;
+    virtual SystemFontData      GetSysFontData( int nFallbackLevel ) const override;
 #endif // ENABLE_CAIRO_CANVAS
 };
 
diff --git a/vcl/inc/headless/svpvd.hxx b/vcl/inc/headless/svpvd.hxx
index 9b73ae54604d..1dd39f8c2b29 100644
--- a/vcl/inc/headless/svpvd.hxx
+++ b/vcl/inc/headless/svpvd.hxx
@@ -37,18 +37,18 @@ public:
     virtual ~SvpSalVirtualDevice();
 
     // SalVirtualDevice
-    virtual SalGraphics*    AcquireGraphics() SAL_OVERRIDE;
-    virtual void            ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE;
+    virtual SalGraphics*    AcquireGraphics() override;
+    virtual void            ReleaseGraphics( SalGraphics* pGraphics ) override;
 
-    virtual bool        SetSize( long nNewDX, long nNewDY ) SAL_OVERRIDE;
+    virtual bool        SetSize( long nNewDX, long nNewDY ) override;
     virtual bool        SetSizeUsingBuffer( long nNewDX, long nNewDY,
                                             const basebmp::RawMemorySharedArray &pBuffer,
                                             const bool bTopDown
-                                          ) SAL_OVERRIDE;
+                                          ) override;
 
     // SalGeometryProvider
-    virtual long GetWidth() const SAL_OVERRIDE { return m_aDevice.get() ? m_aDevice->getSize().getX() : 0; }
-    virtual long GetHeight() const SAL_OVERRIDE { return m_aDevice.get() ? m_aDevice->getSize().getY() : 0; }
+    virtual long GetWidth() const override { return m_aDevice.get() ? m_aDevice->getSize().getX() : 0; }
+    virtual long GetHeight() const override { return m_aDevice.get() ? m_aDevice->getSize().getY() : 0; }
 };
 
 #endif // INCLUDED_VCL_INC_HEADLESS_SVPVD_HXX
diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx
index a04eb71ab949..aa6c216e2de7 100644
--- a/vcl/inc/helpwin.hxx
+++ b/vcl/inc/helpwin.hxx
@@ -46,14 +46,14 @@ private:
 private:
     DECL_LINK_TYPED( TimerHdl, Timer*, void );
 
-    virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE;
-    virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE;
-    virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE;
+    virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override;
+    virtual void RequestHelp( const HelpEvent& rHEvt ) override;
+    virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
 
-    virtual OUString GetText() const SAL_OVERRIDE;
+    virtual OUString GetText() const override;
     void ImplShow();
 
-    virtual void        dispose() SAL_OVERRIDE;
+    virtual void        dispose() override;
 public:
                         HelpTextWindow( vcl::Window* pParent, const OUString& rText, sal_uInt16 nHelpWinStyle, QuickHelpFlags nStyle );
     virtual             ~HelpTextWindow();
diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx
index b89ebe99221c..12d45703df06 100644
--- a/vcl/inc/ilstbox.hxx
+++ b/vcl/inc/ilstbox.hxx
@@ -240,14 +240,14 @@ private:
     vcl::QuickSelectionEngine maQuickSelectionEngine;
 
 protected:
-    virtual void    KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
-    virtual void    MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
-    virtual void    MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
-    virtual void    Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE;
-    virtual void    Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE;
-    virtual void    Resize() SAL_OVERRIDE;
-    virtual void    GetFocus() SAL_OVERRIDE;
-    virtual void    LoseFocus() SAL_OVERRIDE;
+    virtual void    KeyInput( const KeyEvent& rKEvt ) override;
+    virtual void    MouseButtonDown( const MouseEvent& rMEvt ) override;
+    virtual void    MouseMove( const MouseEvent& rMEvt ) override;
+    virtual void    Tracking( const TrackingEvent& rTEvt ) override;
+    virtual void    Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override;
+    virtual void    Resize() override;
+    virtual void    GetFocus() override;
+    virtual void    LoseFocus() override;
 
     bool            SelectEntries( sal_Int32  nSelect, LB_EVENT_TYPE eLET, bool bShift = false, bool bCtrl = false, bool bSelectPosChange = false );
     void            ImplPaint(vcl::RenderContext& rRenderContext, sal_Int32 nPos, bool bErase = false, bool bLayout = false);
@@ -259,15 +259,15 @@ protected:
     void            ImplShowFocusRect();
     void            ImplHideFocusRect();
 
-    virtual void    StateChanged( StateChangedType nType ) SAL_OVERRIDE;
-    virtual void    DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
+    virtual void    StateChanged( StateChangedType nType ) override;
+    virtual void    DataChanged( const DataChangedEvent& rDCEvt ) override;
 
 public:
-    virtual void  FillLayoutData() const SAL_OVERRIDE;
+    virtual void  FillLayoutData() const override;
 
                     ImplListBoxWindow( vcl::Window* pParent, WinBits nWinStyle );
     virtual         ~ImplListBoxWindow();
-    virtual void    dispose() SAL_OVERRIDE;
+    virtual void    dispose() override;
 
     ImplEntryList*  GetEntryList() const { return mpEntryList; }
 
@@ -359,13 +359,13 @@ public:
     void EnableQuickSelection( const bool& b );
 
     using Control::ImplInitSettings;
-    virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE;
+    virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
 
 protected:
     // ISearchableStringList
-    virtual vcl::StringEntryIdentifier    CurrentEntry( OUString& _out_entryText ) const SAL_OVERRIDE;
-    virtual vcl::StringEntryIdentifier    NextEntry( vcl::StringEntryIdentifier _currentEntry, OUString& _out_entryText ) const SAL_OVERRIDE;
-    virtual void                            SelectEntry( vcl::StringEntryIdentifier _entry ) SAL_OVERRIDE;
+    virtual vcl::StringEntryIdentifier    CurrentEntry( OUString& _out_entryText ) const override;
+    virtual vcl::StringEntryIdentifier    NextEntry( vcl::StringEntryIdentifier _currentEntry, OUString& _out_entryText ) const override;
+    virtual void                            SelectEntry( vcl::StringEntryIdentifier _entry ) override;
 };
 
 class ImplListBox : public Control
@@ -386,11 +386,11 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxDNDListenerContainer;
 
 protected:
-    virtual void        GetFocus() SAL_OVERRIDE;
-    virtual void        StateChanged( StateChangedType nType ) SAL_OVERRIDE;
-    virtual void        DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
+    virtual void        GetFocus() override;
+    virtual void        StateChanged( StateChangedType nType ) override;
+    virtual void        DataChanged( const DataChangedEvent& rDCEvt ) override;
 
-    virtual bool        Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
+    virtual bool        Notify( NotifyEvent& rNEvt ) override;
 
     void                ImplResizeControls();
     void                ImplCheckScrollBars();
@@ -403,14 +403,14 @@ protected:
 public:
                     ImplListBox( vcl::Window* pParent, WinBits nWinStyle );
                     virtual ~ImplListBox();
-    virtual void    dispose() SAL_OVERRIDE;
+    virtual void    dispose() override;
 
     const ImplEntryList*    GetEntryList() const            { return maLBWindow->GetEntryList(); }
     ImplListBoxWindow*      GetMainWindow()                 { return maLBWindow.get(); }
 
-    virtual void    Resize() SAL_OVERRIDE;
-    virtual const Wallpaper& GetDisplayBackground() const SAL_OVERRIDE;
-    virtual vcl::Window*     GetPreferredKeyInputWindow() SAL_OVERRIDE;
+    virtual void    Resize() override;
+    virtual const Wallpaper& GetDisplayBackground() const override;
+    virtual vcl::Window*     GetPreferredKeyInputWindow() override;
 
     sal_Int32       InsertEntry( sal_Int32  nPos, const OUString& rStr );
     sal_Int32       InsertEntry( sal_Int32  nPos, const OUString& rStr, const Image& rImage );
@@ -497,12 +497,12 @@ private:
     bool            mbAutoWidth;
 
 protected:
-    virtual bool    PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
+    virtual bool    PreNotify( NotifyEvent& rNEvt ) override;
 
 public:
                     ImplListBoxFloatingWindow( vcl::Window* pParent );
     virtual         ~ImplListBoxFloatingWindow();
-    virtual void    dispose() SAL_OVERRIDE;
+    virtual void    dispose() override;
     void            SetImplListBox( ImplListBox* pLB )  { mpImplLB = pLB; }
 
     void            SetPrefSize( const Size& rSz )      { maPrefSz = rSz; }
@@ -514,8 +514,8 @@ public:
     void            StartFloat( bool bStartTracking );
 
     virtual void    setPosSizePixel( long nX, long nY,
-                                     long nWidth, long nHeight, PosSizeFlags nFlags = PosSizeFlags::All ) SAL_OVERRIDE;
-    void            SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) SAL_OVERRIDE
+                                     long nWidth, long nHeight, PosSizeFlags nFlags = PosSizeFlags::All ) override;
+    void            SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) override
                         { FloatingWindow::SetPosSizePixel( rNewPos, rNewSize ); }
 
     void            SetDropDownLineCount( sal_uInt16 n ) { mnDDLineCount = n; }
@@ -523,7 +523,7 @@ public:
 
     sal_Int32       GetPopupModeStartSaveSelection() const { return mnPopupModeStartSaveSelection; }
 
-    virtual void    Resize() SAL_OVERRIDE;
+    virtual void    Resize() override;
 };
 
 class ImplWin : public Control
@@ -544,17 +544,17 @@ private:
 
     void ImplDraw(vcl::RenderContext& rRenderContext, bool bLayout = false);
 protected:
-    virtual void  FillLayoutData() const SAL_OVERRIDE;
+    virtual void  FillLayoutData() const override;
 
 public:
                     ImplWin( vcl::Window* pParent, WinBits nWinStyle = 0 );
 
-    virtual void    MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
-    virtual void    Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE;
-    virtual void    Resize() SAL_OVERRIDE;
-    virtual void    GetFocus() SAL_OVERRIDE;
-    virtual void    LoseFocus() SAL_OVERRIDE;
-    virtual bool    PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
+    virtual void    MouseButtonDown( const MouseEvent& rMEvt ) override;
+    virtual void    Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override;
+    virtual void    Resize() override;
+    virtual void    GetFocus() override;
+    virtual void    LoseFocus() override;
+    virtual bool    PreNotify( NotifyEvent& rNEvt ) override;
 
     sal_Int32       GetItemPos() const { return mnItemPos; }
     void            SetItemPos( sal_Int32  n ) { mnItemPos = n; }
@@ -579,10 +579,10 @@ public:
     bool GetEdgeBlending() const { return mbEdgeBlending; }
     void SetEdgeBlending(bool bNew) { mbEdgeBlending = bNew; }
 
-    virtual void    ShowFocus(const Rectangle& rRect) SAL_OVERRIDE;
+    virtual void    ShowFocus(const Rectangle& rRect) override;
 
     using Control::ImplInitSettings;
-    virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE;
+    virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
 
 };
 
@@ -594,7 +594,7 @@ private:
 public:
                     ImplBtn( vcl::Window* pParent, WinBits nWinStyle = 0 );
 
-    virtual void    MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+    virtual void    MouseButtonDown( const MouseEvent& rMEvt ) override;
     void    MBDown();
 
     boost::signals2::signal< void ( ImplBtn* ) > buttonDownSignal;
diff --git a/vcl/inc/ios/iosinst.hxx b/vcl/inc/ios/iosinst.hxx
index fb987c18dc4f..0ad543c71ac2 100644
--- a/vcl/inc/ios/iosinst.hxx
+++ b/vcl/inc/ios/iosinst.hxx
@@ -37,11 +37,11 @@ public:
     virtual ~IosSalInstance();
     static IosSalInstance *getInstance();
 
-    virtual SalSystem* CreateSalSystem() SAL_OVERRIDE;
+    virtual SalSystem* CreateSalSystem() override;
 
     void GetWorkArea( Rectangle& rRect );
-    SalFrame* CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) SAL_OVERRIDE;
-    SalFrame* CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) SAL_OVERRIDE;
+    SalFrame* CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) override;
+    SalFrame* CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) override;
 };
 
 #endif // INCLUDED_VCL_INC_IOS_IOSINST_HXX
diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx
index 592c84800cee..7172ca627b73 100644
--- a/vcl/inc/opengl/salbmp.hxx
+++ b/vcl/inc/opengl/salbmp.hxx
@@ -53,7 +53,7 @@ private:
     std::deque< OpenGLSalBitmapOp* >    maPendingOps;
 
     void makeCurrent();
-    virtual void updateChecksum() const SAL_OVERRIDE;
+    virtual void updateChecksum() const override;
 
     bool calcChecksumGL(OpenGLTexture& rInputTexture, ChecksumType& rChecksum) const;
 
@@ -64,26 +64,26 @@ public:
 public:
 
     // SalBitmap methods
-    bool            Create( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal ) SAL_OVERRIDE;
-    bool            Create( const SalBitmap& rSalBmp ) SAL_OVERRIDE;
-    bool            Create( const SalBitmap& rSalBmp, SalGraphics* pGraphics ) SAL_OVERRIDE;
-    bool            Create( const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount ) SAL_OVERRIDE;
+    bool            Create( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal ) override;
+    bool            Create( const SalBitmap& rSalBmp ) override;
+    bool            Create( const SalBitmap& rSalBmp, SalGraphics* pGraphics ) override;
+    bool            Create( const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount ) override;
     virtual bool    Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas >& rBitmapCanvas,
                             Size& rSize,
-                            bool bMask = false ) SAL_OVERRIDE;
+                            bool bMask = false ) override;
 
-    void            Destroy() SAL_OVERRIDE;
+    void            Destroy() override;
 
-    Size            GetSize() const SAL_OVERRIDE;
-    sal_uInt16      GetBitCount() const SAL_OVERRIDE;
+    Size            GetSize() const override;
+    sal_uInt16      GetBitCount() const override;
 
-    BitmapBuffer   *AcquireBuffer( BitmapAccessMode nMode ) SAL_OVERRIDE;
-    void            ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode ) SAL_OVERRIDE;
+    BitmapBuffer   *AcquireBuffer( BitmapAccessMode nMode ) override;
+    void            ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode ) override;
 
-    bool            GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE;
+    bool            GetSystemData( BitmapSystemData& rData ) override;
 
-    bool            Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) SAL_OVERRIDE;
-    bool            Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) SAL_OVERRIDE;
+    bool            Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) override;
+    bool            Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) override;
 
 public:
 
diff --git a/vcl/inc/opengl/watchdog.hxx b/vcl/inc/opengl/watchdog.hxx
index b88c46831c36..0213efb7d668 100644
--- a/vcl/inc/opengl/watchdog.hxx
+++ b/vcl/inc/opengl/watchdog.hxx
@@ -18,7 +18,7 @@
 class OpenGLWatchdogThread : private salhelper::Thread
 {
     OpenGLWatchdogThread();
-    virtual void execute() SAL_OVERRIDE;
+    virtual void execute() override;
 public:
     using salhelper::Thread::acquire;
     using salhelper::Thread::release;
diff --git a/vcl/inc/opengl/win/gdiimpl.hxx b/vcl/inc/opengl/win/gdiimpl.hxx
index 9e8c26a44f50..ecefede6e7ea 100644
--- a/vcl/inc/opengl/win/gdiimpl.hxx
+++ b/vcl/inc/opengl/win/gdiimpl.hxx
@@ -30,14 +30,14 @@ public:
                              SalGeometryProvider *mpProvider);
 
 protected:
-    virtual rtl::Reference<OpenGLContext> CreateWinContext() SAL_OVERRIDE;
-    virtual bool UseContext( const rtl::Reference<OpenGLContext> &pContext ) SAL_OVERRIDE;
+    virtual rtl::Reference<OpenGLContext> CreateWinContext() override;
+    virtual bool UseContext( const rtl::Reference<OpenGLContext> &pContext ) override;
 
     bool RenderTextureCombo(TextureCombo& rCombo, int nX, int nY);
 
 public:
-    virtual void Init() SAL_OVERRIDE;
-    virtual void copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) SAL_OVERRIDE;
+    virtual void Init() override;
+    virtual void copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) override;
 
 
     bool TryRenderCachedNativeControl(ControlCacheKey& rControlCacheKey, int nX, int nY);
diff --git a/vcl/inc/opengl/x11/X11DeviceInfo.hxx b/vcl/inc/opengl/x11/X11DeviceInfo.hxx
index c34deb3b8549..224a52679c3a 100644
--- a/vcl/inc/opengl/x11/X11DeviceInfo.hxx
+++ b/vcl/inc/opengl/x11/X11DeviceInfo.hxx
@@ -43,7 +43,7 @@ public:
     X11OpenGLDeviceInfo();
     virtual ~X11OpenGLDeviceInfo();
 
-    virtual bool isDeviceBlocked() SAL_OVERRIDE;
+    virtual bool isDeviceBlocked() override;
 
     const OString& GetVendor() const
     {
diff --git a/vcl/inc/opengl/x11/gdiimpl.hxx b/vcl/inc/opengl/x11/gdiimpl.hxx
index 19804a8aff17..f07468d6a135 100644
--- a/vcl/inc/opengl/x11/gdiimpl.hxx
+++ b/vcl/inc/opengl/x11/gdiimpl.hxx
@@ -28,25 +28,25 @@ public:
     virtual ~X11OpenGLSalGraphicsImpl();
 
 protected:
-    virtual rtl::Reference<OpenGLContext> CreateWinContext() SAL_OVERRIDE;
-    virtual bool UseContext( const rtl::Reference<OpenGLContext> &pContext ) SAL_OVERRIDE;
+    virtual rtl::Reference<OpenGLContext> CreateWinContext() override;
+    virtual bool UseContext( const rtl::Reference<OpenGLContext> &pContext ) override;
 
     bool RenderPixmap(X11Pixmap* pPixmap, X11Pixmap* pMask, int nX, int nY, TextureCombo& rCombo);
 
 public:
     // implementation of X11GraphicsImpl
 
-    virtual void copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) SAL_OVERRIDE;
+    virtual void copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) override;
 
-    virtual void Init() SAL_OVERRIDE;
+    virtual void Init() override;
 
-    bool FillPixmapFromScreen( X11Pixmap* pPixmap, int nX, int nY ) SAL_OVERRIDE;
-    bool RenderPixmapToScreen(X11Pixmap* pPixmap, X11Pixmap* pMask, int nX, int nY) SAL_OVERRIDE;
+    bool FillPixmapFromScreen( X11Pixmap* pPixmap, int nX, int nY ) override;
+    bool RenderPixmapToScreen(X11Pixmap* pPixmap, X11Pixmap* pMask, int nX, int nY) override;
 
     bool RenderAndCacheNativeControl(X11Pixmap* pPixmap, X11Pixmap* pMask, int nX, int nY,
-                                     ControlCacheKey& aControlCacheKey) SAL_OVERRIDE;
+                                     ControlCacheKey& aControlCacheKey) override;
     bool TryRenderCachedNativeControl(ControlCacheKey& rControlCacheKey,
-                                      int nX, int nY) SAL_OVERRIDE;
+                                      int nX, int nY) override;
 };
 
 #endif // INCLUDED_VCL_INC_OPENGL_X11_GDIIMPL_HXX
diff --git a/vcl/inc/opengl/x11/salvd.hxx b/vcl/inc/opengl/x11/salvd.hxx
index eb08ae10c504..0ab611eb7baf 100644
--- a/vcl/inc/opengl/x11/salvd.hxx
+++ b/vcl/inc/opengl/x11/salvd.hxx
@@ -39,17 +39,17 @@ public:
     virtual ~X11OpenGLSalVirtualDevice();
 
     // SalGeometryProvider
-    virtual long GetWidth() const SAL_OVERRIDE { return mnWidth; }
-    virtual long GetHeight() const SAL_OVERRIDE { return mnHeight; }
+    virtual long GetWidth() const override { return mnWidth; }
+    virtual long GetHeight() const override { return mnHeight; }
 
     SalDisplay *            GetDisplay() const { return mpDisplay; }
     SalX11Screen            GetXScreenNumber() const { return mnXScreen; }
 
-    virtual SalGraphics*    AcquireGraphics() SAL_OVERRIDE;
-    virtual void            ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE;
+    virtual SalGraphics*    AcquireGraphics() override;
+    virtual void            ReleaseGraphics( SalGraphics* pGraphics ) override;
 
                             // Set new size, without saving the old contents
-    virtual bool            SetSize( long nNewDX, long nNewDY ) SAL_OVERRIDE;
+    virtual bool            SetSize( long nNewDX, long nNewDY ) override;
 };
 
 #endif // INCLUDED_VCL_INC_OPENGL_X11_SALVD_H
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index 2e177907aeb4..6e82b872abad 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -154,92 +154,92 @@ public:
 
     rtl::Reference<OpenGLContext> GetOpenGLContext();
 
-    virtual void Init() SAL_OVERRIDE;
+    virtual void Init() override;
 
-    virtual void DeInit() SAL_OVERRIDE;
+    virtual void DeInit() override;
 
-    virtual void freeResources() SAL_OVERRIDE;
+    virtual void freeResources() override;
 
     const vcl::Region& getClipRegion() const;
-    virtual bool setClipRegion( const vcl::Region& ) SAL_OVERRIDE;
+    virtual bool setClipRegion( const vcl::Region& ) override;
 
     //
     // get the depth of the device
-    virtual sal_uInt16 GetBitCount() const SAL_OVERRIDE;
+    virtual sal_uInt16 GetBitCount() const override;
 
     // get the width of the device
-    virtual long GetGraphicsWidth() const SAL_OVERRIDE;
+    virtual long GetGraphicsWidth() const override;
 
     // set the clip region to empty
-    virtual void ResetClipRegion() SAL_OVERRIDE;
+    virtual void ResetClipRegion() override;
 
     // set the line color to transparent (= don't draw lines)
 
-    virtual void SetLineColor() SAL_OVERRIDE;
+    virtual void SetLineColor() override;
 
     // set the line color to a specific color
-    virtual void SetLineColor( SalColor nSalColor ) SAL_OVERRIDE;
+    virtual void SetLineColor( SalColor nSalColor ) override;
 
     // set the fill color to transparent (= don't fill)
-    virtual void SetFillColor() SAL_OVERRIDE;
+    virtual void SetFillColor() override;
 
     // set the fill color to a specific color, shapes will be
     // filled accordingly
-    virtual void SetFillColor( SalColor nSalColor ) SAL_OVERRIDE;
+    virtual void SetFillColor( SalColor nSalColor ) override;
 
     // enable/disable XOR drawing
-    virtual void SetXORMode( bool bSet, bool bInvertOnly ) SAL_OVERRIDE;
+    virtual void SetXORMode( bool bSet, bool bInvertOnly ) override;
 
     // set line color for raster operations
-    virtual void SetROPLineColor( SalROPColor nROPColor ) SAL_OVERRIDE;
+    virtual void SetROPLineColor( SalROPColor nROPColor ) override;
 
     // set fill color for raster operations
-    virtual void SetROPFillColor( SalROPColor nROPColor ) SAL_OVERRIDE;
+    virtual void SetROPFillColor( SalROPColor nROPColor ) override;
 
     // draw --> LineColor and FillColor and RasterOp and ClipRegion
-    virtual void drawPixel( long nX, long nY ) SAL_OVERRIDE;
-    virtual void drawPixel( long nX, long nY, SalColor nSalColor ) SAL_OVERRIDE;
+    virtual void drawPixel( long nX, long nY ) override;
+    virtual void drawPixel( long nX, long nY, SalColor nSalColor ) override;
 
-    virtual void drawLine( long nX1, long nY1, long nX2, long nY2 ) SAL_OVERRIDE;
+    virtual void drawLine( long nX1, long nY1, long nX2, long nY2 ) override;
 
-    virtual void drawRect( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
+    virtual void drawRect( long nX, long nY, long nWidth, long nHeight ) override;
 
-    virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) SAL_OVERRIDE;
+    virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) override;
 
-    virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) SAL_OVERRIDE;
+    virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) override;
 
-    virtual void drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ) SAL_OVERRIDE;
-    virtual bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ) SAL_OVERRIDE;
+    virtual void drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ) override;
+    virtual bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ) override;
 
     virtual bool drawPolyLine(
                 const ::basegfx::B2DPolygon&,
                 double fTransparency,
                 const ::basegfx::B2DVector& rLineWidths,
                 basegfx::B2DLineJoin,
-                com::sun::star::drawing::LineCap) SAL_OVERRIDE;
+                com::sun::star::drawing::LineCap) override;
 
     virtual bool drawPolyLineBezier(
                 sal_uInt32 nPoints,
                 const SalPoint* pPtAry,
-                const sal_uInt8* pFlgAry ) SAL_OVERRIDE;
+                const sal_uInt8* pFlgAry ) override;
 
     virtual bool drawPolygonBezier(
                 sal_uInt32 nPoints,
                 const SalPoint* pPtAry,
-                const sal_uInt8* pFlgAry ) SAL_OVERRIDE;
+                const sal_uInt8* pFlgAry ) override;
 
     virtual bool drawPolyPolygonBezier(
                 sal_uInt32 nPoly,
                 const sal_uInt32* pPoints,
                 const SalPoint* const* pPtAry,
-                const sal_uInt8* const* pFlgAry ) SAL_OVERRIDE;
+                const sal_uInt8* const* pFlgAry ) override;
 
     // CopyArea --> No RasterOp, but ClipRegion
     virtual void copyArea(
                 long nDestX, long nDestY,
                 long nSrcX, long nSrcY,
                 long nSrcWidth, long nSrcHeight,
-                sal_uInt16 nFlags ) SAL_OVERRIDE;
+                sal_uInt16 nFlags ) override;
 
     // CopyBits and DrawBitmap --> RasterOp and ClipRegion
     // CopyBits() --> pSrcGraphics == NULL, then CopyBits on same Graphics
@@ -247,43 +247,43 @@ public:
 
     virtual bool blendBitmap(
                 const SalTwoRect&,
-                const SalBitmap& rBitmap ) SAL_OVERRIDE;
+                const SalBitmap& rBitmap ) override;
 
     virtual bool blendAlphaBitmap(
                 const SalTwoRect&,
                 const SalBitmap& rSrcBitmap,
                 const SalBitmap& rMaskBitmap,
-                const SalBitmap& rAlphaBitmap ) SAL_OVERRIDE;
+                const SalBitmap& rAlphaBitmap ) override;
 
-    virtual void drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap ) SAL_OVERRIDE;
+    virtual void drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap ) override;
 
     virtual void drawBitmap(
                 const SalTwoRect& rPosAry,
                 const SalBitmap& rSalBitmap,
-                const SalBitmap& rMaskBitmap ) SAL_OVERRIDE;
+                const SalBitmap& rMaskBitmap ) override;
 
     virtual void drawMask(
                 const SalTwoRect& rPosAry,
                 const SalBitmap& rSalBitmap,
-                SalColor nMaskColor ) SAL_OVERRIDE;
+                SalColor nMaskColor ) override;
 
-    virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
+    virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight ) override;
 
-    virtual SalColor getPixel( long nX, long nY ) SAL_OVERRIDE;
+    virtual SalColor getPixel( long nX, long nY ) override;
 
     // invert --> ClipRegion (only Windows or VirDevs)
     virtual void invert(
                 long nX, long nY,
                 long nWidth, long nHeight,
-                SalInvert nFlags) SAL_OVERRIDE;
+                SalInvert nFlags) override;
 
-    virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) SAL_OVERRIDE;
+    virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) override;
 
     virtual bool drawEPS(
                 long nX, long nY,
                 long nWidth, long nHeight,
                 void* pPtr,
-                sal_uLong nSize ) SAL_OVERRIDE;
+                sal_uLong nSize ) override;
 
     /** Render bitmap with alpha channel
 
@@ -300,7 +300,7 @@ public:
     virtual bool drawAlphaBitmap(
                 const SalTwoRect&,
                 const SalBitmap& rSourceBitmap,
-                const SalBitmap& rAlphaBitmap ) SAL_OVERRIDE;
+                const SalBitmap& rAlphaBitmap ) override;
 
     /** draw transformed bitmap (maybe with alpha) where Null, X, Y define the coordinate system */
     virtual bool drawTransformedBitmap(
@@ -308,7 +308,7 @@ public:
                 const basegfx::B2DPoint& rX,
                 const basegfx::B2DPoint& rY,
                 const SalBitmap& rSourceBitmap,
-                const SalBitmap* pAlphaBitmap) SAL_OVERRIDE;
+                const SalBitmap* pAlphaBitmap) override;
 
     /** Render solid rectangle with given transparency
 
@@ -319,11 +319,11 @@ public:
     virtual bool drawAlphaRect(
                     long nX, long nY,
                     long nWidth, long nHeight,
-                    sal_uInt8 nTransparency ) SAL_OVERRIDE;
+                    sal_uInt8 nTransparency ) override;
 
-    virtual bool drawGradient(const tools::PolyPolygon& rPolygon, const Gradient& rGradient) SAL_OVERRIDE;
+    virtual bool drawGradient(const tools::PolyPolygon& rPolygon, const Gradient& rGradient) override;
 
-    virtual OpenGLContext *beginPaint() SAL_OVERRIDE;
+    virtual OpenGLContext *beginPaint() override;
 private:
 };
 
diff --git a/vcl/inc/osx/a11ylistener.hxx b/vcl/inc/osx/a11ylistener.hxx
index c20f42363efc..647333cf561e 100644
--- a/vcl/inc/osx/a11ylistener.hxx
+++ b/vcl/inc/osx/a11ylistener.hxx
@@ -40,11 +40,11 @@ public:
 
     // XEventListener
     virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
 
     // XAccessibleEventListener
     virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent )
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
 
 private:
     const id m_wrapperObject;
diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h
index 1e8a61eb3a57..4e483f8defc1 100644
--- a/vcl/inc/osx/salframe.h
+++ b/vcl/inc/osx/salframe.h
@@ -106,59 +106,59 @@ public:
 
     virtual ~AquaSalFrame();
 
-    virtual SalGraphics*        AcquireGraphics() SAL_OVERRIDE;
-    virtual void                ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE;
-    virtual bool                PostEvent(ImplSVEvent* pData) SAL_OVERRIDE;
-    virtual void                SetTitle( const OUString& rTitle ) SAL_OVERRIDE;
-    virtual void                SetIcon( sal_uInt16 nIcon ) SAL_OVERRIDE;
-    virtual void                SetRepresentedURL( const OUString& ) SAL_OVERRIDE;
-    virtual void                SetMenu( SalMenu* pSalMenu ) SAL_OVERRIDE;
-    virtual void                DrawMenuBar() SAL_OVERRIDE;
-    virtual void                Show( bool bVisible, bool bNoActivate = false ) SAL_OVERRIDE;
-    virtual void                SetMinClientSize( long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual void                SetMaxClientSize( long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) SAL_OVERRIDE;
-    virtual void                GetClientSize( long& rWidth, long& rHeight ) SAL_OVERRIDE;
-    virtual void                GetWorkArea( Rectangle& rRect ) SAL_OVERRIDE;
-    virtual SalFrame*           GetParent() const SAL_OVERRIDE;
-    virtual void                SetWindowState( const SalFrameState* pState ) SAL_OVERRIDE;
-    virtual bool                GetWindowState( SalFrameState* pState ) SAL_OVERRIDE;
-    virtual void                ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) SAL_OVERRIDE;
-    virtual void                StartPresentation( bool bStart ) SAL_OVERRIDE;
-    virtual void                SetAlwaysOnTop( bool bOnTop ) SAL_OVERRIDE;
-    virtual void                ToTop( sal_uInt16 nFlags ) SAL_OVERRIDE;
-    virtual void                SetPointer( PointerStyle ePointerStyle ) SAL_OVERRIDE;
-    virtual void                CaptureMouse( bool bMouse ) SAL_OVERRIDE;
-    virtual void                SetPointerPos( long nX, long nY ) SAL_OVERRIDE;
-    virtual void                Flush( void ) SAL_OVERRIDE;
-    virtual void                Flush( const Rectangle& ) SAL_OVERRIDE;
-    virtual void                Sync() SAL_OVERRIDE;
-    virtual void                SetInputContext( SalInputContext* pContext ) SAL_OVERRIDE;
-    virtual void                EndExtTextInput( EndExtTextInputFlags nFlags ) SAL_OVERRIDE;
-    virtual OUString            GetKeyName( sal_uInt16 nKeyCode ) SAL_OVERRIDE;
-    virtual bool                MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) SAL_OVERRIDE;
-    virtual LanguageType        GetInputLanguage() SAL_OVERRIDE;
-    virtual void                UpdateSettings( AllSettings& rSettings ) SAL_OVERRIDE;
-    virtual void                Beep() SAL_OVERRIDE;
-    virtual const SystemEnvData*    GetSystemData() const SAL_OVERRIDE;
-    virtual SalPointerState     GetPointerState() SAL_OVERRIDE;
-    virtual KeyIndicatorState   GetIndicatorState() SAL_OVERRIDE;
-    virtual void                SimulateKeyPress( sal_uInt16 nKeyCode ) SAL_OVERRIDE;
-    virtual void                SetParent( SalFrame* pNewParent ) SAL_OVERRIDE;
-    virtual bool                SetPluginParent( SystemParentData* pNewParent ) SAL_OVERRIDE;
-    virtual void                SetExtendedFrameStyle( SalExtStyle ) SAL_OVERRIDE;
-    virtual void                SetScreenNumber(unsigned int) SAL_OVERRIDE;
-    virtual void                SetApplicationID( const OUString &rApplicationID ) SAL_OVERRIDE;
+    virtual SalGraphics*        AcquireGraphics() override;
+    virtual void                ReleaseGraphics( SalGraphics* pGraphics ) override;
+    virtual bool                PostEvent(ImplSVEvent* pData) override;
+    virtual void                SetTitle( const OUString& rTitle ) override;
+    virtual void                SetIcon( sal_uInt16 nIcon ) override;
+    virtual void                SetRepresentedURL( const OUString& ) override;
+    virtual void                SetMenu( SalMenu* pSalMenu ) override;
+    virtual void                DrawMenuBar() override;
+    virtual void                Show( bool bVisible, bool bNoActivate = false ) override;
+    virtual void                SetMinClientSize( long nWidth, long nHeight ) override;
+    virtual void                SetMaxClientSize( long nWidth, long nHeight ) override;
+    virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) override;
+    virtual void                GetClientSize( long& rWidth, long& rHeight ) override;
+    virtual void                GetWorkArea( Rectangle& rRect ) override;
+    virtual SalFrame*           GetParent() const override;
+    virtual void                SetWindowState( const SalFrameState* pState ) override;
+    virtual bool                GetWindowState( SalFrameState* pState ) override;
+    virtual void                ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) override;
+    virtual void                StartPresentation( bool bStart ) override;
+    virtual void                SetAlwaysOnTop( bool bOnTop ) override;
+    virtual void                ToTop( sal_uInt16 nFlags ) override;
+    virtual void                SetPointer( PointerStyle ePointerStyle ) override;
+    virtual void                CaptureMouse( bool bMouse ) override;
+    virtual void                SetPointerPos( long nX, long nY ) override;
+    virtual void                Flush( void ) override;
+    virtual void                Flush( const Rectangle& ) override;
+    virtual void                Sync() override;
+    virtual void                SetInputContext( SalInputContext* pContext ) override;
+    virtual void                EndExtTextInput( EndExtTextInputFlags nFlags ) override;
+    virtual OUString            GetKeyName( sal_uInt16 nKeyCode ) override;
+    virtual bool                MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) override;
+    virtual LanguageType        GetInputLanguage() override;
+    virtual void                UpdateSettings( AllSettings& rSettings ) override;
+    virtual void                Beep() override;
+    virtual const SystemEnvData*    GetSystemData() const override;
+    virtual SalPointerState     GetPointerState() override;
+    virtual KeyIndicatorState   GetIndicatorState() override;
+    virtual void                SimulateKeyPress( sal_uInt16 nKeyCode ) override;
+    virtual void                SetParent( SalFrame* pNewParent ) override;
+    virtual bool                SetPluginParent( SystemParentData* pNewParent ) override;
+    virtual void                SetExtendedFrameStyle( SalExtStyle ) override;
+    virtual void                SetScreenNumber(unsigned int) override;
+    virtual void                SetApplicationID( const OUString &rApplicationID ) override;
 
     // shaped system windows
     // set clip region to none (-> rectangular windows, normal state)
-    virtual void ResetClipRegion() SAL_OVERRIDE;
+    virtual void ResetClipRegion() override;
     // start setting the clipregion consisting of nRects rectangles
-    virtual void BeginSetClipRegion( sal_uLong nRects ) SAL_OVERRIDE;
+    virtual void BeginSetClipRegion( sal_uLong nRects ) override;
     // add a rectangle to the clip region
-    virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
+    virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) override;
     // done setting up the clipregion
-    virtual void EndSetClipRegion() SAL_OVERRIDE;
+    virtual void EndSetClipRegion() override;
 
     void UpdateFrameGeometry();
 
diff --git a/vcl/inc/osx/salinst.h b/vcl/inc/osx/salinst.h
index 2d9895778cb4..b8d45f0f2903 100644
--- a/vcl/inc/osx/salinst.h
+++ b/vcl/inc/osx/salinst.h
@@ -43,9 +43,9 @@ class SalYieldMutex : public comphelper::SolarMutex
 
 public:
                                                 SalYieldMutex();
-    virtual void                                acquire() SAL_OVERRIDE;
-    virtual void                                release() SAL_OVERRIDE;
-    virtual bool                                tryToAcquire() SAL_OVERRIDE;
+    virtual void                                acquire() override;
+    virtual void                                release() override;
+    virtual bool                                tryToAcquire() override;
     sal_uLong                                   GetAcquireCount() const { return mnCount; }
     oslThreadIdentifier                         GetThreadId() const { return mnThreadId; }
 };
@@ -80,51 +80,51 @@ public:
     AquaSalInstance();
     virtual ~AquaSalInstance();
 
-    virtual SalFrame*       CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) SAL_OVERRIDE;
-    virtual SalFrame*       CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) SAL_OVERRIDE;
-    virtual void            DestroyFrame( SalFrame* pFrame ) SAL_OVERRIDE;
+    virtual SalFrame*       CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) override;
+    virtual SalFrame*       CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) override;
+    virtual void            DestroyFrame( SalFrame* pFrame ) override;
     virtual SalObject*      CreateObject( SalFrame* pParent, SystemWindowData* pWindowData,
-                                          bool bShow = true ) SAL_OVERRIDE;
-    virtual void            DestroyObject( SalObject* pObject ) SAL_OVERRIDE;
+                                          bool bShow = true ) override;
+    virtual void            DestroyObject( SalObject* pObject ) override;
     virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics* pGraphics,
                                                    long &nDX, long &nDY,
                                                    sal_uInt16 nBitCount,
-                                                   const SystemGraphicsData *pData ) SAL_OVERRIDE;
+                                                   const SystemGraphicsData *pData ) override;
     virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
-                                               ImplJobSetup* pSetupData ) SAL_OVERRIDE;
-    virtual void            DestroyInfoPrinter( SalInfoPrinter* pPrinter ) SAL_OVERRIDE;
-    virtual SalPrinter*     CreatePrinter( SalInfoPrinter* pInfoPrinter ) SAL_OVERRIDE;
-    virtual void            DestroyPrinter( SalPrinter* pPrinter ) SAL_OVERRIDE;
-    virtual void            GetPrinterQueueInfo( ImplPrnQueueList* pList ) SAL_OVERRIDE;
-    virtual void            GetPrinterQueueState( SalPrinterQueueInfo* pInfo ) SAL_OVERRIDE;
-    virtual void            DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) SAL_OVERRIDE;
-    virtual OUString        GetDefaultPrinter() SAL_OVERRIDE;
-    virtual SalTimer*       CreateSalTimer() SAL_OVERRIDE;
-    virtual SalI18NImeStatus* CreateI18NImeStatus() SAL_OVERRIDE;
-    virtual SalSystem*      CreateSalSystem() SAL_OVERRIDE;
-    virtual SalBitmap*      CreateSalBitmap() SAL_OVERRIDE;
-    virtual comphelper::SolarMutex* GetYieldMutex() SAL_OVERRIDE;
-    virtual sal_uLong       ReleaseYieldMutex() SAL_OVERRIDE;
-    virtual void            AcquireYieldMutex( sal_uLong nCount ) SAL_OVERRIDE;
-    virtual bool            CheckYieldMutex() SAL_OVERRIDE;
+                                               ImplJobSetup* pSetupData ) override;
+    virtual void            DestroyInfoPrinter( SalInfoPrinter* pPrinter ) override;
+    virtual SalPrinter*     CreatePrinter( SalInfoPrinter* pInfoPrinter ) override;
+    virtual void            DestroyPrinter( SalPrinter* pPrinter ) override;
+    virtual void            GetPrinterQueueInfo( ImplPrnQueueList* pList ) override;
+    virtual void            GetPrinterQueueState( SalPrinterQueueInfo* pInfo ) override;
+    virtual void            DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) override;
+    virtual OUString        GetDefaultPrinter() override;
+    virtual SalTimer*       CreateSalTimer() override;
+    virtual SalI18NImeStatus* CreateI18NImeStatus() override;
+    virtual SalSystem*      CreateSalSystem() override;
+    virtual SalBitmap*      CreateSalBitmap() override;
+    virtual comphelper::SolarMutex* GetYieldMutex() override;
+    virtual sal_uLong       ReleaseYieldMutex() override;
+    virtual void            AcquireYieldMutex( sal_uLong nCount ) override;
+    virtual bool            CheckYieldMutex() override;
     virtual void            DoYield(bool bWait, bool bHandleAllCurrentEvents,
-                                    sal_uLong nReleased) SAL_OVERRIDE;
-    virtual bool            AnyInput( VclInputFlags nType ) SAL_OVERRIDE;
-    virtual SalMenu*        CreateMenu( bool bMenuBar, Menu* pVCLMenu ) SAL_OVERRIDE;
-    virtual void            DestroyMenu( SalMenu* ) SAL_OVERRIDE;
-    virtual SalMenuItem*    CreateMenuItem( const SalItemParams* pItemData ) SAL_OVERRIDE;
-    virtual void            DestroyMenuItem( SalMenuItem* ) SAL_OVERRIDE;
-    virtual SalSession*     CreateSalSession() SAL_OVERRIDE;
+                                    sal_uLong nReleased) override;
+    virtual bool            AnyInput( VclInputFlags nType ) override;
+    virtual SalMenu*        CreateMenu( bool bMenuBar, Menu* pVCLMenu ) override;
+    virtual void            DestroyMenu( SalMenu* ) override;
+    virtual SalMenuItem*    CreateMenuItem( const SalItemParams* pItemData ) override;
+    virtual void            DestroyMenuItem( SalMenuItem* ) override;
+    virtual SalSession*     CreateSalSession() override;
     virtual void*           GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType,
-                                                     int& rReturnedBytes ) SAL_OVERRIDE;
+                                                     int& rReturnedBytes ) override;
     virtual void            AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType,
-                                                    const OUString& rDocumentService) SAL_OVERRIDE;
+                                                    const OUString& rDocumentService) override;
 
     // dtrans implementation
     virtual css::uno::Reference< css::uno::XInterface > CreateClipboard(
-            const css::uno::Sequence< css::uno::Any >& i_rArguments ) SAL_OVERRIDE;
-    virtual css::uno::Reference< css::uno::XInterface > CreateDragSource() SAL_OVERRIDE;
-    virtual css::uno::Reference< css::uno::XInterface > CreateDropTarget() SAL_OVERRIDE;
+            const css::uno::Sequence< css::uno::Any >& i_rArguments ) override;
+    virtual css::uno::Reference< css::uno::XInterface > CreateDragSource() override;
+    virtual css::uno::Reference< css::uno::XInterface > CreateDropTarget() override;
 
     static void handleAppDefinedEvent( NSEvent* pEvent );
 
diff --git a/vcl/inc/osx/salmenu.h b/vcl/inc/osx/salmenu.h
index 941a1b235463..ad1b29e9cb6f 100644
--- a/vcl/inc/osx/salmenu.h
+++ b/vcl/inc/osx/salmenu.h
@@ -55,24 +55,24 @@ public:
     AquaSalMenu( bool bMenuBar );
     virtual ~AquaSalMenu();
 
-    virtual bool VisibleMenuBar() SAL_OVERRIDE;
+    virtual bool VisibleMenuBar() override;
     // must return true to actually display native menu bars
     // otherwise only menu messages are processed (eg, OLE on Windows)
 
-    virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ) SAL_OVERRIDE;
-    virtual void RemoveItem( unsigned nPos ) SAL_OVERRIDE;
-    virtual void SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos ) SAL_OVERRIDE;
-    virtual void SetFrame( const SalFrame* pFrame ) SAL_OVERRIDE;
-    virtual void CheckItem( unsigned nPos, bool bCheck ) SAL_OVERRIDE;
-    virtual void EnableItem( unsigned nPos, bool bEnable ) SAL_OVERRIDE;
-    virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText ) SAL_OVERRIDE;
-    virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage) SAL_OVERRIDE;
-    virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const vcl::KeyCode& rKeyCode, const OUString& rKeyName ) SAL_OVERRIDE;
-    virtual void GetSystemMenuData( SystemMenuData* pData ) SAL_OVERRIDE;
-    virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, FloatWinPopupFlags nFlags) SAL_OVERRIDE;
-    virtual bool AddMenuBarButton( const SalMenuButtonItem& ) SAL_OVERRIDE;
-    virtual void RemoveMenuBarButton( sal_uInt16 nId ) SAL_OVERRIDE;
-    virtual Rectangle GetMenuBarButtonRectPixel( sal_uInt16 i_nItemId, SalFrame* i_pReferenceFrame ) SAL_OVERRIDE;
+    virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ) override;
+    virtual void RemoveItem( unsigned nPos ) override;
+    virtual void SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos ) override;
+    virtual void SetFrame( const SalFrame* pFrame ) override;
+    virtual void CheckItem( unsigned nPos, bool bCheck ) override;
+    virtual void EnableItem( unsigned nPos, bool bEnable ) override;
+    virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText ) override;
+    virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage) override;
+    virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const vcl::KeyCode& rKeyCode, const OUString& rKeyName ) override;
+    virtual void GetSystemMenuData( SystemMenuData* pData ) override;
+    virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, FloatWinPopupFlags nFlags) override;
+    virtual bool AddMenuBarButton( const SalMenuButtonItem& ) override;
+    virtual void RemoveMenuBarButton( sal_uInt16 nId ) override;
+    virtual Rectangle GetMenuBarButtonRectPixel( sal_uInt16 i_nItemId, SalFrame* i_pReferenceFrame ) override;
 
     int getItemIndexByPos( sal_uInt16 nPos ) const;
     const AquaSalFrame* getFrame() const;
diff --git a/vcl/inc/osx/salobj.h b/vcl/inc/osx/salobj.h
index 5db9d3e2ad1f..be7f84417047 100644
--- a/vcl/inc/osx/salobj.h
+++ b/vcl/inc/osx/salobj.h
@@ -55,14 +55,14 @@ public:
     AquaSalObject( AquaSalFrame* pFrame, SystemWindowData* pWinData );
     virtual ~AquaSalObject();
 
-    virtual void                    ResetClipRegion() SAL_OVERRIDE;
-    virtual sal_uInt16              GetClipRegionType() SAL_OVERRIDE;
-    virtual void                    BeginSetClipRegion( sal_uLong nRects ) SAL_OVERRIDE;
-    virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual void                    EndSetClipRegion() SAL_OVERRIDE;
-    virtual void                    SetPosSize( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual void                    Show( bool bVisible ) SAL_OVERRIDE;
-    virtual const SystemEnvData*    GetSystemData() const SAL_OVERRIDE;
+    virtual void                    ResetClipRegion() override;
+    virtual sal_uInt16              GetClipRegionType() override;
+    virtual void                    BeginSetClipRegion( sal_uLong nRects ) override;
+    virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) override;
+    virtual void                    EndSetClipRegion() override;
+    virtual void                    SetPosSize( long nX, long nY, long nWidth, long nHeight ) override;
+    virtual void                    Show( bool bVisible ) override;
+    virtual const SystemEnvData*    GetSystemData() const override;
 };
 
 #endif // INCLUDED_VCL_INC_OSX_SALOBJ_H
diff --git a/vcl/inc/osx/salprn.h b/vcl/inc/osx/salprn.h
index 20ac58189fbb..03c41f0a7fbd 100644
--- a/vcl/inc/osx/salprn.h
+++ b/vcl/inc/osx/salprn.h
@@ -68,20 +68,20 @@ class AquaSalInfoPrinter : public SalInfoPrinter
 
     void                        SetupPrinterGraphics( CGContextRef i_xContext ) const;
 
-    virtual SalGraphics*        AcquireGraphics() SAL_OVERRIDE;
-    virtual void                ReleaseGraphics( SalGraphics* i_pGraphics ) SAL_OVERRIDE;
-    virtual bool                Setup( SalFrame* i_pFrame, ImplJobSetup* i_pSetupData ) SAL_OVERRIDE;
-    virtual bool                SetPrinterData( ImplJobSetup* pSetupData ) SAL_OVERRIDE;
-    virtual bool                SetData( sal_uLong i_nFlags, ImplJobSetup* i_pSetupData ) SAL_OVERRIDE;
+    virtual SalGraphics*        AcquireGraphics() override;
+    virtual void                ReleaseGraphics( SalGraphics* i_pGraphics ) override;
+    virtual bool                Setup( SalFrame* i_pFrame, ImplJobSetup* i_pSetupData ) override;
+    virtual bool                SetPrinterData( ImplJobSetup* pSetupData ) override;
+    virtual bool                SetData( sal_uLong i_nFlags, ImplJobSetup* i_pSetupData ) override;
     virtual void                GetPageInfo( const ImplJobSetup* i_pSetupData,
                                              long& o_rOutWidth, long& o_rOutHeight,
                                              long& o_rPageOffX, long& o_rPageOffY,
-                                             long& o_rPageWidth, long& o_rPageHeight ) SAL_OVERRIDE;
-    virtual sal_uLong           GetCapabilities( const ImplJobSetup* i_pSetupData, PrinterCapType i_nType ) SAL_OVERRIDE;
-    virtual sal_uLong           GetPaperBinCount( const ImplJobSetup* i_pSetupData ) SAL_OVERRIDE;
-    virtual OUString            GetPaperBinName( const ImplJobSetup* i_pSetupData, sal_uLong i_nPaperBin ) SAL_OVERRIDE;
-    virtual void                InitPaperFormats( const ImplJobSetup* i_pSetupData ) SAL_OVERRIDE;
-    virtual int                 GetLandscapeAngle( const ImplJobSetup* i_pSetupData ) SAL_OVERRIDE;
+                                             long& o_rPageWidth, long& o_rPageHeight ) override;
+    virtual sal_uLong           GetCapabilities( const ImplJobSetup* i_pSetupData, PrinterCapType i_nType ) override;
+    virtual sal_uLong           GetPaperBinCount( const ImplJobSetup* i_pSetupData ) override;
+    virtual OUString            GetPaperBinName( const ImplJobSetup* i_pSetupData, sal_uLong i_nPaperBin ) override;
+    virtual void                InitPaperFormats( const ImplJobSetup* i_pSetupData ) override;
+    virtual int                 GetLandscapeAngle( const ImplJobSetup* i_pSetupData ) override;
 
     // the artificial separation between InfoPrinter and Printer
     // is not really useful for us
@@ -128,18 +128,18 @@ class AquaSalPrinter : public SalPrinter
                                               sal_uLong i_nCopies,
                                               bool i_bCollate,
                                               bool i_bDirect,
-                                              ImplJobSetup* i_pSetupData ) SAL_OVERRIDE;
+                                              ImplJobSetup* i_pSetupData ) override;
     // implement pull model print system
     virtual bool                    StartJob( const OUString* i_pFileName,
                                               const OUString& rJobName,
                                               const OUString& i_rAppName,
                                               ImplJobSetup* i_pSetupData,
-                                              vcl::PrinterController& i_rListener ) SAL_OVERRIDE;
+                                              vcl::PrinterController& i_rListener ) override;
 
-    virtual bool                    EndJob() SAL_OVERRIDE;
-    virtual SalGraphics*            StartPage( ImplJobSetup* i_pSetupData, bool i_bNewJobData ) SAL_OVERRIDE;
-    virtual bool                    EndPage() SAL_OVERRIDE;
-    virtual sal_uLong               GetErrorCode() SAL_OVERRIDE;
+    virtual bool                    EndJob() override;
+    virtual SalGraphics*            StartPage( ImplJobSetup* i_pSetupData, bool i_bNewJobData ) override;
+    virtual bool                    EndPage() override;
+    virtual sal_uLong               GetErrorCode() override;
 
     private:
     AquaSalPrinter( const AquaSalPrinter& ) = delete;
diff --git a/vcl/inc/osx/salsys.h b/vcl/inc/osx/salsys.h
index 74832c7d7a66..863c73e4635c 100644
--- a/vcl/inc/osx/salsys.h
+++ b/vcl/inc/osx/salsys.h
@@ -33,13 +33,13 @@ public:
     virtual ~AquaSalSystem();
 
     // get info about the display
-    virtual unsigned int GetDisplayScreenCount() SAL_OVERRIDE;
-    virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ) SAL_OVERRIDE;
+    virtual unsigned int GetDisplayScreenCount() override;
+    virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ) override;
 
     virtual int ShowNativeMessageBox( const OUString& rTitle,
                                       const OUString& rMessage,
                                       int nButtonCombination,
-                                      int nDefaultButton, bool bUseResources) SAL_OVERRIDE;
+                                      int nDefaultButton, bool bUseResources) override;
 };
 
 #endif // INCLUDED_VCL_INC_OSX_SALSYS_H
diff --git a/vcl/inc/osx/saltimer.h b/vcl/inc/osx/saltimer.h
index b751a81c7778..9d8926bba3e3 100644
--- a/vcl/inc/osx/saltimer.h
+++ b/vcl/inc/osx/saltimer.h
@@ -33,8 +33,8 @@ class AquaSalTimer : public SalTimer
     AquaSalTimer();
     virtual ~AquaSalTimer();
 
-    void Start( sal_uLong nMS ) SAL_OVERRIDE;
-    void Stop() SAL_OVERRIDE;
+    void Start( sal_uLong nMS ) override;
+    void Stop() override;
 
     static void handleStartTimerEvent( NSEvent* pEvent );
 
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index 853a822ee1ab..a34a29977e13 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -64,12 +64,12 @@ namespace vcl
         public:
             PrintPreviewWindow( vcl::Window* pParent );
             virtual ~PrintPreviewWindow();
-            virtual void dispose() SAL_OVERRIDE;
+            virtual void dispose() override;
 
-            virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE;
-            virtual void Command( const CommandEvent& ) SAL_OVERRIDE;
-            virtual void Resize() SAL_OVERRIDE;
-            virtual void DataChanged( const DataChangedEvent& ) SAL_OVERRIDE;
+            virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override;
+            virtual void Command( const CommandEvent& ) override;
+            virtual void Resize() override;
+            virtual void DataChanged( const DataChangedEvent& ) override;
 
             void setPreview( const GDIMetaFile&, const Size& i_rPaperSize,
                              const OUString& i_rPaperName,
@@ -88,9 +88,9 @@ namespace vcl
         public:
             ShowNupOrderWindow( vcl::Window* pParent );
 
-            virtual Size GetOptimalSize() const SAL_OVERRIDE;
+            virtual Size GetOptimalSize() const override;
 
-            virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) SAL_OVERRIDE;
+            virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) override;
 
             void setValues( int i_nOrderMode, int i_nColumns, int i_nRows )
             {
@@ -236,9 +236,9 @@ namespace vcl
         void storeToSettings();
         com::sun::star::beans::PropertyValue* getValueForWindow( vcl::Window* ) const;
 
-        virtual void Resize() SAL_OVERRIDE;
-        virtual void Command( const CommandEvent& ) SAL_OVERRIDE;
-        virtual void DataChanged( const DataChangedEvent& ) SAL_OVERRIDE;
+        virtual void Resize() override;
+        virtual void Command( const CommandEvent& ) override;
+        virtual void DataChanged( const DataChangedEvent& ) override;
 
         DECL_LINK_TYPED( SelectHdl, ListBox&, void );
         DECL_LINK_TYPED( ClickHdl, Button*, void );
@@ -254,7 +254,7 @@ namespace vcl
     public:
         PrintDialog( vcl::Window*, const std::shared_ptr< PrinterController >& );
         virtual ~PrintDialog();
-        virtual void dispose() SAL_OVERRIDE;
+        virtual void dispose() override;
 
         bool isPrintToFile();
         bool isCollate();
@@ -280,7 +280,7 @@ namespace vcl
     public:
         PrintProgressDialog(vcl::Window* i_pParent, int i_nMax);
         virtual ~PrintProgressDialog();
-        virtual void dispose() SAL_OVERRIDE;
+        virtual void dispose() override;
         bool isCanceled() const { return mbCanceled; }
         void setProgress( int i_nCurrent, int i_nMax = -1 );
         void tick();
diff --git a/vcl/inc/quartz/salbmp.h b/vcl/inc/quartz/salbmp.h
index bcbf9b366715..274190d66e68 100644
--- a/vcl/inc/quartz/salbmp.h
+++ b/vcl/inc/quartz/salbmp.h
@@ -57,26 +57,26 @@ public:
 public:
 
     // SalBitmap methods
-    bool            Create( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal ) SAL_OVERRIDE;
-    bool            Create( const SalBitmap& rSalBmp ) SAL_OVERRIDE;
-    bool            Create( const SalBitmap& rSalBmp, SalGraphics* pGraphics ) SAL_OVERRIDE;
-    bool            Create( const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount ) SAL_OVERRIDE;
+    bool            Create( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal ) override;
+    bool            Create( const SalBitmap& rSalBmp ) override;
+    bool            Create( const SalBitmap& rSalBmp, SalGraphics* pGraphics ) override;
+    bool            Create( const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount ) override;
     virtual bool    Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas >& rBitmapCanvas,
                             Size& rSize,
-                            bool bMask = false ) SAL_OVERRIDE;
+                            bool bMask = false ) override;
 
-    void            Destroy() SAL_OVERRIDE;
+    void            Destroy() override;
 
-    Size            GetSize() const SAL_OVERRIDE;
-    sal_uInt16          GetBitCount() const SAL_OVERRIDE;
+    Size            GetSize() const override;
+    sal_uInt16          GetBitCount() const override;
 
-    BitmapBuffer   *AcquireBuffer( BitmapAccessMode nMode ) SAL_OVERRIDE;
-    void            ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode ) SAL_OVERRIDE;
+    BitmapBuffer   *AcquireBuffer( BitmapAccessMode nMode ) override;
+    void            ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode ) override;
 
-    bool            GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE;
+    bool            GetSystemData( BitmapSystemData& rData ) override;
 
-    bool            Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) SAL_OVERRIDE;
-    bool            Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) SAL_OVERRIDE;
+    bool            Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) override;
+    bool            Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) override;
 
 private:
     // quartz helper
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 98ebd87384df..af65ce28c64e 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -60,9 +60,9 @@ public:
                                     CoreTextFontData( const ImplDevFontAttributes&, sal_IntPtr nFontID );
     virtual                         ~CoreTextFontData();
 
-    PhysicalFontFace*               Clone() const SAL_OVERRIDE;
-    ImplFontEntry*                  CreateFontInstance( FontSelectPattern& ) const SAL_OVERRIDE;
-    sal_IntPtr                      GetFontId() const SAL_OVERRIDE;
+    PhysicalFontFace*               Clone() const override;
+    ImplFontEntry*                  CreateFontInstance( FontSelectPattern& ) const override;
+    sal_IntPtr                      GetFontId() const override;
 
     int                             GetFontTable( const char pTagName[5], unsigned char* ) const;
 
@@ -226,127 +226,127 @@ public:
     // InvalidateContext does an UnsetState and sets mrContext to 0
     void                    InvalidateContext();
 
-    virtual SalGraphicsImpl* GetImpl() const SAL_OVERRIDE;
+    virtual SalGraphicsImpl* GetImpl() const override;
 
-    virtual bool            setClipRegion( const vcl::Region& ) SAL_OVERRIDE;
+    virtual bool            setClipRegion( const vcl::Region& ) override;
 
     // draw --> LineColor and FillColor and RasterOp and ClipRegion
-    virtual void            drawPixel( long nX, long nY ) SAL_OVERRIDE;
-    virtual void            drawPixel( long nX, long nY, SalColor nSalColor ) SAL_OVERRIDE;
-    virtual void            drawLine( long nX1, long nY1, long nX2, long nY2 ) SAL_OVERRIDE;
-    virtual void            drawRect( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual void            drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) SAL_OVERRIDE;
-    virtual void            drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) SAL_OVERRIDE;
-    virtual void            drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ) SAL_OVERRIDE;
-    virtual bool            drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ) SAL_OVERRIDE;
-    virtual bool            drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) SAL_OVERRIDE;
-    virtual bool            drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) SAL_OVERRIDE;
-    virtual bool            drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry ) SAL_OVERRIDE;
+    virtual void            drawPixel( long nX, long nY ) override;
+    virtual void            drawPixel( long nX, long nY, SalColor nSalColor ) override;
+    virtual void            drawLine( long nX1, long nY1, long nX2, long nY2 ) override;
+    virtual void            drawRect( long nX, long nY, long nWidth, long nHeight ) override;
+    virtual void            drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) override;
+    virtual void            drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) override;
+    virtual void            drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ) override;
+    virtual bool            drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ) override;
+    virtual bool            drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) override;
+    virtual bool            drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) override;
+    virtual bool            drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry ) override;
     virtual bool            drawPolyLine(
                                 const ::basegfx::B2DPolygon&,
                                 double fTransparency,
                                 const ::basegfx::B2DVector& rLineWidths,
                                 basegfx::B2DLineJoin,
-                                com::sun::star::drawing::LineCap eLineCap) SAL_OVERRIDE;
-    virtual bool            drawGradient( const tools::PolyPolygon&, const Gradient& ) SAL_OVERRIDE { return false; };
+                                com::sun::star::drawing::LineCap eLineCap) override;
+    virtual bool            drawGradient( const tools::PolyPolygon&, const Gradient& ) override { return false; };
 
     // CopyArea --> No RasterOp, but ClipRegion
     virtual void            copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth,
-                                      long nSrcHeight, sal_uInt16 nFlags ) SAL_OVERRIDE;
+                                      long nSrcHeight, sal_uInt16 nFlags ) override;
 
     // CopyBits and DrawBitmap --> RasterOp and ClipRegion
     // CopyBits() --> pSrcGraphics == NULL, then CopyBits on same Graphics
-    virtual void            copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) SAL_OVERRIDE;
-    virtual void            drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap ) SAL_OVERRIDE;
+    virtual void            copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) override;
+    virtual void            drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap ) override;
     virtual void            drawBitmap( const SalTwoRect& rPosAry,
                                         const SalBitmap& rSalBitmap,
-                                        const SalBitmap& rTransparentBitmap ) SAL_OVERRIDE;
+                                        const SalBitmap& rTransparentBitmap ) override;
     virtual void            drawMask( const SalTwoRect& rPosAry,
                                       const SalBitmap& rSalBitmap,
-                                      SalColor nMaskColor ) SAL_OVERRIDE;
+                                      SalColor nMaskColor ) override;
 
-    virtual SalBitmap*      getBitmap( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual SalColor        getPixel( long nX, long nY ) SAL_OVERRIDE;
+    virtual SalBitmap*      getBitmap( long nX, long nY, long nWidth, long nHeight ) override;
+    virtual SalColor        getPixel( long nX, long nY ) override;
 
     // invert --> ClipRegion (only Windows or VirDevs)
-    virtual void            invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags) SAL_OVERRIDE;
-    virtual void            invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) SAL_OVERRIDE;
+    virtual void            invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags) override;
+    virtual void            invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) override;
 
-    virtual bool            drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ) SAL_OVERRIDE;
+    virtual bool            drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ) override;
 
     virtual bool            blendBitmap( const SalTwoRect&,
-                                         const SalBitmap& rBitmap ) SAL_OVERRIDE;
+                                         const SalBitmap& rBitmap ) override;
 
     virtual bool            blendAlphaBitmap( const SalTwoRect&,
                                               const SalBitmap& rSrcBitmap,
                                               const SalBitmap& rMaskBitmap,
-                                              const SalBitmap& rAlphaBitmap ) SAL_OVERRIDE;
+                                              const SalBitmap& rAlphaBitmap ) override;
 
     virtual bool            drawAlphaBitmap( const SalTwoRect&,
                                              const SalBitmap& rSourceBitmap,
-                                             const SalBitmap& rAlphaBitmap ) SAL_OVERRIDE;
+                                             const SalBitmap& rAlphaBitmap ) override;
 
     bool                    drawTransformedBitmap(
                                             const basegfx::B2DPoint& rNull,
                                             const basegfx::B2DPoint& rX,
                                             const basegfx::B2DPoint& rY,
                                             const SalBitmap& rSourceBitmap,
-                                            const SalBitmap* pAlphaBitmap) SAL_OVERRIDE;
+                                            const SalBitmap* pAlphaBitmap) override;
 
     virtual bool            drawAlphaRect( long nX, long nY, long nWidth,
-                                           long nHeight, sal_uInt8 nTransparency ) SAL_OVERRIDE;
+                                           long nHeight, sal_uInt8 nTransparency ) override;
 
     // native widget rendering methods that require mirroring
 #ifdef MACOSX
     virtual bool            hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
-                                                  const Point& aPos, bool& rIsInside ) SAL_OVERRIDE;
+                                                  const Point& aPos, bool& rIsInside ) override;
     virtual bool            drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                                ControlState nState, const ImplControlValue& aValue,
-                                               const OUString& aCaption ) SAL_OVERRIDE;
+                                               const OUString& aCaption ) override;
     virtual bool            getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
                                                     const ImplControlValue& aValue, const OUString& aCaption,
-                                                    Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) SAL_OVERRIDE;
+                                                    Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) override;
 #endif
 
     // get device resolution
-    virtual void            GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) SAL_OVERRIDE;
+    virtual void            GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) override;
     // get the depth of the device
-    virtual sal_uInt16      GetBitCount() const SAL_OVERRIDE;
+    virtual sal_uInt16      GetBitCount() const override;
     // get the width of the device
-    virtual long            GetGraphicsWidth() const SAL_OVERRIDE;
+    virtual long            GetGraphicsWidth() const override;
 
     // set the clip region to empty
-    virtual void            ResetClipRegion() SAL_OVERRIDE;
+    virtual void            ResetClipRegion() override;
 
     // set the line color to transparent (= don't draw lines)
-    virtual void            SetLineColor() SAL_OVERRIDE;
+    virtual void            SetLineColor() override;
     // set the line color to a specific color
-    virtual void            SetLineColor( SalColor nSalColor ) SAL_OVERRIDE;
+    virtual void            SetLineColor( SalColor nSalColor ) override;
     // set the fill color to transparent (= don't fill)
-    virtual void            SetFillColor() SAL_OVERRIDE;
+    virtual void            SetFillColor() override;
     // set the fill color to a specific color, shapes will be
     // filled accordingly
-    virtual void            SetFillColor( SalColor nSalColor ) SAL_OVERRIDE;
+    virtual void            SetFillColor( SalColor nSalColor ) override;
     // enable/disable XOR drawing
-    virtual void            SetXORMode( bool bSet, bool bInvertOnly ) SAL_OVERRIDE;
+    virtual void            SetXORMode( bool bSet, bool bInvertOnly ) override;
     // set line color for raster operations
-    virtual void            SetROPLineColor( SalROPColor nROPColor ) SAL_OVERRIDE;
+    virtual void            SetROPLineColor( SalROPColor nROPColor ) override;
     // set fill color for raster operations
-    virtual void            SetROPFillColor( SalROPColor nROPColor ) SAL_OVERRIDE;
+    virtual void            SetROPFillColor( SalROPColor nROPColor ) override;
     // set the text color to a specific color
-    virtual void            SetTextColor( SalColor nSalColor ) SAL_OVERRIDE;
+    virtual void            SetTextColor( SalColor nSalColor ) override;
     // set the font
-    virtual sal_uInt16      SetFont( FontSelectPattern*, int nFallbackLevel ) SAL_OVERRIDE;
+    virtual sal_uInt16      SetFont( FontSelectPattern*, int nFallbackLevel ) override;
     // get the current font's metrics
-    virtual void            GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) SAL_OVERRIDE;
+    virtual void            GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) override;
     // get the repertoire of the current font
-    virtual const FontCharMapPtr GetFontCharMap() const SAL_OVERRIDE;
-    virtual bool            GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const SAL_OVERRIDE;
+    virtual const FontCharMapPtr GetFontCharMap() const override;
+    virtual bool            GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const override;
     // graphics must fill supplied font list
-    virtual void            GetDevFontList( PhysicalFontCollection* ) SAL_OVERRIDE;
+    virtual void            GetDevFontList( PhysicalFontCollection* ) override;
     // graphics must drop any cached font info
-    virtual void            ClearDevFontCache() SAL_OVERRIDE;
-    virtual bool            AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ) SAL_OVERRIDE;
+    virtual void            ClearDevFontCache() override;
+    virtual bool            AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ) override;
     // CreateFontSubset: a method to get a subset of glyhps of a font
     // inside a new valid font file
     // returns TRUE if creation of subset was successful
@@ -366,7 +366,7 @@ public:
                                                   sal_Int32* pWidths,
                                                   int nGlyphs,
                                                   FontSubsetInfo& rInfo // out parameter
-                                                  ) SAL_OVERRIDE;
+                                                  ) override;
 
     // GetFontEncodingVector: a method to get the encoding map Unicode
     // to font encoded character; this is only used for type1 fonts and
@@ -375,7 +375,7 @@ public:
     // glyphs with only a name) exist it is set to the corresponding
     // map for non encoded glyphs; the encoding vector contains -1
     // as encoding for these cases
-    virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded, std::set<sal_Unicode> const** ) SAL_OVERRIDE;
+    virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded, std::set<sal_Unicode> const** ) override;
 
     // GetEmbedFontData: gets the font data for a font marked
     // embeddable by GetDevFontList or NULL in case of error
@@ -389,29 +389,29 @@ public:
                                               sal_Int32* pWidths,
                                               size_t nLen,
                                               FontSubsetInfo& rInfo,
-                                              long* pDataLen ) SAL_OVERRIDE;
+                                              long* pDataLen ) override;
     // frees the font data again
-    virtual void            FreeEmbedFontData( const void* pData, long nDataLen ) SAL_OVERRIDE;
+    virtual void            FreeEmbedFontData( const void* pData, long nDataLen ) override;
 
     virtual void            GetGlyphWidths( const PhysicalFontFace*,
                                             bool bVertical,
                                             Int32Vector& rWidths,
-                                            Ucs2UIntMap& rUnicodeEnc ) SAL_OVERRIDE;
+                                            Ucs2UIntMap& rUnicodeEnc ) override;
 
-    virtual bool            GetGlyphBoundRect( sal_GlyphId, Rectangle& ) SAL_OVERRIDE;
-    virtual bool            GetGlyphOutline( sal_GlyphId, basegfx::B2DPolyPolygon& ) SAL_OVERRIDE;
+    virtual bool            GetGlyphBoundRect( sal_GlyphId, Rectangle& ) override;
+    virtual bool            GetGlyphOutline( sal_GlyphId, basegfx::B2DPolyPolygon& ) override;
 
-    virtual SalLayout*      GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) SAL_OVERRIDE;
-    virtual void            DrawServerFontLayout( const ServerFontLayout& ) SAL_OVERRIDE;
-    virtual bool            supportsOperation( OutDevSupportType ) const SAL_OVERRIDE;
+    virtual SalLayout*      GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) override;
+    virtual void            DrawServerFontLayout( const ServerFontLayout& ) override;
+    virtual bool            supportsOperation( OutDevSupportType ) const override;
 
 #ifdef MACOSX
     // Query the platform layer for control support
-    virtual bool            IsNativeControlSupported( ControlType nType, ControlPart nPart ) SAL_OVERRIDE;
+    virtual bool            IsNativeControlSupported( ControlType nType, ControlPart nPart ) override;
 #endif
 
     virtual SystemGraphicsData
-                            GetGraphicsData() const SAL_OVERRIDE;
+                            GetGraphicsData() const override;
 
 private:
     // differences between VCL, Quartz and kHiThemeOrientation coordinate systems
diff --git a/vcl/inc/quartz/salvd.h b/vcl/inc/quartz/salvd.h
index 90843d7be523..7159d166d9d3 100644
--- a/vcl/inc/quartz/salvd.h
+++ b/vcl/inc/quartz/salvd.h
@@ -56,12 +56,12 @@ public:
     AquaSalVirtualDevice( AquaSalGraphics* pGraphic, long &nDX, long &nDY, sal_uInt16 nBitCount, const SystemGraphicsData *pData );
     virtual ~AquaSalVirtualDevice();
 
-    virtual SalGraphics*            AcquireGraphics() SAL_OVERRIDE;
-    virtual void                    ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE;
-    virtual bool                    SetSize( long nNewDX, long nNewDY ) SAL_OVERRIDE;
+    virtual SalGraphics*            AcquireGraphics() override;
+    virtual void                    ReleaseGraphics( SalGraphics* pGraphics ) override;
+    virtual bool                    SetSize( long nNewDX, long nNewDY ) override;
 
-    virtual long GetWidth() const SAL_OVERRIDE;
-    virtual long GetHeight() const SAL_OVERRIDE;
+    virtual long GetWidth() const override;
+    virtual long GetHeight() const override;
 };
 
 #endif // INCLUDED_VCL_INC_QUARTZ_SALVD_H
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index d175b5fd5303..0b781ef3aa39 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -123,9 +123,9 @@ public:
     SalFrameGeometry        maGeometry;
 
     // SalGeometryProvider
-    virtual long GetWidth() const SAL_OVERRIDE { return maGeometry.nWidth; }
-    virtual long GetHeight() const SAL_OVERRIDE { return maGeometry.nHeight; }
-    virtual bool IsOffScreen() const SAL_OVERRIDE { return false; }
+    virtual long GetWidth() const override { return maGeometry.nWidth; }
+    virtual long GetHeight() const override { return maGeometry.nHeight; }
+    virtual bool IsOffScreen() const override { return false; }
 
     // SalGraphics or NULL, but two Graphics for all SalFrames
     // must be returned
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index 775a34d8da2a..a0c87e18efbc 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -235,23 +235,23 @@ protected:
 class VCL_PLUGIN_PUBLIC MultiSalLayout : public SalLayout
 {
 public:
-    virtual void    DrawText( SalGraphics& ) const SAL_OVERRIDE;
-    virtual sal_Int32 GetTextBreak(DeviceCoordinate nMaxWidth, DeviceCoordinate nCharExtra, int nFactor) const SAL_OVERRIDE;
-    virtual DeviceCoordinate FillDXArray( DeviceCoordinate* pDXArray ) const SAL_OVERRIDE;
-    virtual void    GetCaretPositions( int nArraySize, long* pCaretXArray ) const SAL_OVERRIDE;
+    virtual void    DrawText( SalGraphics& ) const override;
+    virtual sal_Int32 GetTextBreak(DeviceCoordinate nMaxWidth, DeviceCoordinate nCharExtra, int nFactor) const override;
+    virtual DeviceCoordinate FillDXArray( DeviceCoordinate* pDXArray ) const override;
+    virtual void    GetCaretPositions( int nArraySize, long* pCaretXArray ) const override;
     virtual int     GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIdxAry, Point& rPos,
                                    int&, DeviceCoordinate* pGlyphAdvAry, int* pCharPosAry,
-                                   const PhysicalFontFace** pFallbackFonts ) const SAL_OVERRIDE;
-    virtual bool    GetOutline( SalGraphics&, ::basegfx::B2DPolyPolygonVector& ) const SAL_OVERRIDE;
+                                   const PhysicalFontFace** pFallbackFonts ) const override;
+    virtual bool    GetOutline( SalGraphics&, ::basegfx::B2DPolyPolygonVector& ) const override;
 
     // used only by OutputDevice::ImplLayout, TODO: make friend
     explicit        MultiSalLayout( SalLayout& rBaseLayout,
                                     const PhysicalFontFace* pBaseFont = NULL );
     bool            AddFallback( SalLayout& rFallbackLayout,
                                  ImplLayoutRuns&, const PhysicalFontFace* pFallbackFont );
-    virtual bool    LayoutText( ImplLayoutArgs& ) SAL_OVERRIDE;
-    virtual void    AdjustLayout( ImplLayoutArgs& ) SAL_OVERRIDE;
-    virtual void    InitFont() const SAL_OVERRIDE;
+    virtual bool    LayoutText( ImplLayoutArgs& ) override;
+    virtual void    AdjustLayout( ImplLayoutArgs& ) override;
+    virtual void    InitFont() const override;
 
     void SetInComplete(bool bInComplete = true);
 
@@ -260,9 +260,9 @@ protected:
 
 private:
     // dummy implementations
-    virtual void    MoveGlyph( int, long ) SAL_OVERRIDE {}
-    virtual void    DropGlyph( int ) SAL_OVERRIDE {}
-    virtual void    Simplify( bool ) SAL_OVERRIDE {}
+    virtual void    MoveGlyph( int, long ) override {}
+    virtual void    DropGlyph( int ) override {}
+    virtual void    Simplify( bool ) override {}
 
                     MultiSalLayout( const MultiSalLayout& ) = delete;
                     MultiSalLayout& operator=( const MultiSalLayout& ) = delete;
@@ -334,7 +334,7 @@ public:
     // used by layout engines
     void            AppendGlyph( const GlyphItem& );
     void            Reserve(int size) { m_GlyphItems.reserve(size + 1); }
-    virtual void    AdjustLayout( ImplLayoutArgs& ) SAL_OVERRIDE;
+    virtual void    AdjustLayout( ImplLayoutArgs& ) override;
     void    ApplyDXArray( ImplLayoutArgs& );
     void    Justify( DeviceCoordinate nNewWidth );
     void            KashidaJustify( long nIndex, int nWidth );
@@ -342,24 +342,24 @@ public:
     void            SortGlyphItems();
 
     // used by upper layers
-    virtual DeviceCoordinate GetTextWidth() const SAL_OVERRIDE;
-    virtual DeviceCoordinate FillDXArray( DeviceCoordinate* pDXArray ) const SAL_OVERRIDE;
-    virtual sal_Int32 GetTextBreak(DeviceCoordinate nMaxWidth, DeviceCoordinate nCharExtra, int nFactor) const SAL_OVERRIDE;
-    virtual void    GetCaretPositions( int nArraySize, long* pCaretXArray ) const SAL_OVERRIDE;
+    virtual DeviceCoordinate GetTextWidth() const override;
+    virtual DeviceCoordinate FillDXArray( DeviceCoordinate* pDXArray ) const override;
+    virtual sal_Int32 GetTextBreak(DeviceCoordinate nMaxWidth, DeviceCoordinate nCharExtra, int nFactor) const override;
+    virtual void    GetCaretPositions( int nArraySize, long* pCaretXArray ) const override;
 
     // used by display layers
     virtual int     GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIdxAry, Point& rPos, int&,
                                    DeviceCoordinate* pGlyphAdvAry = NULL, int* pCharPosAry = NULL,
-                                   const PhysicalFontFace** pFallbackFonts = NULL ) const SAL_OVERRIDE;
+                                   const PhysicalFontFace** pFallbackFonts = NULL ) const override;
 
 protected:
                     GenericSalLayout();
     virtual         ~GenericSalLayout();
 
     // for glyph+font+script fallback
-    virtual void    MoveGlyph( int nStart, long nNewXPos ) SAL_OVERRIDE;
-    virtual void    DropGlyph( int nStart ) SAL_OVERRIDE;
-    virtual void    Simplify( bool bIsBase ) SAL_OVERRIDE;
+    virtual void    MoveGlyph( int nStart, long nNewXPos ) override;
+    virtual void    DropGlyph( int nStart ) override;
+    virtual void    Simplify( bool bIsBase ) override;
 
     bool            GetCharWidths( DeviceCoordinate* pCharWidths ) const;
 
diff --git a/vcl/inc/salvd.hxx b/vcl/inc/salvd.hxx
index 737757f1f3e0..6f2156a15c3f 100644
--- a/vcl/inc/salvd.hxx
+++ b/vcl/inc/salvd.hxx
@@ -35,7 +35,7 @@ public:
     virtual ~SalVirtualDevice();
 
     // SalGeometryProvider
-    virtual bool IsOffScreen() const SAL_OVERRIDE { return true; }
+    virtual bool IsOffScreen() const override { return true; }
 
     // SalGraphics or NULL, but two Graphics for all SalVirtualDevices
     // must be returned
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 779a14019c37..0559cd896ca1 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -100,7 +100,7 @@ namespace vcl { class DisplayConnection; class SettingsConfigItem; class DeleteO
 class LocaleConfigurationListener : public utl::ConfigurationListener
 {
 public:
-    virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) SAL_OVERRIDE;
+    virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) override;
 };
 
 typedef std::vector<Link<VclWindowEvent&,bool> > SVAppKeyListeners;
diff --git a/vcl/inc/textlayout.hxx b/vcl/inc/textlayout.hxx
index f7fbeb91ff78..5b7a122adf13 100644
--- a/vcl/inc/textlayout.hxx
+++ b/vcl/inc/textlayout.hxx
@@ -57,26 +57,26 @@ namespace vcl
         // ITextLayout overridables
         virtual long        GetTextWidth( const OUString& _rText,
                                           sal_Int32 _nStartIndex,
-                                          sal_Int32 _nLength ) const SAL_OVERRIDE;
+                                          sal_Int32 _nLength ) const override;
 
         virtual void        DrawText( const Point& _rStartPoint,
                                       const OUString& _rText,
                                       sal_Int32 _nStartIndex,
                                       sal_Int32 _nLength,
                                       MetricVector* _pVector,
-                                      OUString* _pDisplayText ) SAL_OVERRIDE;
+                                      OUString* _pDisplayText ) override;
 
         virtual bool        GetCaretPositions( const OUString& _rText,
                                                long* _pCaretXArray,
                                                sal_Int32 _nStartIndex,
-                                               sal_Int32 _nLength ) const SAL_OVERRIDE;
+                                               sal_Int32 _nLength ) const override;
 
         virtual sal_Int32   GetTextBreak( const OUString& _rText,
                                           long _nMaxTextWidth,
                                           sal_Int32 _nStartIndex,
-                                          sal_Int32 _nLength ) const SAL_OVERRIDE;
+                                          sal_Int32 _nLength ) const override;
 
-        virtual bool        DecomposeTextRectAction() const SAL_OVERRIDE;
+        virtual bool        DecomposeTextRectAction() const override;
 
     private:
         OutputDevice&   m_rTargetDevice;
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index 38324c404a28..6490edaa911c 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -88,8 +88,8 @@ class GtkSalTimer : public SalTimer
 public:
     GtkSalTimer();
     virtual ~GtkSalTimer();
-    virtual void Start( sal_uLong nMS ) SAL_OVERRIDE;
-    virtual void Stop() SAL_OVERRIDE;
+    virtual void Start( sal_uLong nMS ) override;
+    virtual void Stop() override;
     bool         Expired();
 
     sal_uLong    m_nTimeoutMS;
@@ -107,7 +107,7 @@ public:
     virtual ~GtkData();
 
     void Init();
-    virtual void Dispose() SAL_OVERRIDE;
+    virtual void Dispose() override;
 
     static void initNWF();
     static void deInitNWF();
@@ -118,8 +118,8 @@ public:
     void Yield( bool bWait, bool bHandleAllCurrentEvents );
     inline GdkDisplay *GetGdkDisplay();
 
-    virtual void ErrorTrapPush() SAL_OVERRIDE;
-    virtual bool ErrorTrapPop( bool bIgnoreError ) SAL_OVERRIDE;
+    virtual void ErrorTrapPush() override;
+    virtual bool ErrorTrapPop( bool bIgnoreError ) override;
 
     inline GtkSalDisplay *GetGtkDisplay() const;
     bool BlockIdleTimeout() const { return blockIdleTimeout; }
@@ -150,12 +150,12 @@ public:
 
     GtkSalSystem* getSystem() const { return m_pSys; }
 
-    virtual void deregisterFrame( SalFrame* pFrame ) SAL_OVERRIDE;
+    virtual void deregisterFrame( SalFrame* pFrame ) override;
     GdkCursor *getCursor( PointerStyle ePointerStyle );
 #if GTK_CHECK_VERSION(3,0,0)
     virtual int CaptureMouse( SalFrame* pFrame );
 #else
-    virtual int CaptureMouse( SalFrame* pFrame ) SAL_OVERRIDE;
+    virtual int CaptureMouse( SalFrame* pFrame ) override;
 #endif
 
     SalX11Screen GetDefaultXScreen() { return m_pSys->GetDisplayDefaultXScreen(); }
@@ -164,7 +164,7 @@ public:
 #if GTK_CHECK_VERSION(3,0,0)
 //    int          GetScreenCount() { return m_pSys->GetDisplayScreenCount(); }
 #else
-    virtual ScreenData *initScreen( SalX11Screen nXScreen ) const SAL_OVERRIDE;
+    virtual ScreenData *initScreen( SalX11Screen nXScreen ) const override;
 #endif
 
     GdkFilterReturn filterGdkEvent( GdkXEvent* sys_event,
@@ -174,10 +174,10 @@ public:
     void screenSizeChanged( GdkScreen* );
     void monitorsChanged( GdkScreen* );
 
-    virtual void PostUserEvent() SAL_OVERRIDE;
+    virtual void PostUserEvent() override;
 
 #if !GTK_CHECK_VERSION(3,0,0)
-    virtual bool Dispatch( XEvent *pEvent ) SAL_OVERRIDE;
+    virtual bool Dispatch( XEvent *pEvent ) override;
 #endif
 };
 
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index e559f85b79f9..8ccba66b914d 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -364,102 +364,102 @@ public:
 
     // SalGraphics or NULL, but two Graphics for all SalFrames
     // must be returned
-    virtual SalGraphics*        AcquireGraphics() SAL_OVERRIDE;
-    virtual void                ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE;
+    virtual SalGraphics*        AcquireGraphics() override;
+    virtual void                ReleaseGraphics( SalGraphics* pGraphics ) override;
 
     // Event must be destroyed, when Frame is destroyed
     // When Event is called, SalInstance::Yield() must be returned
-    virtual bool                PostEvent(ImplSVEvent* pData) SAL_OVERRIDE;
+    virtual bool                PostEvent(ImplSVEvent* pData) override;
 
-    virtual void                SetTitle( const OUString& rTitle ) SAL_OVERRIDE;
-    virtual void                SetIcon( sal_uInt16 nIcon ) SAL_OVERRIDE;
-    virtual void                SetMenu( SalMenu *pSalMenu ) SAL_OVERRIDE;
+    virtual void                SetTitle( const OUString& rTitle ) override;
+    virtual void                SetIcon( sal_uInt16 nIcon ) override;
+    virtual void                SetMenu( SalMenu *pSalMenu ) override;
     SalMenu*                    GetMenu();
-    virtual void                DrawMenuBar() SAL_OVERRIDE;
+    virtual void                DrawMenuBar() override;
     void                        EnsureAppMenuWatch();
 
-    virtual void                SetExtendedFrameStyle( SalExtStyle nExtStyle ) SAL_OVERRIDE;
+    virtual void                SetExtendedFrameStyle( SalExtStyle nExtStyle ) override;
     // Before the window is visible, a resize event
     // must be sent with the correct size
-    virtual void                Show( bool bVisible, bool bNoActivate = false ) SAL_OVERRIDE;
+    virtual void                Show( bool bVisible, bool bNoActivate = false ) override;
     // Set ClientSize and Center the Window to the desktop
     // and send/post a resize message
-    virtual void                SetMinClientSize( long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual void                SetMaxClientSize( long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) SAL_OVERRIDE;
-    virtual void                GetClientSize( long& rWidth, long& rHeight ) SAL_OVERRIDE;
-    virtual void                GetWorkArea( Rectangle& rRect ) SAL_OVERRIDE;
-    virtual SalFrame*           GetParent() const SAL_OVERRIDE;
-    virtual void                SetWindowState( const SalFrameState* pState ) SAL_OVERRIDE;
-    virtual bool                GetWindowState( SalFrameState* pState ) SAL_OVERRIDE;
-    virtual void                ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) SAL_OVERRIDE;
+    virtual void                SetMinClientSize( long nWidth, long nHeight ) override;
+    virtual void                SetMaxClientSize( long nWidth, long nHeight ) override;
+    virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) override;
+    virtual void                GetClientSize( long& rWidth, long& rHeight ) override;
+    virtual void                GetWorkArea( Rectangle& rRect ) override;
+    virtual SalFrame*           GetParent() const override;
+    virtual void                SetWindowState( const SalFrameState* pState ) override;
+    virtual bool                GetWindowState( SalFrameState* pState ) override;
+    virtual void                ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) override;
     // Enable/Disable ScreenSaver, SystemAgents, ...
-    virtual void                StartPresentation( bool bStart ) SAL_OVERRIDE;
+    virtual void                StartPresentation( bool bStart ) override;
     // Show Window over all other Windows
-    virtual void                SetAlwaysOnTop( bool bOnTop ) SAL_OVERRIDE;
+    virtual void                SetAlwaysOnTop( bool bOnTop ) override;
 
     // Window to top and grab focus
-    virtual void                ToTop( sal_uInt16 nFlags ) SAL_OVERRIDE;
+    virtual void                ToTop( sal_uInt16 nFlags ) override;
 
     // this function can call with the same
     // pointer style
-    virtual void                SetPointer( PointerStyle ePointerStyle ) SAL_OVERRIDE;
-    virtual void                CaptureMouse( bool bMouse ) SAL_OVERRIDE;
-    virtual void                SetPointerPos( long nX, long nY ) SAL_OVERRIDE;
+    virtual void                SetPointer( PointerStyle ePointerStyle ) override;
+    virtual void                CaptureMouse( bool bMouse ) override;
+    virtual void                SetPointerPos( long nX, long nY ) override;
 
     // flush output buffer
     using SalFrame::Flush;
-    virtual void                Flush() SAL_OVERRIDE;
+    virtual void                Flush() override;
     // flush output buffer, wait till outstanding operations are done
-    virtual void                Sync() SAL_OVERRIDE;
+    virtual void                Sync() override;
 
-    virtual void                SetInputContext( SalInputContext* pContext ) SAL_OVERRIDE;
-    virtual void                EndExtTextInput( EndExtTextInputFlags nFlags ) SAL_OVERRIDE;
+    virtual void                SetInputContext( SalInputContext* pContext ) override;
+    virtual void                EndExtTextInput( EndExtTextInputFlags nFlags ) override;
 
-    virtual OUString            GetKeyName( sal_uInt16 nKeyCode ) SAL_OVERRIDE;
-    virtual bool                MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) SAL_OVERRIDE;
+    virtual OUString            GetKeyName( sal_uInt16 nKeyCode ) override;
+    virtual bool                MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) override;
 
     // returns the input language used for the last key stroke
     // may be LANGUAGE_DONTKNOW if not supported by the OS
-    virtual LanguageType        GetInputLanguage() SAL_OVERRIDE;
+    virtual LanguageType        GetInputLanguage() override;
 
-    virtual void                UpdateSettings( AllSettings& rSettings ) SAL_OVERRIDE;
+    virtual void                UpdateSettings( AllSettings& rSettings ) override;
 
-    virtual void                Beep() SAL_OVERRIDE;
+    virtual void                Beep() override;
 
     // returns system data (most prominent: window handle)
-    virtual const SystemEnvData*    GetSystemData() const SAL_OVERRIDE;
+    virtual const SystemEnvData*    GetSystemData() const override;
 
     // get current modifier and button mask
-    virtual SalPointerState     GetPointerState() SAL_OVERRIDE;
+    virtual SalPointerState     GetPointerState() override;
 
-    virtual KeyIndicatorState   GetIndicatorState() SAL_OVERRIDE;
+    virtual KeyIndicatorState   GetIndicatorState() override;
 
-    virtual void                SimulateKeyPress( sal_uInt16 nKeyCode ) SAL_OVERRIDE;
+    virtual void                SimulateKeyPress( sal_uInt16 nKeyCode ) override;
 
     // set new parent window
-    virtual void                SetParent( SalFrame* pNewParent ) SAL_OVERRIDE;
+    virtual void                SetParent( SalFrame* pNewParent ) override;
     // reparent window to act as a plugin; implementation
     // may choose to use a new system window internally
     // return false to indicate failure
-    virtual bool                SetPluginParent( SystemParentData* pNewParent ) SAL_OVERRIDE;
+    virtual bool                SetPluginParent( SystemParentData* pNewParent ) override;
 
-    virtual void                SetScreenNumber( unsigned int ) SAL_OVERRIDE;
-    virtual void                SetApplicationID( const OUString &rWMClass ) SAL_OVERRIDE;
+    virtual void                SetScreenNumber( unsigned int ) override;
+    virtual void                SetApplicationID( const OUString &rWMClass ) override;
 
     // shaped system windows
     // set clip region to none (-> rectangular windows, normal state)
-    virtual void                ResetClipRegion() SAL_OVERRIDE;
+    virtual void                ResetClipRegion() override;
     // start setting the clipregion consisting of nRects rectangles
-    virtual void                BeginSetClipRegion( sal_uLong nRects ) SAL_OVERRIDE;
+    virtual void                BeginSetClipRegion( sal_uLong nRects ) override;
     // add a rectangle to the clip region
-    virtual void                UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
+    virtual void                UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) override;
     // done setting up the clipregion
-    virtual void                EndSetClipRegion() SAL_OVERRIDE;
+    virtual void                EndSetClipRegion() override;
 
     static GtkSalFrame         *getFromWindow( GtkWindow *pWindow );
 
-    virtual Window              GetX11Window() SAL_OVERRIDE;
+    virtual Window              GetX11Window() override;
 
     static void                 KeyCodeToGdkKey(const vcl::KeyCode& rKeyCode,
         guint* pGdkKeyCode, GdkModifierType *pGdkModifiers);
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index b41228664c72..ee101af7d609 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -41,18 +41,18 @@ public:
     virtual bool        drawNativeControl( ControlType nType, ControlPart nPart,
                                                const Rectangle& rControlRegion,
                                                ControlState nState, const ImplControlValue& aValue,
-                                               const OUString& rCaption ) SAL_OVERRIDE;
-    virtual bool        IsNativeControlSupported( ControlType nType, ControlPart nPart ) SAL_OVERRIDE;
+                                               const OUString& rCaption ) override;
+    virtual bool        IsNativeControlSupported( ControlType nType, ControlPart nPart ) override;
     virtual bool        getNativeControlRegion( ControlType nType, ControlPart nPart,
                                                     const Rectangle& rControlRegion,
                                                     ControlState nState,
                                                     const ImplControlValue& aValue,
                                                     const OUString& rCaption,
                                                     Rectangle &rNativeBoundingRegion,
-                                                    Rectangle &rNativeContentRegion ) SAL_OVERRIDE;
-    virtual bool        SupportsCairo() const SAL_OVERRIDE;
-    virtual cairo::SurfaceSharedPtr CreateSurface(const cairo::CairoSurfaceSharedPtr& rSurface) const SAL_OVERRIDE;
-    virtual cairo::SurfaceSharedPtr CreateSurface(const OutputDevice& rRefDevice, int x, int y, int width, int height) const SAL_OVERRIDE;
+                                                    Rectangle &rNativeContentRegion ) override;
+    virtual bool        SupportsCairo() const override;
+    virtual cairo::SurfaceSharedPtr CreateSurface(const cairo::CairoSurfaceSharedPtr& rSurface) const override;
+    virtual cairo::SurfaceSharedPtr CreateSurface(const OutputDevice& rRefDevice, int x, int y, int width, int height) const override;
     void WidgetQueueDraw() const;
 
     void updateSettings( AllSettings& rSettings );
@@ -61,7 +61,7 @@ public:
 
     cairo_t* getCairoContext() const;
 
-    virtual void GetResolution(sal_Int32& rDPIX, sal_Int32& rDPIY) SAL_OVERRIDE;
+    virtual void GetResolution(sal_Int32& rDPIX, sal_Int32& rDPIY) override;
 private:
     GtkWidget       *mpWindow;
     static GtkStyleContext *mpButtonStyle;
@@ -151,30 +151,30 @@ public:
     static  bool        bNeedTwoPasses;
 
     // native widget methods
-    virtual bool        IsNativeControlSupported( ControlType nType, ControlPart nPart ) SAL_OVERRIDE;
+    virtual bool        IsNativeControlSupported( ControlType nType, ControlPart nPart ) override;
     virtual bool        hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
-                                              const Point& aPos, bool& rIsInside ) SAL_OVERRIDE;
+                                              const Point& aPos, bool& rIsInside ) override;
     virtual bool        drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                            ControlState nState, const ImplControlValue& aValue,
-                                           const OUString& rCaption ) SAL_OVERRIDE;
+                                           const OUString& rCaption ) override;
     virtual bool        getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
                                                 const ImplControlValue& aValue, const OUString& rCaption,
-                                                Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) SAL_OVERRIDE;
+                                                Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) override;
 
     //helper methods for frame's UpdateSettings
     void updateSettings( AllSettings& rSettings );
     static void refreshFontconfig( GtkSettings *pSettings );
     static void signalSettingsNotify( GObject*, GParamSpec *pSpec, gpointer );
 
-    virtual bool            setClipRegion( const vcl::Region& ) SAL_OVERRIDE;
-    virtual void            ResetClipRegion() SAL_OVERRIDE;
+    virtual bool            setClipRegion( const vcl::Region& ) override;
+    virtual void            ResetClipRegion() override;
 
     // some themes set the background pixmap of our window EVERY time
     // a control is painted; but presentation effects need
     // the background set to None; workaround: set the background
     // before copyBits
     virtual void            copyBits( const SalTwoRect& rPosAry,
-                                      SalGraphics* pSrcGraphics ) SAL_OVERRIDE;
+                                      SalGraphics* pSrcGraphics ) override;
 
 protected:
     typedef std::list< Rectangle > clipList;
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index 6b68a8493ca2..48701bafb3d6 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -60,42 +60,42 @@ public:
             GtkInstance( SalYieldMutex* pMutex );
     virtual ~GtkInstance();
     void    EnsureInit();
-    virtual void AfterAppInit() SAL_OVERRIDE;
-
-    virtual SalFrame*           CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) SAL_OVERRIDE;
-    virtual SalFrame*           CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) SAL_OVERRIDE;
-    virtual SalObject*          CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow = true ) SAL_OVERRIDE;
-    virtual SalSystem*          CreateSalSystem() SAL_OVERRIDE;
-    virtual SalInfoPrinter*     CreateInfoPrinter(SalPrinterQueueInfo* pPrinterQueueInfo, ImplJobSetup* pJobSetup) SAL_OVERRIDE;
-    virtual SalPrinter*         CreatePrinter( SalInfoPrinter* pInfoPrinter ) SAL_OVERRIDE;
-    virtual SalMenu*            CreateMenu( bool, Menu* ) SAL_OVERRIDE;
-    virtual void                DestroyMenu( SalMenu* pMenu ) SAL_OVERRIDE;
-    virtual SalMenuItem*        CreateMenuItem( const SalItemParams* ) SAL_OVERRIDE;
-    virtual void                DestroyMenuItem( SalMenuItem* pItem ) SAL_OVERRIDE;
-    virtual SalTimer*           CreateSalTimer() SAL_OVERRIDE;
-    virtual void                AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService) SAL_OVERRIDE;
+    virtual void AfterAppInit() override;
+
+    virtual SalFrame*           CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) override;
+    virtual SalFrame*           CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) override;
+    virtual SalObject*          CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow = true ) override;
+    virtual SalSystem*          CreateSalSystem() override;
+    virtual SalInfoPrinter*     CreateInfoPrinter(SalPrinterQueueInfo* pPrinterQueueInfo, ImplJobSetup* pJobSetup) override;
+    virtual SalPrinter*         CreatePrinter( SalInfoPrinter* pInfoPrinter ) override;
+    virtual SalMenu*            CreateMenu( bool, Menu* ) override;
+    virtual void                DestroyMenu( SalMenu* pMenu ) override;
+    virtual SalMenuItem*        CreateMenuItem( const SalItemParams* ) override;
+    virtual void                DestroyMenuItem( SalMenuItem* pItem ) override;
+    virtual SalTimer*           CreateSalTimer() override;
+    virtual void                AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService) override;
     virtual SalVirtualDevice*   CreateVirtualDevice( SalGraphics*,
                                                      long &nDX, long &nDY,
                                                      sal_uInt16 nBitCount,
-                                                     const SystemGraphicsData* ) SAL_OVERRIDE;
-    virtual SalBitmap*          CreateSalBitmap() SAL_OVERRIDE;
+                                                     const SystemGraphicsData* ) override;
+    virtual SalBitmap*          CreateSalBitmap() override;
 
-    virtual void                DoYield(bool bWait, bool bHandleAllCurrentEvents, sal_uLong nReleased) SAL_OVERRIDE;
-    virtual bool                AnyInput( VclInputFlags nType ) SAL_OVERRIDE;
+    virtual void                DoYield(bool bWait, bool bHandleAllCurrentEvents, sal_uLong nReleased) override;
+    virtual bool                AnyInput( VclInputFlags nType ) override;
 
-    virtual GenPspGraphics     *CreatePrintGraphics() SAL_OVERRIDE;
+    virtual GenPspGraphics     *CreatePrintGraphics() override;
 
-    virtual bool hasNativeFileSelection() const SAL_OVERRIDE { return true; }
+    virtual bool hasNativeFileSelection() const override { return true; }
 
     virtual com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFilePicker2 >
         createFilePicker( const com::sun::star::uno::Reference<
-                              com::sun::star::uno::XComponentContext >& ) SAL_OVERRIDE;
+                              com::sun::star::uno::XComponentContext >& ) override;
     virtual com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFolderPicker2 >
         createFolderPicker( const com::sun::star::uno::Reference<
-                                com::sun::star::uno::XComponentContext >& ) SAL_OVERRIDE;
+                                com::sun::star::uno::XComponentContext >& ) override;
 
 #if GTK_CHECK_VERSION(3,0,0)
-    virtual css::uno::Reference< css::uno::XInterface > CreateClipboard( const css::uno::Sequence< css::uno::Any >& i_rArguments ) SAL_OVERRIDE;
+    virtual css::uno::Reference< css::uno::XInterface > CreateClipboard( const css::uno::Sequence< css::uno::Any >& i_rArguments ) override;
 #endif
 
     void                        RemoveTimer (SalTimer *pTimer);
diff --git a/vcl/inc/unx/gtk/gtkobject.hxx b/vcl/inc/unx/gtk/gtkobject.hxx
index 5204143b6be8..9e2ad5da1fc1 100644
--- a/vcl/inc/unx/gtk/gtkobject.hxx
+++ b/vcl/inc/unx/gtk/gtkobject.hxx
@@ -44,18 +44,18 @@ public:
     virtual ~GtkSalObject();
 
     // override all pure virtual methods
-     virtual void                   ResetClipRegion() SAL_OVERRIDE;
-    virtual sal_uInt16              GetClipRegionType() SAL_OVERRIDE;
-    virtual void                    BeginSetClipRegion( sal_uLong nRects ) SAL_OVERRIDE;
-    virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual void                    EndSetClipRegion() SAL_OVERRIDE;
+     virtual void                   ResetClipRegion() override;
+    virtual sal_uInt16              GetClipRegionType() override;
+    virtual void                    BeginSetClipRegion( sal_uLong nRects ) override;
+    virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) override;
+    virtual void                    EndSetClipRegion() override;
 
-    virtual void                    SetPosSize( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual void                    Show( bool bVisible ) SAL_OVERRIDE;
+    virtual void                    SetPosSize( long nX, long nY, long nWidth, long nHeight ) override;
+    virtual void                    Show( bool bVisible ) override;
 
-    virtual void                    SetForwardKey( bool bEnable ) SAL_OVERRIDE;
+    virtual void                    SetForwardKey( bool bEnable ) override;
 
-    virtual const SystemEnvData*    GetSystemData() const SAL_OVERRIDE;
+    virtual const SystemEnvData*    GetSystemData() const override;
 };
 
 #endif // INCLUDED_VCL_INC_UNX_GTK_GTKOBJECT_HXX
diff --git a/vcl/inc/unx/gtk/gtkprn.hxx b/vcl/inc/unx/gtk/gtkprn.hxx
index dd72ebcd0e60..0b515bf61c62 100644
--- a/vcl/inc/unx/gtk/gtkprn.hxx
+++ b/vcl/inc/unx/gtk/gtkprn.hxx
@@ -25,8 +25,8 @@ public:
     virtual bool StartJob(
             const OUString* i_pFileName, const OUString& i_rJobName,
             const OUString& i_rAppName, ImplJobSetup* io_pSetupData,
-            vcl::PrinterController& io_rController) SAL_OVERRIDE;
-    virtual bool EndJob() SAL_OVERRIDE;
+            vcl::PrinterController& io_rController) override;
+    virtual bool EndJob() override;
 
 private:
     bool impl_doJob(
@@ -41,7 +41,7 @@ private:
 class VCL_DLLPUBLIC GtkSalInfoPrinter : public PspSalInfoPrinter
 {
 public:
-    sal_uLong GetCapabilities(const ImplJobSetup* i_pSetupData, PrinterCapType i_nType) SAL_OVERRIDE;
+    sal_uLong GetCapabilities(const ImplJobSetup* i_pSetupData, PrinterCapType i_nType) override;
 };
 
 #endif // INCLUDED_VCL_INC_UNX_GTK_GTKPRN_HXX
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index 1db5de82046e..998a9257d699 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -57,21 +57,21 @@ public:
     GtkSalMenu( bool bMenuBar );
     virtual ~GtkSalMenu();
 
-    virtual bool                VisibleMenuBar() SAL_OVERRIDE;   // must return TRUE to actually DISPLAY native menu bars
+    virtual bool                VisibleMenuBar() override;   // must return TRUE to actually DISPLAY native menu bars
                                                     // otherwise only menu messages are processed (eg, OLE on Windows)
 
-    virtual void                InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ) SAL_OVERRIDE;
-    virtual void                RemoveItem( unsigned nPos ) SAL_OVERRIDE;
-    virtual void                SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos ) SAL_OVERRIDE;
-    virtual void                SetFrame( const SalFrame* pFrame ) SAL_OVERRIDE;
+    virtual void                InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ) override;
+    virtual void                RemoveItem( unsigned nPos ) override;
+    virtual void                SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos ) override;
+    virtual void                SetFrame( const SalFrame* pFrame ) override;
     const GtkSalFrame*          GetFrame() const;
-    virtual void                CheckItem( unsigned nPos, bool bCheck ) SAL_OVERRIDE;
-    virtual void                EnableItem( unsigned nPos, bool bEnable ) SAL_OVERRIDE;
-    virtual void                ShowItem( unsigned nPos, bool bShow ) SAL_OVERRIDE;
-    virtual void                SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText ) SAL_OVERRIDE;
-    virtual void                SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage) SAL_OVERRIDE;
-    virtual void                SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const vcl::KeyCode& rKeyCode, const OUString& rKeyName ) SAL_OVERRIDE;
-    virtual void                GetSystemMenuData( SystemMenuData* pData ) SAL_OVERRIDE;
+    virtual void                CheckItem( unsigned nPos, bool bCheck ) override;
+    virtual void                EnableItem( unsigned nPos, bool bEnable ) override;
+    virtual void                ShowItem( unsigned nPos, bool bShow ) override;
+    virtual void                SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText ) override;
+    virtual void                SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage) override;
+    virtual void                SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const vcl::KeyCode& rKeyCode, const OUString& rKeyName ) override;
+    virtual void                GetSystemMenuData( SystemMenuData* pData ) override;
 
     void                        SetMenu( Menu* pMenu ) { mpVCLMenu = pMenu; }
     Menu*                       GetMenu() { return mpVCLMenu; }
diff --git a/vcl/inc/unx/gtk/gtksys.hxx b/vcl/inc/unx/gtk/gtksys.hxx
index 29d956196f03..32585bb43e09 100644
--- a/vcl/inc/unx/gtk/gtksys.hxx
+++ b/vcl/inc/unx/gtk/gtksys.hxx
@@ -26,14 +26,14 @@ public:
     virtual ~GtkSalSystem();
     static   GtkSalSystem *GetSingleton();
 
-    virtual bool          IsUnifiedDisplay() SAL_OVERRIDE;
-    virtual unsigned int  GetDisplayScreenCount() SAL_OVERRIDE;
-    virtual unsigned int  GetDisplayBuiltInScreen() SAL_OVERRIDE;
-    virtual Rectangle     GetDisplayScreenPosSizePixel   (unsigned int nScreen) SAL_OVERRIDE;
+    virtual bool          IsUnifiedDisplay() override;
+    virtual unsigned int  GetDisplayScreenCount() override;
+    virtual unsigned int  GetDisplayBuiltInScreen() override;
+    virtual Rectangle     GetDisplayScreenPosSizePixel   (unsigned int nScreen) override;
     virtual int           ShowNativeDialog (const OUString&              rTitle,
                                             const OUString&              rMessage,
                                             const std::list< OUString >& rButtons,
-                                            int                        nDefButton) SAL_OVERRIDE;
+                                            int                        nDefButton) override;
     SalX11Screen      GetDisplayDefaultXScreen()
             { return getXScreenFromDisplayScreen( GetDisplayBuiltInScreen() ); }
     int               GetDisplayXScreenCount();
diff --git a/vcl/inc/unx/i18n_status.hxx b/vcl/inc/unx/i18n_status.hxx
index 223ab5479baa..cd6d87559fc7 100644
--- a/vcl/inc/unx/i18n_status.hxx
+++ b/vcl/inc/unx/i18n_status.hxx
@@ -44,8 +44,8 @@ public:
     X11ImeStatus() {}
     virtual ~X11ImeStatus();
 
-    virtual bool canToggle() SAL_OVERRIDE;
-    virtual void toggle() SAL_OVERRIDE;
+    virtual bool canToggle() override;
+    virtual void toggle() override;
 };
 
 class I18NStatus
diff --git a/vcl/inc/unx/kde/kdedata.hxx b/vcl/inc/unx/kde/kdedata.hxx
index e6bc5b15b017..9bdada352466 100644
--- a/vcl/inc/unx/kde/kdedata.hxx
+++ b/vcl/inc/unx/kde/kdedata.hxx
@@ -30,9 +30,9 @@ public:
     KDEData( SalInstance *pInstance ) : X11SalData( SAL_DATA_KDE3, pInstance ) {}
     virtual ~KDEData();
 
-    virtual void Init() SAL_OVERRIDE;
-    virtual void initNWF() SAL_OVERRIDE;
-    virtual void deInitNWF() SAL_OVERRIDE;
+    virtual void Init() override;
+    virtual void initNWF() override;
+    virtual void deInitNWF() override;
 };
 
 class SalKDEDisplay : public SalX11Display
@@ -62,11 +62,11 @@ public:
     KDESalFrame( SalFrame* pParent, SalFrameStyleFlags );
     virtual ~KDESalFrame();
 
-    virtual SalGraphics* AcquireGraphics() SAL_OVERRIDE;
-    virtual void ReleaseGraphics( SalGraphics *pGraphics ) SAL_OVERRIDE;
-    virtual void updateGraphics( bool bClear ) SAL_OVERRIDE;
-    virtual void UpdateSettings( AllSettings& rSettings ) SAL_OVERRIDE;
-    virtual void Show( bool bVisible, bool bNoActivate ) SAL_OVERRIDE;
+    virtual SalGraphics* AcquireGraphics() override;
+    virtual void ReleaseGraphics( SalGraphics *pGraphics ) override;
+    virtual void updateGraphics( bool bClear ) override;
+    virtual void UpdateSettings( AllSettings& rSettings ) override;
+    virtual void Show( bool bVisible, bool bNoActivate ) override;
 };
 
 class KDESalInstance : public X11SalInstance
@@ -75,13 +75,13 @@ public:
     KDESalInstance( SalYieldMutex* pMutex )
             : X11SalInstance( pMutex ) {}
     virtual ~KDESalInstance() {}
-    virtual SalFrame* CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) SAL_OVERRIDE;
+    virtual SalFrame* CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) override;
 
-    virtual bool hasNativeFileSelection() const SAL_OVERRIDE { return true; }
+    virtual bool hasNativeFileSelection() const override { return true; }
 
     virtual com::sun::star::uno::Reference< com::sun::star::ui::dialogs::XFilePicker2 >
         createFilePicker( const com::sun::star::uno::Reference<
-                              com::sun::star::uno::XComponentContext >& ) SAL_OVERRIDE;
+                              com::sun::star::uno::XComponentContext >& ) override;
 };
 
 class KDEXLib : public SalXLib
@@ -100,7 +100,7 @@ public:
         m_nFakeCmdLineArgs( 0 )
         {}
     virtual ~KDEXLib();
-    virtual void Init() SAL_OVERRIDE;
+    virtual void Init() override;
 
     void doStartup();
 };
diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h
index edd8b023266f..c04d5ee58e2b 100644
--- a/vcl/inc/unx/salbmp.h
+++ b/vcl/inc/unx/salbmp.h
@@ -116,18 +116,18 @@ public:
                                     const Size& rSize,
                                     sal_uInt16 nBitCount,
                                     const BitmapPalette& rPal
-                                ) SAL_OVERRIDE;
+                                ) override;
 
-    virtual bool                Create( const SalBitmap& rSalBmp ) SAL_OVERRIDE;
+    virtual bool                Create( const SalBitmap& rSalBmp ) override;
     virtual bool                Create(
                                     const SalBitmap& rSalBmp,
                                     SalGraphics* pGraphics
-                                ) SAL_OVERRIDE;
+                                ) override;
 
     virtual bool                Create(
                                     const SalBitmap& rSalBmp,
                                     sal_uInt16 nNewBitCount
-                                ) SAL_OVERRIDE;
+                                ) override;
 
     virtual bool                Create(
                                     const ::com::sun::star::uno::Reference<
@@ -135,19 +135,19 @@ public:
                                     >& rBitmapCanvas,
                                     Size& rSize,
                                     bool bMask = false
-                                ) SAL_OVERRIDE;
+                                ) override;
 
-    virtual void                Destroy() SAL_OVERRIDE;
+    virtual void                Destroy() override;
 
-    virtual Size                GetSize() const SAL_OVERRIDE;
-    virtual sal_uInt16          GetBitCount() const SAL_OVERRIDE;
+    virtual Size                GetSize() const override;
+    virtual sal_uInt16          GetBitCount() const override;
 
-    virtual BitmapBuffer*       AcquireBuffer( BitmapAccessMode nMode ) SAL_OVERRIDE;
-    virtual void                ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode ) SAL_OVERRIDE;
-    virtual bool                GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE;
+    virtual BitmapBuffer*       AcquireBuffer( BitmapAccessMode nMode ) override;
+    virtual void                ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode ) override;
+    virtual bool                GetSystemData( BitmapSystemData& rData ) override;
 
-    virtual bool                Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) SAL_OVERRIDE;
-    virtual bool                Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) SAL_OVERRIDE;
+    virtual bool                Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) override;
+    virtual bool                Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) override;
 };
 
 // - ImplSalDDB -
diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx
index 3c0f273c907e..df2f700c6e71 100644
--- a/vcl/inc/unx/saldata.hxx
+++ b/vcl/inc/unx/saldata.hxx
@@ -64,7 +64,7 @@ public:
     virtual ~X11SalData();
 
     virtual void            Init();
-    virtual void            Dispose() SAL_OVERRIDE;
+    virtual void            Dispose() override;
 
     virtual void            initNWF();
     virtual void            deInitNWF();
@@ -76,8 +76,8 @@ public:
     static void             Timeout( bool idle );
 
     // X errors
-    virtual void            ErrorTrapPush() SAL_OVERRIDE;
-    virtual bool            ErrorTrapPop( bool bIgnoreError ) SAL_OVERRIDE;
+    virtual void            ErrorTrapPush() override;
+    virtual bool            ErrorTrapPop( bool bIgnoreError ) override;
     void                    XError( Display *pDisp, XErrorEvent *pEvent );
     bool                    HasXErrorOccurred() const
                                 { return m_aXErrorHandlerStack.back().m_bWas; }
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 8e209d607645..6c8c274313f0 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -352,7 +352,7 @@ public:
 
     std::list< SalObject* >& getSalObjects() { return m_aSalObjects; }
 
-    virtual void    PostUserEvent() SAL_OVERRIDE = 0;
+    virtual void    PostUserEvent() override = 0;
 };
 
 inline  Display *SalColormap::GetXDisplay() const
@@ -364,9 +364,9 @@ public:
              SalX11Display( Display* pDisp );
     virtual ~SalX11Display();
 
-    virtual bool        Dispatch( XEvent *pEvent ) SAL_OVERRIDE;
+    virtual bool        Dispatch( XEvent *pEvent ) override;
     virtual void        Yield();
-    virtual void        PostUserEvent() SAL_OVERRIDE;
+    virtual void        PostUserEvent() override;
 
     bool                IsEvent();
     void                SetupInput( SalI18N_InputMethod *pInputMethod );
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index e211fd16d5a1..489ee25cdd26 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -200,68 +200,68 @@ public:
     bool                    appendUnicodeSequence( sal_Unicode );
     bool                    endUnicodeSequence();
 
-    virtual SalGraphics*        AcquireGraphics() SAL_OVERRIDE;
-    virtual void                ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE;
+    virtual SalGraphics*        AcquireGraphics() override;
+    virtual void                ReleaseGraphics( SalGraphics* pGraphics ) override;
 
     // call with true to clear graphics (setting None as drawable)
     // call with false to setup graphics with window (GetWindow())
     virtual void                updateGraphics( bool bClear );
 
-    virtual bool                PostEvent(ImplSVEvent* pData) SAL_OVERRIDE;
-
-    virtual void                SetTitle( const OUString& rTitle ) SAL_OVERRIDE;
-    virtual void                SetIcon( sal_uInt16 nIcon ) SAL_OVERRIDE;
-    virtual void                SetMenu( SalMenu* pMenu ) SAL_OVERRIDE;
-    virtual void                                DrawMenuBar() SAL_OVERRIDE;
-
-    virtual void                SetExtendedFrameStyle( SalExtStyle nExtStyle ) SAL_OVERRIDE;
-    virtual void                Show( bool bVisible, bool bNoActivate = false ) SAL_OVERRIDE;
-    virtual void                SetMinClientSize( long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual void                SetMaxClientSize( long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) SAL_OVERRIDE;
-    virtual void                GetClientSize( long& rWidth, long& rHeight ) SAL_OVERRIDE;
-    virtual void                GetWorkArea( Rectangle& rRect ) SAL_OVERRIDE;
-    virtual SalFrame*           GetParent() const SAL_OVERRIDE;
-    virtual void                SetWindowState( const SalFrameState* pState ) SAL_OVERRIDE;
-    virtual bool                GetWindowState( SalFrameState* pState ) SAL_OVERRIDE;
-    virtual void                ShowFullScreen( bool bFullScreen, sal_Int32 nMonitor ) SAL_OVERRIDE;
-    virtual void                StartPresentation( bool bStart ) SAL_OVERRIDE;
-    virtual void                SetAlwaysOnTop( bool bOnTop ) SAL_OVERRIDE;
-    virtual void                ToTop( sal_uInt16 nFlags ) SAL_OVERRIDE;
-    virtual void                SetPointer( PointerStyle ePointerStyle ) SAL_OVERRIDE;
-    virtual void                CaptureMouse( bool bMouse ) SAL_OVERRIDE;
-    virtual void                SetPointerPos( long nX, long nY ) SAL_OVERRIDE;
+    virtual bool                PostEvent(ImplSVEvent* pData) override;
+
+    virtual void                SetTitle( const OUString& rTitle ) override;
+    virtual void                SetIcon( sal_uInt16 nIcon ) override;
+    virtual void                SetMenu( SalMenu* pMenu ) override;
+    virtual void                                DrawMenuBar() override;
+
+    virtual void                SetExtendedFrameStyle( SalExtStyle nExtStyle ) override;
+    virtual void                Show( bool bVisible, bool bNoActivate = false ) override;
+    virtual void                SetMinClientSize( long nWidth, long nHeight ) override;
+    virtual void                SetMaxClientSize( long nWidth, long nHeight ) override;
+    virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) override;
+    virtual void                GetClientSize( long& rWidth, long& rHeight ) override;
+    virtual void                GetWorkArea( Rectangle& rRect ) override;
+    virtual SalFrame*           GetParent() const override;
+    virtual void                SetWindowState( const SalFrameState* pState ) override;
+    virtual bool                GetWindowState( SalFrameState* pState ) override;
+    virtual void                ShowFullScreen( bool bFullScreen, sal_Int32 nMonitor ) override;
+    virtual void                StartPresentation( bool bStart ) override;
+    virtual void                SetAlwaysOnTop( bool bOnTop ) override;
+    virtual void                ToTop( sal_uInt16 nFlags ) override;
+    virtual void                SetPointer( PointerStyle ePointerStyle ) override;
+    virtual void                CaptureMouse( bool bMouse ) override;
+    virtual void                SetPointerPos( long nX, long nY ) override;
     using SalFrame::Flush;
-    virtual void                Flush() SAL_OVERRIDE;
-    virtual void                Sync() SAL_OVERRIDE;
-    virtual void                SetInputContext( SalInputContext* pContext ) SAL_OVERRIDE;
-    virtual void                EndExtTextInput( EndExtTextInputFlags nFlags ) SAL_OVERRIDE;
-    virtual OUString              GetKeyName( sal_uInt16 nKeyCode ) SAL_OVERRIDE;
-    virtual bool                MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) SAL_OVERRIDE;
-    virtual LanguageType        GetInputLanguage() SAL_OVERRIDE;
-    virtual void                UpdateSettings( AllSettings& rSettings ) SAL_OVERRIDE;
-    virtual void                Beep() SAL_OVERRIDE;
-    virtual const SystemEnvData*    GetSystemData() const SAL_OVERRIDE;
-    virtual SalPointerState     GetPointerState() SAL_OVERRIDE;
-    virtual KeyIndicatorState   GetIndicatorState() SAL_OVERRIDE;
-    virtual void                SimulateKeyPress( sal_uInt16 nKeyCode ) SAL_OVERRIDE;
-    virtual void                SetParent( SalFrame* pNewParent ) SAL_OVERRIDE;
-    virtual bool                SetPluginParent( SystemParentData* pNewParent ) SAL_OVERRIDE;
-
-    virtual void                SetScreenNumber( unsigned int ) SAL_OVERRIDE;
-    virtual void                SetApplicationID( const OUString &rWMClass ) SAL_OVERRIDE;
+    virtual void                Flush() override;
+    virtual void                Sync() override;
+    virtual void                SetInputContext( SalInputContext* pContext ) override;
+    virtual void                EndExtTextInput( EndExtTextInputFlags nFlags ) override;
+    virtual OUString              GetKeyName( sal_uInt16 nKeyCode ) override;
+    virtual bool                MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) override;
+    virtual LanguageType        GetInputLanguage() override;
+    virtual void                UpdateSettings( AllSettings& rSettings ) override;
+    virtual void                Beep() override;
+    virtual const SystemEnvData*    GetSystemData() const override;
+    virtual SalPointerState     GetPointerState() override;
+    virtual KeyIndicatorState   GetIndicatorState() override;
+    virtual void                SimulateKeyPress( sal_uInt16 nKeyCode ) override;
+    virtual void                SetParent( SalFrame* pNewParent ) override;
+    virtual bool                SetPluginParent( SystemParentData* pNewParent ) override;
+
+    virtual void                SetScreenNumber( unsigned int ) override;
+    virtual void                SetApplicationID( const OUString &rWMClass ) override;
 
     // shaped system windows
     // set clip region to none (-> rectangular windows, normal state)
-    virtual void                    ResetClipRegion() SAL_OVERRIDE;
+    virtual void                    ResetClipRegion() override;
     // start setting the clipregion consisting of nRects rectangles
-    virtual void                    BeginSetClipRegion( sal_uIntPtr nRects ) SAL_OVERRIDE;
+    virtual void                    BeginSetClipRegion( sal_uIntPtr nRects ) override;
     // add a rectangle to the clip region
-    virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
+    virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) override;
     // done setting up the clipregion
-    virtual void                    EndSetClipRegion() SAL_OVERRIDE;
+    virtual void                    EndSetClipRegion() override;
 
-    virtual Window GetX11Window() SAL_OVERRIDE;
+    virtual Window GetX11Window() override;
 
     /// @internal
     void setPendingSizeEvent();
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index 3517359dadaa..422b5b2b19c1 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -77,7 +77,7 @@ public:
     void                            Init( X11OpenGLSalVirtualDevice *pVirtualDevice );
     void                            DeInit();
 
-    virtual SalGraphicsImpl*        GetImpl() const SAL_OVERRIDE;
+    virtual SalGraphicsImpl*        GetImpl() const override;
     inline  const SalDisplay*       GetDisplay() const;
     inline  Display*                GetXDisplay() const;
     inline  const SalVisual&        GetVisual() const;
@@ -94,32 +94,32 @@ public:
     SalX11Screen                    GetScreenNumber() const { return m_nXScreen; }
 
     // override all pure virtual methods
-    virtual void                    GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) SAL_OVERRIDE;
-    virtual sal_uInt16              GetBitCount() const SAL_OVERRIDE;
-    virtual long                    GetGraphicsWidth() const SAL_OVERRIDE;
+    virtual void                    GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) override;
+    virtual sal_uInt16              GetBitCount() const override;
+    virtual long                    GetGraphicsWidth() const override;
 
-    virtual void                    ResetClipRegion() SAL_OVERRIDE;
-    virtual bool                    setClipRegion( const vcl::Region& ) SAL_OVERRIDE;
+    virtual void                    ResetClipRegion() override;
+    virtual bool                    setClipRegion( const vcl::Region& ) override;
 
-    virtual void                    SetLineColor() SAL_OVERRIDE;
-    virtual void                    SetLineColor( SalColor nSalColor ) SAL_OVERRIDE;
-    virtual void                    SetFillColor() SAL_OVERRIDE;
+    virtual void                    SetLineColor() override;
+    virtual void                    SetLineColor( SalColor nSalColor ) override;
+    virtual void                    SetFillColor() override;
 
-    virtual void                    SetFillColor( SalColor nSalColor ) SAL_OVERRIDE;
+    virtual void                    SetFillColor( SalColor nSalColor ) override;
 
-    virtual void                    SetXORMode( bool bSet, bool ) SAL_OVERRIDE;
+    virtual void                    SetXORMode( bool bSet, bool ) override;
 
-    virtual void                    SetROPLineColor( SalROPColor nROPColor ) SAL_OVERRIDE;
-    virtual void                    SetROPFillColor( SalROPColor nROPColor ) SAL_OVERRIDE;
+    virtual void                    SetROPLineColor( SalROPColor nROPColor ) override;
+    virtual void                    SetROPFillColor( SalROPColor nROPColor ) override;
 
-    virtual void                    SetTextColor( SalColor nSalColor ) SAL_OVERRIDE;
-    virtual sal_uInt16              SetFont( FontSelectPattern*, int nFallbackLevel ) SAL_OVERRIDE;
-    virtual void                    GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) SAL_OVERRIDE;
-    virtual const FontCharMapPtr    GetFontCharMap() const SAL_OVERRIDE;
-    virtual bool                    GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const SAL_OVERRIDE;
-    virtual void                    GetDevFontList( PhysicalFontCollection* ) SAL_OVERRIDE;
-    virtual void                    ClearDevFontCache() SAL_OVERRIDE;
-    virtual bool                    AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ) SAL_OVERRIDE;
+    virtual void                    SetTextColor( SalColor nSalColor ) override;
+    virtual sal_uInt16              SetFont( FontSelectPattern*, int nFallbackLevel ) override;
+    virtual void                    GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) override;
+    virtual const FontCharMapPtr    GetFontCharMap() const override;
+    virtual bool                    GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const override;
+    virtual void                    GetDevFontList( PhysicalFontCollection* ) override;
+    virtual void                    ClearDevFontCache() override;
+    virtual bool                    AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ) override;
 
     virtual bool                    CreateFontSubset(
                                         const OUString& rToFile,
@@ -128,9 +128,9 @@ public:
                                         const sal_uInt8* pEncoding,
                                         sal_Int32* pWidths,
                                         int nGlyphs,
-                                        FontSubsetInfo& rInfo ) SAL_OVERRIDE;
+                                        FontSubsetInfo& rInfo ) override;
 
-    virtual const Ucs2SIntMap*      GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded, std::set<sal_Unicode> const**) SAL_OVERRIDE;
+    virtual const Ucs2SIntMap*      GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded, std::set<sal_Unicode> const**) override;
 
     virtual const void*             GetEmbedFontData(
                                         const PhysicalFontFace*,
@@ -138,61 +138,61 @@ public:
                                         sal_Int32* pWidths,
                                         size_t nLen,
                                         FontSubsetInfo& rInfo,
-                                        long* pDataLen ) SAL_OVERRIDE;
+                                        long* pDataLen ) override;
 
-    virtual void                    FreeEmbedFontData( const void* pData, long nDataLen ) SAL_OVERRIDE;
+    virtual void                    FreeEmbedFontData( const void* pData, long nDataLen ) override;
 
     virtual void                    GetGlyphWidths(
                                         const PhysicalFontFace*,
                                         bool bVertical,
                                         Int32Vector& rWidths,
-                                        Ucs2UIntMap& rUnicodeEnc ) SAL_OVERRIDE;
+                                        Ucs2UIntMap& rUnicodeEnc ) override;
 
-    virtual bool                    GetGlyphBoundRect( sal_GlyphId nIndex, Rectangle& ) SAL_OVERRIDE;
-    virtual bool                    GetGlyphOutline( sal_GlyphId nIndex, ::basegfx::B2DPolyPolygon& ) SAL_OVERRIDE;
-    virtual SalLayout*              GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) SAL_OVERRIDE;
-    virtual void                    DrawServerFontLayout( const ServerFontLayout& ) SAL_OVERRIDE;
+    virtual bool                    GetGlyphBoundRect( sal_GlyphId nIndex, Rectangle& ) override;
+    virtual bool                    GetGlyphOutline( sal_GlyphId nIndex, ::basegfx::B2DPolyPolygon& ) override;
+    virtual SalLayout*              GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) override;
+    virtual void                    DrawServerFontLayout( const ServerFontLayout& ) override;
 
-    virtual bool                    supportsOperation( OutDevSupportType ) const SAL_OVERRIDE;
-    virtual void                    drawPixel( long nX, long nY ) SAL_OVERRIDE;
-    virtual void                    drawPixel( long nX, long nY, SalColor nSalColor ) SAL_OVERRIDE;
-    virtual void                    drawLine( long nX1, long nY1, long nX2, long nY2 ) SAL_OVERRIDE;
-    virtual void                    drawRect( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual void                    drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) SAL_OVERRIDE;
-    virtual void                    drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) SAL_OVERRIDE;
+    virtual bool                    supportsOperation( OutDevSupportType ) const override;
+    virtual void                    drawPixel( long nX, long nY ) override;
+    virtual void                    drawPixel( long nX, long nY, SalColor nSalColor ) override;
+    virtual void                    drawLine( long nX1, long nY1, long nX2, long nY2 ) override;
+    virtual void                    drawRect( long nX, long nY, long nWidth, long nHeight ) override;
+    virtual void                    drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) override;
+    virtual void                    drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) override;
 
     virtual void                    drawPolyPolygon(
                                         sal_uInt32 nPoly,
                                         const sal_uInt32* pPoints,
-                                        PCONSTSALPOINT* pPtAry ) SAL_OVERRIDE;
+                                        PCONSTSALPOINT* pPtAry ) override;
 
-    virtual bool                    drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ) SAL_OVERRIDE;
+    virtual bool                    drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ) override;
 
     virtual bool                    drawPolyLine(
                                         const ::basegfx::B2DPolygon&,
                                         double fTransparency,
                                         const ::basegfx::B2DVector& rLineWidth,
                                         basegfx::B2DLineJoin,
-                                        com::sun::star::drawing::LineCap ) SAL_OVERRIDE;
+                                        com::sun::star::drawing::LineCap ) override;
 
-    virtual bool                    drawGradient( const tools::PolyPolygon&, const Gradient& ) SAL_OVERRIDE;
+    virtual bool                    drawGradient( const tools::PolyPolygon&, const Gradient& ) override;
 
 #if 1 // TODO: remove these obsolete methods
     virtual bool                    drawPolyLineBezier(
                                         sal_uInt32 nPoints,
                                         const SalPoint* pPtAry,
-                                        const sal_uInt8* pFlgAry ) SAL_OVERRIDE;
+                                        const sal_uInt8* pFlgAry ) override;
 
     virtual bool                    drawPolygonBezier(
                                         sal_uInt32 nPoints,
                                         const SalPoint* pPtAry,
-                                        const sal_uInt8* pFlgAry ) SAL_OVERRIDE;
+                                        const sal_uInt8* pFlgAry ) override;
 
     virtual bool                    drawPolyPolygonBezier(
                                         sal_uInt32 nPoly,
                                         const sal_uInt32* pPoints,
                                         const SalPoint* const* pPtAry,
-                                        const sal_uInt8* const* pFlgAry ) SAL_OVERRIDE;
+                                        const sal_uInt8* const* pFlgAry ) override;
 #endif
 
     virtual void                    copyArea(
@@ -202,68 +202,68 @@ public:
                                         long nSrcY,
                                         long nSrcWidth,
                                         long nSrcHeight,
-                                        sal_uInt16 nFlags ) SAL_OVERRIDE;
+                                        sal_uInt16 nFlags ) override;
 
     virtual void                    copyBits(
                                         const SalTwoRect& rPosAry,
-                                        SalGraphics* pSrcGraphics ) SAL_OVERRIDE;
+                                        SalGraphics* pSrcGraphics ) override;
 
     virtual void                    drawBitmap(
                                         const SalTwoRect& rPosAry,
-                                        const SalBitmap& rSalBitmap ) SAL_OVERRIDE;
+                                        const SalBitmap& rSalBitmap ) override;
 
     virtual void                    drawBitmap(
                                         const SalTwoRect& rPosAry,
                                         const SalBitmap& rSalBitmap,
-                                        const SalBitmap& rMaskBitmap ) SAL_OVERRIDE;
+                                        const SalBitmap& rMaskBitmap ) override;
 
     virtual void                    drawMask(
                                         const SalTwoRect& rPosAry,
                                         const SalBitmap& rSalBitmap,
-                                        SalColor nMaskColor ) SAL_OVERRIDE;
+                                        SalColor nMaskColor ) override;
 
-    virtual SalBitmap*              getBitmap( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual SalColor                getPixel( long nX, long nY ) SAL_OVERRIDE;
-    virtual void                    invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags ) SAL_OVERRIDE;
-    virtual void                    invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) SAL_OVERRIDE;
+    virtual SalBitmap*              getBitmap( long nX, long nY, long nWidth, long nHeight ) override;
+    virtual SalColor                getPixel( long nX, long nY ) override;
+    virtual void                    invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags ) override;
+    virtual void                    invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) override;
 
-    virtual bool                    drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ) SAL_OVERRIDE;
+    virtual bool                    drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ) override;
 
     virtual bool                    blendBitmap(
                                         const SalTwoRect&,
-                                        const SalBitmap& rBitmap ) SAL_OVERRIDE;
+                                        const SalBitmap& rBitmap ) override;
 
     virtual bool                    blendAlphaBitmap(
                                         const SalTwoRect&,
                                         const SalBitmap& rSrcBitmap,
                                         const SalBitmap& rMaskBitmap,
-                                        const SalBitmap& rAlphaBitmap ) SAL_OVERRIDE;
+                                        const SalBitmap& rAlphaBitmap ) override;
 
     virtual bool                    drawAlphaBitmap(
                                         const SalTwoRect&,
                                         const SalBitmap& rSourceBitmap,
-                                        const SalBitmap& rAlphaBitmap ) SAL_OVERRIDE;
+                                        const SalBitmap& rAlphaBitmap ) override;
 
     virtual bool                    drawTransformedBitmap(
                                         const basegfx::B2DPoint& rNull,
                                         const basegfx::B2DPoint& rX,
                                         const basegfx::B2DPoint& rY,
                                         const SalBitmap& rSourceBitmap,
-                                        const SalBitmap* pAlphaBitmap) SAL_OVERRIDE;
+                                        const SalBitmap* pAlphaBitmap) override;
 
     virtual bool                    drawAlphaRect(
                                         long nX, long nY, long nWidth,
-                                        long nHeight, sal_uInt8 nTransparency ) SAL_OVERRIDE;
+                                        long nHeight, sal_uInt8 nTransparency ) override;
 
-    virtual SystemGraphicsData      GetGraphicsData() const SAL_OVERRIDE;
-    virtual bool                    SupportsCairo() const SAL_OVERRIDE;
-    virtual cairo::SurfaceSharedPtr CreateSurface(const cairo::CairoSurfaceSharedPtr& rSurface) const SAL_OVERRIDE;
-    virtual cairo::SurfaceSharedPtr CreateSurface(const OutputDevice& rRefDevice, int x, int y, int width, int height) const SAL_OVERRIDE;
-    virtual cairo::SurfaceSharedPtr CreateBitmapSurface(const OutputDevice& rRefDevice, const BitmapSystemData& rData, const Size& rSize) const SAL_OVERRIDE;
-    virtual css::uno::Any           GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& rSurface, const basegfx::B2ISize& rSize) const SAL_OVERRIDE;
-    virtual SystemFontData          GetSysFontData( int nFallbackLevel ) const SAL_OVERRIDE;
+    virtual SystemGraphicsData      GetGraphicsData() const override;
+    virtual bool                    SupportsCairo() const override;
+    virtual cairo::SurfaceSharedPtr CreateSurface(const cairo::CairoSurfaceSharedPtr& rSurface) const override;
+    virtual cairo::SurfaceSharedPtr CreateSurface(const OutputDevice& rRefDevice, int x, int y, int width, int height) const override;
+    virtual cairo::SurfaceSharedPtr CreateBitmapSurface(const OutputDevice& rRefDevice, const BitmapSystemData& rData, const Size& rSize) const override;
+    virtual css::uno::Any           GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& rSurface, const basegfx::B2ISize& rSize) const override;
+    virtual SystemFontData          GetSysFontData( int nFallbackLevel ) const override;
 
-    virtual OpenGLContext          *BeginPaint() SAL_OVERRIDE;
+    virtual OpenGLContext          *BeginPaint() override;
 
     bool TryRenderCachedNativeControl(ControlCacheKey& aControlCacheKey,
                                       int nX, int nY);
diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h
index ebd3c36bc5cf..74e1cb296bb6 100644
--- a/vcl/inc/unx/salinst.h
+++ b/vcl/inc/unx/salinst.h
@@ -48,12 +48,12 @@ public:
     X11SalInstance( SalYieldMutex* pMutex ) : SalGenericInstance( pMutex ), mpXLib(NULL) {}
     virtual ~X11SalInstance();
 
-    virtual SalFrame*           CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) SAL_OVERRIDE;
-    virtual SalFrame*           CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) SAL_OVERRIDE;
-    virtual void                DestroyFrame( SalFrame* pFrame ) SAL_OVERRIDE;
+    virtual SalFrame*           CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) override;
+    virtual SalFrame*           CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) override;
+    virtual void                DestroyFrame( SalFrame* pFrame ) override;
 
-    virtual SalObject*          CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow = true ) SAL_OVERRIDE;
-    virtual void                DestroyObject( SalObject* pObject ) SAL_OVERRIDE;
+    virtual SalObject*          CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow = true ) override;
+    virtual void                DestroyObject( SalObject* pObject ) override;
 
     /// Gtk vclplug needs to pass GtkSalGraphics to X11SalVirtualDevice, so create it, and pass as pNewGraphics.
     virtual SalVirtualDevice* CreateX11VirtualDevice(SalGraphics* pGraphics, long &nDX, long &nDY,
@@ -61,28 +61,28 @@ public:
 
     virtual SalVirtualDevice*   CreateVirtualDevice( SalGraphics* pGraphics,
                                                      long &nDX, long &nDY,
-                                                     sal_uInt16 nBitCount, const SystemGraphicsData *pData = NULL ) SAL_OVERRIDE;
-    virtual void                PostPrintersChanged() SAL_OVERRIDE;
-    virtual GenPspGraphics     *CreatePrintGraphics() SAL_OVERRIDE;
+                                                     sal_uInt16 nBitCount, const SystemGraphicsData *pData = NULL ) override;
+    virtual void                PostPrintersChanged() override;
+    virtual GenPspGraphics     *CreatePrintGraphics() override;
 
-    virtual SalTimer*           CreateSalTimer() SAL_OVERRIDE;
-    virtual SalI18NImeStatus*   CreateI18NImeStatus() SAL_OVERRIDE;
-    virtual SalSystem*          CreateSalSystem() SAL_OVERRIDE;
-    virtual SalBitmap*          CreateSalBitmap() SAL_OVERRIDE;
-    virtual SalSession*         CreateSalSession() SAL_OVERRIDE;
+    virtual SalTimer*           CreateSalTimer() override;
+    virtual SalI18NImeStatus*   CreateI18NImeStatus() override;
+    virtual SalSystem*          CreateSalSystem() override;
+    virtual SalBitmap*          CreateSalBitmap() override;
+    virtual SalSession*         CreateSalSession() override;
 
-    virtual void                DoYield(bool bWait, bool bHandleAllCurrentEvents, sal_uLong nReleased) SAL_OVERRIDE;
-    virtual bool                AnyInput( VclInputFlags nType ) SAL_OVERRIDE;
+    virtual void                DoYield(bool bWait, bool bHandleAllCurrentEvents, sal_uLong nReleased) override;
+    virtual bool                AnyInput( VclInputFlags nType ) override;
 
-    virtual void*               GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ) SAL_OVERRIDE;
+    virtual void*               GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ) override;
     void                        SetLib( SalXLib *pXLib ) { mpXLib = pXLib; }
 
     // dtrans implementation
     virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
-        CreateClipboard( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& i_rArguments ) SAL_OVERRIDE;
-    virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDragSource() SAL_OVERRIDE;
-    virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDropTarget() SAL_OVERRIDE;
-    virtual void            AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService) SAL_OVERRIDE;
+        CreateClipboard( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& i_rArguments ) override;
+    virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDragSource() override;
+    virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDropTarget() override;
+    virtual void            AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService) override;
 };
 
 #endif // INCLUDED_VCL_INC_UNX_SALINST_H
diff --git a/vcl/inc/unx/salmenu.h b/vcl/inc/unx/salmenu.h
index a2e600e8461e..9d43a10ff0f2 100644
--- a/vcl/inc/unx/salmenu.h
+++ b/vcl/inc/unx/salmenu.h
@@ -29,19 +29,19 @@ public:
     X11SalMenu() {}
     virtual ~X11SalMenu();
 
-    virtual bool VisibleMenuBar() SAL_OVERRIDE;  // must return TRUE to actually DISPLAY native menu bars
+    virtual bool VisibleMenuBar() override;  // must return TRUE to actually DISPLAY native menu bars
                             // otherwise only menu messages are processed (eg, OLE on Windows)
 
-    virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ) SAL_OVERRIDE;
-    virtual void RemoveItem( unsigned nPos ) SAL_OVERRIDE;
-    virtual void SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos ) SAL_OVERRIDE;
-    virtual void SetFrame( const SalFrame* pFrame ) SAL_OVERRIDE;
-    virtual void CheckItem( unsigned nPos, bool bCheck ) SAL_OVERRIDE;
-    virtual void EnableItem( unsigned nPos, bool bEnable ) SAL_OVERRIDE;
-    virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText ) SAL_OVERRIDE;
-    virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage) SAL_OVERRIDE;
-    virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const vcl::KeyCode& rKeyCode, const OUString& rKeyName ) SAL_OVERRIDE;
-    virtual void GetSystemMenuData( SystemMenuData* pData ) SAL_OVERRIDE;
+    virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ) override;
+    virtual void RemoveItem( unsigned nPos ) override;
+    virtual void SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos ) override;
+    virtual void SetFrame( const SalFrame* pFrame ) override;
+    virtual void CheckItem( unsigned nPos, bool bCheck ) override;
+    virtual void EnableItem( unsigned nPos, bool bEnable ) override;
+    virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText ) override;
+    virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage) override;
+    virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const vcl::KeyCode& rKeyCode, const OUString& rKeyName ) override;
+    virtual void GetSystemMenuData( SystemMenuData* pData ) override;
 };
 
 class X11SalMenuItem : public SalMenuItem
diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h
index ec94c1039088..77167daecf39 100644
--- a/vcl/inc/unx/salobj.h
+++ b/vcl/inc/unx/salobj.h
@@ -70,17 +70,17 @@ public:
     virtual ~X11SalObject();
 
     // override all pure virtual methods
-     virtual void                   ResetClipRegion() SAL_OVERRIDE;
-    virtual sal_uInt16                  GetClipRegionType() SAL_OVERRIDE;
-    virtual void                    BeginSetClipRegion( sal_uIntPtr nRects ) SAL_OVERRIDE;
-    virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual void                    EndSetClipRegion() SAL_OVERRIDE;
+     virtual void                   ResetClipRegion() override;
+    virtual sal_uInt16                  GetClipRegionType() override;
+    virtual void                    BeginSetClipRegion( sal_uIntPtr nRects ) override;
+    virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) override;
+    virtual void                    EndSetClipRegion() override;
 
-    virtual void                    SetPosSize( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual void                    Show( bool bVisible ) SAL_OVERRIDE;
-    virtual void                    GrabFocus() SAL_OVERRIDE;
+    virtual void                    SetPosSize( long nX, long nY, long nWidth, long nHeight ) override;
+    virtual void                    Show( bool bVisible ) override;
+    virtual void                    GrabFocus() override;
 
-    virtual const SystemEnvData*    GetSystemData() const SAL_OVERRIDE;
+    virtual const SystemEnvData*    GetSystemData() const override;
 };
 
 #endif // INCLUDED_VCL_INC_UNX_SALOBJ_H
diff --git a/vcl/inc/unx/saltimer.h b/vcl/inc/unx/saltimer.h
index e3c302512f1d..108404e08037 100644
--- a/vcl/inc/unx/saltimer.h
+++ b/vcl/inc/unx/saltimer.h
@@ -31,8 +31,8 @@ public:
     virtual ~X11SalTimer();
 
     // override all pure virtual methods
-    void  Start( sal_uIntPtr nMS ) SAL_OVERRIDE;
-    void  Stop() SAL_OVERRIDE;
+    void  Start( sal_uIntPtr nMS ) override;
+    void  Stop() override;
 };
 
 #endif
diff --git a/vcl/inc/unx/salvd.h b/vcl/inc/unx/salvd.h
index 12b0cca27182..fbe173feeb52 100644
--- a/vcl/inc/unx/salvd.h
+++ b/vcl/inc/unx/salvd.h
@@ -61,15 +61,15 @@ public:
     sal_uInt16      GetDepth() const { return nDepth_; }
     SalX11Screen            GetXScreenNumber() const { return m_nXScreen; }
 
-    virtual SalGraphics*    AcquireGraphics() SAL_OVERRIDE;
-    virtual void            ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE;
+    virtual SalGraphics*    AcquireGraphics() override;
+    virtual void            ReleaseGraphics( SalGraphics* pGraphics ) override;
 
     /// Set new size, without saving the old contents
-    virtual bool        SetSize( long nNewDX, long nNewDY ) SAL_OVERRIDE;
+    virtual bool        SetSize( long nNewDX, long nNewDY ) override;
 
     // SalGeometryProvider
-    virtual long GetWidth() const SAL_OVERRIDE { return nDX_; }
-    virtual long GetHeight() const SAL_OVERRIDE { return nDY_; }
+    virtual long GetWidth() const override { return nDX_; }
+    virtual long GetHeight() const override { return nDY_; }
 };
 
 #endif // INCLUDED_VCL_INC_UNX_SALVD_H
diff --git a/vcl/inc/unx/x11/x11sys.hxx b/vcl/inc/unx/x11/x11sys.hxx
index 7acf3e71f50f..7c44132fc7a4 100644
--- a/vcl/inc/unx/x11/x11sys.hxx
+++ b/vcl/inc/unx/x11/x11sys.hxx
@@ -32,14 +32,14 @@ public:
     virtual ~X11SalSystem();
 
     // override pure virtual methods
-    virtual unsigned int GetDisplayScreenCount() SAL_OVERRIDE;
-    virtual bool         IsUnifiedDisplay() SAL_OVERRIDE;
-    virtual unsigned int GetDisplayBuiltInScreen() SAL_OVERRIDE;
-    virtual Rectangle    GetDisplayScreenPosSizePixel( unsigned int nScreen ) SAL_OVERRIDE;
+    virtual unsigned int GetDisplayScreenCount() override;
+    virtual bool         IsUnifiedDisplay() override;
+    virtual unsigned int GetDisplayBuiltInScreen() override;
+    virtual Rectangle    GetDisplayScreenPosSizePixel( unsigned int nScreen ) override;
     virtual int ShowNativeDialog( const OUString& rTitle,
                                   const OUString& rMessage,
                                   const std::list< OUString >& rButtons,
-                                  int nDefButton ) SAL_OVERRIDE;
+                                  int nDefButton ) override;
 };
 
 #endif // INCLUDED_VCL_INC_UNX_X11_X11SYS_HXX
diff --git a/vcl/inc/win/salbmp.h b/vcl/inc/win/salbmp.h
index 05df37c43b82..1fad90491fdf 100644
--- a/vcl/inc/win/salbmp.h
+++ b/vcl/inc/win/salbmp.h
@@ -80,25 +80,25 @@ public:
 public:
 
     bool                        Create( HANDLE hBitmap, bool bDIB, bool bCopyHandle );
-    virtual bool                Create( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal ) SAL_OVERRIDE;
-    virtual bool                Create( const SalBitmap& rSalBmpImpl ) SAL_OVERRIDE;
-    virtual bool                Create( const SalBitmap& rSalBmpImpl, SalGraphics* pGraphics ) SAL_OVERRIDE;
-    virtual bool                Create( const SalBitmap& rSalBmpImpl, sal_uInt16 nNewBitCount ) SAL_OVERRIDE;
+    virtual bool                Create( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal ) override;
+    virtual bool                Create( const SalBitmap& rSalBmpImpl ) override;
+    virtual bool                Create( const SalBitmap& rSalBmpImpl, SalGraphics* pGraphics ) override;
+    virtual bool                Create( const SalBitmap& rSalBmpImpl, sal_uInt16 nNewBitCount ) override;
     virtual bool                Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas >& rBitmapCanvas,
                                            Size& rSize,
-                                           bool bMask = false ) SAL_OVERRIDE;
+                                           bool bMask = false ) override;
 
-    virtual void                Destroy() SAL_OVERRIDE;
+    virtual void                Destroy() override;
 
-    virtual Size                GetSize() const SAL_OVERRIDE { return maSize; }
-    virtual sal_uInt16          GetBitCount() const SAL_OVERRIDE { return mnBitCount; }
+    virtual Size                GetSize() const override { return maSize; }
+    virtual sal_uInt16          GetBitCount() const override { return mnBitCount; }
 
-    virtual BitmapBuffer*       AcquireBuffer( BitmapAccessMode nMode ) SAL_OVERRIDE;
-    virtual void                ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode ) SAL_OVERRIDE;
-    virtual bool                GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE;
+    virtual BitmapBuffer*       AcquireBuffer( BitmapAccessMode nMode ) override;
+    virtual void                ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode ) override;
+    virtual bool                GetSystemData( BitmapSystemData& rData ) override;
 
-    virtual bool                Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) SAL_OVERRIDE;
-    virtual bool                Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) SAL_OVERRIDE;
+    virtual bool                Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) override;
+    virtual bool                Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) override;
 };
 
 #endif // INCLUDED_VCL_INC_WIN_SALBMP_H
diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h
index 68a2337657f1..27fa46e5c3fb 100644
--- a/vcl/inc/win/salframe.h
+++ b/vcl/inc/win/salframe.h
@@ -87,52 +87,52 @@ public:
     WinSalFrame();
     virtual ~WinSalFrame();
 
-    virtual SalGraphics*        AcquireGraphics() SAL_OVERRIDE;
-    virtual void                ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE;
-    virtual bool                PostEvent(ImplSVEvent* pData) SAL_OVERRIDE;
-    virtual void                SetTitle( const OUString& rTitle ) SAL_OVERRIDE;
-    virtual void                SetIcon( sal_uInt16 nIcon ) SAL_OVERRIDE;
-    virtual void                SetMenu( SalMenu* pSalMenu ) SAL_OVERRIDE;
-    virtual void                DrawMenuBar() SAL_OVERRIDE;
-    virtual void                SetExtendedFrameStyle( SalExtStyle nExtStyle ) SAL_OVERRIDE;
-    virtual void                Show( bool bVisible, bool bNoActivate = FALSE ) SAL_OVERRIDE;
-    virtual void                SetMinClientSize( long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual void                SetMaxClientSize( long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) SAL_OVERRIDE;
-    virtual void                GetClientSize( long& rWidth, long& rHeight ) SAL_OVERRIDE;
-    virtual void                GetWorkArea( Rectangle& rRect ) SAL_OVERRIDE;
-    virtual SalFrame*           GetParent() const SAL_OVERRIDE;
-    virtual void                SetWindowState( const SalFrameState* pState ) SAL_OVERRIDE;
-    virtual bool                GetWindowState( SalFrameState* pState ) SAL_OVERRIDE;
-    virtual void                ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) SAL_OVERRIDE;
-    virtual void                StartPresentation( bool bStart ) SAL_OVERRIDE;
-    virtual void                SetAlwaysOnTop( bool bOnTop ) SAL_OVERRIDE;
-    virtual void                ToTop( sal_uInt16 nFlags ) SAL_OVERRIDE;
-    virtual void                SetPointer( PointerStyle ePointerStyle ) SAL_OVERRIDE;
-    virtual void                CaptureMouse( bool bMouse ) SAL_OVERRIDE;
-    virtual void                SetPointerPos( long nX, long nY ) SAL_OVERRIDE;
+    virtual SalGraphics*        AcquireGraphics() override;
+    virtual void                ReleaseGraphics( SalGraphics* pGraphics ) override;
+    virtual bool                PostEvent(ImplSVEvent* pData) override;
+    virtual void                SetTitle( const OUString& rTitle ) override;
+    virtual void                SetIcon( sal_uInt16 nIcon ) override;
+    virtual void                SetMenu( SalMenu* pSalMenu ) override;
+    virtual void                DrawMenuBar() override;
+    virtual void                SetExtendedFrameStyle( SalExtStyle nExtStyle ) override;
+    virtual void                Show( bool bVisible, bool bNoActivate = FALSE ) override;
+    virtual void                SetMinClientSize( long nWidth, long nHeight ) override;
+    virtual void                SetMaxClientSize( long nWidth, long nHeight ) override;
+    virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) override;
+    virtual void                GetClientSize( long& rWidth, long& rHeight ) override;
+    virtual void                GetWorkArea( Rectangle& rRect ) override;
+    virtual SalFrame*           GetParent() const override;
+    virtual void                SetWindowState( const SalFrameState* pState ) override;
+    virtual bool                GetWindowState( SalFrameState* pState ) override;
+    virtual void                ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) override;
+    virtual void                StartPresentation( bool bStart ) override;
+    virtual void                SetAlwaysOnTop( bool bOnTop ) override;
+    virtual void                ToTop( sal_uInt16 nFlags ) override;
+    virtual void                SetPointer( PointerStyle ePointerStyle ) override;
+    virtual void                CaptureMouse( bool bMouse ) override;
+    virtual void                SetPointerPos( long nX, long nY ) override;
     using SalFrame::Flush;
-    virtual void                Flush() SAL_OVERRIDE;
-    virtual void                Sync() SAL_OVERRIDE;
-    virtual void                SetInputContext( SalInputContext* pContext ) SAL_OVERRIDE;
-    virtual void                EndExtTextInput( EndExtTextInputFlags nFlags ) SAL_OVERRIDE;
-    virtual OUString            GetKeyName( sal_uInt16 nKeyCode ) SAL_OVERRIDE;
-    virtual bool                MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) SAL_OVERRIDE;
-    virtual LanguageType        GetInputLanguage() SAL_OVERRIDE;
-    virtual void                UpdateSettings( AllSettings& rSettings ) SAL_OVERRIDE;
-    virtual void                Beep() SAL_OVERRIDE;
-    virtual const SystemEnvData*    GetSystemData() const SAL_OVERRIDE;
-    virtual SalPointerState     GetPointerState() SAL_OVERRIDE;
-    virtual KeyIndicatorState   GetIndicatorState() SAL_OVERRIDE;
-    virtual void                SimulateKeyPress( sal_uInt16 nKeyCode ) SAL_OVERRIDE;
-    virtual void                SetParent( SalFrame* pNewParent ) SAL_OVERRIDE;
-    virtual bool                SetPluginParent( SystemParentData* pNewParent ) SAL_OVERRIDE;
-    virtual void                SetScreenNumber( unsigned int ) SAL_OVERRIDE;
-    virtual void                SetApplicationID( const OUString &rApplicationID ) SAL_OVERRIDE;
-    virtual void                ResetClipRegion() SAL_OVERRIDE;
-    virtual void                BeginSetClipRegion( sal_uIntPtr nRects ) SAL_OVERRIDE;
-    virtual void                UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual void                EndSetClipRegion() SAL_OVERRIDE;
+    virtual void                Flush() override;
+    virtual void                Sync() override;
+    virtual void                SetInputContext( SalInputContext* pContext ) override;
+    virtual void                EndExtTextInput( EndExtTextInputFlags nFlags ) override;
+    virtual OUString            GetKeyName( sal_uInt16 nKeyCode ) override;
+    virtual bool                MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) override;
+    virtual LanguageType        GetInputLanguage() override;
+    virtual void                UpdateSettings( AllSettings& rSettings ) override;
+    virtual void                Beep() override;
+    virtual const SystemEnvData*    GetSystemData() const override;
+    virtual SalPointerState     GetPointerState() override;
+    virtual KeyIndicatorState   GetIndicatorState() override;
+    virtual void                SimulateKeyPress( sal_uInt16 nKeyCode ) override;
+    virtual void                SetParent( SalFrame* pNewParent ) override;
+    virtual bool                SetPluginParent( SystemParentData* pNewParent ) override;
+    virtual void                SetScreenNumber( unsigned int ) override;
+    virtual void                SetApplicationID( const OUString &rApplicationID ) override;
+    virtual void                ResetClipRegion() override;
+    virtual void                BeginSetClipRegion( sal_uIntPtr nRects ) override;
+    virtual void                UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) override;
+    virtual void                EndSetClipRegion() override;
 };
 
 void ImplSalGetWorkArea( HWND hWnd, RECT *pRect, const RECT *pParentRect );
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 01cb43235d46..b7697d6843f4 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -77,9 +77,9 @@ public:
                                 BYTE nPitchAndFamily  );
     virtual                 ~ImplWinFontData();
 
-    virtual PhysicalFontFace*   Clone() const SAL_OVERRIDE;
-    virtual ImplFontEntry*  CreateFontInstance( FontSelectPattern& ) const SAL_OVERRIDE;
-    virtual sal_IntPtr      GetFontId() const SAL_OVERRIDE;
+    virtual PhysicalFontFace*   Clone() const override;
+    virtual ImplFontEntry*  CreateFontInstance( FontSelectPattern& ) const override;
+    virtual sal_IntPtr      GetFontId() const override;
     void                    SetFontId( sal_IntPtr nId ) { mnId = nId; }
     void                    UpdateFromHDC( HDC ) const;
 
@@ -247,7 +247,7 @@ public:
                             SalGeometryProvider *pProvider);
     virtual ~WinSalGraphics();
 
-    SalGraphicsImpl* GetImpl() const SAL_OVERRIDE;
+    SalGraphicsImpl* GetImpl() const override;
     bool isPrinter() const;
     bool isVirtualDevice() const;
     bool isWindow() const;
@@ -256,123 +256,123 @@ public:
     void setHWND(HWND hWnd);
 
 protected:
-    virtual bool        setClipRegion( const vcl::Region& ) SAL_OVERRIDE;
+    virtual bool        setClipRegion( const vcl::Region& ) override;
     // draw --> LineColor and FillColor and RasterOp and ClipRegion
-    virtual void        drawPixel( long nX, long nY ) SAL_OVERRIDE;
-    virtual void        drawPixel( long nX, long nY, SalColor nSalColor ) SAL_OVERRIDE;
-    virtual void        drawLine( long nX1, long nY1, long nX2, long nY2 ) SAL_OVERRIDE;
-    virtual void        drawRect( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual void        drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) SAL_OVERRIDE;
-    virtual void        drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) SAL_OVERRIDE;
-    virtual void        drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ) SAL_OVERRIDE;
-    virtual bool        drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ) SAL_OVERRIDE;
+    virtual void        drawPixel( long nX, long nY ) override;
+    virtual void        drawPixel( long nX, long nY, SalColor nSalColor ) override;
+    virtual void        drawLine( long nX1, long nY1, long nX2, long nY2 ) override;
+    virtual void        drawRect( long nX, long nY, long nWidth, long nHeight ) override;
+    virtual void        drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) override;
+    virtual void        drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) override;
+    virtual void        drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ) override;
+    virtual bool        drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ) override;
     virtual bool        drawPolyLine(
         const ::basegfx::B2DPolygon&,
         double fTransparency,
         const ::basegfx::B2DVector& rLineWidth,
         basegfx::B2DLineJoin,
-        com::sun::star::drawing::LineCap) SAL_OVERRIDE;
-    virtual bool        drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) SAL_OVERRIDE;
-    virtual bool        drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) SAL_OVERRIDE;
-    virtual bool        drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry ) SAL_OVERRIDE;
-    virtual bool        drawGradient( const tools::PolyPolygon&, const Gradient& ) SAL_OVERRIDE { return false; };
+        com::sun::star::drawing::LineCap) override;
+    virtual bool        drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) override;
+    virtual bool        drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) override;
+    virtual bool        drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry ) override;
+    virtual bool        drawGradient( const tools::PolyPolygon&, const Gradient& ) override { return false; };
 
     // CopyArea --> No RasterOp, but ClipRegion
     virtual void        copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth,
-                                  long nSrcHeight, sal_uInt16 nFlags ) SAL_OVERRIDE;
+                                  long nSrcHeight, sal_uInt16 nFlags ) override;
 
     // CopyBits and DrawBitmap --> RasterOp and ClipRegion
     // CopyBits() --> pSrcGraphics == NULL, then CopyBits on same Graphics
-    virtual void        copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) SAL_OVERRIDE;
-    virtual void        drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap ) SAL_OVERRIDE;
+    virtual void        copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) override;
+    virtual void        drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap ) override;
     virtual void        drawBitmap( const SalTwoRect& rPosAry,
                                     const SalBitmap& rSalBitmap,
-                                    const SalBitmap& rTransparentBitmap ) SAL_OVERRIDE;
+                                    const SalBitmap& rTransparentBitmap ) override;
     virtual void        drawMask( const SalTwoRect& rPosAry,
                                   const SalBitmap& rSalBitmap,
-                                  SalColor nMaskColor ) SAL_OVERRIDE;
+                                  SalColor nMaskColor ) override;
 
-    virtual SalBitmap*  getBitmap( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual SalColor    getPixel( long nX, long nY ) SAL_OVERRIDE;
+    virtual SalBitmap*  getBitmap( long nX, long nY, long nWidth, long nHeight ) override;
+    virtual SalColor    getPixel( long nX, long nY ) override;
 
     // invert --> ClipRegion (only Windows or VirDevs)
-    virtual void        invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags) SAL_OVERRIDE;
-    virtual void        invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) SAL_OVERRIDE;
+    virtual void        invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags) override;
+    virtual void        invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) override;
 
-    virtual bool        drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ) SAL_OVERRIDE;
+    virtual bool        drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ) override;
 
     // native widget rendering methods that require mirroring
     virtual bool        hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
-                                              const Point& aPos, bool& rIsInside ) SAL_OVERRIDE;
+                                              const Point& aPos, bool& rIsInside ) override;
     virtual bool        drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                            ControlState nState, const ImplControlValue& aValue,
-                                           const OUString& aCaption ) SAL_OVERRIDE;
+                                           const OUString& aCaption ) override;
     virtual bool        getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
                                                 const ImplControlValue& aValue, const OUString& aCaption,
-                                                Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) SAL_OVERRIDE;
+                                                Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) override;
 
     virtual bool        blendBitmap( const SalTwoRect&,
-                                     const SalBitmap& rBitmap ) SAL_OVERRIDE;
+                                     const SalBitmap& rBitmap ) override;
 
     virtual bool        blendAlphaBitmap( const SalTwoRect&,
                                           const SalBitmap& rSrcBitmap,
                                           const SalBitmap& rMaskBitmap,
-                                          const SalBitmap& rAlphaBitmap ) SAL_OVERRIDE;
+                                          const SalBitmap& rAlphaBitmap ) override;
 
     virtual bool        drawAlphaBitmap( const SalTwoRect&,
                                          const SalBitmap& rSourceBitmap,
-                                         const SalBitmap& rAlphaBitmap ) SAL_OVERRIDE;
+                                         const SalBitmap& rAlphaBitmap ) override;
     virtual bool       drawTransformedBitmap(
                            const basegfx::B2DPoint& rNull,
                            const basegfx::B2DPoint& rX,
                            const basegfx::B2DPoint& rY,
                            const SalBitmap& rSourceBitmap,
-                           const SalBitmap* pAlphaBitmap) SAL_OVERRIDE;
-    virtual bool       drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency ) SAL_OVERRIDE;
+                           const SalBitmap* pAlphaBitmap) override;
+    virtual bool       drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency ) override;
 
 public:
     // public SalGraphics methods, the interface to the independent vcl part
 
     // get device resolution
-    virtual void            GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) SAL_OVERRIDE;
+    virtual void            GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) override;
     // get the depth of the device
-    virtual sal_uInt16          GetBitCount() const SAL_OVERRIDE;
+    virtual sal_uInt16          GetBitCount() const override;
     // get the width of the device
-    virtual long            GetGraphicsWidth() const SAL_OVERRIDE;
+    virtual long            GetGraphicsWidth() const override;
 
     // set the clip region to empty
-    virtual void            ResetClipRegion() SAL_OVERRIDE;
+    virtual void            ResetClipRegion() override;
 
     // set the line color to transparent (= don't draw lines)
-    virtual void            SetLineColor() SAL_OVERRIDE;
+    virtual void            SetLineColor() override;
     // set the line color to a specific color
-    virtual void            SetLineColor( SalColor nSalColor ) SAL_OVERRIDE;
+    virtual void            SetLineColor( SalColor nSalColor ) override;
     // set the fill color to transparent (= don't fill)
-    virtual void            SetFillColor() SAL_OVERRIDE;
+    virtual void            SetFillColor() override;
     // set the fill color to a specific color, shapes will be
     // filled accordingly
-    virtual void            SetFillColor( SalColor nSalColor ) SAL_OVERRIDE;
+    virtual void            SetFillColor( SalColor nSalColor ) override;
     // enable/disable XOR drawing
-    virtual void            SetXORMode( bool bSet, bool ) SAL_OVERRIDE;
+    virtual void            SetXORMode( bool bSet, bool ) override;
     // set line color for raster operations
-    virtual void            SetROPLineColor( SalROPColor nROPColor ) SAL_OVERRIDE;
+    virtual void            SetROPLineColor( SalROPColor nROPColor ) override;
     // set fill color for raster operations
-    virtual void            SetROPFillColor( SalROPColor nROPColor ) SAL_OVERRIDE;
+    virtual void            SetROPFillColor( SalROPColor nROPColor ) override;
     // set the text color to a specific color
-    virtual void            SetTextColor( SalColor nSalColor ) SAL_OVERRIDE;
+    virtual void            SetTextColor( SalColor nSalColor ) override;
     // set the font
-    virtual sal_uInt16      SetFont( FontSelectPattern*, int nFallbackLevel ) SAL_OVERRIDE;
+    virtual sal_uInt16      SetFont( FontSelectPattern*, int nFallbackLevel ) override;
     // get the current font's metrics
-    virtual void            GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) SAL_OVERRIDE;
+    virtual void            GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) override;
     // get the repertoire of the current font
-    virtual const FontCharMapPtr GetFontCharMap() const SAL_OVERRIDE;
+    virtual const FontCharMapPtr GetFontCharMap() const override;
     // get the layout capabilities of the current font
-    virtual bool GetFontCapabilities(vcl::FontCapabilities &rGetFontCapabilities) const SAL_OVERRIDE;
+    virtual bool GetFontCapabilities(vcl::FontCapabilities &rGetFontCapabilities) const override;
     // graphics must fill supplied font list
-    virtual void            GetDevFontList( PhysicalFontCollection* ) SAL_OVERRIDE;
+    virtual void            GetDevFontList( PhysicalFontCollection* ) override;
     // graphics must drop any cached font info
-    virtual void            ClearDevFontCache() SAL_OVERRIDE;
-    virtual bool            AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ) SAL_OVERRIDE;
+    virtual void            ClearDevFontCache() override;
+    virtual bool            AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ) override;
     // CreateFontSubset: a method to get a subset of glyhps of a font
     // inside a new valid font file
     // returns TRUE if creation of subset was successful
@@ -392,7 +392,7 @@ public:
                                               sal_Int32* pWidths,
                                               int nGlyphs,
                                               FontSubsetInfo& rInfo // out parameter
-                                              ) SAL_OVERRIDE;
+                                              ) override;
 
     // GetFontEncodingVector: a method to get the encoding map Unicode
     // to font encoded character; this is only used for type1 fonts and
@@ -401,7 +401,7 @@ public:
     // glyphs with only a name) exist it is set to the corresponding
     // map for non encoded glyphs; the encoding vector contains -1
     // as encoding for these cases
-    virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded, std::set<sal_Unicode> const** ) SAL_OVERRIDE;
+    virtual const Ucs2SIntMap* GetFontEncodingVector( const PhysicalFontFace*, const Ucs2OStrMap** ppNonEncoded, std::set<sal_Unicode> const** ) override;
 
     // GetEmbedFontData: gets the font data for a font marked
     // embeddable by GetDevFontList or NULL in case of error
@@ -415,28 +415,28 @@ public:
                                           sal_Int32* pWidths,
                                           size_t nLen,
                                           FontSubsetInfo& rInfo,
-                                          long* pDataLen ) SAL_OVERRIDE;
+                                          long* pDataLen ) override;
     // frees the font data again
-    virtual void            FreeEmbedFontData( const void* pData, long nDataLen ) SAL_OVERRIDE;
+    virtual void            FreeEmbedFontData( const void* pData, long nDataLen ) override;
     virtual void            GetGlyphWidths( const PhysicalFontFace*,
                                             bool bVertical,
                                             Int32Vector& rWidths,
-                                            Ucs2UIntMap& rUnicodeEnc ) SAL_OVERRIDE;
+                                            Ucs2UIntMap& rUnicodeEnc ) override;
             int             GetMinKashidaWidth();
 
-    virtual bool            GetGlyphBoundRect( sal_GlyphId, Rectangle& ) SAL_OVERRIDE;
-    virtual bool            GetGlyphOutline( sal_GlyphId, ::basegfx::B2DPolyPolygon& ) SAL_OVERRIDE;
+    virtual bool            GetGlyphBoundRect( sal_GlyphId, Rectangle& ) override;
+    virtual bool            GetGlyphOutline( sal_GlyphId, ::basegfx::B2DPolyPolygon& ) override;
 
-    virtual SalLayout*      GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) SAL_OVERRIDE;
-    virtual void            DrawServerFontLayout( const ServerFontLayout& ) SAL_OVERRIDE;
+    virtual SalLayout*      GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) override;
+    virtual void            DrawServerFontLayout( const ServerFontLayout& ) override;
 
-    virtual bool            supportsOperation( OutDevSupportType ) const SAL_OVERRIDE;
+    virtual bool            supportsOperation( OutDevSupportType ) const override;
     // Query the platform layer for control support
-    virtual bool            IsNativeControlSupported( ControlType nType, ControlPart nPart ) SAL_OVERRIDE;
+    virtual bool            IsNativeControlSupported( ControlType nType, ControlPart nPart ) override;
 
-    virtual SystemGraphicsData GetGraphicsData() const SAL_OVERRIDE;
+    virtual SystemGraphicsData GetGraphicsData() const override;
 
-    virtual OpenGLContext     *BeginPaint() SAL_OVERRIDE;
+    virtual OpenGLContext     *BeginPaint() override;
 
     /// Update settings based on the platform values
     static void updateSettingsNative( AllSettings& rSettings );
diff --git a/vcl/inc/win/salinst.h b/vcl/inc/win/salinst.h
index 7bdf3fc5d112..2d3cadc3a725 100644
--- a/vcl/inc/win/salinst.h
+++ b/vcl/inc/win/salinst.h
@@ -46,41 +46,41 @@ public:
     WinSalInstance();
     virtual ~WinSalInstance();
 
-    virtual SalFrame*       CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) SAL_OVERRIDE;
-    virtual SalFrame*       CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) SAL_OVERRIDE;
-    virtual void            DestroyFrame( SalFrame* pFrame ) SAL_OVERRIDE;
-    virtual SalObject*      CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow = true ) SAL_OVERRIDE;
-    virtual void            DestroyObject( SalObject* pObject ) SAL_OVERRIDE;
+    virtual SalFrame*       CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) override;
+    virtual SalFrame*       CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) override;
+    virtual void            DestroyFrame( SalFrame* pFrame ) override;
+    virtual SalObject*      CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow = true ) override;
+    virtual void            DestroyObject( SalObject* pObject ) override;
     virtual SalVirtualDevice*   CreateVirtualDevice( SalGraphics* pGraphics,
                                                      long &nDX, long &nDY,
-                                                     sal_uInt16 nBitCount, const SystemGraphicsData *pData ) SAL_OVERRIDE;
+                                                     sal_uInt16 nBitCount, const SystemGraphicsData *pData ) override;
     virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
-                                               ImplJobSetup* pSetupData ) SAL_OVERRIDE;
-    virtual void            DestroyInfoPrinter( SalInfoPrinter* pPrinter ) SAL_OVERRIDE;
-    virtual SalPrinter*     CreatePrinter( SalInfoPrinter* pInfoPrinter ) SAL_OVERRIDE;
-    virtual void            DestroyPrinter( SalPrinter* pPrinter ) SAL_OVERRIDE;
-    virtual void            GetPrinterQueueInfo( ImplPrnQueueList* pList ) SAL_OVERRIDE;
-    virtual void            GetPrinterQueueState( SalPrinterQueueInfo* pInfo ) SAL_OVERRIDE;
-    virtual void            DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) SAL_OVERRIDE;
-    virtual OUString            GetDefaultPrinter() SAL_OVERRIDE;
-    virtual SalTimer*           CreateSalTimer() SAL_OVERRIDE;
-    virtual SalI18NImeStatus*   CreateI18NImeStatus() SAL_OVERRIDE;
-    virtual SalSystem*          CreateSalSystem() SAL_OVERRIDE;
-    virtual SalBitmap*          CreateSalBitmap() SAL_OVERRIDE;
-    virtual comphelper::SolarMutex* GetYieldMutex() SAL_OVERRIDE;
-    virtual sal_uIntPtr         ReleaseYieldMutex() SAL_OVERRIDE;
-    virtual void                AcquireYieldMutex( sal_uIntPtr nCount ) SAL_OVERRIDE;
-    virtual bool                CheckYieldMutex() SAL_OVERRIDE;
+                                               ImplJobSetup* pSetupData ) override;
+    virtual void            DestroyInfoPrinter( SalInfoPrinter* pPrinter ) override;
+    virtual SalPrinter*     CreatePrinter( SalInfoPrinter* pInfoPrinter ) override;
+    virtual void            DestroyPrinter( SalPrinter* pPrinter ) override;
+    virtual void            GetPrinterQueueInfo( ImplPrnQueueList* pList ) override;
+    virtual void            GetPrinterQueueState( SalPrinterQueueInfo* pInfo ) override;
+    virtual void            DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) override;
+    virtual OUString            GetDefaultPrinter() override;
+    virtual SalTimer*           CreateSalTimer() override;
+    virtual SalI18NImeStatus*   CreateI18NImeStatus() override;
+    virtual SalSystem*          CreateSalSystem() override;
+    virtual SalBitmap*          CreateSalBitmap() override;
+    virtual comphelper::SolarMutex* GetYieldMutex() override;
+    virtual sal_uIntPtr         ReleaseYieldMutex() override;
+    virtual void                AcquireYieldMutex( sal_uIntPtr nCount ) override;
+    virtual bool                CheckYieldMutex() override;
 
-    virtual void                DoYield(bool bWait, bool bHandleAllCurrentEvents, sal_uLong nReleased) SAL_OVERRIDE;
-    virtual bool                AnyInput( VclInputFlags nType ) SAL_OVERRIDE;
-    virtual SalMenu*            CreateMenu( bool bMenuBar, Menu* ) SAL_OVERRIDE;
-    virtual void                DestroyMenu( SalMenu* ) SAL_OVERRIDE;
-    virtual SalMenuItem*        CreateMenuItem( const SalItemParams* pItemData ) SAL_OVERRIDE;
-    virtual void                DestroyMenuItem( SalMenuItem* ) SAL_OVERRIDE;
-    virtual SalSession*         CreateSalSession() SAL_OVERRIDE;
-    virtual void*               GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ) SAL_OVERRIDE;
-    virtual void                AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService) SAL_OVERRIDE;
+    virtual void                DoYield(bool bWait, bool bHandleAllCurrentEvents, sal_uLong nReleased) override;
+    virtual bool                AnyInput( VclInputFlags nType ) override;
+    virtual SalMenu*            CreateMenu( bool bMenuBar, Menu* ) override;
+    virtual void                DestroyMenu( SalMenu* ) override;
+    virtual SalMenuItem*        CreateMenuItem( const SalItemParams* pItemData ) override;
+    virtual void                DestroyMenuItem( SalMenuItem* ) override;
+    virtual SalSession*         CreateSalSession() override;
+    virtual void*               GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ) override;
+    virtual void                AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService) override;
 
     static int WorkaroundExceptionHandlingInUSER32Lib(int nExcept, LPEXCEPTION_POINTERS pExceptionInfo);
 };
diff --git a/vcl/inc/win/salmenu.h b/vcl/inc/win/salmenu.h
index 588a95b45cc7..858d587a40e8 100644
--- a/vcl/inc/win/salmenu.h
+++ b/vcl/inc/win/salmenu.h
@@ -28,19 +28,19 @@ class WinSalMenu : public SalMenu
 public:
     WinSalMenu();
     virtual ~WinSalMenu();
-    virtual bool VisibleMenuBar() SAL_OVERRIDE;  // must return TRUE to actually DISPLAY native menu bars
+    virtual bool VisibleMenuBar() override;  // must return TRUE to actually DISPLAY native menu bars
                             // otherwise only menu messages are processed (eg, OLE on Windows)
 
-    virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ) SAL_OVERRIDE;
-    virtual void RemoveItem( unsigned nPos ) SAL_OVERRIDE;
-    virtual void SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos ) SAL_OVERRIDE;
-    virtual void SetFrame( const SalFrame* pFrame ) SAL_OVERRIDE;
-    virtual void CheckItem( unsigned nPos, bool bCheck ) SAL_OVERRIDE;
-    virtual void EnableItem( unsigned nPos, bool bEnable ) SAL_OVERRIDE;
-    virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText ) SAL_OVERRIDE;
-    virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage ) SAL_OVERRIDE;
-    virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const vcl::KeyCode& rKeyCode, const OUString& rKeyName ) SAL_OVERRIDE;
-    virtual void GetSystemMenuData( SystemMenuData* pData ) SAL_OVERRIDE;
+    virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ) override;
+    virtual void RemoveItem( unsigned nPos ) override;
+    virtual void SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos ) override;
+    virtual void SetFrame( const SalFrame* pFrame ) override;
+    virtual void CheckItem( unsigned nPos, bool bCheck ) override;
+    virtual void EnableItem( unsigned nPos, bool bEnable ) override;
+    virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText ) override;
+    virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage ) override;
+    virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const vcl::KeyCode& rKeyCode, const OUString& rKeyName ) override;
+    virtual void GetSystemMenuData( SystemMenuData* pData ) override;
 
     HMENU mhMenu;           // the menu handle
     bool  mbMenuBar;        // true for menu bars
diff --git a/vcl/inc/win/salobj.h b/vcl/inc/win/salobj.h
index a33150102a65..78da55fa515c 100644
--- a/vcl/inc/win/salobj.h
+++ b/vcl/inc/win/salobj.h
@@ -40,16 +40,16 @@ public:
     WinSalObject();
     virtual ~WinSalObject();
 
-    virtual void                    ResetClipRegion() SAL_OVERRIDE;
-    virtual sal_uInt16              GetClipRegionType() SAL_OVERRIDE;
-    virtual void                    BeginSetClipRegion( sal_uIntPtr nRects ) SAL_OVERRIDE;
-    virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight) SAL_OVERRIDE;
-    virtual void                    EndSetClipRegion() SAL_OVERRIDE;
-    virtual void                    SetPosSize( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
-    virtual void                    Show( bool bVisible ) SAL_OVERRIDE;
-    virtual void                    Enable( bool bEnable ) SAL_OVERRIDE;
-    virtual void                    GrabFocus() SAL_OVERRIDE;
-    virtual const SystemEnvData*    GetSystemData() const SAL_OVERRIDE;
+    virtual void                    ResetClipRegion() override;
+    virtual sal_uInt16              GetClipRegionType() override;
+    virtual void                    BeginSetClipRegion( sal_uIntPtr nRects ) override;
+    virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight) override;
+    virtual void                    EndSetClipRegion() override;
+    virtual void                    SetPosSize( long nX, long nY, long nWidth, long nHeight ) override;
+    virtual void                    Show( bool bVisible ) override;
+    virtual void                    Enable( bool bEnable ) override;
+    virtual void                    GrabFocus() override;
+    virtual const SystemEnvData*    GetSystemData() const override;
 };
 
 #endif // INCLUDED_VCL_INC_WIN_SALOBJ_H
diff --git a/vcl/inc/win/salprn.h b/vcl/inc/win/salprn.h
index 1835e79b992f..1eed33ad8fb5 100644
--- a/vcl/inc/win/salprn.h
+++ b/vcl/inc/win/salprn.h
@@ -55,20 +55,20 @@ public:
     WinSalInfoPrinter();
     virtual ~WinSalInfoPrinter();
 
-    virtual SalGraphics*            AcquireGraphics() SAL_OVERRIDE;
-    virtual void                    ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE;
-    virtual bool                    Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ) SAL_OVERRIDE;
-    virtual bool                    SetPrinterData( ImplJobSetup* pSetupData ) SAL_OVERRIDE;
-    virtual bool                    SetData( sal_uIntPtr nFlags, ImplJobSetup* pSetupData ) SAL_OVERRIDE;
+    virtual SalGraphics*            AcquireGraphics() override;
+    virtual void                    ReleaseGraphics( SalGraphics* pGraphics ) override;
+    virtual bool                    Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ) override;
+    virtual bool                    SetPrinterData( ImplJobSetup* pSetupData ) override;
+    virtual bool                    SetData( sal_uIntPtr nFlags, ImplJobSetup* pSetupData ) override;
     virtual void                    GetPageInfo( const ImplJobSetup* pSetupData,
                                                  long& rOutWidth, long& rOutHeight,
                                                  long& rPageOffX, long& rPageOffY,
-                                                 long& rPageWidth, long& rPageHeight ) SAL_OVERRIDE;
-    virtual sal_uIntPtr             GetCapabilities( const ImplJobSetup* pSetupData, PrinterCapType nType ) SAL_OVERRIDE;
-    virtual sal_uIntPtr             GetPaperBinCount( const ImplJobSetup* pSetupData ) SAL_OVERRIDE;
-    virtual OUString                GetPaperBinName( const ImplJobSetup* pSetupData, sal_uIntPtr nPaperBin ) SAL_OVERRIDE;
-    virtual void                    InitPaperFormats( const ImplJobSetup* pSetupData ) SAL_OVERRIDE;
-    virtual int                     GetLandscapeAngle( const ImplJobSetup* pSetupData ) SAL_OVERRIDE;
+                                                 long& rPageWidth, long& rPageHeight ) override;
+    virtual sal_uIntPtr             GetCapabilities( const ImplJobSetup* pSetupData, PrinterCapType nType ) override;
+    virtual sal_uIntPtr             GetPaperBinCount( const ImplJobSetup* pSetupData ) override;
+    virtual OUString                GetPaperBinName( const ImplJobSetup* pSetupData, sal_uIntPtr nPaperBin ) override;
+    virtual void                    InitPaperFormats( const ImplJobSetup* pSetupData ) override;
+    virtual int                     GetLandscapeAngle( const ImplJobSetup* pSetupData ) override;
 };
 
 // - WinSalPrinter -
@@ -98,11 +98,11 @@ public:
                                               sal_uIntPtr nCopies,
                                               bool bCollate,
                                               bool bDirect,
-                                              ImplJobSetup* pSetupData ) SAL_OVERRIDE;
-    virtual bool                    EndJob() SAL_OVERRIDE;
-    virtual SalGraphics*            StartPage( ImplJobSetup* pSetupData, bool bNewJobData ) SAL_OVERRIDE;
-    virtual bool                    EndPage() SAL_OVERRIDE;
-    virtual sal_uIntPtr             GetErrorCode() SAL_OVERRIDE;
+                                              ImplJobSetup* pSetupData ) override;
+    virtual bool                    EndJob() override;
+    virtual SalGraphics*            StartPage( ImplJobSetup* pSetupData, bool bNewJobData ) override;
+    virtual bool                    EndPage() override;
+    virtual sal_uIntPtr             GetErrorCode() override;
 
     void markInvalid();
     bool isValid() const { return mbValid; }
diff --git a/vcl/inc/win/salsys.h b/vcl/inc/win/salsys.h
index fc7a4b2d596e..5b6fc7f04bfe 100644
--- a/vcl/inc/win/salsys.h
+++ b/vcl/inc/win/salsys.h
@@ -56,13 +56,13 @@ public:
     WinSalSystem() : m_nPrimary( 0 ) {}
     virtual ~WinSalSystem();
 
-    virtual unsigned int GetDisplayScreenCount() SAL_OVERRIDE;
-    virtual unsigned int GetDisplayBuiltInScreen() SAL_OVERRIDE;
-    virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen )  SAL_OVERRIDE;
+    virtual unsigned int GetDisplayScreenCount() override;
+    virtual unsigned int GetDisplayBuiltInScreen() override;
+    virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen )  override;
     virtual int ShowNativeMessageBox( const OUString& rTitle,
                                       const OUString& rMessage,
                                       int nButtonCombination,
-                                      int nDefaultButton, bool bUseResources)  SAL_OVERRIDE;
+                                      int nDefaultButton, bool bUseResources)  override;
     bool initMonitors();
     // discards monitorinfo; used by WM_DISPLAYCHANGED handler
     void clearMonitors();
diff --git a/vcl/inc/win/saltimer.h b/vcl/inc/win/saltimer.h
index adc0fea69716..220941fc9a2e 100644
--- a/vcl/inc/win/saltimer.h
+++ b/vcl/inc/win/saltimer.h
@@ -28,8 +28,8 @@ public:
     WinSalTimer() {}
     virtual ~WinSalTimer();
 
-    virtual void Start(sal_uIntPtr nMS) SAL_OVERRIDE;
-    virtual void Stop() SAL_OVERRIDE;
+    virtual void Start(sal_uIntPtr nMS) override;
+    virtual void Stop() override;
 };
 
 #endif
diff --git a/vcl/inc/win/salvd.h b/vcl/inc/win/salvd.h
index bb8e168311f4..e19e88d9d096 100644
--- a/vcl/inc/win/salvd.h
+++ b/vcl/inc/win/salvd.h
@@ -49,15 +49,15 @@ public:
     WinSalVirtualDevice();
     virtual ~WinSalVirtualDevice();
 
-    virtual SalGraphics*            AcquireGraphics() SAL_OVERRIDE;
-    virtual void                    ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE;
-    virtual bool                    SetSize( long nNewDX, long nNewDY ) SAL_OVERRIDE;
+    virtual SalGraphics*            AcquireGraphics() override;
+    virtual void                    ReleaseGraphics( SalGraphics* pGraphics ) override;
+    virtual bool                    SetSize( long nNewDX, long nNewDY ) override;
 
     static HBITMAP ImplCreateVirDevBitmap(HDC hDC, long nDX, long nDY, sal_uInt16 nBitCount, void **ppDummy);
 
     // SalGeometryProvider
-    virtual long GetWidth() const SAL_OVERRIDE { return mnWidth; }
-    virtual long GetHeight() const SAL_OVERRIDE { return mnHeight; }
+    virtual long GetWidth() const override { return mnWidth; }
+    virtual long GetHeight() const override { return mnHeight; }
 };
 
 
diff --git a/vcl/inc/xconnection.hxx b/vcl/inc/xconnection.hxx
index d45aa6e66ba3..5969237d51d1 100644
--- a/vcl/inc/xconnection.hxx
+++ b/vcl/inc/xconnection.hxx
@@ -46,14 +46,14 @@ namespace vcl {
         void start();
         void terminate();
 
-        virtual bool dispatchEvent( void* pData, int nBytes ) SAL_OVERRIDE;
+        virtual bool dispatchEvent( void* pData, int nBytes ) override;
 
         // XDisplayConnection
-        virtual void SAL_CALL addEventHandler( const ::com::sun::star::uno::Any& window, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler >& handler, sal_Int32 eventMask ) throw(std::exception) SAL_OVERRIDE;
-        virtual void SAL_CALL removeEventHandler( const ::com::sun::star::uno::Any& window, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler >& handler ) throw(std::exception) SAL_OVERRIDE;
-        virtual void SAL_CALL addErrorHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler >& handler ) throw(std::exception) SAL_OVERRIDE;
-        virtual void SAL_CALL removeErrorHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler >& handler ) throw(std::exception) SAL_OVERRIDE;
-        virtual ::com::sun::star::uno::Any SAL_CALL getIdentifier() throw(std::exception) SAL_OVERRIDE;
+        virtual void SAL_CALL addEventHandler( const ::com::sun::star::uno::Any& window, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler >& handler, sal_Int32 eventMask ) throw(std::exception) override;
+        virtual void SAL_CALL removeEventHandler( const ::com::sun::star::uno::Any& window, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler >& handler ) throw(std::exception) override;
+        virtual void SAL_CALL addErrorHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler >& handler ) throw(std::exception) override;
+        virtual void SAL_CALL removeErrorHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler >& handler ) throw(std::exception) override;
+        virtual ::com::sun::star::uno::Any SAL_CALL getIdentifier() throw(std::exception) override;
 
     };