Second batch of adding SAL_OVERRIDE to overriding function declarations

...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.

Change-Id: Ie656f9d653fc716f72ac175925272696d509038f

7 files changed, 28 insertions, 28 deletions

diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index a1f926a1a582..07d28be8550c 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -83,7 +83,7 @@ public:
                     Invalidate();
                 }
 
-    virtual void Paint( const Rectangle& rRect );
+    virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
 };
 
 
@@ -96,9 +96,9 @@ class MaskSet : public ValueSet
 public:
     MaskSet( SvxBmpMask* pParent, const ResId& rId );
 
-    virtual void    Select();
-    virtual void KeyInput( const KeyEvent& rKEvt );
-    virtual void GetFocus();
+    virtual void    Select() SAL_OVERRIDE;
+    virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
+    virtual void GetFocus() SAL_OVERRIDE;
 
     void onEditColor();
 };
diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx
index 6f756cff9dac..eedf9cce7a82 100644
--- a/svx/source/dialog/contimp.hxx
+++ b/svx/source/dialog/contimp.hxx
@@ -51,8 +51,8 @@ class SvxSuperContourDlg : public SvxContourDlg
     sal_Bool                bGraphicLinked;
     ImageList           maImageList;
 
-    virtual void        Resize();
-    virtual bool        Close();
+    virtual void        Resize() SAL_OVERRIDE;
+    virtual bool        Close() SAL_OVERRIDE;
 
                         DECL_LINK( Tbx1ClickHdl, ToolBox* );
                         DECL_LINK( MousePosHdl, ContourWindow* );
@@ -96,7 +96,7 @@ public:
 
     /** virtual method from Window is used to detect change in high contrast display mode
         to switch the toolbox images */
-    virtual void        DataChanged( const DataChangedEvent& rDCEvt );
+    virtual void        DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
 
 };
 
diff --git a/svx/source/dialog/contwnd.hxx b/svx/source/dialog/contwnd.hxx
index 0dcb7094c0f1..457d1ace00b8 100644
--- a/svx/source/dialog/contwnd.hxx
+++ b/svx/source/dialog/contwnd.hxx
@@ -37,12 +37,12 @@ class ContourWindow : public GraphCtrl
 
 protected:
 
-    virtual void        MouseButtonDown(const MouseEvent& rMEvt);
-    virtual void        MouseMove(const MouseEvent& rMEvt);
-    virtual void        MouseButtonUp(const MouseEvent& rMEvt);
-    virtual void        SdrObjCreated( const SdrObject& rObj );
-    virtual void        InitSdrModel();
-    virtual void        Paint( const Rectangle& rRect );
+    virtual void        MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE;
+    virtual void        MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE;
+    virtual void        MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE;
+    virtual void        SdrObjCreated( const SdrObject& rObj ) SAL_OVERRIDE;
+    virtual void        InitSdrModel() SAL_OVERRIDE;
+    virtual void        Paint( const Rectangle& rRect ) SAL_OVERRIDE;
 
     void                CreatePolyPolygon();
 
diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx
index 065eb06c23c9..da6883a152e4 100644
--- a/svx/source/dialog/imapwnd.hxx
+++ b/svx/source/dialog/imapwnd.hxx
@@ -82,7 +82,7 @@ public:
 
                             ~IMapUserData() { }
 
-    virtual SdrObjUserData* Clone( SdrObject * ) const { return new IMapUserData( *this ); }
+    virtual SdrObjUserData* Clone( SdrObject * ) const SAL_OVERRIDE { return new IMapUserData( *this ); }
 
     void                    SetObject( const IMapObjectPtr& rIMapObj ) { mpObj = rIMapObj; }
     const IMapObjectPtr     GetObject() const { return mpObj; }
@@ -106,17 +106,17 @@ class IMapWindow : public GraphCtrl, public DropTargetHelper
 protected:
 
     // GraphCtrl
-    virtual void        MouseButtonUp(const MouseEvent& rMEvt);
-    virtual void        Command(const CommandEvent& rCEvt);
-    virtual void        RequestHelp( const HelpEvent& rHEvt );
-    virtual void        SdrObjCreated( const SdrObject& rObj );
-    virtual void        SdrObjChanged( const SdrObject& rObj );
-    virtual void        MarkListHasChanged();
-    virtual void        InitSdrModel();
+    virtual void        MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE;
+    virtual void        Command(const CommandEvent& rCEvt) SAL_OVERRIDE;
+    virtual void        RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE;
+    virtual void        SdrObjCreated( const SdrObject& rObj ) SAL_OVERRIDE;
+    virtual void        SdrObjChanged( const SdrObject& rObj ) SAL_OVERRIDE;
+    virtual void        MarkListHasChanged() SAL_OVERRIDE;
+    virtual void        InitSdrModel() SAL_OVERRIDE;
 
     // DropTargetHelper
-    virtual sal_Int8    AcceptDrop( const AcceptDropEvent& rEvt );
-    virtual sal_Int8    ExecuteDrop( const ExecuteDropEvent& rEvt );
+    virtual sal_Int8    AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE;
+    virtual sal_Int8    ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE;
 
     void                CreateImageMap();
     void                ReplaceImageMap( const ImageMap& rNewImageMap, sal_Bool bScaleToGraphic );
@@ -155,7 +155,7 @@ public:
     void                SelectFirstObject();
     void                StartPolyEdit();
 
-    virtual void        KeyInput( const KeyEvent& rKEvt );
+    virtual void        KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
 };
 
 
diff --git a/svx/source/dialog/rlrcitem.hxx b/svx/source/dialog/rlrcitem.hxx
index 3aa9eca807b5..62e6a2d9d076 100644
--- a/svx/source/dialog/rlrcitem.hxx
+++ b/svx/source/dialog/rlrcitem.hxx
@@ -32,7 +32,7 @@ private:
 
 protected:
     virtual void StateChanged( sal_uInt16,
-                               SfxItemState, const SfxPoolItem* pState );
+                               SfxItemState, const SfxPoolItem* pState ) SAL_OVERRIDE;
 
 public:
     SvxRulerItem( sal_uInt16 nId, SvxRuler&, SfxBindings& );
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 06a568bda5b0..9ff334e91299 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -119,8 +119,8 @@ class SvxRubyData_Impl : public cppu::WeakImplHelper1
     Sequence<PropertyValues>&       GetRubyValues() {return aRubyValues;}
     void                            AssertOneEntry();
 
-    virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw (RuntimeException, std::exception);
-    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (RuntimeException, std::exception);
+    virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
 
 };
 
diff --git a/svx/source/dialog/srchctrl.hxx b/svx/source/dialog/srchctrl.hxx
index 91f8386f8f71..d33525b2dd43 100644
--- a/svx/source/dialog/srchctrl.hxx
+++ b/svx/source/dialog/srchctrl.hxx
@@ -29,7 +29,7 @@ class SvxSearchController : public SfxControllerItem
     SvxSearchDialog&    rSrchDlg;
 
 protected:
-    virtual void        StateChanged( sal_uInt16, SfxItemState, const SfxPoolItem* pState );
+    virtual void        StateChanged( sal_uInt16, SfxItemState, const SfxPoolItem* pState ) SAL_OVERRIDE;
 
 public:
     SvxSearchController( sal_uInt16 nId, SfxBindings& rBnd, SvxSearchDialog& rDlg );