From b36963c0a6a09f70ca6d8d607dd3249a3496497d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 12 Oct 2015 16:04:04 +0200 Subject: Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274 --- include/filter/msfilter/mscodec.hxx | 4 +-- include/filter/msfilter/mstoolbar.hxx | 50 ++++++++++++++++----------------- include/filter/msfilter/msvbahelper.hxx | 12 ++++---- include/filter/msfilter/svdfppt.hxx | 22 +++++++-------- 4 files changed, 44 insertions(+), 44 deletions(-) (limited to 'include/filter') diff --git a/include/filter/msfilter/mscodec.hxx b/include/filter/msfilter/mscodec.hxx index f8f5b728365f..5ad8ff81f2ec 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 ) SAL_OVERRIDE; + virtual void Decode( sal_uInt8* pnData, sal_Size nBytes ) 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 ) SAL_OVERRIDE; + virtual void Decode( sal_uInt8* pnData, sal_Size nBytes ) override; }; diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx index efe06121754d..bfada573c325 100644 --- a/include/filter/msfilter/mstoolbar.hxx +++ b/include/filter/msfilter/mstoolbar.hxx @@ -104,7 +104,7 @@ class MSFILTER_DLLPUBLIC WString : public TBBase public: WString(){}; virtual ~WString(){}; - bool Read(SvStream &rS) SAL_OVERRIDE; + bool Read(SvStream &rS) override; OUString getString(){ return sString; } }; @@ -123,9 +123,9 @@ class MSFILTER_DLLPUBLIC TBCExtraInfo : public TBBase public: TBCExtraInfo(); virtual ~TBCExtraInfo(){} - bool Read(SvStream &rS) SAL_OVERRIDE; + bool Read(SvStream &rS) override; #if OSL_DEBUG_LEVEL > 1 - virtual void Print( FILE* ) SAL_OVERRIDE; + virtual void Print( FILE* ) override; #endif OUString getOnAction(); }; @@ -141,9 +141,9 @@ class MSFILTER_DLLPUBLIC TBCGeneralInfo : public TBBase public: TBCGeneralInfo(); virtual ~TBCGeneralInfo() {} - bool Read(SvStream &rS) SAL_OVERRIDE; + bool Read(SvStream &rS) override; #if OSL_DEBUG_LEVEL > 1 - virtual void Print( FILE* ) SAL_OVERRIDE; + virtual void Print( FILE* ) override; #endif bool ImportToolBarControlData( CustomToolBarImportHelper&, std::vector< css::beans::PropertyValue >& ); OUString CustomText() { return customText.getString(); } @@ -157,9 +157,9 @@ friend class TBCBSpecific; // #FIXME hacky access, need to fix public: TBCBitMap(); virtual ~TBCBitMap(); - bool Read(SvStream &rS) SAL_OVERRIDE; + bool Read(SvStream &rS) override; #if OSL_DEBUG_LEVEL > 1 - virtual void Print( FILE* ) SAL_OVERRIDE; + virtual void Print( FILE* ) override; #endif // #FIXME Const-ness Bitmap& getBitMap() { return mBitMap;} @@ -172,9 +172,9 @@ class MSFILTER_DLLPUBLIC TBCMenuSpecific : public TBBase public: TBCMenuSpecific(); virtual ~TBCMenuSpecific(){} - bool Read(SvStream &rS) SAL_OVERRIDE; + bool Read(SvStream &rS) override; #if OSL_DEBUG_LEVEL > 1 - virtual void Print( FILE* ) SAL_OVERRIDE; + virtual void Print( FILE* ) override; #endif OUString Name(); }; @@ -192,9 +192,9 @@ class MSFILTER_DLLPUBLIC TBCCDData : public TBBase public: TBCCDData(); virtual ~TBCCDData(); - bool Read(SvStream &rS) SAL_OVERRIDE; + bool Read(SvStream &rS) override; #if OSL_DEBUG_LEVEL > 1 - virtual void Print( FILE* ) SAL_OVERRIDE; + virtual void Print( FILE* ) override; #endif }; @@ -204,9 +204,9 @@ class TBCComboDropdownSpecific : public TBBase public: TBCComboDropdownSpecific( const TBCHeader& header ); TBCComboDropdownSpecific(){} - bool Read(SvStream &rS) SAL_OVERRIDE; + bool Read(SvStream &rS) override; #if OSL_DEBUG_LEVEL > 1 - virtual void Print( FILE* ) SAL_OVERRIDE; + virtual void Print( FILE* ) override; #endif }; @@ -221,9 +221,9 @@ class TBCBSpecific : public TBBase public: TBCBSpecific(); virtual ~TBCBSpecific(){} - bool Read(SvStream &rS) SAL_OVERRIDE; + bool Read(SvStream &rS) override; #if OSL_DEBUG_LEVEL > 1 - virtual void Print( FILE* ) SAL_OVERRIDE; + virtual void Print( FILE* ) override; #endif // #TODO just add a getGraphic member here TBCBitMap* getIcon(); @@ -271,9 +271,9 @@ public: sal_uInt16 getTcID() const { return tcid; } bool isVisible() { return !( bFlagsTCR & 0x1 ); } bool isBeginGroup() { return ( bFlagsTCR & 0x2 ) != 0; } - bool Read(SvStream &rS) SAL_OVERRIDE; + bool Read(SvStream &rS) override; #if OSL_DEBUG_LEVEL > 1 - virtual void Print( FILE* ) SAL_OVERRIDE; + virtual void Print( FILE* ) override; #endif sal_uInt32 getTbct() { return tbct; }; }; @@ -288,9 +288,9 @@ class MSFILTER_DLLPUBLIC TBCData : public TBBase public: TBCData( const TBCHeader& Header ); virtual ~TBCData(){} - bool Read(SvStream &rS) SAL_OVERRIDE; + bool Read(SvStream &rS) override; #if OSL_DEBUG_LEVEL > 1 - virtual void Print( FILE* ) SAL_OVERRIDE; + virtual void Print( FILE* ) override; #endif bool ImportToolBarControl( CustomToolBarImportHelper&, std::vector< css::beans::PropertyValue >&, bool& bBeginGroup, bool bIsMenuBar ); TBCGeneralInfo& getGeneralInfo() { return controlGeneralInfo; } @@ -310,9 +310,9 @@ class MSFILTER_DLLPUBLIC TB : public TBBase public: TB(); virtual ~TB(){} - bool Read(SvStream &rS) SAL_OVERRIDE; + bool Read(SvStream &rS) override; #if OSL_DEBUG_LEVEL > 1 - virtual void Print( FILE* ) SAL_OVERRIDE; + virtual void Print( FILE* ) override; #endif sal_Int16 getcCL(){ return cCL; } WString& getName(){ return name; } @@ -328,9 +328,9 @@ public: sal_Int16 top; sal_Int16 right; sal_Int16 bottom; - bool Read( SvStream &rS ) SAL_OVERRIDE { rS.ReadInt16( left ).ReadInt16( top ).ReadInt16( right ).ReadInt16( bottom ); return true; } + bool Read( SvStream &rS ) override { rS.ReadInt16( left ).ReadInt16( top ).ReadInt16( right ).ReadInt16( bottom ); return true; } #if OSL_DEBUG_LEVEL > 1 - virtual void Print( FILE* fo ) SAL_OVERRIDE; + virtual void Print( FILE* fo ) override; #endif }; @@ -348,9 +348,9 @@ class MSFILTER_DLLPUBLIC TBVisualData : public TBBase public: TBVisualData(); virtual ~TBVisualData(){} - bool Read(SvStream &rS) SAL_OVERRIDE; + bool Read(SvStream &rS) override; #if OSL_DEBUG_LEVEL > 1 - virtual void Print( FILE* ) SAL_OVERRIDE; + virtual void Print( FILE* ) override; #endif }; diff --git a/include/filter/msfilter/msvbahelper.hxx b/include/filter/msfilter/msvbahelper.hxx index 2e1da6fc9005..e44d6bf64bde 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) SAL_OVERRIDE; + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& rService ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL resolveScriptURLtoVBAMacro( const OUString& rScriptURL ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) 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 bfcea450f3d8..90fb0eb62e2d 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -462,13 +462,13 @@ public: SdrEscherImport( PowerPointImportParam&, const OUString& rBaseURL ); virtual ~SdrEscherImport(); - virtual bool GetColorFromPalette( sal_uInt16 nNum, Color& rColor ) const SAL_OVERRIDE; - virtual bool SeekToShape( SvStream& rSt, void* pClientData, sal_uInt32 nId ) const SAL_OVERRIDE; + virtual bool GetColorFromPalette( sal_uInt16 nNum, Color& rColor ) const override; + virtual bool SeekToShape( SvStream& rSt, void* pClientData, sal_uInt32 nId ) const override; PptFontEntityAtom* GetFontEnityAtom( sal_uInt32 nNum ) const; void RecolorGraphic( SvStream& rSt, sal_uInt32 nRecLen, Graphic& rGraph ); virtual SdrObject* ReadObjText( PPTTextObj* pTextObj, SdrObject* pObj, SdPageCapsule pPage ) const; - 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; + virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rData, void* pData, Rectangle& rTextRect, SdrObject* pObj ) override; + virtual void ProcessClientAnchor2( SvStream& rSt, DffRecordHeader& rHd, void* pData, DffObjData& rObj ) override; void ImportHeaderFooterContainer( DffRecordHeader& rHeader, HeaderFooterEntry& rEntry ); }; @@ -578,7 +578,7 @@ protected: SfxStyleSheet*, SfxStyleSheet** ) const; - virtual SdrObject* ReadObjText( PPTTextObj* pTextObj, SdrObject* pObj, SdPageCapsule pPage ) const SAL_OVERRIDE; + virtual SdrObject* ReadObjText( PPTTextObj* pTextObj, SdrObject* pObj, SdPageCapsule pPage ) const override; // #i32596# - new parameter <_nCalledByGroup>, which // indicates, if the OLE object is imported inside a group object. virtual SdrObject* ImportOLE( @@ -588,7 +588,7 @@ protected: const Rectangle& rVisArea, const int _nCalledByGroup, sal_Int64 nAspect - ) const SAL_OVERRIDE; + ) const override; SvMemoryStream* ImportExOleObjStg( sal_uInt32 nPersistPtr, sal_uInt32& nOleId ) const; SdrPage* MakeBlancPage(bool bMaster) const; bool ReadFontCollection(); @@ -624,9 +624,9 @@ public: ) const; void ImportPage( SdrPage* pPage, const PptSlidePersistEntry* pMasterPersist = NULL ); - virtual bool GetColorFromPalette(sal_uInt16 nNum, Color& rColor) const SAL_OVERRIDE; - virtual bool SeekToShape( SvStream& rSt, void* pClientData, sal_uInt32 nId ) const SAL_OVERRIDE; - virtual const PptSlideLayoutAtom* GetSlideLayoutAtom() const SAL_OVERRIDE; + virtual bool GetColorFromPalette(sal_uInt16 nNum, Color& rColor) const override; + virtual bool SeekToShape( SvStream& rSt, void* pClientData, sal_uInt32 nId ) const override; + virtual const PptSlideLayoutAtom* GetSlideLayoutAtom() const override; SdrObject* CreateTable( SdrObject* pGroupObject, sal_uInt32* pTableArry, @@ -1289,7 +1289,7 @@ public: class PPTConvertOCXControls : public SvxMSConvertOCXControls { - virtual const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > & GetDrawPage() SAL_OVERRIDE; + virtual const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > & GetDrawPage() override; PptPageKind ePageKind; const SdrPowerPointImport* mpPPTImporter; com::sun::star::uno::Reference< com::sun::star::io::XInputStream > mxInStrm; @@ -1310,7 +1310,7 @@ public: const com::sun::star::awt::Size& rSize, com::sun::star::uno::Reference< com::sun::star::drawing::XShape > *pShape, bool bFloatingCtrl - ) SAL_OVERRIDE; + ) override; }; // PowerPoint record types -- cgit