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

4 files changed, 71 insertions, 71 deletions

diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
index 75273ef962dc..3eacb7689abb 100644
--- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx
+++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
@@ -60,15 +60,15 @@ namespace accessibility
         ~AccessibleProxyEditSource_Impl();
 
         // from the SvxEditSource interface
-        SvxTextForwarder*       GetTextForwarder();
-        SvxViewForwarder*       GetViewForwarder();
+        SvxTextForwarder*       GetTextForwarder() SAL_OVERRIDE;
+        SvxViewForwarder*       GetViewForwarder() SAL_OVERRIDE;
         SvxEditViewForwarder*   GetEditViewForwarder( bool bCreate = false ) SAL_OVERRIDE;
 
-        SvxEditSource*          Clone() const;
+        SvxEditSource*          Clone() const SAL_OVERRIDE;
 
-        void                    UpdateData();
+        void                    UpdateData() SAL_OVERRIDE;
 
-        SfxBroadcaster&         GetBroadcaster() const;
+        SfxBroadcaster&         GetBroadcaster() const SAL_OVERRIDE;
 
     private:
         SvxTextEditSource       maEditSource;
@@ -88,70 +88,70 @@ namespace accessibility
         void                    Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
         // SvxEditSource
-        SvxTextForwarder*       GetTextForwarder() { return this; }
-        SvxViewForwarder*       GetViewForwarder() { return this; }
-        SvxEditSource*          Clone() const { return NULL; }
-        void                    UpdateData() {}
-        SfxBroadcaster&         GetBroadcaster() const { return *(const_cast<AccessibleEmptyEditSource_Impl*>(this)); }
+        SvxTextForwarder*       GetTextForwarder() SAL_OVERRIDE { return this; }
+        SvxViewForwarder*       GetViewForwarder() SAL_OVERRIDE { return this; }
+        SvxEditSource*          Clone() const SAL_OVERRIDE { return NULL; }
+        void                    UpdateData() SAL_OVERRIDE {}
+        SfxBroadcaster&         GetBroadcaster() const SAL_OVERRIDE { return *(const_cast<AccessibleEmptyEditSource_Impl*>(this)); }
 
         // SvxTextForwarder
-        sal_Int32          GetParagraphCount() const { return 1; }
-        sal_Int32          GetTextLen( sal_Int32 /*nParagraph*/ ) const { return 0; }
-        OUString        GetText( const ESelection& /*rSel*/ ) const { return OUString(); }
-        SfxItemSet      GetAttribs( const ESelection& /*rSel*/, sal_Bool /*bOnlyHardAttrib*/ = 0 ) const
+        sal_Int32          GetParagraphCount() const SAL_OVERRIDE { return 1; }
+        sal_Int32          GetTextLen( sal_Int32 /*nParagraph*/ ) const SAL_OVERRIDE { return 0; }
+        OUString        GetText( const ESelection& /*rSel*/ ) const SAL_OVERRIDE { return OUString(); }
+        SfxItemSet      GetAttribs( const ESelection& /*rSel*/, sal_Bool /*bOnlyHardAttrib*/ = 0 ) const SAL_OVERRIDE
         {
             // AW: Very dangerous: The former implementation used a SfxItemPool created on the
             // fly which of course was deleted again ASAP. Thus, the returned SfxItemSet was using
             // a deleted Pool by design.
             return SfxItemSet(SdrObject::GetGlobalDrawObjectItemPool());
         }
-        SfxItemSet      GetParaAttribs( sal_Int32 /*nPara*/ ) const { return GetAttribs(ESelection()); }
-        void            SetParaAttribs( sal_Int32 /*nPara*/, const SfxItemSet& /*rSet*/ ) {}
-        void            RemoveAttribs( const ESelection& /*rSelection*/, bool /*bRemoveParaAttribs*/, sal_uInt16 /*nWhich*/ ){}
-        void            GetPortions( sal_Int32 /*nPara*/, std::vector<sal_Int32>& /*rList*/ ) const {}
+        SfxItemSet      GetParaAttribs( sal_Int32 /*nPara*/ ) const SAL_OVERRIDE { return GetAttribs(ESelection()); }
+        void            SetParaAttribs( sal_Int32 /*nPara*/, const SfxItemSet& /*rSet*/ ) SAL_OVERRIDE {}
+        void            RemoveAttribs( const ESelection& /*rSelection*/, bool /*bRemoveParaAttribs*/, sal_uInt16 /*nWhich*/ ) SAL_OVERRIDE {}
+        void            GetPortions( sal_Int32 /*nPara*/, std::vector<sal_Int32>& /*rList*/ ) const SAL_OVERRIDE {}
 
