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

15 files changed, 57 insertions, 57 deletions

diff --git a/sfx2/source/sidebar/Accessible.hxx b/sfx2/source/sidebar/Accessible.hxx
index 6d1ab5d2369e..92f457ef119a 100644
--- a/sfx2/source/sidebar/Accessible.hxx
+++ b/sfx2/source/sidebar/Accessible.hxx
@@ -53,12 +53,12 @@ public:
         const cssu::Reference<css::accessibility::XAccessibleContext>& rxContext);
     virtual ~Accessible (void);
 
-    virtual void SAL_CALL disposing (void);
+    virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
 
 
     // XAccessible
     virtual cssu::Reference<css::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext (void)
-        throw (cssu::RuntimeException, std::exception);
+        throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
     cssu::Reference<css::accessibility::XAccessibleContext> mxContext;
diff --git a/sfx2/source/sidebar/AccessibleTitleBar.hxx b/sfx2/source/sidebar/AccessibleTitleBar.hxx
index 4c6cb1117310..f8517f8adbd1 100644
--- a/sfx2/source/sidebar/AccessibleTitleBar.hxx
+++ b/sfx2/source/sidebar/AccessibleTitleBar.hxx
@@ -35,7 +35,7 @@ public:
     static cssu::Reference<css::accessibility::XAccessible> Create (TitleBar& rTitleBar);
 
 protected:
-    virtual void FillAccessibleStateSet (utl::AccessibleStateSetHelper& rStateSet);
+    virtual void FillAccessibleStateSet (utl::AccessibleStateSetHelper& rStateSet) SAL_OVERRIDE;
 
 private:
     AccessibleTitleBar (VCLXWindow* pWindow);
diff --git a/sfx2/source/sidebar/CommandInfoProvider.cxx b/sfx2/source/sidebar/CommandInfoProvider.cxx
index e1ffbf3f4f17..54589df723ae 100644
--- a/sfx2/source/sidebar/CommandInfoProvider.cxx
+++ b/sfx2/source/sidebar/CommandInfoProvider.cxx
@@ -57,13 +57,13 @@ namespace
         virtual ~FrameListener (void)
         {
         }
-        virtual void SAL_CALL disposing (void)
+        virtual void SAL_CALL disposing (void) SAL_OVERRIDE
         {
             if (mxFrame.is())
                 mxFrame->removeEventListener(this);
         }
         virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent)
-            throw (cssu::RuntimeException, std::exception)
+            throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE
         {
             (void)rEvent;
             mrInfoProvider.SetFrame(NULL);
diff --git a/sfx2/source/sidebar/ControllerItem.cxx b/sfx2/source/sidebar/ControllerItem.cxx
index 7ee4e702a1df..6caa99e32001 100644
--- a/sfx2/source/sidebar/ControllerItem.cxx
+++ b/sfx2/source/sidebar/ControllerItem.cxx
@@ -60,20 +60,20 @@ namespace
         virtual ~FrameActionListener (void)
         {
         }
-        virtual void SAL_CALL disposing (void)
+        virtual void SAL_CALL disposing (void) SAL_OVERRIDE
         {
             if (mxFrame.is())
                 mxFrame->removeFrameActionListener(this);
         }
         virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent)
-            throw (cssu::RuntimeException, std::exception)
+            throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE
         {
             (void)rEvent;
             mrControllerItem.ResetFrame();
             mxFrame = NULL;
         }
         virtual void SAL_CALL frameAction (const css::frame::FrameActionEvent& rEvent)
