Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code

Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274

7 files changed, 63 insertions, 63 deletions

diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx
index 2c7277fe7a38..636c94b17edb 100644
--- a/vcl/workben/icontest.cxx
+++ b/vcl/workben/icontest.cxx
@@ -75,11 +75,11 @@ public:
 
     MyWorkWindow( vcl::Window* pParent, WinBits nWinStyle );
     virtual ~MyWorkWindow() { disposeOnce(); }
-    virtual void dispose() SAL_OVERRIDE { mpFixedBitmap.clear(); WorkWindow::dispose(); }
+    virtual void dispose() override { mpFixedBitmap.clear(); WorkWindow::dispose(); }
     void LoadGraphic( const OUString& sImageFile );
 
-    virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE;
-    virtual void Resize() SAL_OVERRIDE;
+    virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) override;
+    virtual void Resize() override;
 };
 
 MyWorkWindow::MyWorkWindow( vcl::Window* pParent, WinBits nWinStyle )
@@ -140,8 +140,8 @@ void MyWorkWindow::Resize()
 class IconTestApp : public Application
 {
 public:
-    virtual void Init() SAL_OVERRIDE;
-    virtual int Main() SAL_OVERRIDE;
+    virtual void Init() override;
+    virtual int Main() override;
 
     IconTestApp() : nRet(EXIT_SUCCESS) {};
 
diff --git a/vcl/workben/mtfdemo.cxx b/vcl/workben/mtfdemo.cxx
index dd17a571d006..404552750c35 100644
--- a/vcl/workben/mtfdemo.cxx
+++ b/vcl/workben/mtfdemo.cxx
@@ -55,7 +55,7 @@ public:
         }
     }
 
-    virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)  SAL_OVERRIDE;
+    virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)  override;
 };
 
 void DemoMtfWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
@@ -84,7 +84,7 @@ public:
     {
     }
 
-    virtual int Main() SAL_OVERRIDE
+    virtual int Main() override
     {
         try
         {
@@ -110,7 +110,7 @@ public:
 
 protected:
     uno::Reference<lang::XMultiServiceFactory> xMSF;
-    void Init() SAL_OVERRIDE
+    void Init() override
     {
         try
         {
@@ -143,7 +143,7 @@ protected:
         }
     }
 
-    void DeInit() SAL_OVERRIDE
+    void DeInit() override
     {
         uno::Reference< lang::XComponent >(
             comphelper::getProcessComponentContext(),
diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx
index 451c4c550ce8..3daa2a5af226 100644
--- a/vcl/workben/outdevgrind.cxx
+++ b/vcl/workben/outdevgrind.cxx
@@ -58,8 +58,8 @@ namespace
 class GrindApp : public Application
 {
 public:
-    virtual int Main() SAL_OVERRIDE;
-    virtual sal_uInt16 Exception( sal_uInt16 nError ) SAL_OVERRIDE;
+    virtual int Main() override;
+    virtual sal_uInt16 Exception( sal_uInt16 nError ) override;
 };
 
 class TestWindow : public Dialog
@@ -73,7 +73,7 @@ class TestWindow : public Dialog
             Show();
         }
 
-        virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE;
+        virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override;
 };
 
 typedef std::function<void (OutputDevice*)>   functor_type;
diff --git a/vcl/workben/svdem.cxx b/vcl/workben/svdem.cxx
index 6889c0d883c3..3003f29402e0 100644
--- a/vcl/workben/svdem.cxx
+++ b/vcl/workben/svdem.cxx
@@ -75,13 +75,13 @@ class MyWin : public WorkWindow
 public:
                 MyWin( vcl::Window* pParent, WinBits nWinStyle );
 
-    void        MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
-    void        MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
-    void        MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
-    void        KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
-    void        KeyUp( const KeyEvent& rKEvt ) SAL_OVERRIDE;
-    void        Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE;
-    void        Resize() SAL_OVERRIDE;
+    void        MouseMove( const MouseEvent& rMEvt ) override;
+    void        MouseButtonDown( const MouseEvent& rMEvt ) override;
+    void        MouseButtonUp( const MouseEvent& rMEvt ) override;
+    void        KeyInput( const KeyEvent& rKEvt ) override;
+    void        KeyUp( const KeyEvent& rKEvt ) override;
+    void        Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) override;
+    void        Resize() override;
 };
 
 void Main()
diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx
index b044f0ed53c3..7a1de724ec43 100644
--- a/vcl/workben/svpclient.cxx
+++ b/vcl/workben/svpclient.cxx
@@ -98,17 +98,17 @@ class MyWin : public WorkWindow
 public:
                  MyWin( vcl::Window* pParent, WinBits nWinStyle );
 
-    virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
-    virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
-    virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
-    virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
-    virtual void KeyUp( const KeyEvent& rKEvt ) SAL_OVERRIDE;
-    virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE;
-    virtual void Resize() SAL_OVERRIDE;
-
-    virtual bool Close() SAL_OVERRIDE;
+    virtual void MouseMove( const MouseEvent& rMEvt ) override;
+    virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
+    virtual void MouseButtonUp( const MouseEvent& rMEvt ) override;
+    virtual void KeyInput( const KeyEvent& rKEvt ) override;
+    virtual void KeyUp( const KeyEvent& rKEvt ) override;
+    virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) override;
+    virtual void Resize() override;
+
+    virtual bool Close() override;
     virtual ~MyWin() { disposeOnce(); }
-    virtual void dispose() SAL_OVERRIDE;
+    virtual void dispose() override;
 
     void parseList( const OString& rList );
     static OString processCommand( const OString& rCommand );
diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx
index 140f807e3971..f3e538005a0d 100644
--- a/vcl/workben/svptest.cxx
+++ b/vcl/workben/svptest.cxx
@@ -85,13 +85,13 @@ class MyWin : public WorkWindow
 public:
                  MyWin( vcl::Window* pParent, WinBits nWinStyle );
 
-    virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
-    virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
-    virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
-    virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
-    virtual void KeyUp( const KeyEvent& rKEvt ) SAL_OVERRIDE;
-    virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE;
-    virtual void Resize() SAL_OVERRIDE;
+    virtual void MouseMove( const MouseEvent& rMEvt ) override;
+    virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
+    virtual void MouseButtonUp( const MouseEvent& rMEvt ) override;
+    virtual void KeyInput( const KeyEvent& rKEvt ) override;
+    virtual void KeyUp( const KeyEvent& rKEvt ) override;
+    virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) override;
+    virtual void Resize() override;
 };
 
 void Main()
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index ff79a6e125b9..02be8e2f76de 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -106,11 +106,11 @@ class DemoRenderer
         // repeating count for profiling (to exceed the poor time resolution on Windows)
         virtual sal_uInt16 getTestRepeatCount() = 0;
 #define RENDER_DETAILS(name,key,repeat) \
-        virtual OUString getName() SAL_OVERRIDE \
+        virtual OUString getName() override \
             { return OUString(SAL_STRINGIFY(name)); } \
-        virtual sal_uInt16 getAccelerator() SAL_OVERRIDE \
+        virtual sal_uInt16 getAccelerator() override \
             { return key; } \
-        virtual sal_uInt16 getTestRepeatCount() SAL_OVERRIDE \
+        virtual sal_uInt16 getTestRepeatCount() override \
             { return repeat; }
 
         double sumTime;
