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, 44 insertions, 44 deletions

diff --git a/include/filter/msfilter/mscodec.hxx b/include/filter/msfilter/mscodec.hxx
index 12da3b787be5..8c1ee61565e5 100644
--- a/include/filter/msfilter/mscodec.hxx
+++ b/include/filter/msfilter/mscodec.hxx
@@ -148,7 +148,7 @@ public:
         @param nBytes
             Size of the passed data block.
     */
-    virtual void                Decode( sal_uInt8* pnData, sal_Size nBytes );
+    virtual void                Decode( sal_uInt8* pnData, sal_Size nBytes ) SAL_OVERRIDE;
 };
 
 /** Encodes and decodes data from protected MSO Word 95- documents.
@@ -169,7 +169,7 @@ public:
         @param nBytes
             Size of the passed data block.
     */
-    virtual void                Decode( sal_uInt8* pnData, sal_Size nBytes );
+    virtual void                Decode( sal_uInt8* pnData, sal_Size nBytes ) SAL_OVERRIDE;
 };
 
 
diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx
index f4d6c37b5597..1eaa7acdb5dd 100644
--- a/include/filter/msfilter/mstoolbar.hxx
+++ b/include/filter/msfilter/mstoolbar.hxx
@@ -105,7 +105,7 @@ class MSFILTER_DLLPUBLIC WString : public TBBase
 public:
     WString(){};
     ~WString(){};
-    bool Read(SvStream &rS);
+    bool Read(SvStream &rS) SAL_OVERRIDE;
     OUString getString(){ return sString; }
 };
 
@@ -124,8 +124,8 @@ class MSFILTER_DLLPUBLIC TBCExtraInfo : public TBBase
 public:
     TBCExtraInfo();
     ~TBCExtraInfo(){}
-    bool Read(SvStream &rS);
-    void Print( FILE* );
+    bool Read(SvStream &rS) SAL_OVERRIDE;
+    void Print( FILE* ) SAL_OVERRIDE;
     OUString getOnAction();
 };
 
@@ -140,8 +140,8 @@ class MSFILTER_DLLPUBLIC TBCGeneralInfo  : public TBBase
 public:
     TBCGeneralInfo();
     ~TBCGeneralInfo() {}
-    bool Read(SvStream &rS);
-    void Print( FILE* );
+    bool Read(SvStream &rS) SAL_OVERRIDE;
+    void Print( FILE* ) SAL_OVERRIDE;
     bool ImportToolBarControlData( CustomToolBarImportHelper&, std::vector< css::beans::PropertyValue >& );
     OUString CustomText() { return customText.getString(); }
     OUString DescriptionText() { return descriptionText.getString(); }
@@ -156,8 +156,8 @@ friend class TBCBSpecific; // #FIXME hacky access, need to fix
 public:
     TBCBitMap();
     ~TBCBitMap();
-    bool Read(SvStream &rS);
-    void Print( FILE* );
+    bool Read(SvStream &rS) SAL_OVERRIDE;
+    void Print( FILE* ) SAL_OVERRIDE;
     Bitmap& getBitMap();
 };
 
@@ -168,8 +168,8 @@ class MSFILTER_DLLPUBLIC TBCMenuSpecific : public TBBase
 public:
     TBCMenuSpecific();
     ~TBCMenuSpecific(){}
-    bool Read(SvStream &rS);
-    void Print( FILE* );
+    bool Read(SvStream &rS) SAL_OVERRIDE;
+    void Print( FILE* ) SAL_OVERRIDE;
     OUString Name();
 };
 
@@ -186,8 +186,8 @@ class MSFILTER_DLLPUBLIC TBCCDData : public TBBase
 public:
     TBCCDData();
     ~TBCCDData();
-    bool Read(SvStream &rS);
-    void Print( FILE* );
+    bool Read(SvStream &rS) SAL_OVERRIDE;
+    void Print( FILE* ) SAL_OVERRIDE;
 };
 
 class TBCComboDropdownSpecific : public TBBase
@@ -196,8 +196,8 @@ class TBCComboDropdownSpecific : public TBBase
 public:
     TBCComboDropdownSpecific( const TBCHeader& header );
     TBCComboDropdownSpecific(){}
-    bool Read(SvStream &rS);
-    void Print( FILE* );
+    bool Read(SvStream &rS) SAL_OVERRIDE;
+    void Print( FILE* ) SAL_OVERRIDE;
 };
 
 class TBCBSpecific :  public TBBase
@@ -211,8 +211,8 @@ class TBCBSpecific :  public TBBase
 public:
     TBCBSpecific();
     ~TBCBSpecific(){}