-        sal_uInt16          GetItemState( const ESelection& /*rSel*/, sal_uInt16 /*nWhich*/ ) const { return 0; }
-        sal_uInt16          GetItemState( sal_Int32 /*nPara*/, sal_uInt16 /*nWhich*/ ) const { return 0; }
+        sal_uInt16          GetItemState( const ESelection& /*rSel*/, sal_uInt16 /*nWhich*/ ) const SAL_OVERRIDE { return 0; }
+        sal_uInt16          GetItemState( sal_Int32 /*nPara*/, sal_uInt16 /*nWhich*/ ) const SAL_OVERRIDE { return 0; }
 
-        SfxItemPool*    GetPool() const { return NULL; }
+        SfxItemPool*    GetPool() const SAL_OVERRIDE { return NULL; }
 
-        void            QuickInsertText( const OUString& /*rText*/, const ESelection& /*rSel*/ ) {}
-        void            QuickInsertField( const SvxFieldItem& /*rFld*/, const ESelection& /*rSel*/ ) {}
-        void            QuickSetAttribs( const SfxItemSet& /*rSet*/, const ESelection& /*rSel*/ ) {}
-        void            QuickInsertLineBreak( const ESelection& /*rSel*/ ) {}
+        void            QuickInsertText( const OUString& /*rText*/, const ESelection& /*rSel*/ ) SAL_OVERRIDE {}
+        void            QuickInsertField( const SvxFieldItem& /*rFld*/, const ESelection& /*rSel*/ ) SAL_OVERRIDE {}
+        void            QuickSetAttribs( const SfxItemSet& /*rSet*/, const ESelection& /*rSel*/ ) SAL_OVERRIDE {}
+        void            QuickInsertLineBreak( const ESelection& /*rSel*/ ) SAL_OVERRIDE {}
 
-        const SfxItemSet * GetEmptyItemSetPtr() { return 0; }
+        const SfxItemSet * GetEmptyItemSetPtr() SAL_OVERRIDE { return 0; }
 
-        void        AppendParagraph() {}
-        sal_Int32  AppendTextPortion( sal_Int32 /*nPara*/, const OUString & /*rText*/, const SfxItemSet & /*rSet*/ ) { return 0; }
+        void        AppendParagraph() SAL_OVERRIDE {}
+        sal_Int32  AppendTextPortion( sal_Int32 /*nPara*/, const OUString & /*rText*/, const SfxItemSet & /*rSet*/ ) SAL_OVERRIDE { return 0; }
 
         //XTextCopy
-        void        CopyText(const SvxTextForwarder& ){}
+        void        CopyText(const SvxTextForwarder& ) SAL_OVERRIDE {}
 
-        OUString    CalcFieldValue( const SvxFieldItem& /*rField*/, sal_Int32 /*nPara*/, sal_Int32 /*nPos*/, Color*& /*rpTxtColor*/, Color*& /*rpFldColor*/ )
+        OUString    CalcFieldValue( const SvxFieldItem& /*rField*/, sal_Int32 /*nPara*/, sal_Int32 /*nPos*/, Color*& /*rpTxtColor*/, Color*& /*rpFldColor*/ ) SAL_OVERRIDE
         {
             return  OUString();
         }
-        void            FieldClicked( const SvxFieldItem&, sal_Int32, sal_Int32 ) {;}
+        void            FieldClicked( const SvxFieldItem&, sal_Int32, sal_Int32 ) SAL_OVERRIDE {;}
 
-        bool            IsValid() const { return true; }
+        bool            IsValid() const SAL_OVERRIDE { return true; }
 
         void            SetNotifyHdl( const Link& ) {}