-            throw (cssu::RuntimeException, std::exception)
+            throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE
         {
             if (rEvent.Action == frame::FrameAction_CONTEXT_CHANGED)
                 mrControllerItem.NotifyFrameContextChange();
diff --git a/sfx2/source/sidebar/Deck.hxx b/sfx2/source/sidebar/Deck.hxx
index 5a0850ce7a61..65aa238d9148 100644
--- a/sfx2/source/sidebar/Deck.hxx
+++ b/sfx2/source/sidebar/Deck.hxx
@@ -65,9 +65,9 @@ public:
     */
     void ShowPanel (const Panel& rPanel);
 
-    virtual void Paint (const Rectangle& rUpdateArea);
-    virtual void DataChanged (const DataChangedEvent& rEvent);
-    virtual bool Notify (NotifyEvent& rEvent);
+    virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE;
+    virtual void DataChanged (const DataChangedEvent& rEvent) SAL_OVERRIDE;
+    virtual bool Notify (NotifyEvent& rEvent) SAL_OVERRIDE;
 
     void PrintWindowTree();
     static void PrintWindowSubTree (Window* pRoot, int nIndentation);
@@ -79,7 +79,7 @@ public:
     public:
         ScrollContainerWindow (Window* pParentWindow);
         virtual ~ScrollContainerWindow (void);
-        virtual void Paint (const Rectangle& rUpdateArea);
+        virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE;
         void SetSeparators (const ::std::vector<sal_Int32>& rSeparators);
     private:
         ::std::vector<sal_Int32> maSeparators;
diff --git a/sfx2/source/sidebar/DeckTitleBar.hxx b/sfx2/source/sidebar/DeckTitleBar.hxx
index 7b4be835b6c8..d70e148525ba 100644
--- a/sfx2/source/sidebar/DeckTitleBar.hxx
+++ b/sfx2/source/sidebar/DeckTitleBar.hxx
@@ -38,15 +38,15 @@ public:
 
     void SetCloserVisible (const bool bIsCloserVisible);
 
-    virtual void DataChanged (const DataChangedEvent& rEvent);
+    virtual void DataChanged (const DataChangedEvent& rEvent) SAL_OVERRIDE;
 
 protected:
-    virtual Rectangle GetTitleArea (const Rectangle& rTitleBarBox);
-    virtual void PaintDecoration (const Rectangle& rTitleBarBox);
-    virtual sidebar::Paint GetBackgroundPaint (void);
-    virtual Color GetTextColor (void);
-    virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex);
-    virtual cssu::Reference<css::accessibility::XAccessible> CreateAccessible (void);
+    virtual Rectangle GetTitleArea (const Rectangle& rTitleBarBox) SAL_OVERRIDE;
+    virtual void PaintDecoration (const Rectangle& rTitleBarBox) SAL_OVERRIDE;
+    virtual sidebar::Paint GetBackgroundPaint (void) SAL_OVERRIDE;
+    virtual Color GetTextColor (void) SAL_OVERRIDE;
+    virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex) SAL_OVERRIDE;
+    virtual cssu::Reference<css::accessibility::XAccessible> CreateAccessible (void) SAL_OVERRIDE;
 
 private:
     const sal_uInt16 mnCloserItemIndex;
diff --git a/sfx2/source/sidebar/MenuButton.hxx b/sfx2/source/sidebar/MenuButton.hxx
index c7e855411fd9..268eff9a3da6 100644
--- a/sfx2/source/sidebar/MenuButton.hxx
+++ b/sfx2/source/sidebar/MenuButton.hxx
@@ -31,10 +31,10 @@ public:
     MenuButton (Window* pParentWindow);
     virtual ~MenuButton (void);
 
-    virtual void Paint (const Rectangle& rUpdateArea);
-    virtual void MouseMove (const MouseEvent& rEvent);
-    virtual void MouseButtonDown (const MouseEvent& rMouseEvent);
-    virtual void MouseButtonUp (const MouseEvent& rMouseEvent);
+    virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE;
+    virtual void MouseMove (const MouseEvent& rEvent) SAL_OVERRIDE;
+    virtual void MouseButtonDown (const MouseEvent& rMouseEvent) SAL_OVERRIDE;
+    virtual void MouseButtonUp (const MouseEvent& rMouseEvent) SAL_OVERRIDE;
 
 protected:
     using CheckBox::FillLayoutData;
diff --git a/sfx2/source/sidebar/Panel.hxx b/sfx2/source/sidebar/Panel.hxx
index fb902c8f1d0f..218f95373798 100644
--- a/sfx2/source/sidebar/Panel.hxx
+++ b/sfx2/source/sidebar/Panel.hxx
@@ -63,10 +63,10 @@ public:
     bool HasIdPredicate (const ::rtl::OUString& rsId) const;
     const ::rtl::OUString& GetId (void) const;
 
-    virtual void Paint (const Rectangle& rUpdateArea);
-    virtual void Resize (void);
-    virtual void DataChanged (const DataChangedEvent& rEvent);
-    virtual void Activate (void);
+    virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE;
+    virtual void Resize (void) SAL_OVERRIDE;
+    virtual void DataChanged (const DataChangedEvent& rEvent) SAL_OVERRIDE;
+    virtual void Activate (void) SAL_OVERRIDE;
 
 private:
     const ::rtl::OUString msPanelId;