-    bool Read(SvStream &rS);
-    void Print( FILE* );
+    bool Read(SvStream &rS) SAL_OVERRIDE;
+    void Print( FILE* ) SAL_OVERRIDE;
     // #TODO just add a getGraphic member here
     TBCBitMap* getIcon();
     TBCBitMap* getIconMask();
@@ -259,8 +259,8 @@ public:
     sal_uInt16 getTcID() const { return tcid; }
     bool isVisible() { return !( bFlagsTCR & 0x1 ); }
     bool isBeginGroup() { return ( bFlagsTCR & 0x2 ); }
-    bool Read(SvStream &rS);
-    void Print( FILE* );
+    bool Read(SvStream &rS) SAL_OVERRIDE;
+    void Print( FILE* ) SAL_OVERRIDE;
     sal_uInt32 getTbct() { return tbct; };
 };
 
@@ -274,8 +274,8 @@ class MSFILTER_DLLPUBLIC TBCData : public TBBase
 public:
     TBCData( const TBCHeader& Header );
     ~TBCData(){}
-    bool Read(SvStream &rS);
-    void Print( FILE* );
+    bool Read(SvStream &rS) SAL_OVERRIDE;
+    void Print( FILE* ) SAL_OVERRIDE;
     bool ImportToolBarControl( CustomToolBarImportHelper&, std::vector< css::beans::PropertyValue >&, bool& bBeginGroup, bool bIsMenuBar );
     TBCGeneralInfo& getGeneralInfo() { return controlGeneralInfo; }
     TBCMenuSpecific* getMenuSpecific();
@@ -294,8 +294,8 @@ class MSFILTER_DLLPUBLIC TB : public TBBase
 public:
     TB();
     ~TB(){}
-    bool Read(SvStream &rS);
-    void Print( FILE* );
+    bool Read(SvStream &rS) SAL_OVERRIDE;
+    void Print( FILE* ) SAL_OVERRIDE;
     sal_Int16 getcCL(){ return cCL; }
     WString& getName(){ return name; }
     bool IsEnabled();
@@ -310,8 +310,8 @@ public:
     sal_Int16 top;
     sal_Int16 right;
     sal_Int16 bottom;
-    bool Read( SvStream &rS ) { rS.ReadInt16( left ).ReadInt16( top ).ReadInt16( right ).ReadInt16( bottom ); return true; }
-    void Print( FILE* fo );
+    bool Read( SvStream &rS ) SAL_OVERRIDE { rS.ReadInt16( left ).ReadInt16( top ).ReadInt16( right ).ReadInt16( bottom ); return true; }
+    void Print( FILE* fo ) SAL_OVERRIDE;
 };
 
 typedef cppu::WeakImplHelper1< css::container::XIndexContainer > PropertyValueIndexContainer_BASE;
@@ -329,8 +329,8 @@ class MSFILTER_DLLPUBLIC TBVisualData : public TBBase
 public:
     TBVisualData();
     ~TBVisualData(){}
-    bool Read(SvStream &rS);
-    void Print( FILE* );
+    bool Read(SvStream &rS) SAL_OVERRIDE;
+    void Print( FILE* ) SAL_OVERRIDE;
 };
 #endif
 
diff --git a/include/filter/msfilter/msvbahelper.hxx b/include/filter/msfilter/msvbahelper.hxx
index 5afa6fe5f8d4..055eedb2f094 100644
--- a/include/filter/msfilter/msvbahelper.hxx
+++ b/include/filter/msfilter/msvbahelper.hxx
@@ -65,30 +65,30 @@ public:
     // com.sun.star.lang.XServiceInfo interface -------------------------------
 
     virtual OUString SAL_CALL
-                        getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception);
+                        getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual sal_Bool SAL_CALL
                         supportsService( const OUString& rService )
-                            throw (::com::sun::star::uno::RuntimeException, std::exception);
+                            throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
-                        getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception);
+                        getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // com.sun.star.lang.XInitialization interface ----------------------------
 
     virtual void SAL_CALL initialize(
                             const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rArgs )
-                            throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception);
+                            throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // com.sun.star.script.vba.XVBAMacroResolver interface --------------------
 
     virtual OUString SAL_CALL
                         resolveVBAMacroToScriptURL( const OUString& rVBAMacroName )
-                            throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception);
+                            throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     virtual OUString SAL_CALL
                         resolveScriptURLtoVBAMacro( const OUString& rScriptURL )
-                            throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception);
+                            throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxModel;
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index e3762d93ed42..91cdf074d87b 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -436,13 +436,13 @@ public:
 
                         SdrEscherImport( PowerPointImportParam&, const OUString& rBaseURL );
     virtual             ~SdrEscherImport();