-        LanguageType    GetLanguage( sal_Int32, sal_Int32 ) const { return LANGUAGE_DONTKNOW; }
-        sal_Int32       GetFieldCount( sal_Int32 ) const { return 0; }
-        EFieldInfo      GetFieldInfo( sal_Int32, sal_uInt16 ) const { return EFieldInfo(); }
-        EBulletInfo     GetBulletInfo( sal_Int32 ) const { return EBulletInfo(); }
-        Rectangle       GetCharBounds( sal_Int32, sal_Int32 ) const { return Rectangle(); }
-        Rectangle       GetParaBounds( sal_Int32 ) const { return Rectangle(); }
-        MapMode         GetMapMode() const { return MapMode(); }
-        OutputDevice*   GetRefDevice() const { return NULL; }
-        bool            GetIndexAtPoint( const Point&, sal_Int32&, sal_Int32& ) const { return false; }
-        bool            GetWordIndices( sal_Int32, sal_Int32, sal_Int32&, sal_Int32& ) const { return false; }
-        bool            GetAttributeRun( sal_Int32&, sal_Int32&, sal_Int32, sal_Int32, bool ) const { return false; }
-        sal_Int32       GetLineCount( sal_Int32 nPara ) const { return nPara == 0 ? 1 : 0; }
-        sal_Int32       GetLineLen( sal_Int32, sal_Int32 ) const { return 0; }
-        void            GetLineBoundaries( /*out*/sal_Int32 & rStart, /*out*/sal_Int32 & rEnd, sal_Int32 /*nParagraph*/, sal_Int32 /*nLine*/ ) const  { rStart = rEnd = 0; }
-        sal_Int32       GetLineNumberAtIndex( sal_Int32 /*nPara*/, sal_Int32 /*nIndex*/ ) const   { return 0; }
+        LanguageType    GetLanguage( sal_Int32, sal_Int32 ) const SAL_OVERRIDE { return LANGUAGE_DONTKNOW; }
+        sal_Int32       GetFieldCount( sal_Int32 ) const SAL_OVERRIDE { return 0; }
+        EFieldInfo      GetFieldInfo( sal_Int32, sal_uInt16 ) const SAL_OVERRIDE { return EFieldInfo(); }
+        EBulletInfo     GetBulletInfo( sal_Int32 ) const SAL_OVERRIDE { return EBulletInfo(); }
+        Rectangle       GetCharBounds( sal_Int32, sal_Int32 ) const SAL_OVERRIDE { return Rectangle(); }
+        Rectangle       GetParaBounds( sal_Int32 ) const SAL_OVERRIDE { return Rectangle(); }
+        MapMode         GetMapMode() const SAL_OVERRIDE { return MapMode(); }
+        OutputDevice*   GetRefDevice() const SAL_OVERRIDE { return NULL; }
+        bool            GetIndexAtPoint( const Point&, sal_Int32&, sal_Int32& ) const SAL_OVERRIDE { return false; }
+        bool            GetWordIndices( sal_Int32, sal_Int32, sal_Int32&, sal_Int32& ) const SAL_OVERRIDE { return false; }
+        bool            GetAttributeRun( sal_Int32&, sal_Int32&, sal_Int32, sal_Int32, bool ) const SAL_OVERRIDE { return false; }
+        sal_Int32       GetLineCount( sal_Int32 nPara ) const SAL_OVERRIDE { return nPara == 0 ? 1 : 0; }
+        sal_Int32       GetLineLen( sal_Int32, sal_Int32 ) const SAL_OVERRIDE { return 0; }
+        void            GetLineBoundaries( /*out*/sal_Int32 & rStart, /*out*/sal_Int32 & rEnd, sal_Int32 /*nParagraph*/, sal_Int32 /*nLine*/ ) const SAL_OVERRIDE  { rStart = rEnd = 0; }
+        sal_Int32       GetLineNumberAtIndex( sal_Int32 /*nPara*/, sal_Int32 /*nIndex*/ ) const SAL_OVERRIDE   { return 0; }
 
         // the following two methods would, strictly speaking, require
         // a switch to a real EditSource, too. Fortunately, the
@@ -161,15 +161,15 @@ namespace accessibility
         // when that changes: via accessibility API, it would no
         // longer be possible to enter text in previously empty
         // shapes).
-        bool            Delete( const ESelection& ) { return false; }
-        bool            InsertText( const OUString&, const ESelection& ) { return false; }
-        bool            QuickFormatDoc( bool ) { return true; }
-        sal_Int16       GetDepth( sal_Int32 ) const { return -1; }
-        bool            SetDepth( sal_Int32, sal_Int16 ) { return true; }
-
-        Rectangle       GetVisArea() const { return Rectangle(); }
-        Point           LogicToPixel( const Point& rPoint, const MapMode& /*rMapMode*/ ) const { return rPoint; }
-        Point           PixelToLogic( const Point& rPoint, const MapMode& /*rMapMode*/ ) const { return rPoint; }
+        bool            Delete( const ESelection& ) SAL_OVERRIDE { return false; }
+        bool            InsertText( const OUString&, const ESelection& ) SAL_OVERRIDE { return false; }
+        bool            QuickFormatDoc( bool ) SAL_OVERRIDE { return true; }
+        sal_Int16       GetDepth( sal_Int32 ) const SAL_OVERRIDE { return -1; }
+        bool            SetDepth( sal_Int32, sal_Int16 ) SAL_OVERRIDE { return true; }
+
+        Rectangle       GetVisArea() const SAL_OVERRIDE { return Rectangle(); }
+        Point           LogicToPixel( const Point& rPoint, const MapMode& /*rMapMode*/ ) const SAL_OVERRIDE { return rPoint; }
+        Point           PixelToLogic( const Point& rPoint, const MapMode& /*rMapMode*/ ) const SAL_OVERRIDE { return rPoint; }
 
     };
 
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.hxx b/svx/source/accessibility/AccessibleEmptyEditSource.hxx
index e4174aa83ddf..b897f7ca28e5 100644
--- a/svx/source/accessibility/AccessibleEmptyEditSource.hxx
+++ b/svx/source/accessibility/AccessibleEmptyEditSource.hxx
@@ -53,20 +53,20 @@ namespace accessibility
         ~AccessibleEmptyEditSource();
 
         // from the SvxEditSource interface