diff --git a/sfx2/source/sidebar/PanelTitleBar.hxx b/sfx2/source/sidebar/PanelTitleBar.hxx
index ba83173acd64..4d4a27f9c606 100644
--- a/sfx2/source/sidebar/PanelTitleBar.hxx
+++ b/sfx2/source/sidebar/PanelTitleBar.hxx
@@ -43,17 +43,17 @@ public:
         const ::rtl::OUString& rsCommandName,
         const ::cssu::Reference<css::frame::XFrame>& rxFrame);
 
-    virtual void DataChanged (const DataChangedEvent& rEvent);
-    virtual void MouseButtonDown (const MouseEvent& rMouseEvent);
-    virtual void MouseButtonUp (const MouseEvent& rMouseEvent);
+    virtual void DataChanged (const DataChangedEvent& rEvent) SAL_OVERRIDE;
+    virtual void MouseButtonDown (const MouseEvent& rMouseEvent) SAL_OVERRIDE;
+    virtual void MouseButtonUp (const MouseEvent& rMouseEvent) SAL_OVERRIDE;
 
 protected:
-    virtual Rectangle GetTitleArea (const Rectangle& rTitleBarBox);
-    virtual void PaintDecoration (const Rectangle& rTitleBarBox);
-    virtual sidebar::Paint GetBackgroundPaint (void);
-    virtual Color GetTextColor (void);
-    virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex);
-    virtual cssu::Reference<css::accessibility::XAccessible> CreateAccessible (void);
+    virtual Rectangle GetTitleArea (const Rectangle& rTitleBarBox) SAL_OVERRIDE;
+    virtual void PaintDecoration (const Rectangle& rTitleBarBox) SAL_OVERRIDE;
+    virtual sidebar::Paint GetBackgroundPaint (void) SAL_OVERRIDE;
+    virtual Color GetTextColor (void) SAL_OVERRIDE;
+    virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex) SAL_OVERRIDE;
+    virtual cssu::Reference<css::accessibility::XAccessible> CreateAccessible (void) SAL_OVERRIDE;
 
 private:
     bool mbIsLeftButtonDown;
diff --git a/sfx2/source/sidebar/SidebarController.hxx b/sfx2/source/sidebar/SidebarController.hxx
index 98dfbb197288..69f724254cda 100644
--- a/sfx2/source/sidebar/SidebarController.hxx
+++ b/sfx2/source/sidebar/SidebarController.hxx
@@ -92,23 +92,23 @@ public:
 
     // ui::XContextChangeEventListener
     virtual void SAL_CALL notifyContextChangeEvent (const css::ui::ContextChangeEventObject& rEvent)
-        throw(cssu::RuntimeException, std::exception);
+        throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // XEventListener
     virtual void SAL_CALL disposing (const css::lang::EventObject& rEventObject)
-        throw(cssu::RuntimeException, std::exception);
+        throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // beans::XPropertyChangeListener
     virtual void SAL_CALL propertyChange (const css::beans::PropertyChangeEvent& rEvent)
-        throw(cssu::RuntimeException, std::exception);
+        throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // frame::XStatusListener
     virtual void SAL_CALL statusChanged (const css::frame::FeatureStateEvent& rEvent)
-        throw(cssu::RuntimeException, std::exception);
+        throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // ui::XSidebar
     virtual void SAL_CALL requestLayout (void)
-        throw(cssu::RuntimeException, std::exception);
+        throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE;
 
     void NotifyResize (void);
 
@@ -248,7 +248,7 @@ private:
 
     Context GetCurrentContext (void) const;
 
-    virtual void SAL_CALL disposing (void);
+    virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
 };
 
 
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.hxx b/sfx2/source/sidebar/SidebarDockingWindow.hxx
index 8a0dfa4c910b..0fde50e6e8b0 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.hxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.hxx
@@ -40,15 +40,15 @@ public:
         WinBits nBits);
     virtual ~SidebarDockingWindow (void);
 
-    virtual bool Close (void);
+    virtual bool Close (void) SAL_OVERRIDE;
 
 protected:
     // Window overridables
-    virtual void GetFocus (void);
+    virtual void GetFocus (void) SAL_OVERRIDE;
 
     virtual SfxChildAlignment CheckAlignment (
         SfxChildAlignment eCurrentAlignment,
-        SfxChildAlignment eRequestedAlignment);
+        SfxChildAlignment eRequestedAlignment) SAL_OVERRIDE;
 
 private:
     ::rtl::Reference<sfx2::sidebar::SidebarController> mpSidebarController;