-    virtual bool        GetColorFromPalette( sal_uInt16 nNum, Color& rColor ) const;
-    virtual sal_Bool    SeekToShape( SvStream& rSt, void* pClientData, sal_uInt32 nId ) const;
+    virtual bool        GetColorFromPalette( sal_uInt16 nNum, Color& rColor ) const SAL_OVERRIDE;
+    virtual sal_Bool    SeekToShape( SvStream& rSt, void* pClientData, sal_uInt32 nId ) const SAL_OVERRIDE;
     PptFontEntityAtom*  GetFontEnityAtom( sal_uInt32 nNum ) const;
     void                RecolorGraphic( SvStream& rSt, sal_uInt32 nRecLen, Graphic& rGraph );
     virtual SdrObject*  ReadObjText( PPTTextObj* pTextObj, SdrObject* pObj, SdPage* pPage ) const;
-    virtual SdrObject*  ProcessObj( SvStream& rSt, DffObjData& rData, void* pData, Rectangle& rTextRect, SdrObject* pObj );
-    virtual void        ProcessClientAnchor2( SvStream& rSt, DffRecordHeader& rHd, void* pData, DffObjData& rObj );
+    virtual SdrObject*  ProcessObj( SvStream& rSt, DffObjData& rData, void* pData, Rectangle& rTextRect, SdrObject* pObj ) SAL_OVERRIDE;
+    virtual void        ProcessClientAnchor2( SvStream& rSt, DffRecordHeader& rHd, void* pData, DffObjData& rObj ) SAL_OVERRIDE;
     void                ImportHeaderFooterContainer( DffRecordHeader& rHeader, HeaderFooterEntry& rEntry );
 };
 
@@ -560,7 +560,7 @@ protected:
                                 SfxStyleSheet*,
                                 SfxStyleSheet** )
                              const;
-    virtual SdrObject*      ReadObjText( PPTTextObj* pTextObj, SdrObject* pObj, SdPage* pPage ) const;
+    virtual SdrObject*      ReadObjText( PPTTextObj* pTextObj, SdrObject* pObj, SdPage* pPage ) const SAL_OVERRIDE;
     // #i32596# - new parameter <_nCalledByGroup>, which
     // indicates, if the OLE object is imported inside a group object.
     virtual SdrObject*      ImportOLE(
@@ -570,7 +570,7 @@ protected:
                                 const Rectangle& rVisArea,
                                 const int _nCalledByGroup,
                                 sal_Int64 nAspect
-                            ) const;
+                            ) const SAL_OVERRIDE;
     SvMemoryStream*         ImportExOleObjStg( sal_uInt32 nPersistPtr, sal_uInt32& nOleId ) const;
     SdrPage*                MakeBlancPage(sal_Bool bMaster) const;
     sal_Bool                ReadFontCollection();
@@ -610,8 +610,8 @@ public:
                             ) const;
 
     void                    ImportPage( SdrPage* pPage, const PptSlidePersistEntry* pMasterPersist = NULL );
-    virtual bool            GetColorFromPalette(sal_uInt16 nNum, Color& rColor) const;
-    virtual sal_Bool        SeekToShape( SvStream& rSt, void* pClientData, sal_uInt32 nId ) const;
+    virtual bool            GetColorFromPalette(sal_uInt16 nNum, Color& rColor) const SAL_OVERRIDE;
+    virtual sal_Bool        SeekToShape( SvStream& rSt, void* pClientData, sal_uInt32 nId ) const SAL_OVERRIDE;
     sal_Unicode             PPTSubstitute(
                                 sal_uInt16 nFont,
                                 sal_Unicode nChar,
@@ -620,7 +620,7 @@ public:
                                 char nDefault
                             ) const;
     const PptDocumentAtom&  GetDocumentAtom() const { return aDocAtom; }
-    virtual const PptSlideLayoutAtom*   GetSlideLayoutAtom() const;
+    virtual const PptSlideLayoutAtom*   GetSlideLayoutAtom() const SAL_OVERRIDE;
     SdrObject*              CreateTable(
                                 SdrObject* pGroupObject,
                                 sal_uInt32* pTableArry,
@@ -1295,7 +1295,7 @@ public:
 
 class PPTConvertOCXControls : public SvxMSConvertOCXControls
 {
-    virtual const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > & GetDrawPage();
+    virtual const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > & GetDrawPage() SAL_OVERRIDE;
     PptPageKind     ePageKind;
     const SdrPowerPointImport* mpPPTImporter;
     com::sun::star::uno::Reference< com::sun::star::io::XInputStream > mxInStrm;
@@ -1316,7 +1316,7 @@ public :
         const com::sun::star::awt::Size& rSize,
         com::sun::star::uno::Reference< com::sun::star::drawing::XShape > *pShape,
         bool bFloatingCtrl
-    );
+    ) SAL_OVERRIDE;
 };
 
 // PowerPoint record types