-        SvxTextForwarder*       GetTextForwarder();
-        SvxViewForwarder*       GetViewForwarder();
+        SvxTextForwarder*       GetTextForwarder() SAL_OVERRIDE;
+        SvxViewForwarder*       GetViewForwarder() SAL_OVERRIDE;
 
-        SvxEditSource*          Clone() const;
+        SvxEditSource*          Clone() const SAL_OVERRIDE;
 
         // this method internally switches from empty to proxy mode,
         // creating an SvxTextEditSource for the functionality.
         SvxEditViewForwarder*   GetEditViewForwarder( bool bCreate = false ) SAL_OVERRIDE;
 
-        void                    UpdateData();
-        SfxBroadcaster&         GetBroadcaster() const;
+        void                    UpdateData() SAL_OVERRIDE;
+        SfxBroadcaster&         GetBroadcaster() const SAL_OVERRIDE;
 
         // from the SfxListener interface
-        void                    Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+        void                    Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
 
     private:
         void Switch2ProxyEditSource();
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index bc16276c2679..6a6e06a8c2d4 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -189,7 +189,7 @@ namespace accessibility
 
         void ParagraphsMoved( sal_Int32 nFirst, sal_Int32 nMiddle, sal_Int32 nLast );
 
-        virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+        virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
 
         int getNotifierClientId() const { return mnNotifierClientId; }
 
diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx
index 4ef53b974fbc..5804b9fae990 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.hxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.hxx
@@ -246,21 +246,21 @@ public:
 
     virtual void SAL_CALL
         disposing (const ::com::sun::star::lang::EventObject& rEventObject)
-        throw (::com::sun::star::uno::RuntimeException, std::exception);
+        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 
     //=====  document::XEventListener  ========================================
 
     virtual void SAL_CALL
         notifyEvent (const ::com::sun::star::document::EventObject& rEventObject)
-        throw (::com::sun::star::uno::RuntimeException, std::exception);
+        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 
     //=====  view::XSelectionChangeListener  ==================================
 
     virtual void  SAL_CALL
         selectionChanged (const ::com::sun::star::lang::EventObject& rEvent)
-        throw (::com::sun::star::uno::RuntimeException, std::exception);
+        throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 
     //=====  IAccessibleViewForwarderListener  ================================
@@ -277,7 +277,7 @@ public:
             The modified view forwarder.  Use this one from now on.
     */
     virtual void ViewForwarderChanged (ChangeType aChangeType,
-        const IAccessibleViewForwarder* pViewForwarder);
+        const IAccessibleViewForwarder* pViewForwarder) SAL_OVERRIDE;
 
     //=====  IAccessibleParent  ===============================================
 
@@ -295,17 +295,17 @@ public:
         const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rxShape,
         const long _nIndex,
         const AccessibleShapeTreeInfo& _rShapeTreeInfo
-    )   throw (::com::sun::star::uno::RuntimeException);
+    )   throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
 
     // Add the impl method for IAccessibleParent interface
     virtual AccessibleControlShape* GetAccControlShapeFromModel
         (::com::sun::star::beans::XPropertySet* pSet)
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
     virtual ::com::sun::star::uno::Reference<
             ::com::sun::star::accessibility::XAccessible>
         GetAccessibleCaption (const ::com::sun::star::uno::Reference<
             ::com::sun::star::drawing::XShape>& xShape)
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
 protected:
     /** This list holds the descriptors of all currently visible shapes and
         associated accessible object.
@@ -359,7 +359,7 @@ protected:
     /** This method is called from the component helper base class while
         disposing.
     */
-    virtual void SAL_CALL disposing (void);
+    virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
 
     void impl_dispose (void);