diff --git a/sfx2/source/sidebar/SidebarPanel.hxx b/sfx2/source/sidebar/SidebarPanel.hxx
index 2679c663b23a..29de65dc0c4b 100644
--- a/sfx2/source/sidebar/SidebarPanel.hxx
+++ b/sfx2/source/sidebar/SidebarPanel.hxx
@@ -59,7 +59,7 @@ protected:
     virtual void SAL_CALL disposing (const css::lang::EventObject& rEventObject)
         throw(cssu::RuntimeException);
 
-    virtual void SAL_CALL disposing (void);
+    virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
 
 private:
     Panel* mpPanel;
diff --git a/sfx2/source/sidebar/TabBar.hxx b/sfx2/source/sidebar/TabBar.hxx
index ef09a07544c8..b9d4e717c2f4 100644
--- a/sfx2/source/sidebar/TabBar.hxx
+++ b/sfx2/source/sidebar/TabBar.hxx
@@ -72,9 +72,9 @@ public:
         const PopupMenuProvider& rPopupMenuProvider);
     virtual ~TabBar (void);
 
-    virtual void Paint (const Rectangle& rUpdateArea);
-    virtual void DataChanged (const DataChangedEvent& rDataChangedEvent);
-    virtual bool Notify (NotifyEvent& rEvent);
+    virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE;
+    virtual void DataChanged (const DataChangedEvent& rDataChangedEvent) SAL_OVERRIDE;
+    virtual bool Notify (NotifyEvent& rEvent) SAL_OVERRIDE;
 
     static sal_Int32 GetDefaultWidth (void);
 
diff --git a/sfx2/source/sidebar/TabItem.hxx b/sfx2/source/sidebar/TabItem.hxx
index ae1755568873..32ee7d5394cb 100644
--- a/sfx2/source/sidebar/TabItem.hxx
+++ b/sfx2/source/sidebar/TabItem.hxx
@@ -36,10 +36,10 @@ public:
     TabItem (Window* pParentWindow);
     virtual ~TabItem (void);
 
-    virtual void Paint (const Rectangle& rUpdateArea);
-    virtual void MouseMove (const MouseEvent& rEvent);
-    virtual void MouseButtonDown (const MouseEvent& rMouseEvent);
-    virtual void MouseButtonUp (const MouseEvent& rMouseEvent);
+    virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE;
+    virtual void MouseMove (const MouseEvent& rEvent) SAL_OVERRIDE;
+    virtual void MouseButtonDown (const MouseEvent& rMouseEvent) SAL_OVERRIDE;
+    virtual void MouseButtonUp (const MouseEvent& rMouseEvent) SAL_OVERRIDE;
 
 private:
     bool mbIsLeftButtonDown;
diff --git a/sfx2/source/sidebar/TitleBar.hxx b/sfx2/source/sidebar/TitleBar.hxx
index 6442333197c6..2ff949e47bcd 100644
--- a/sfx2/source/sidebar/TitleBar.hxx
+++ b/sfx2/source/sidebar/TitleBar.hxx
@@ -40,14 +40,14 @@ public:
     void SetTitle (const ::rtl::OUString& rsTitle);
     void SetIcon (const Image& rIcon);
 
-    virtual void Paint (const Rectangle& rUpdateArea);
-    virtual void DataChanged (const DataChangedEvent& rEvent);
+    virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE;
+    virtual void DataChanged (const DataChangedEvent& rEvent) SAL_OVERRIDE;
     virtual void setPosSizePixel (
         long nX,
         long nY,
         long nWidth,
         long nHeight,
-        sal_uInt16 nFlags = WINDOW_POSSIZE_ALL);
+        sal_uInt16 nFlags = WINDOW_POSSIZE_ALL) SAL_OVERRIDE;
 
     ToolBox& GetToolBox (void);
     const ToolBox& GetToolBox (void) const;
@@ -62,7 +62,7 @@ protected:
     virtual sidebar::Paint GetBackgroundPaint (void) = 0;
     virtual Color GetTextColor (void) = 0;
     virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex);
-    virtual cssu::Reference<css::accessibility::XAccessible> CreateAccessible (void);
+    virtual cssu::Reference<css::accessibility::XAccessible> CreateAccessible (void) SAL_OVERRIDE;
 
 private:
     Image maIcon;