@@ -234,7 +234,7 @@ public:
     {
         RENDER_DETAILS(lines,KEY_L,100)
         virtual void RenderRegion(OutputDevice &rDev, Rectangle r,
-                                  const RenderContext &rCtx) SAL_OVERRIDE
+                                  const RenderContext &rCtx) override
         {
             if (rCtx.meStyle == RENDER_EXPANDED)
             {
@@ -322,7 +322,7 @@ public:
         RENDER_DETAILS(text,KEY_T,1)
 
         virtual void RenderRegion(OutputDevice &rDev, Rectangle r,
-                                  const RenderContext &rCtx) SAL_OVERRIDE
+                                  const RenderContext &rCtx) override
         {
             if (rCtx.meStyle == RENDER_EXPANDED)
             {
@@ -479,7 +479,7 @@ public:
     {
         RENDER_DETAILS(checks,KEY_C,20)
         virtual void RenderRegion(OutputDevice &rDev, Rectangle r,
-                                  const RenderContext &rCtx) SAL_OVERRIDE
+                                  const RenderContext &rCtx) override
         {
             if (rCtx.meStyle == RENDER_EXPANDED)
             {
@@ -541,7 +541,7 @@ public:
         RENDER_DETAILS(poly,KEY_P,20)
         DrawCheckered maCheckered;
         virtual void RenderRegion(OutputDevice &rDev, Rectangle r,
-                                  const RenderContext &rCtx) SAL_OVERRIDE
+                                  const RenderContext &rCtx) override
         {
             maCheckered.RenderRegion(rDev, r, rCtx);
 
@@ -564,7 +564,7 @@ public:
     {
         RENDER_DETAILS(ellipse,KEY_E,5000)
         virtual void RenderRegion(OutputDevice &rDev, Rectangle r,
-                                  const RenderContext &) SAL_OVERRIDE
+                                  const RenderContext &) override
         {
             rDev.SetLineColor(Color(COL_RED));
             rDev.SetFillColor(Color(COL_GREEN));
@@ -576,7 +576,7 @@ public:
     {
         RENDER_DETAILS(gradient,KEY_G,50)
         virtual void RenderRegion(OutputDevice &rDev, Rectangle r,
-                                  const RenderContext &rCtx) SAL_OVERRIDE
+                                  const RenderContext &rCtx) override
         {
             if (rCtx.meStyle == RENDER_EXPANDED)
             {
@@ -692,7 +692,7 @@ public:
         }
 
         virtual void RenderRegion(OutputDevice &rDev, Rectangle r,
-                                  const RenderContext &rCtx) SAL_OVERRIDE
+                                  const RenderContext &rCtx) override
         {
             Bitmap aBitmap(rCtx.mpDemoRenderer->maIntroBW);
             aBitmap.Scale(r.GetSize(), BmpScaleFlag::BestQuality);
@@ -707,7 +707,7 @@ public:
         RENDER_DETAILS(bitmapex,KEY_X,2)
         DrawCheckered maCheckered;
         virtual void RenderRegion(OutputDevice &rDev, Rectangle r,
-                                  const RenderContext &rCtx) SAL_OVERRIDE
+                                  const RenderContext &rCtx) override
         {
             maCheckered.RenderRegion(rDev, r, rCtx);
 
@@ -724,7 +724,7 @@ public:
     {
         RENDER_DETAILS(polypoly,KEY_N,100)
         virtual void RenderRegion(OutputDevice &rDev, Rectangle r,
-                                  const RenderContext &) SAL_OVERRIDE
+                                  const RenderContext &) override
         {
             struct {
                 double nX, nY;
@@ -816,7 +816,7 @@ public:
             }
         }
         virtual void RenderRegion(OutputDevice &rDev, Rectangle r,
-                                  const RenderContext &rCtx) SAL_OVERRIDE
+                                  const RenderContext &rCtx) override
         {
             // avoid infinite recursion
             if (rCtx.mbVDev)
@@ -1028,7 +1028,7 @@ public:
         }
 
         virtual void RenderRegion(OutputDevice &rDev, Rectangle r,
-                                  const RenderContext &rCtx) SAL_OVERRIDE
+                                  const RenderContext &rCtx) override
         {
             if (rCtx.meStyle == RENDER_EXPANDED)
             {
@@ -1076,7 +1076,7 @@ public:
     {
         RENDER_DETAILS(fetchdraw,KEY_F,50)
         virtual void RenderRegion(OutputDevice &rDev, Rectangle r,
-                                  const RenderContext &) SAL_OVERRIDE
+                                  const RenderContext &) override
         {
             Bitmap aBitmap(rDev.GetBitmap(Point(0,0),rDev.GetOutputSizePixel()));
             aBitmap.Scale(r.GetSize(), BmpScaleFlag::BestQuality);
@@ -1372,7 +1372,7 @@ class DemoWin : public WorkWindow
         {
             join();
         }
-        virtual void execute() SAL_OVERRIDE
+        virtual void execute() override
         {
             osl_waitThread(&maDelay);
 
@@ -1396,13 +1396,13 @@ public:
     {
         disposeOnce();
     }
-    virtual void dispose() SAL_OVERRIDE
+    virtual void dispose() override
     {
         mxThread.clear();
         mrRenderer.removeInvalidate(this);
         WorkWindow::dispose();
     }
-    virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE
+    virtual void MouseButtonDown(const MouseEvent& rMEvt) override
     {
         mrRenderer.SetSizePixel(GetSizePixel());
         if (!mrRenderer.MouseButtonDown(rMEvt))
@@ -1422,12 +1422,12 @@ public:
             }
         }
     }
-    virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE
+    virtual void KeyInput(const KeyEvent& rKEvt) override
     {
         mrRenderer.SetSizePixel(GetSizePixel());
         mrRenderer.KeyInput(rKEvt);
     }
-    virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE
+    virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override
     {
         mrRenderer.SetSizePixel(GetSizePixel());
         fprintf(stderr, "DemoWin::Paint(%ld,%ld,%ld,%ld)\n", rRect.getX(), rRect.getY(), rRect.getWidth(), rRect.getHeight());
@@ -1529,7 +1529,7 @@ public:
         Show();
     }
     virtual ~DemoWidgets() { disposeOnce(); }
-    virtual void dispose() SAL_OVERRIDE
+    virtual void dispose() override
     {
         mpGLButton.disposeAndClear();
         mpGLCombo.disposeAndClear();
@@ -1542,7 +1542,7 @@ public:
         delete mpBar;
         WorkWindow::dispose();
     }
-    virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE
+    virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override
     {
         Rectangle aWholeSize(Point(0, 0),GetOutputSizePixel());
         vcl::Region aClip(aWholeSize);
@@ -1621,7 +1621,7 @@ class DemoPopup : public FloatingWindow
         Update();
     }
 
-    virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle&) SAL_OVERRIDE
+    virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle&) override
     {
         // Interestingly in GL mode on Windows, this doesn't render.
 
@@ -1645,7 +1645,7 @@ class DemoPopup : public FloatingWindow
         SetLineColor( aColor );
     }
 
-    virtual void MouseButtonDown( const MouseEvent & ) SAL_OVERRIDE
+    virtual void MouseButtonDown( const MouseEvent & ) override
     {
         Application::Quit();
     }
@@ -1777,7 +1777,7 @@ class DemoApp : public Application
 public:
     DemoApp() {}
 
-    virtual int Main() SAL_OVERRIDE
+    virtual int Main() override
     {
         try
         {
@@ -1859,7 +1859,7 @@ public:
 
 protected:
     uno::Reference<lang::XMultiServiceFactory> xMSF;
-    void Init() SAL_OVERRIDE
+    void Init() override
     {
         try
         {
@@ -1877,7 +1877,7 @@ protected:
             Application::Abort("Bootstrap exception " + e.Message);
         }
     }
-    void DeInit() SAL_OVERRIDE
+    void DeInit() override
     {
         uno::Reference< lang::XComponent >(
             comphelper::getProcessComponentContext(),