diff options
Diffstat (limited to 'sc/source/filter')
122 files changed, 1343 insertions, 1343 deletions
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 75bc1bbab1ad..3764147015be 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -120,21 +120,21 @@ private: ::osl::Mutex m_aMutex; public: // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) { return cppu::UnoType<container::XIndexContainer>::get(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<container::XIndexContainer>::get(); } + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { ::osl::MutexGuard aGuard( m_aMutex ); return ( IdToOleNameHash.size() > 0 ); } // XNameAcess - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByName(aName) ) throw container::NoSuchElementException(); return uno::makeAny( IdToOleNameHash[ aName ] ); } - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { ::osl::MutexGuard aGuard( m_aMutex ); uno::Sequence< OUString > aResult( IdToOleNameHash.size() ); @@ -145,7 +145,7 @@ public: *pName = it->first; return aResult; } - virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { ::osl::MutexGuard aGuard( m_aMutex ); return ( IdToOleNameHash.find( aName ) != IdToOleNameHash.end() ); @@ -158,7 +158,7 @@ public: return IdToOleNameHash.size(); } // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { ::osl::MutexGuard aGuard( m_aMutex ); if ( hasByName( aName ) ) @@ -168,14 +168,14 @@ public: throw lang::IllegalArgumentException(); IdToOleNameHash[ aName ] = xElement; } - virtual void SAL_CALL removeByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual void SAL_CALL removeByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByName( aName ) ) throw container::NoSuchElementException(); IdToOleNameHash.erase( IdToOleNameHash.find( aName ) ); } - virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByName( aName ) ) diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx index 26d2b255025d..9f6f0f0cb302 100644 --- a/sc/source/filter/excel/xelink.cxx +++ b/sc/source/filter/excel/xelink.cxx @@ -57,7 +57,7 @@ public: private: /** Writes the start of the record that is equal in all EXTERNNAME records and calls WriteAddData(). */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; /** Called to write additional data following the common record contents. @descr Derived classes should overwrite this function to write their data. */ virtual void WriteAddData( XclExpStream& rStrm ); @@ -78,7 +78,7 @@ public: private: /** Writes additional record contents. */ - virtual void WriteAddData( XclExpStream& rStrm ); + virtual void WriteAddData( XclExpStream& rStrm ) SAL_OVERRIDE; }; @@ -92,7 +92,7 @@ public: private: /** Writes additional record contents. */ - virtual void WriteAddData( XclExpStream& rStrm ); + virtual void WriteAddData( XclExpStream& rStrm ) SAL_OVERRIDE; private: typedef boost::shared_ptr< XclExpCachedMatrix > XclExpCachedMatRef; @@ -111,7 +111,7 @@ public: private: /** Writes additional record contents. */ - virtual void WriteAddData( XclExpStream& rStrm ); + virtual void WriteAddData( XclExpStream& rStrm ) SAL_OVERRIDE; private: const XclExpSupbook& mrSupbook; @@ -138,7 +138,7 @@ public: sal_uInt16 InsertExtName( const XclExpSupbook& rSupbook, const OUString& rName, const ScExternalRefCache::TokenArrayRef pArray ); /** Writes the EXTERNNAME record list. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: typedef XclExpRecordList< XclExpExtNameBase > XclExpExtNameList; @@ -167,7 +167,7 @@ public: bool InsertValue( SCCOL nScCol, SCROW nScRow, const Any& rValue ); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; void WriteBool( XclExpStream& rStrm, bool bValue ); void WriteDouble( XclExpStream& rStrm, double fValue ); @@ -204,7 +204,7 @@ public: void StoreCellRange( const ScRange& rRange, const ::formula::FormulaToken& rToken ); /** Writes the XCT and all CRN records. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: ScExternalRefCache::TableTypeRef mxCacheTable; @@ -258,13 +258,13 @@ public: sal_uInt16 InsertAddIn( const OUString& rName ); /** Writes the EXTERNSHEET and all EXTERNNAME, XCT and CRN records. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: /** Initializes the record data with the passed encoded URL. */ void Init( const OUString& rEncUrl ); /** Writes the contents of the EXTERNSHEET record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclExpString maTabName; /// The name of the sheet. @@ -318,14 +318,14 @@ public: sal_uInt16 InsertExtName( const OUString& rName, const ScExternalRefCache::TokenArrayRef pArray ); /** Writes the SUPBOOK and all EXTERNNAME, XCT and CRN records. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: /** Returns the sheet name inside of this SUPBOOK. */ const XclExpString* GetTabName( sal_uInt16 nSBTab ) const; /** Writes the SUPBOOK record contents. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: typedef XclExpRecordList< XclExpXct > XclExpXctList; @@ -411,7 +411,7 @@ public: XclExpRefLogEntry* pRefLogEntry = NULL ); /** Writes all SUPBOOK records with their sub records. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; struct XclExpSBIndex { @@ -511,36 +511,36 @@ public: virtual void FindExtSheet( sal_uInt16& rnExtSheet, sal_uInt16& rnFirstXclTab, sal_uInt16& rnLastXclTab, SCTAB nFirstScTab, SCTAB nLastScTab, - XclExpRefLogEntry* pRefLogEntry ); - virtual sal_uInt16 FindExtSheet( sal_Unicode cCode ); + XclExpRefLogEntry* pRefLogEntry ) SAL_OVERRIDE; + virtual sal_uInt16 FindExtSheet( sal_Unicode cCode ) SAL_OVERRIDE; virtual void FindExtSheet( sal_uInt16 nFileId, const OUString& rTabName, sal_uInt16 nXclTabSpan, sal_uInt16& rnExtSheet, sal_uInt16& rnFirstSBTab, sal_uInt16& rnLastSBTab, - XclExpRefLogEntry* pRefLogEntry ); + XclExpRefLogEntry* pRefLogEntry ) SAL_OVERRIDE; - virtual void StoreCellRange( const ScSingleRefData& rRef1, const ScSingleRefData& rRef2, const ScAddress& rPos ); + virtual void StoreCellRange( const ScSingleRefData& rRef1, const ScSingleRefData& rRef2, const ScAddress& rPos ) SAL_OVERRIDE; - virtual void StoreCell( sal_uInt16 nFileId, const OUString& rTabName, const ScAddress& rPos ); - virtual void StoreCellRange( sal_uInt16 nFileId, const OUString& rTabName, const ScRange& rRange ); + virtual void StoreCell( sal_uInt16 nFileId, const OUString& rTabName, const ScAddress& rPos ) SAL_OVERRIDE; + virtual void StoreCellRange( sal_uInt16 nFileId, const OUString& rTabName, const ScRange& rRange ) SAL_OVERRIDE; virtual bool InsertAddIn( sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, - const OUString& rName ); + const OUString& rName ) SAL_OVERRIDE; /** InsertEuroTool */ virtual bool InsertEuroTool( sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, - const OUString& rName ); + const OUString& rName ) SAL_OVERRIDE; virtual bool InsertDde( sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, - const OUString& rApplic, const OUString& rTopic, const OUString& rItem ); + const OUString& rApplic, const OUString& rTopic, const OUString& rItem ) SAL_OVERRIDE; virtual bool InsertExtName( sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, const OUString& rUrl, - const OUString& rName, const ScExternalRefCache::TokenArrayRef pArray ); + const OUString& rName, const ScExternalRefCache::TokenArrayRef pArray ) SAL_OVERRIDE; - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: typedef XclExpRecordList< XclExpExternSheet > XclExpExtSheetList; @@ -581,35 +581,35 @@ public: virtual void FindExtSheet( sal_uInt16& rnExtSheet, sal_uInt16& rnFirstXclTab, sal_uInt16& rnLastXclTab, SCTAB nFirstScTab, SCTAB nLastScTab, - XclExpRefLogEntry* pRefLogEntry ); - virtual sal_uInt16 FindExtSheet( sal_Unicode cCode ); + XclExpRefLogEntry* pRefLogEntry ) SAL_OVERRIDE; + virtual sal_uInt16 FindExtSheet( sal_Unicode cCode ) SAL_OVERRIDE; virtual void FindExtSheet( sal_uInt16 nFileId, const OUString& rTabName, sal_uInt16 nXclTabSpan, sal_uInt16& rnExtSheet, sal_uInt16& rnFirstSBTab, sal_uInt16& rnLastSBTab, - XclExpRefLogEntry* pRefLogEntry ); + XclExpRefLogEntry* pRefLogEntry ) SAL_OVERRIDE; - virtual void StoreCellRange( const ScSingleRefData& rRef1, const ScSingleRefData& rRef2, const ScAddress& rPos ); + virtual void StoreCellRange( const ScSingleRefData& rRef1, const ScSingleRefData& rRef2, const ScAddress& rPos ) SAL_OVERRIDE; - virtual void StoreCell( sal_uInt16 nFileId, const OUString& rTabName, const ScAddress& rPos ); - virtual void StoreCellRange( sal_uInt16 nFileId, const OUString& rTabName, const ScRange& rRange ); + virtual void StoreCell( sal_uInt16 nFileId, const OUString& rTabName, const ScAddress& rPos ) SAL_OVERRIDE; + virtual void StoreCellRange( sal_uInt16 nFileId, const OUString& rTabName, const ScRange& rRange ) SAL_OVERRIDE; virtual bool InsertAddIn( sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, - const OUString& rName ); + const OUString& rName ) SAL_OVERRIDE; /** InsertEuroTool */ virtual bool InsertEuroTool( sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, - const OUString& rName ); + const OUString& rName ) SAL_OVERRIDE; virtual bool InsertDde( sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, - const OUString& rApplic, const OUString& rTopic, const OUString& rItem ); + const OUString& rApplic, const OUString& rTopic, const OUString& rItem ) SAL_OVERRIDE; virtual bool InsertExtName( sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, const OUString& rUrl, - const OUString& rName, const ScExternalRefCache::TokenArrayRef pArray ); + const OUString& rName, const ScExternalRefCache::TokenArrayRef pArray ) SAL_OVERRIDE; - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: /** Searches for or inserts a new XTI structure. diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx index b15659e37cf7..42268fab2c1f 100644 --- a/sc/source/filter/excel/xename.cxx +++ b/sc/source/filter/excel/xename.cxx @@ -89,13 +89,13 @@ public: bool IsMacroCall( bool bVBasic, bool bFunc ) const; /** Writes the entire NAME record to the passed stream. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the body of the NAME record to the passed stream. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: OUString maOrigName; /// The original user-defined name. diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index 42a2c002e047..09dadf7f840f 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -1809,8 +1809,8 @@ class XclExpPivotRecWrapper : public XclExpRecordBase { public: explicit XclExpPivotRecWrapper( XclExpPivotTableManager& rPTMgr, SCTAB nScTab ); - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: XclExpPivotTableManager& mrPTMgr; SCTAB mnScTab; diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx index 9afaf913872a..554e7921f6cb 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -77,23 +77,23 @@ public: PaletteIndex( const ColorDataVec& rColorDataTable ) : maColorData( rColorDataTable ) {} // Methods XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) + virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return maColorData.size(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { //--Index; // apparently the palette is already 1 based return uno::makeAny( sal_Int32( maColorData[ Index ] ) ); } // Methods XElementAcess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) + virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ::getCppuType( (sal_Int32*)0 ); } - virtual ::sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return (maColorData.size() > 0); } diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx index 4748c3191528..e285bebd4edc 100644 --- a/sc/source/filter/excel/xltoolbar.cxx +++ b/sc/source/filter/excel/xltoolbar.cxx @@ -31,8 +31,8 @@ class MSOExcelCommandConvertor : public MSOCommandConvertor IdToString tcidToOOcmd; public: MSOExcelCommandConvertor(); - virtual OUString MSOCommandToOOCommand( sal_Int16 msoCmd ); - virtual OUString MSOTCIDToOOCommand( sal_Int16 key ); + virtual OUString MSOCommandToOOCommand( sal_Int16 msoCmd ) SAL_OVERRIDE; + virtual OUString MSOTCIDToOOCommand( sal_Int16 key ) SAL_OVERRIDE; }; MSOExcelCommandConvertor::MSOExcelCommandConvertor() diff --git a/sc/source/filter/excel/xltoolbar.hxx b/sc/source/filter/excel/xltoolbar.hxx index 9161f19b3cf7..e895ed77e4de 100644 --- a/sc/source/filter/excel/xltoolbar.hxx +++ b/sc/source/filter/excel/xltoolbar.hxx @@ -25,8 +25,8 @@ public: sal_uInt16 cmdType:5; bool C:1; sal_uInt16 reserved3:8; - bool Read( SvStream& rS ); - void Print(FILE* fp); + bool Read( SvStream& rS ) SAL_OVERRIDE; + void Print(FILE* fp) SAL_OVERRIDE; }; class ScTBC : public TBBase @@ -37,8 +37,8 @@ class ScTBC : public TBBase public: ScTBC(); ~ScTBC(){} - void Print( FILE* ); - bool Read(SvStream &rS); + void Print( FILE* ) SAL_OVERRIDE; + bool Read(SvStream &rS) SAL_OVERRIDE; bool ImportToolBarControl( ScCTBWrapper&, const com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& toolbarcontainer, CustomToolBarImportHelper& helper, bool bIsMenuBar ); }; @@ -53,8 +53,8 @@ class ScCTB : public TBBase public: ScCTB(sal_uInt16); ~ScCTB(){} - void Print( FILE* ); - bool Read(SvStream &rS); + void Print( FILE* ) SAL_OVERRIDE; + bool Read(SvStream &rS) SAL_OVERRIDE; bool IsMenuToolbar(); bool ImportCustomToolBar( ScCTBWrapper&, CustomToolBarImportHelper& ); bool ImportMenuTB( ScCTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& ); @@ -78,8 +78,8 @@ public: CTBS& operator = ( const CTBS&); CTBS(); ~CTBS(){} - void Print( FILE* ); - bool Read(SvStream &rS); + void Print( FILE* ) SAL_OVERRIDE; + bool Read(SvStream &rS) SAL_OVERRIDE; }; class ScCTBWrapper : public TBBase @@ -91,8 +91,8 @@ class ScCTBWrapper : public TBBase public: ScCTBWrapper(); ~ScCTBWrapper(); - bool Read(SvStream &rS); - void Print( FILE* ); + bool Read(SvStream &rS) SAL_OVERRIDE; + void Print( FILE* ) SAL_OVERRIDE; bool ImportCustomToolBar( SfxObjectShell& rDocSh ); ScCTB* GetCustomizationData( const OUString& name ); }; diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx index 8e1d984799d2..142de659cd50 100644 --- a/sc/source/filter/inc/XclExpChangeTrack.hxx +++ b/sc/source/filter/inc/XclExpChangeTrack.hxx @@ -38,15 +38,15 @@ private: XclExpString sUsername; sal_uInt8 aGUID[ 16 ]; - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: XclExpUserBView( const OUString& rUsername, const sal_uInt8* pGUID ); inline const sal_uInt8* GetGUID() const { return aGUID; } - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; @@ -73,7 +73,7 @@ public: inline const_iterator end () const { return aViews.end(); } - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; }; @@ -85,12 +85,12 @@ private: sal_uInt8 aGUID[ 16 ]; sal_uInt32 nCurrTab; - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: XclExpUsersViewBegin( const sal_uInt8* pGUID, sal_uInt32 nTab ); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; @@ -99,11 +99,11 @@ public: class XclExpUsersViewEnd : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; @@ -112,11 +112,11 @@ public: class XclExpChTr0x0191 : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; @@ -125,11 +125,11 @@ public: class XclExpChTr0x0198 : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; @@ -138,11 +138,11 @@ public: class XclExpChTr0x0192 : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; @@ -151,11 +151,11 @@ public: class XclExpChTr0x0197 : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; @@ -170,8 +170,8 @@ public: inline XclExpChTrEmpty( sal_uInt16 nNum ) : nRecNum( nNum ) {} virtual ~XclExpChTrEmpty(); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; @@ -180,13 +180,13 @@ public: class XclExpChTr0x0195 : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: virtual ~XclExpChTr0x0195(); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; @@ -198,14 +198,14 @@ private: XclExpString sUsername; DateTime aDateTime; - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: inline XclExpChTr0x0194( const ScChangeTrack& rChangeTrack ); virtual ~XclExpChTr0x0194(); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; inline XclExpChTr0x0194::XclExpChTr0x0194( const ScChangeTrack& rChangeTrack ) : @@ -223,7 +223,7 @@ private: sal_uInt8 aGUID[ 16 ]; sal_uInt32 nCount; - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: inline XclExpChTrHeader() : nCount( 0 ) {} @@ -232,10 +232,10 @@ public: inline void SetGUID( const sal_uInt8* pGUID ) { memcpy( aGUID, pGUID, 16 ); } inline void SetCount( sal_uInt32 nNew ) { nCount = nNew; } - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; @@ -249,7 +249,7 @@ private: DateTime aDateTime; sal_uInt8 aGUID[ 16 ]; - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: inline XclExpChTrInfo( @@ -259,10 +259,10 @@ public: sal_Int32 nLogNumber ); virtual ~XclExpChTrInfo(); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; inline XclExpChTrInfo::XclExpChTrInfo( const OUString& rUsername, const DateTime& rDateTime, const sal_uInt8* pGUID, sal_Int32 nLogNumber ) : @@ -313,7 +313,7 @@ private: inline void Clear() { if( pBuffer ) delete[] pBuffer; pBuffer = NULL; } - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: inline XclExpChTrTabId( sal_uInt16 nCount ) : @@ -323,10 +323,10 @@ public: void Copy( const XclExpChTrTabIdBuffer& rBuffer ); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; @@ -362,7 +362,7 @@ protected: inline void WriteTabId( XclExpStream& rStrm, SCTAB nTabId ) const; // save header data, call SaveActionData() - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; inline sal_Size GetHeaderByteCount() const { return 12; } // overload to save action data without header, called by SaveCont() @@ -395,8 +395,8 @@ public: // could be overloaded to use more indexes per action virtual void SetIndex( sal_uInt32& rIndex ); - virtual void Save( XclExpStream& rStrm ); - virtual sal_Size GetLen() const; + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; inline XclExpChTrAction* GetAddAction() { return pAddAction; } }; @@ -471,7 +471,7 @@ protected: const XclExpRoot& rRoot, const ScCellValue& rScCell, XclExpChTrData*& rpData, sal_uInt32& rXclLength1, sal_uInt16& rXclLength2 ); - virtual void SaveActionData( XclExpStream& rStrm ) const; + virtual void SaveActionData( XclExpStream& rStrm ) const SAL_OVERRIDE; public: XclExpChTrCellContent( @@ -480,10 +480,10 @@ public: const XclExpChTrTabIdBuffer& rTabIdBuffer ); virtual ~XclExpChTrCellContent(); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetActionByteCount() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetActionByteCount() const SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; @@ -497,9 +497,9 @@ protected: XclExpChTrInsert( const XclExpChTrInsert& rCopy ) : XclExpChTrAction( rCopy ), aRange( rCopy.aRange ) {} - virtual void SaveActionData( XclExpStream& rStrm ) const; - virtual void PrepareSaveAction( XclExpStream& rStrm ) const; - virtual void CompleteSaveAction( XclExpStream& rStrm ) const; + virtual void SaveActionData( XclExpStream& rStrm ) const SAL_OVERRIDE; + virtual void PrepareSaveAction( XclExpStream& rStrm ) const SAL_OVERRIDE; + virtual void CompleteSaveAction( XclExpStream& rStrm ) const SAL_OVERRIDE; public: XclExpChTrInsert( @@ -509,10 +509,10 @@ public: ScChangeTrack& rChangeTrack ); virtual ~XclExpChTrInsert(); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetActionByteCount() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetActionByteCount() const SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; @@ -524,7 +524,7 @@ private: SCTAB nTab; protected: - virtual void SaveActionData( XclExpStream& rStrm ) const; + virtual void SaveActionData( XclExpStream& rStrm ) const SAL_OVERRIDE; public: XclExpChTrInsertTab( @@ -533,10 +533,10 @@ public: const XclExpChTrTabIdBuffer& rTabIdBuffer ); virtual ~XclExpChTrInsertTab(); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetActionByteCount() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetActionByteCount() const SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; @@ -548,9 +548,9 @@ protected: ScRange aSourceRange; ScRange aDestRange; - virtual void SaveActionData( XclExpStream& rStrm ) const; - virtual void PrepareSaveAction( XclExpStream& rStrm ) const; - virtual void CompleteSaveAction( XclExpStream& rStrm ) const; + virtual void SaveActionData( XclExpStream& rStrm ) const SAL_OVERRIDE; + virtual void PrepareSaveAction( XclExpStream& rStrm ) const SAL_OVERRIDE; + virtual void CompleteSaveAction( XclExpStream& rStrm ) const SAL_OVERRIDE; public: XclExpChTrMoveRange( @@ -560,10 +560,10 @@ public: ScChangeTrack& rChangeTrack ); virtual ~XclExpChTrMoveRange(); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetActionByteCount() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetActionByteCount() const SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; @@ -572,16 +572,16 @@ public: class XclExpChTr0x014A : public XclExpChTrInsert { protected: - virtual void SaveActionData( XclExpStream& rStrm ) const; + virtual void SaveActionData( XclExpStream& rStrm ) const SAL_OVERRIDE; public: XclExpChTr0x014A( const XclExpChTrInsert& rAction ); virtual ~XclExpChTr0x014A(); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetActionByteCount() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetActionByteCount() const SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; diff --git a/sc/source/filter/inc/XclImpChangeTrack.hxx b/sc/source/filter/inc/XclImpChangeTrack.hxx index f4a128e8a122..2e09d2ea1aa4 100644 --- a/sc/source/filter/inc/XclImpChangeTrack.hxx +++ b/sc/source/filter/inc/XclImpChangeTrack.hxx @@ -162,7 +162,7 @@ class XclImpChTrFmlConverter : public ExcelToSc8 private: XclImpChangeTrack& rChangeTrack; - virtual bool Read3DTabReference( sal_uInt16 nIxti, SCTAB& rFirstTab, SCTAB& rLastTab, ExternalTabInfo& rExtInfo ); + virtual bool Read3DTabReference( sal_uInt16 nIxti, SCTAB& rFirstTab, SCTAB& rLastTab, ExternalTabInfo& rExtInfo ) SAL_OVERRIDE; public: inline XclImpChTrFmlConverter( diff --git a/sc/source/filter/inc/autofilterbuffer.hxx b/sc/source/filter/inc/autofilterbuffer.hxx index c150e3f30c76..6507a1874ee4 100644 --- a/sc/source/filter/inc/autofilterbuffer.hxx +++ b/sc/source/filter/inc/autofilterbuffer.hxx @@ -81,12 +81,12 @@ public: explicit DiscreteFilter( const WorkbookHelper& rHelper ); /** Imports filter settings from the filters and filter elements. */ - virtual void importAttribs( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual void importAttribs( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; /** Imports filter settings from the FILTERS and FILTER records. */ - virtual void importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm ); + virtual void importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; /** Returns converted UNO API filter settings representing all filter settings. */ - virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount ); + virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount ) SAL_OVERRIDE; private: typedef ::std::vector< OUString > FilterValueVector; @@ -105,12 +105,12 @@ public: explicit Top10Filter( const WorkbookHelper& rHelper ); /** Imports filter settings from the filters and filter elements. */ - virtual void importAttribs( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual void importAttribs( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; /** Imports filter settings from the FILTERS and FILTER records. */ - virtual void importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm ); + virtual void importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; /** Returns converted UNO API filter settings representing all filter settings. */ - virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount ); + virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount ) SAL_OVERRIDE; private: double mfValue; /// Number of items or percentage. @@ -148,12 +148,12 @@ public: explicit CustomFilter( const WorkbookHelper& rHelper ); /** Imports filter settings from the filters and filter elements. */ - virtual void importAttribs( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual void importAttribs( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; /** Imports filter settings from the FILTERS and FILTER records. */ - virtual void importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm ); + virtual void importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; /** Returns converted UNO API filter settings representing all filter settings. */ - virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount ); + virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount ) SAL_OVERRIDE; private: /** Apeends the passed filter criteriom, if it contains valid settings. */ diff --git a/sc/source/filter/inc/autofiltercontext.hxx b/sc/source/filter/inc/autofiltercontext.hxx index 5efb9d6d0237..8c958189c0b6 100644 --- a/sc/source/filter/inc/autofiltercontext.hxx +++ b/sc/source/filter/inc/autofiltercontext.hxx @@ -37,11 +37,11 @@ public: explicit FilterSettingsContext( WorksheetContextBase& rParent, FilterSettingsBase& rFilterSettings ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onStartElement( const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); - virtual void onStartRecord( SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; private: FilterSettingsBase& mrFilterSettings; @@ -55,11 +55,11 @@ public: explicit FilterColumnContext( WorksheetContextBase& rParent, FilterColumn& rFilterColumn ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onStartElement( const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); - virtual void onStartRecord( SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; private: FilterColumn& mrFilterColumn; @@ -73,11 +73,11 @@ public: explicit AutoFilterContext( WorksheetFragmentBase& rFragment, AutoFilter& rAutoFilter ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onStartElement( const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); - virtual void onStartRecord( SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; private: AutoFilter& mrAutoFilter; diff --git a/sc/source/filter/inc/biffcodec.hxx b/sc/source/filter/inc/biffcodec.hxx index aeb2bbded10b..8031fbbc6b87 100644 --- a/sc/source/filter/inc/biffcodec.hxx +++ b/sc/source/filter/inc/biffcodec.hxx @@ -45,8 +45,8 @@ public: inline BiffDecoderBase* clone() { return implClone(); } /** Implementation of the ::comphelper::IDocPasswordVerifier interface. */ - virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ); - virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ); + virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) SAL_OVERRIDE; + virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) SAL_OVERRIDE; /** Returns true, if the decoder has been initialized correctly. */ inline bool isValid() const { return mbValid; } @@ -90,11 +90,11 @@ private: BiffDecoder_XOR( const BiffDecoder_XOR& rDecoder ); /** Returns a clone of the decoder for usage in new streams. */ - virtual BiffDecoder_XOR* implClone(); + virtual BiffDecoder_XOR* implClone() SAL_OVERRIDE; /** Implements password verification and initialization of the decoder. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const OUString& rPassword ); - virtual bool implVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const OUString& rPassword ) SAL_OVERRIDE; + virtual bool implVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) SAL_OVERRIDE; /** Implementation of decryption of a memory block. */ @@ -102,7 +102,7 @@ private: sal_uInt8* pnDestData, const sal_uInt8* pnSrcData, sal_Int64 nStreamPos, - sal_uInt16 nBytes ); + sal_uInt16 nBytes ) SAL_OVERRIDE; private: ::oox::core::BinaryCodec_XOR maCodec; /// Cipher algorithm implementation. @@ -121,18 +121,18 @@ private: BiffDecoder_RCF( const BiffDecoder_RCF& rDecoder ); /** Returns a clone of the decoder for usage in new streams. */ - virtual BiffDecoder_RCF* implClone(); + virtual BiffDecoder_RCF* implClone() SAL_OVERRIDE; /** Implements password verification and initialization of the decoder. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const OUString& rPassword ); - virtual bool implVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const OUString& rPassword ) SAL_OVERRIDE; + virtual bool implVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) SAL_OVERRIDE; /** Implementation of decryption of a memory block. */ virtual void implDecode( sal_uInt8* pnDestData, const sal_uInt8* pnSrcData, sal_Int64 nStreamPos, - sal_uInt16 nBytes ); + sal_uInt16 nBytes ) SAL_OVERRIDE; private: ::oox::core::BinaryCodec_RCF maCodec; /// Cipher algorithm implementation. diff --git a/sc/source/filter/inc/biffinputstream.hxx b/sc/source/filter/inc/biffinputstream.hxx index ca11f905f4d7..11f324677bbd 100644 --- a/sc/source/filter/inc/biffinputstream.hxx +++ b/sc/source/filter/inc/biffinputstream.hxx @@ -209,24 +209,24 @@ public: // BinaryStreamBase interface (seeking) ----------------------------------- /** Returns the data size of the whole record without record headers. */ - virtual sal_Int64 size() const; + virtual sal_Int64 size() const SAL_OVERRIDE; /** Returns the position inside of the whole record content. */ - virtual sal_Int64 tell() const; + virtual sal_Int64 tell() const SAL_OVERRIDE; /** Seeks in record content to the specified position. */ - virtual void seek( sal_Int64 nRecPos ); + virtual void seek( sal_Int64 nRecPos ) SAL_OVERRIDE; /** Closes the input stream but not the wrapped stream. */ - virtual void close(); + virtual void close() SAL_OVERRIDE; // BinaryInputStream interface (stream read access) ----------------------- /** Reads nBytes bytes to the passed sequence. @return Number of bytes really read. */ - virtual sal_Int32 readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ); + virtual sal_Int32 readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; /** Reads nBytes bytes and copies them to the passed buffer opMem. @return Number of bytes really read. */ - virtual sal_Int32 readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ); + virtual sal_Int32 readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; /** Seeks forward inside the current record. */ - virtual void skip( sal_Int32 nBytes, size_t nAtomSize = 1 ); + virtual void skip( sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; /** Stream operator for integral and floating-point types. */ template< typename Type > diff --git a/sc/source/filter/inc/chartsheetfragment.hxx b/sc/source/filter/inc/chartsheetfragment.hxx index 3cce8ab47e0d..cc9e9449dbbc 100644 --- a/sc/source/filter/inc/chartsheetfragment.hxx +++ b/sc/source/filter/inc/chartsheetfragment.hxx @@ -35,14 +35,14 @@ public: const OUString& rFragmentPath ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual const ::oox::core::RecordInfo* getRecordInfos() const; - virtual void initializeImport(); - virtual void finalizeImport(); + virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; + virtual void initializeImport() SAL_OVERRIDE; + virtual void finalizeImport() SAL_OVERRIDE; private: /** Imports the relation identifier for the DrawingML part. */ diff --git a/sc/source/filter/inc/commentsfragment.hxx b/sc/source/filter/inc/commentsfragment.hxx index 5b55a90b0b91..97a59ace922b 100644 --- a/sc/source/filter/inc/commentsfragment.hxx +++ b/sc/source/filter/inc/commentsfragment.hxx @@ -35,14 +35,14 @@ public: const WorksheetHelper& rHelper, const OUString& rFragmentPath ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); - virtual void onEndElement(); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; + virtual void onEndElement() SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); - virtual void onEndRecord(); + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void onEndRecord() SAL_OVERRIDE; - virtual const ::oox::core::RecordInfo* getRecordInfos() const; + virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; private: /** Imports comment data from the comment element. */ diff --git a/sc/source/filter/inc/condformatcontext.hxx b/sc/source/filter/inc/condformatcontext.hxx index 1a0a59c2a7c0..c2fc442e81fb 100644 --- a/sc/source/filter/inc/condformatcontext.hxx +++ b/sc/source/filter/inc/condformatcontext.hxx @@ -35,8 +35,8 @@ class ColorScaleContext : public WorksheetContextBase public: explicit ColorScaleContext( CondFormatContext& rFragment, CondFormatRuleRef xRule ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onStartElement( const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; private: CondFormatRuleRef mxRule; @@ -47,8 +47,8 @@ class DataBarContext : public WorksheetContextBase public: explicit DataBarContext( CondFormatContext& rFormat, CondFormatRuleRef xRule ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onStartElement( const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; private: CondFormatRuleRef mxRule; @@ -59,8 +59,8 @@ class IconSetContext : public WorksheetContextBase public: explicit IconSetContext( CondFormatContext& rFormat, CondFormatRuleRef xRule ); - virtual oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onStartElement( const AttributeList& rAttribs ); + virtual oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; private: CondFormatRuleRef mxRule; }; @@ -71,14 +71,14 @@ public: explicit CondFormatContext( WorksheetFragmentBase& rFragment ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onStartElement( const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); - virtual void onEndElement(); - - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); - virtual void onStartRecord( SequenceInputStream& rStrm ); - virtual void onEndRecord(); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; + virtual void onEndElement() SAL_OVERRIDE; + + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void onEndRecord() SAL_OVERRIDE; private: CondFormatRef mxCondFmt; diff --git a/sc/source/filter/inc/connectionsfragment.hxx b/sc/source/filter/inc/connectionsfragment.hxx index fd8f40a93c5a..5b4ecd2cb97c 100644 --- a/sc/source/filter/inc/connectionsfragment.hxx +++ b/sc/source/filter/inc/connectionsfragment.hxx @@ -35,11 +35,11 @@ public: explicit ConnectionContext( WorkbookFragmentBase& rParent, Connection& rConnection ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onStartElement( const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); - virtual void onStartRecord( SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; private: Connection& mrConnection; @@ -55,11 +55,11 @@ public: const OUString& rFragmentPath ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual const ::oox::core::RecordInfo* getRecordInfos() const; - virtual void finalizeImport(); + virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; + virtual void finalizeImport() SAL_OVERRIDE; }; diff --git a/sc/source/filter/inc/drawingfragment.hxx b/sc/source/filter/inc/drawingfragment.hxx index d1d1eda4e92c..5796788d807b 100644 --- a/sc/source/filter/inc/drawingfragment.hxx +++ b/sc/source/filter/inc/drawingfragment.hxx @@ -51,7 +51,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape ); private: - virtual void attachMacro( const OUString& rMacroUrl ); + virtual void attachMacro( const OUString& rMacroUrl ) SAL_OVERRIDE; private: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxShape; @@ -70,7 +70,7 @@ public: protected: virtual void finalizeXShape( ::oox::core::XmlFilterBase& rFilter, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes ); + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes ) SAL_OVERRIDE; private: OUString maMacroName; @@ -115,9 +115,9 @@ public: const OUString& rFragmentPath ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); - virtual void onEndElement(); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; + virtual void onEndElement() SAL_OVERRIDE; private: typedef ::std::auto_ptr< ShapeAnchor > ShapeAnchorRef; @@ -140,7 +140,7 @@ public: sal_Int32 nCtrlIndex, sal_Int32 nCtrlType, sal_Int32 nDropStyle ); private: - virtual void attachMacro( const OUString& rMacroUrl ); + virtual void attachMacro( const OUString& rMacroUrl ) SAL_OVERRIDE; private: ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > mxCtrlFormIC; @@ -160,28 +160,28 @@ public: const ::oox::vml::ShapeBase* getNoteShape( const ::com::sun::star::table::CellAddress& rPos ) const; /** Filters cell note shapes. */ - virtual bool isShapeSupported( const ::oox::vml::ShapeBase& rShape ) const; + virtual bool isShapeSupported( const ::oox::vml::ShapeBase& rShape ) const SAL_OVERRIDE; /** Returns additional base names for automatic shape name creation. */ - virtual OUString getShapeBaseName( const ::oox::vml::ShapeBase& rShape ) const; + virtual OUString getShapeBaseName( const ::oox::vml::ShapeBase& rShape ) const SAL_OVERRIDE; /** Calculates the shape rectangle from a cell anchor string. */ virtual bool convertClientAnchor( ::com::sun::star::awt::Rectangle& orShapeRect, - const OUString& rShapeAnchor ) const; + const OUString& rShapeAnchor ) const SAL_OVERRIDE; /** Creates a UNO control shape for legacy drawing controls. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createAndInsertClientXShape( const ::oox::vml::ShapeBase& rShape, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes, - const ::com::sun::star::awt::Rectangle& rShapeRect ) const; + const ::com::sun::star::awt::Rectangle& rShapeRect ) const SAL_OVERRIDE; /** Updates the bounding box covering all shapes of this drawing. */ virtual void notifyXShapeInserted( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape, const ::com::sun::star::awt::Rectangle& rShapeRect, - const ::oox::vml::ShapeBase& rShape, bool bGroupChild ); + const ::oox::vml::ShapeBase& rShape, bool bGroupChild ) SAL_OVERRIDE; private: /** Converts the passed VML textbox text color to an OLE color. */ @@ -215,7 +215,7 @@ public: const OUString& rFragmentPath ); protected: - virtual void finalizeImport(); + virtual void finalizeImport() SAL_OVERRIDE; }; diff --git a/sc/source/filter/inc/drawingmanager.hxx b/sc/source/filter/inc/drawingmanager.hxx index c0c1cec95420..c374594979e6 100644 --- a/sc/source/filter/inc/drawingmanager.hxx +++ b/sc/source/filter/inc/drawingmanager.hxx @@ -219,7 +219,7 @@ public: /** Called when a new UNO shape has been inserted into the draw page. */ virtual void notifyShapeInserted( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape, - const ::com::sun::star::awt::Rectangle& rShapeRect ); + const ::com::sun::star::awt::Rectangle& rShapeRect ) SAL_OVERRIDE; }; diff --git a/sc/source/filter/inc/eeimport.hxx b/sc/source/filter/inc/eeimport.hxx index cf92e6056bff..d02bf23c4c62 100644 --- a/sc/source/filter/inc/eeimport.hxx +++ b/sc/source/filter/inc/eeimport.hxx @@ -51,12 +51,12 @@ public: ScEEImport( ScDocument* pDoc, const ScRange& rRange ); virtual ~ScEEImport(); - virtual sal_uLong Read( SvStream& rStream, const OUString& rBaseURL ); - virtual ScRange GetRange() { return maRange; } + virtual sal_uLong Read( SvStream& rStream, const OUString& rBaseURL ) SAL_OVERRIDE; + virtual ScRange GetRange() SAL_OVERRIDE { return maRange; } virtual void WriteToDocument( bool bSizeColsRows = false, double nOutputFactor = 1.0, SvNumberFormatter* pFormatter = NULL, - bool bConvertDate = true ); + bool bConvertDate = true ) SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/inc/excelchartconverter.hxx b/sc/source/filter/inc/excelchartconverter.hxx index 5abff61ba6ae..43f80c5bba98 100644 --- a/sc/source/filter/inc/excelchartconverter.hxx +++ b/sc/source/filter/inc/excelchartconverter.hxx @@ -36,13 +36,13 @@ public: /** Creates an external data provider that is able to use spreadsheet data. */ virtual void createDataProvider( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& rxChartDoc ); + const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& rxChartDoc ) SAL_OVERRIDE; /** Creates a data sequence from the passed formula. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > createDataSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider >& rxDataProvider, - const ::oox::drawingml::chart::DataSequenceModel& rDataSeq ); + const ::oox::drawingml::chart::DataSequenceModel& rDataSeq ) SAL_OVERRIDE; }; diff --git a/sc/source/filter/inc/excelfilter.hxx b/sc/source/filter/inc/excelfilter.hxx index 83eb7da54601..bc472de4c738 100644 --- a/sc/source/filter/inc/excelfilter.hxx +++ b/sc/source/filter/inc/excelfilter.hxx @@ -41,21 +41,21 @@ public: WorkbookGlobals& getWorkbookGlobals() const; void unregisterWorkbookGlobals(); - virtual bool importDocument() throw(); - virtual bool exportDocument() throw(); + virtual bool importDocument() throw() SAL_OVERRIDE; + virtual bool exportDocument() throw() SAL_OVERRIDE; - virtual const ::oox::drawingml::Theme* getCurrentTheme() const; - virtual ::oox::vml::Drawing* getVmlDrawing(); - virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles(); - virtual ::oox::drawingml::chart::ChartConverter* getChartConverter(); - virtual void useInternalChartDataTable( bool bInternal ); + virtual const ::oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE; + virtual ::oox::vml::Drawing* getVmlDrawing() SAL_OVERRIDE; + virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE; + virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() SAL_OVERRIDE; + virtual void useInternalChartDataTable( bool bInternal ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rDescriptor ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rDescriptor ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: - virtual GraphicHelper* implCreateGraphicHelper() const; - virtual ::oox::ole::VbaProject* implCreateVbaProject() const; - virtual OUString implGetImplementationName() const; + virtual GraphicHelper* implCreateGraphicHelper() const SAL_OVERRIDE; + virtual ::oox::ole::VbaProject* implCreateVbaProject() const SAL_OVERRIDE; + virtual OUString implGetImplementationName() const SAL_OVERRIDE; WorkbookGlobals* mpBookGlob; }; diff --git a/sc/source/filter/inc/excelvbaproject.hxx b/sc/source/filter/inc/excelvbaproject.hxx index d0994dbcd9ef..9bc706c55847 100644 --- a/sc/source/filter/inc/excelvbaproject.hxx +++ b/sc/source/filter/inc/excelvbaproject.hxx @@ -41,7 +41,7 @@ public: protected: /** Adds dummy modules for sheets without imported code name. */ - virtual void prepareImport(); + virtual void prepareImport() SAL_OVERRIDE; private: ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument > diff --git a/sc/source/filter/inc/excform.hxx b/sc/source/filter/inc/excform.hxx index 5d7b046f57e3..cd6d2539da7e 100644 --- a/sc/source/filter/inc/excform.hxx +++ b/sc/source/filter/inc/excform.hxx @@ -52,9 +52,9 @@ public: ExcelToSc( const XclImpRoot& rRoot ); virtual ~ExcelToSc(); virtual ConvErr Convert( const ScTokenArray*&, XclImpStream& rStrm, sal_Size nFormulaLen, - bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula ); + bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula ) SAL_OVERRIDE; - virtual ConvErr Convert( _ScRangeListTabs&, XclImpStream& rStrm, sal_Size nFormulaLen, SCsTAB nTab, const FORMULA_TYPE eFT = FT_CellFormula ); + virtual ConvErr Convert( _ScRangeListTabs&, XclImpStream& rStrm, sal_Size nFormulaLen, SCsTAB nTab, const FORMULA_TYPE eFT = FT_CellFormula ) SAL_OVERRIDE; virtual ConvErr ConvertExternName( const ScTokenArray*& rpArray, XclImpStream& rStrm, sal_Size nFormulaLen, const OUString& rUrl, const ::std::vector<OUString>& rTabNames ); @@ -129,16 +129,16 @@ public: ExcelToSc8( const XclImpRoot& rRoot ); virtual ~ExcelToSc8(); - virtual ConvErr Convert( const ScTokenArray*& rpTokArray, XclImpStream& rStrm, sal_Size nFormulaLen, bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula ); + virtual ConvErr Convert( const ScTokenArray*& rpTokArray, XclImpStream& rStrm, sal_Size nFormulaLen, bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula ) SAL_OVERRIDE; - virtual ConvErr Convert( _ScRangeListTabs&, XclImpStream& rStrm, sal_Size nFormulaLen, SCsTAB nTab, const FORMULA_TYPE eFT = FT_CellFormula ); + virtual ConvErr Convert( _ScRangeListTabs&, XclImpStream& rStrm, sal_Size nFormulaLen, SCsTAB nTab, const FORMULA_TYPE eFT = FT_CellFormula ) SAL_OVERRIDE; virtual ConvErr ConvertExternName( const ScTokenArray*& rpArray, XclImpStream& rStrm, sal_Size nFormulaLen, - const OUString& rUrl, const ::std::vector<OUString>& rTabNames ); + const OUString& rUrl, const ::std::vector<OUString>& rTabNames ) SAL_OVERRIDE; static inline bool IsComplRowRange( const sal_uInt16 nRow1, const sal_uInt16 nRow2 ); - virtual bool GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, sal_Size nLen ); + virtual bool GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, sal_Size nLen ) SAL_OVERRIDE; }; diff --git a/sc/source/filter/inc/excimp8.hxx b/sc/source/filter/inc/excimp8.hxx index f0270fe9c311..b5c102965b78 100644 --- a/sc/source/filter/inc/excimp8.hxx +++ b/sc/source/filter/inc/excimp8.hxx @@ -42,7 +42,7 @@ public: ImportExcel8( XclImpRootData& rImpData, SvStream& rStrm ); virtual ~ImportExcel8( void ); - virtual FltError Read( void ); + virtual FltError Read( void ) SAL_OVERRIDE; void Calccount( void ); // 0x0C void Precision( void ); // 0x0E @@ -61,8 +61,8 @@ public: void FeatHdr( void ); // 0x0867 void Feat( void ); // 0x0868 - virtual void EndSheet( void ); - virtual void PostDocLoad( void ); + virtual void EndSheet( void ) SAL_OVERRIDE; + virtual void PostDocLoad( void ) SAL_OVERRIDE; private: void LoadDocumentProperties(); diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx index 90a2a12fa58c..2f1967906a3b 100644 --- a/sc/source/filter/inc/excrecds.hxx +++ b/sc/source/filter/inc/excrecds.hxx @@ -49,8 +49,8 @@ struct ScQueryEntry; class ExcRecord : public XclExpRecord { public: - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; virtual sal_uInt16 GetNum() const = 0; virtual sal_Size GetLen() const = 0; @@ -60,7 +60,7 @@ protected: private: /** Writes the body of the record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; }; @@ -71,9 +71,9 @@ class ExcEmptyRec : public ExcRecord private: protected: public: - virtual void Save( XclExpStream& rStrm ); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; //--------------------------------------------------------- class ExcDummyRec - @@ -82,8 +82,8 @@ class ExcDummyRec : public ExcRecord { protected: public: - virtual void Save( XclExpStream& rStrm ); - virtual sal_uInt16 GetNum() const; + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; virtual const sal_uInt8* GetData() const = 0; // byte data must contain header and body }; @@ -94,7 +94,7 @@ public: class ExcBoolRecord : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; protected: bool bVal; @@ -104,7 +104,7 @@ protected: public: inline ExcBoolRecord( const bool bDefault ) : bVal( bDefault ) {} - virtual sal_Size GetLen( void ) const; + virtual sal_Size GetLen( void ) const SAL_OVERRIDE; }; @@ -129,12 +129,12 @@ public: class ExcBof : public ExcBof_Base { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: ExcBof( void ); - virtual sal_uInt16 GetNum( void ) const; - virtual sal_Size GetLen( void ) const; + virtual sal_uInt16 GetNum( void ) const SAL_OVERRIDE; + virtual sal_Size GetLen( void ) const SAL_OVERRIDE; }; @@ -144,12 +144,12 @@ public: class ExcBofW : public ExcBof_Base { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: ExcBofW( void ); - virtual sal_uInt16 GetNum( void ) const; - virtual sal_Size GetLen( void ) const; + virtual sal_uInt16 GetNum( void ) const SAL_OVERRIDE; + virtual sal_Size GetLen( void ) const SAL_OVERRIDE; }; @@ -159,8 +159,8 @@ class ExcEof : public ExcRecord { private: public: - virtual sal_uInt16 GetNum( void ) const; - virtual sal_Size GetLen( void ) const; + virtual sal_uInt16 GetNum( void ) const SAL_OVERRIDE; + virtual sal_Size GetLen( void ) const SAL_OVERRIDE; }; @@ -173,8 +173,8 @@ private: static const sal_uInt8 pMyData[]; static const sal_Size nMyLen; public: - virtual sal_Size GetLen( void ) const; - virtual const sal_uInt8* GetData( void ) const; + virtual sal_Size GetLen( void ) const SAL_OVERRIDE; + virtual const sal_uInt8* GetData( void ) const SAL_OVERRIDE; }; // EXC_ID_WINDOWPROTECTION @@ -183,7 +183,7 @@ class XclExpWindowProtection : public XclExpBoolRecord public: XclExpWindowProtection(bool bValue); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; // EXC_ID_PROTECT Document Protection @@ -198,7 +198,7 @@ class XclExpSheetProtection : public XclExpProtection SCTAB mnTab; public: XclExpSheetProtection(bool bValue, SCTAB nTab); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; class XclExpPassHash : public XclExpRecord @@ -208,7 +208,7 @@ public: virtual ~XclExpPassHash(); private: - virtual void WriteBody(XclExpStream& rStrm); + virtual void WriteBody(XclExpStream& rStrm) SAL_OVERRIDE; private: sal_uInt16 mnHash; @@ -224,8 +224,8 @@ private: static const sal_uInt8 pMyData[]; static const sal_Size nMyLen; public: - virtual sal_Size GetLen( void ) const; - virtual const sal_uInt8* GetData( void ) const; + virtual sal_Size GetLen( void ) const SAL_OVERRIDE; + virtual const sal_uInt8* GetData( void ) const SAL_OVERRIDE; }; @@ -236,8 +236,8 @@ private: static const sal_uInt8 pMyData[]; static const sal_Size nMyLen; public: - virtual sal_Size GetLen( void ) const; - virtual const sal_uInt8* GetData( void ) const; + virtual sal_Size GetLen( void ) const SAL_OVERRIDE; + virtual const sal_uInt8* GetData( void ) const SAL_OVERRIDE; }; @@ -247,9 +247,9 @@ class Exc1904 : public ExcBoolRecord { public: Exc1904( ScDocument& rDoc ); - virtual sal_uInt16 GetNum( void ) const; + virtual sal_uInt16 GetNum( void ) const SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: bool bDateCompatibility; }; @@ -273,7 +273,7 @@ public: inline void SetStreamPos( sal_Size nNewStrPos ) { nStrPos = nNewStrPos; } void UpdateStreamPos( XclExpStream& rStrm ); - virtual sal_uInt16 GetNum() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; }; @@ -283,11 +283,11 @@ class ExcBundlesheet : public ExcBundlesheetBase private: OString aName; - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: ExcBundlesheet( RootData& rRootData, SCTAB nTab ); - virtual sal_Size GetLen() const; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; //--------------------------------------------------------- class ExcDummy_02 - @@ -299,8 +299,8 @@ private: static const sal_uInt8 pMyData[]; static const sal_Size nMyLen; public: - virtual sal_Size GetLen( void ) const; - virtual const sal_uInt8* GetData( void ) const; + virtual sal_Size GetLen( void ) const SAL_OVERRIDE; + virtual const sal_uInt8* GetData( void ) const SAL_OVERRIDE; }; @@ -317,7 +317,7 @@ private: sal_uInt16 mnDocCountry; /// The document country ID. /** Writes the body of the COUNTRY record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; }; @@ -338,7 +338,7 @@ public: explicit XclExpXmlSheetPr( bool bFitToPages, SCTAB nScTab, const Color& rTabColor, XclExpFilterManager* pManager ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: SCTAB mnScTab; @@ -410,7 +410,7 @@ private: sal_uInt8 nOp, double fVal, OUString* pText, bool bSimple = false ); - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; public: XclExpAutofilter( const XclExpRoot& rRoot, sal_uInt16 nC ); @@ -422,7 +422,7 @@ public: bool AddEntry( const ScQueryEntry& rEntry ); bool AddMultiValueEntry( const ScQueryEntry& rEntry ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; @@ -435,8 +435,8 @@ public: void AddObjRecs(); - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; bool HasFilterMode() const; diff --git a/sc/source/filter/inc/exp_op.hxx b/sc/source/filter/inc/exp_op.hxx index 1a6ce47f869b..374f08551dd6 100644 --- a/sc/source/filter/inc/exp_op.hxx +++ b/sc/source/filter/inc/exp_op.hxx @@ -63,7 +63,7 @@ protected: public: ExportBiff5( XclExpRootData& rExpData, SvStream& rStrm ); virtual ~ExportBiff5(); - FltError Write(); + FltError Write() SAL_OVERRIDE; }; diff --git a/sc/source/filter/inc/externallinkfragment.hxx b/sc/source/filter/inc/externallinkfragment.hxx index 5aea1766c0c1..1402b9f2112a 100644 --- a/sc/source/filter/inc/externallinkfragment.hxx +++ b/sc/source/filter/inc/externallinkfragment.hxx @@ -44,10 +44,10 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XExternalSheetCache >& rxSheetCache ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; private: /** Imports cell settings from a c element. */ @@ -85,13 +85,13 @@ public: ExternalLink& rExtLink ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); - virtual void onEndElement(); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; + virtual void onEndElement() SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual const ::oox::core::RecordInfo* getRecordInfos() const; + virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; private: ::oox::core::ContextHandlerRef createSheetDataContext( sal_Int32 nSheetId ); diff --git a/sc/source/filter/inc/extlstcontext.hxx b/sc/source/filter/inc/extlstcontext.hxx index cb15ff40e3a3..4a716312ebac 100644 --- a/sc/source/filter/inc/extlstcontext.hxx +++ b/sc/source/filter/inc/extlstcontext.hxx @@ -21,8 +21,8 @@ class ExtCfRuleContext : public WorksheetContextBase public: explicit ExtCfRuleContext( WorksheetContextBase& rFragment, void* pDataBar ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onStartElement( const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; private: void* mpTarget; @@ -44,9 +44,9 @@ public: explicit ExtLstLocalContext( WorksheetContextBase& rFragment, void* pTarget ); // until now a ExtLst always extends an existing entry protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onStartElement( const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; private: void* mpTarget; @@ -61,8 +61,8 @@ public: explicit ExtGlobalContext( WorksheetContextBase& rFragment ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onStartElement( const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; private: }; @@ -77,7 +77,7 @@ public: explicit ExtLstGlobalContext( WorksheetFragment& rFragment ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; } //namespace xls diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx index a7d478b42075..c8c0164c39e1 100644 --- a/sc/source/filter/inc/ftools.hxx +++ b/sc/source/filter/inc/ftools.hxx @@ -278,36 +278,36 @@ public: ScFormatFilterPluginImpl(); virtual ~ScFormatFilterPluginImpl(); // various import filters - virtual FltError ScImportLotus123( SfxMedium&, ScDocument*, rtl_TextEncoding eSrc = RTL_TEXTENCODING_DONTKNOW ); - virtual FltError ScImportQuattroPro( SfxMedium &rMedium, ScDocument *pDoc ); - virtual FltError ScImportExcel( SfxMedium&, ScDocument*, const EXCIMPFORMAT ); + virtual FltError ScImportLotus123( SfxMedium&, ScDocument*, rtl_TextEncoding eSrc = RTL_TEXTENCODING_DONTKNOW ) SAL_OVERRIDE; + virtual FltError ScImportQuattroPro( SfxMedium &rMedium, ScDocument *pDoc ) SAL_OVERRIDE; + virtual FltError ScImportExcel( SfxMedium&, ScDocument*, const EXCIMPFORMAT ) SAL_OVERRIDE; // eFormat == EIF_AUTO -> passender Filter wird automatisch verwendet // eFormat == EIF_BIFF5 -> nur Biff5-Stream fuehrt zum Erfolg (auch wenn in einem Excel97-Doc) // eFormat == EIF_BIFF8 -> nur Biff8-Stream fuehrt zum Erfolg (nur in Excel97-Docs) // eFormat == EIF_BIFF_LE4 -> nur Nicht-Storage-Dateien _koennen_ zum Erfolg fuehren - virtual FltError ScImportStarCalc10( SvStream&, ScDocument* ); + virtual FltError ScImportStarCalc10( SvStream&, ScDocument* ) SAL_OVERRIDE; virtual FltError ScImportDif( SvStream&, ScDocument*, const ScAddress& rInsPos, - const rtl_TextEncoding eSrc = RTL_TEXTENCODING_DONTKNOW, sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ); - virtual FltError ScImportRTF( SvStream&, const OUString& rBaseURL, ScDocument*, ScRange& rRange ); + const rtl_TextEncoding eSrc = RTL_TEXTENCODING_DONTKNOW, sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) SAL_OVERRIDE; + virtual FltError ScImportRTF( SvStream&, const OUString& rBaseURL, ScDocument*, ScRange& rRange ) SAL_OVERRIDE; virtual FltError ScImportHTML( SvStream&, const OUString& rBaseURL, ScDocument*, ScRange& rRange, double nOutputFactor = 1.0, bool bCalcWidthHeight = true, - SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ); + SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) SAL_OVERRIDE; - virtual ScEEAbsImport *CreateRTFImport( ScDocument* pDoc, const ScRange& rRange ); - virtual ScEEAbsImport *CreateHTMLImport( ScDocument* pDocP, const OUString& rBaseURL, const ScRange& rRange, bool bCalcWidthHeight ); - virtual OUString GetHTMLRangeNameList( ScDocument* pDoc, const OUString& rOrigName ); + virtual ScEEAbsImport *CreateRTFImport( ScDocument* pDoc, const ScRange& rRange ) SAL_OVERRIDE; + virtual ScEEAbsImport *CreateHTMLImport( ScDocument* pDocP, const OUString& rBaseURL, const ScRange& rRange, bool bCalcWidthHeight ) SAL_OVERRIDE; + virtual OUString GetHTMLRangeNameList( ScDocument* pDoc, const OUString& rOrigName ) SAL_OVERRIDE; // various export filters - virtual FltError ScExportExcel5( SfxMedium&, ScDocument*, ExportFormatExcel eFormat, rtl_TextEncoding eDest ); + virtual FltError ScExportExcel5( SfxMedium&, ScDocument*, ExportFormatExcel eFormat, rtl_TextEncoding eDest ) SAL_OVERRIDE; virtual FltError ScExportDif( SvStream&, ScDocument*, const ScAddress& rOutPos, const rtl_TextEncoding eDest, - sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ); + sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) SAL_OVERRIDE; virtual FltError ScExportDif( SvStream&, ScDocument*, const ScRange& rRange, const rtl_TextEncoding eDest, - sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ); + sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) SAL_OVERRIDE; virtual FltError ScExportHTML( SvStream&, const OUString& rBaseURL, ScDocument*, const ScRange& rRange, const rtl_TextEncoding eDest, bool bAll, - const OUString& rStreamPath, OUString& rNonConvertibleChars ); - virtual FltError ScExportRTF( SvStream&, ScDocument*, const ScRange& rRange, const rtl_TextEncoding eDest ); + const OUString& rStreamPath, OUString& rNonConvertibleChars ) SAL_OVERRIDE; + virtual FltError ScExportRTF( SvStream&, ScDocument*, const ScRange& rRange, const rtl_TextEncoding eDest ) SAL_OVERRIDE; - virtual ScOrcusFilters* GetOrcusFilters(); + virtual ScOrcusFilters* GetOrcusFilters() SAL_OVERRIDE; }; diff --git a/sc/source/filter/inc/htmlimp.hxx b/sc/source/filter/inc/htmlimp.hxx index 151017b683ac..2730ad6b2fdb 100644 --- a/sc/source/filter/inc/htmlimp.hxx +++ b/sc/source/filter/inc/htmlimp.hxx @@ -35,7 +35,7 @@ public: const ScHTMLParser* GetParser() const { return (ScHTMLParser*)mpParser; } virtual void WriteToDocument( bool bSizeColsRows = false, double nOutputFactor = 1.0, - SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ); + SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) SAL_OVERRIDE; static OUString GetHTMLRangeNameList( ScDocument* pDoc, const OUString& rOrigName ); }; diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx index 39ca2d8f77a7..e50b0d9e9348 100644 --- a/sc/source/filter/inc/htmlpars.hxx +++ b/sc/source/filter/inc/htmlpars.hxx @@ -88,7 +88,7 @@ public: explicit ScHTMLParser( EditEngine* pEditEngine, ScDocument* pDoc ); virtual ~ScHTMLParser(); - virtual sal_uLong Read( SvStream& rStrm, const OUString& rBaseURL ) = 0; + virtual sal_uLong Read( SvStream& rStrm, const OUString& rBaseURL ) SAL_OVERRIDE = 0; ScHTMLStyles& GetStyles(); ScDocument& GetDoc(); @@ -226,8 +226,8 @@ private: public: ScHTMLLayoutParser( EditEngine*, const OUString& rBaseURL, const Size& aPageSize, ScDocument* ); virtual ~ScHTMLLayoutParser(); - virtual sal_uLong Read( SvStream&, const OUString& rBaseURL ); - virtual const ScHTMLTable* GetGlobalTable() const; + virtual sal_uLong Read( SvStream&, const OUString& rBaseURL ) SAL_OVERRIDE; + virtual const ScHTMLTable* GetGlobalTable() const SAL_OVERRIDE; }; @@ -621,10 +621,10 @@ public: explicit ScHTMLQueryParser( EditEngine* pEditEngine, ScDocument* pDoc ); virtual ~ScHTMLQueryParser(); - virtual sal_uLong Read( SvStream& rStrm, const OUString& rBaseURL ); + virtual sal_uLong Read( SvStream& rStrm, const OUString& rBaseURL ) SAL_OVERRIDE; /** Returns the "global table" which contains the entire HTML document. */ - virtual const ScHTMLTable* GetGlobalTable() const; + virtual const ScHTMLTable* GetGlobalTable() const SAL_OVERRIDE; private: /** Handles all possible tags in the HTML document. */ diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx index ccc407edf05d..f43a0b82e399 100644 --- a/sc/source/filter/inc/imp_op.hxx +++ b/sc/source/filter/inc/imp_op.hxx @@ -208,7 +208,7 @@ public: virtual ~ImportExcel( void ); - virtual FltError Read( void ); + virtual FltError Read( void ) SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/inc/lotform.hxx b/sc/source/filter/inc/lotform.hxx index 1778a87aa40e..661b9eb04ce5 100644 --- a/sc/source/filter/inc/lotform.hxx +++ b/sc/source/filter/inc/lotform.hxx @@ -90,7 +90,7 @@ private: public: LotusToSc( SvStream& aStr, rtl_TextEncoding eSrc, bool b ); virtual ConvErr Convert( const ScTokenArray*& rpErg, sal_Int32& nRest, - const FORMULA_TYPE eFT = FT_CellFormula ); + const FORMULA_TYPE eFT = FT_CellFormula ) SAL_OVERRIDE; void Reset( const ScAddress& rEingPos ); inline void SetWK3( void ); diff --git a/sc/source/filter/inc/lotimpop.hxx b/sc/source/filter/inc/lotimpop.hxx index 17bcf0fcfd39..f1157a607ddf 100644 --- a/sc/source/filter/inc/lotimpop.hxx +++ b/sc/source/filter/inc/lotimpop.hxx @@ -82,7 +82,7 @@ public: virtual ~ImportLotus(); - FltError Read(); + FltError Read() SAL_OVERRIDE; FltError Read( SvStream& ); // special for *.fm3-Dateien }; diff --git a/sc/source/filter/inc/ooxformulaparser.hxx b/sc/source/filter/inc/ooxformulaparser.hxx index 199370aa2e4b..e6adca8cfa9c 100644 --- a/sc/source/filter/inc/ooxformulaparser.hxx +++ b/sc/source/filter/inc/ooxformulaparser.hxx @@ -50,26 +50,26 @@ public: // com.sun.star.lang.XServiceInfo interface ------------------------------- virtual ::rtl::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 ::rtl::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< ::rtl::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.sheet.XFilterFormulaParser interface ---------------------- virtual ::rtl::OUString SAL_CALL getSupportedNamespace() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // com.sun.star.sheet.XFormulaParser interface ---------------------------- @@ -77,13 +77,13 @@ public: parseFormula( const ::rtl::OUString& rFormula, const ::com::sun::star::table::CellAddress& rReferencePos ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::rtl::OUString SAL_CALL printFormula( const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >& rTokens, const ::com::sun::star::table::CellAddress& rReferencePos ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: typedef ::boost::shared_ptr< OOXMLFormulaParserImpl > ParserImplRef; diff --git a/sc/source/filter/inc/orcusfiltersimpl.hxx b/sc/source/filter/inc/orcusfiltersimpl.hxx index 0db7f6a79b39..c0c61c47f6f0 100644 --- a/sc/source/filter/inc/orcusfiltersimpl.hxx +++ b/sc/source/filter/inc/orcusfiltersimpl.hxx @@ -20,12 +20,12 @@ class ScOrcusFiltersImpl : public ScOrcusFilters public: static OString toSystemPath(const OUString& rPath); - virtual bool importCSV(ScDocument& rDoc, SfxMedium& rMedium) const; - virtual bool importGnumeric(ScDocument& rDoc, SfxMedium& rMedium) const; - virtual bool importXLSX(ScDocument& rDoc, SfxMedium& rMedium) const; - virtual bool importODS(ScDocument& rDoc, SfxMedium& rMedium) const; + virtual bool importCSV(ScDocument& rDoc, SfxMedium& rMedium) const SAL_OVERRIDE; + virtual bool importGnumeric(ScDocument& rDoc, SfxMedium& rMedium) const SAL_OVERRIDE; + virtual bool importXLSX(ScDocument& rDoc, SfxMedium& rMedium) const SAL_OVERRIDE; + virtual bool importODS(ScDocument& rDoc, SfxMedium& rMedium) const SAL_OVERRIDE; - virtual ScOrcusXMLContext* createXMLContext(ScDocument& rDoc, const OUString& rPath) const; + virtual ScOrcusXMLContext* createXMLContext(ScDocument& rDoc, const OUString& rPath) const SAL_OVERRIDE; }; class ScOrcusXMLContextImpl : public ScOrcusXMLContext @@ -39,9 +39,9 @@ public: ScOrcusXMLContextImpl(ScDocument& rDoc, const OUString& rPath); virtual ~ScOrcusXMLContextImpl(); - virtual bool loadXMLStructure(SvTreeListBox& rTreeCtrl, ScOrcusXMLTreeParam& rParam); + virtual bool loadXMLStructure(SvTreeListBox& rTreeCtrl, ScOrcusXMLTreeParam& rParam) SAL_OVERRIDE; - virtual bool importXML(const ScOrcusImportXMLParam& rParam); + virtual bool importXML(const ScOrcusImportXMLParam& rParam) SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx index ca6027e5ceba..b54f3976c2b9 100644 --- a/sc/source/filter/inc/orcusinterface.hxx +++ b/sc/source/filter/inc/orcusinterface.hxx @@ -43,7 +43,7 @@ class ScOrcusGlobalSettings : public orcus::spreadsheet::iface::import_global_se public: ScOrcusGlobalSettings(ScDocumentImport& rDoc); - virtual void set_origin_date(int year, int month, int day); + virtual void set_origin_date(int year, int month, int day) SAL_OVERRIDE; }; class ScOrcusSharedStrings : public orcus::spreadsheet::iface::import_shared_strings @@ -54,21 +54,21 @@ class ScOrcusSharedStrings : public orcus::spreadsheet::iface::import_shared_str public: ScOrcusSharedStrings(ScOrcusFactory& rFactory); - virtual size_t append(const char* s, size_t n); - virtual size_t add(const char* s, size_t n); + virtual size_t append(const char* s, size_t n) SAL_OVERRIDE; + virtual size_t add(const char* s, size_t n) SAL_OVERRIDE; - virtual void set_segment_bold(bool b); - virtual void set_segment_italic(bool b); - virtual void set_segment_font(size_t font_index); - virtual void set_segment_font_name(const char* s, size_t n); - virtual void set_segment_font_size(double point); + virtual void set_segment_bold(bool b) SAL_OVERRIDE; + virtual void set_segment_italic(bool b) SAL_OVERRIDE; + virtual void set_segment_font(size_t font_index) SAL_OVERRIDE; + virtual void set_segment_font_name(const char* s, size_t n) SAL_OVERRIDE; + virtual void set_segment_font_size(double point) SAL_OVERRIDE; virtual void set_segment_font_color(orcus::spreadsheet::color_elem_t alpha, orcus::spreadsheet::color_elem_t red, orcus::spreadsheet::color_elem_t green, - orcus::spreadsheet::color_elem_t blue); - virtual void append_segment(const char* s, size_t n); + orcus::spreadsheet::color_elem_t blue) SAL_OVERRIDE; + virtual void append_segment(const char* s, size_t n) SAL_OVERRIDE; - virtual size_t commit_segments(); + virtual size_t commit_segments() SAL_OVERRIDE; }; class ScOrcusSheet : public orcus::spreadsheet::iface::import_sheet @@ -89,35 +89,35 @@ public: ScOrcusSheet(ScDocumentImport& rDoc, SCTAB nTab, ScOrcusFactory& rFactory); // Orcus import interface - virtual void set_auto(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, const char* p, size_t n); - virtual void set_string(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, size_t sindex); - virtual void set_value(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, double value); - virtual void set_bool(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, bool value); + virtual void set_auto(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, const char* p, size_t n) SAL_OVERRIDE; + virtual void set_string(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, size_t sindex) SAL_OVERRIDE; + virtual void set_value(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, double value) SAL_OVERRIDE; + virtual void set_bool(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, bool value) SAL_OVERRIDE; virtual void set_date_time( - orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, int year, int month, int day, int hour, int minute, double second); + orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, int year, int month, int day, int hour, int minute, double second) SAL_OVERRIDE; - virtual void set_format(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, size_t xf_index); + virtual void set_format(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, size_t xf_index) SAL_OVERRIDE; - virtual void set_formula(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, const char* p, size_t n); - virtual void set_formula_result(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, const char* p, size_t n); + virtual void set_formula(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, const char* p, size_t n) SAL_OVERRIDE; + virtual void set_formula_result(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, const char* p, size_t n) SAL_OVERRIDE; virtual void set_shared_formula( orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, size_t sindex, - const char* p_formula, size_t n_formula); + const char* p_formula, size_t n_formula) SAL_OVERRIDE; virtual void set_shared_formula( orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, size_t sindex, - const char* p_formula, size_t n_formula, const char* p_range, size_t n_range); + const char* p_formula, size_t n_formula, const char* p_range, size_t n_range) SAL_OVERRIDE; - virtual void set_shared_formula(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, size_t sindex); + virtual void set_shared_formula(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, size_t sindex) SAL_OVERRIDE; virtual void set_array_formula( orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, - const char* p, size_t n, orcus::spreadsheet::row_t array_rows, orcus::spreadsheet::col_t array_cols); + const char* p, size_t n, orcus::spreadsheet::row_t array_rows, orcus::spreadsheet::col_t array_cols) SAL_OVERRIDE; virtual void set_array_formula( orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, - const char* p, size_t n, const char* p_range, size_t n_range); + const char* p, size_t n, const char* p_range, size_t n_range) SAL_OVERRIDE; SCTAB getIndex() const { return mnTab; } }; @@ -128,77 +128,77 @@ class ScOrcusStyles : public orcus::spreadsheet::iface::import_styles public: // font - virtual void set_font_count(size_t n); - virtual void set_font_bold(bool b); - virtual void set_font_italic(bool b); - virtual void set_font_name(const char* s, size_t n); - virtual void set_font_size(double point); - virtual void set_font_underline(orcus::spreadsheet::underline_t e); + virtual void set_font_count(size_t n) SAL_OVERRIDE; + virtual void set_font_bold(bool b) SAL_OVERRIDE; + virtual void set_font_italic(bool b) SAL_OVERRIDE; + virtual void set_font_name(const char* s, size_t n) SAL_OVERRIDE; + virtual void set_font_size(double point) SAL_OVERRIDE; + virtual void set_font_underline(orcus::spreadsheet::underline_t e) SAL_OVERRIDE; virtual void set_font_color( orcus::spreadsheet::color_elem_t alpha, orcus::spreadsheet::color_elem_t red, orcus::spreadsheet::color_elem_t green, - orcus::spreadsheet::color_elem_t blue); - virtual size_t commit_font(); + orcus::spreadsheet::color_elem_t blue) SAL_OVERRIDE; + virtual size_t commit_font() SAL_OVERRIDE; // fill - virtual void set_fill_count(size_t n); - virtual void set_fill_pattern_type(const char* s, size_t n); - virtual void set_fill_fg_color(orcus::spreadsheet::color_elem_t alpha, orcus::spreadsheet::color_elem_t red, orcus::spreadsheet::color_elem_t green, orcus::spreadsheet::color_elem_t blue); - virtual void set_fill_bg_color(orcus::spreadsheet::color_elem_t alpha, orcus::spreadsheet::color_elem_t red, orcus::spreadsheet::color_elem_t green, orcus::spreadsheet::color_elem_t blue); - virtual size_t commit_fill(); + virtual void set_fill_count(size_t n) SAL_OVERRIDE; + virtual void set_fill_pattern_type(const char* s, size_t n) SAL_OVERRIDE; + virtual void set_fill_fg_color(orcus::spreadsheet::color_elem_t alpha, orcus::spreadsheet::color_elem_t red, orcus::spreadsheet::color_elem_t green, orcus::spreadsheet::color_elem_t blue) SAL_OVERRIDE; + virtual void set_fill_bg_color(orcus::spreadsheet::color_elem_t alpha, orcus::spreadsheet::color_elem_t red, orcus::spreadsheet::color_elem_t green, orcus::spreadsheet::color_elem_t blue) SAL_OVERRIDE; + virtual size_t commit_fill() SAL_OVERRIDE; // border - virtual void set_border_count(size_t n); - virtual void set_border_style(orcus::spreadsheet::border_direction_t dir, const char* s, size_t n); + virtual void set_border_count(size_t n) SAL_OVERRIDE; + virtual void set_border_style(orcus::spreadsheet::border_direction_t dir, const char* s, size_t n) SAL_OVERRIDE; virtual void set_border_color(orcus::spreadsheet::border_direction_t dir, orcus::spreadsheet::color_elem_t alpha, orcus::spreadsheet::color_elem_t red, orcus::spreadsheet::color_elem_t green, - orcus::spreadsheet::color_elem_t blue); - virtual size_t commit_border(); + orcus::spreadsheet::color_elem_t blue) SAL_OVERRIDE; + virtual size_t commit_border() SAL_OVERRIDE; // cell protection - virtual void set_cell_hidden(bool b); - virtual void set_cell_locked(bool b); - virtual size_t commit_cell_protection(); + virtual void set_cell_hidden(bool b) SAL_OVERRIDE; + virtual void set_cell_locked(bool b) SAL_OVERRIDE; + virtual size_t commit_cell_protection() SAL_OVERRIDE; // number format - virtual void set_number_format_count(size_t n); - virtual void set_number_format_identifier(size_t n); - virtual void set_number_format_code(const char* s, size_t n); - virtual size_t commit_number_format(); + virtual void set_number_format_count(size_t n) SAL_OVERRIDE; + virtual void set_number_format_identifier(size_t n) SAL_OVERRIDE; + virtual void set_number_format_code(const char* s, size_t n) SAL_OVERRIDE; + virtual size_t commit_number_format() SAL_OVERRIDE; // cell style xf - virtual void set_cell_style_xf_count(size_t n); - virtual size_t commit_cell_style_xf(); + virtual void set_cell_style_xf_count(size_t n) SAL_OVERRIDE; + virtual size_t commit_cell_style_xf() SAL_OVERRIDE; // cell xf - virtual void set_cell_xf_count(size_t n); - virtual size_t commit_cell_xf(); + virtual void set_cell_xf_count(size_t n) SAL_OVERRIDE; + virtual size_t commit_cell_xf() SAL_OVERRIDE; // xf (cell format) - used both by cell xf and cell style xf. - virtual void set_xf_number_format(size_t index); - virtual void set_xf_font(size_t index); - virtual void set_xf_fill(size_t index); - virtual void set_xf_border(size_t index); - virtual void set_xf_protection(size_t index); - virtual void set_xf_style_xf(size_t index); - virtual void set_xf_apply_alignment(bool b); - virtual void set_xf_horizontal_alignment(orcus::spreadsheet::hor_alignment_t align); - virtual void set_xf_vertical_alignment(orcus::spreadsheet::ver_alignment_t align); + virtual void set_xf_number_format(size_t index) SAL_OVERRIDE; + virtual void set_xf_font(size_t index) SAL_OVERRIDE; + virtual void set_xf_fill(size_t index) SAL_OVERRIDE; + virtual void set_xf_border(size_t index) SAL_OVERRIDE; + virtual void set_xf_protection(size_t index) SAL_OVERRIDE; + virtual void set_xf_style_xf(size_t index) SAL_OVERRIDE; + virtual void set_xf_apply_alignment(bool b) SAL_OVERRIDE; + virtual void set_xf_horizontal_alignment(orcus::spreadsheet::hor_alignment_t align) SAL_OVERRIDE; + virtual void set_xf_vertical_alignment(orcus::spreadsheet::ver_alignment_t align) SAL_OVERRIDE; // cell style entry - virtual void set_cell_style_count(size_t n); - virtual void set_cell_style_name(const char* s, size_t n); - virtual void set_cell_style_xf(size_t index); - virtual void set_cell_style_builtin(size_t index); - virtual size_t commit_cell_style(); + virtual void set_cell_style_count(size_t n) SAL_OVERRIDE; + virtual void set_cell_style_name(const char* s, size_t n) SAL_OVERRIDE; + virtual void set_cell_style_xf(size_t index) SAL_OVERRIDE; + virtual void set_cell_style_builtin(size_t index) SAL_OVERRIDE; + virtual size_t commit_cell_style() SAL_OVERRIDE; }; class ScOrcusFactory : public orcus::spreadsheet::iface::import_factory @@ -232,13 +232,13 @@ class ScOrcusFactory : public orcus::spreadsheet::iface::import_factory public: ScOrcusFactory(ScDocument& rDoc); - virtual orcus::spreadsheet::iface::import_sheet* append_sheet(const char *sheet_name, size_t sheet_name_length); - virtual orcus::spreadsheet::iface::import_sheet* get_sheet(const char *sheet_name, size_t sheet_name_length); - virtual orcus::spreadsheet::iface::import_sheet* get_sheet(orcus::spreadsheet::sheet_t sheet_index); - virtual orcus::spreadsheet::iface::import_global_settings* get_global_settings(); - virtual orcus::spreadsheet::iface::import_shared_strings* get_shared_strings(); - virtual orcus::spreadsheet::iface::import_styles* get_styles(); - virtual void finalize(); + virtual orcus::spreadsheet::iface::import_sheet* append_sheet(const char *sheet_name, size_t sheet_name_length) SAL_OVERRIDE; + virtual orcus::spreadsheet::iface::import_sheet* get_sheet(const char *sheet_name, size_t sheet_name_length) SAL_OVERRIDE; + virtual orcus::spreadsheet::iface::import_sheet* get_sheet(orcus::spreadsheet::sheet_t sheet_index) SAL_OVERRIDE; + virtual orcus::spreadsheet::iface::import_global_settings* get_global_settings() SAL_OVERRIDE; + virtual orcus::spreadsheet::iface::import_shared_strings* get_shared_strings() SAL_OVERRIDE; + virtual orcus::spreadsheet::iface::import_styles* get_styles() SAL_OVERRIDE; + virtual void finalize() SAL_OVERRIDE; size_t appendString(const OUString& rStr); size_t addString(const OUString& rStr); diff --git a/sc/source/filter/inc/pivotcachefragment.hxx b/sc/source/filter/inc/pivotcachefragment.hxx index 0a3b093dd193..b35cd1527cba 100644 --- a/sc/source/filter/inc/pivotcachefragment.hxx +++ b/sc/source/filter/inc/pivotcachefragment.hxx @@ -38,10 +38,10 @@ public: PivotCacheField& rCacheField ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onStartElement( const AttributeList& rAttribs ); - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); - virtual void onStartRecord( SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; private: PivotCacheField& mrCacheField; @@ -58,10 +58,10 @@ public: PivotCache& rPivotCache ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); - virtual const ::oox::core::RecordInfo* getRecordInfos() const; - virtual void finalizeImport(); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; + virtual void finalizeImport() SAL_OVERRIDE; private: PivotCache& mrPivotCache; @@ -78,9 +78,9 @@ public: const PivotCache& rPivotCache ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); - virtual const ::oox::core::RecordInfo* getRecordInfos() const; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; private: void startCacheRecord(); @@ -106,7 +106,7 @@ public: PivotCache& rPivotCache ); /** Imports the entire fragment, returns true, if EOF record has been reached. */ - virtual bool importFragment(); + virtual bool importFragment() SAL_OVERRIDE; private: PivotCache& mrPivotCache; @@ -123,7 +123,7 @@ public: /** Reads the current record from stream and tries to insert a cell into the source data sheet. */ - virtual void importRecord( BiffInputStream& rStrm ); + virtual void importRecord( BiffInputStream& rStrm ) SAL_OVERRIDE; private: void startNextRow(); diff --git a/sc/source/filter/inc/pivottablefragment.hxx b/sc/source/filter/inc/pivottablefragment.hxx index 6c551b8aedd4..7847f2be33fb 100644 --- a/sc/source/filter/inc/pivottablefragment.hxx +++ b/sc/source/filter/inc/pivottablefragment.hxx @@ -40,10 +40,10 @@ public: PivotTableField& rTableField ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onStartElement( const AttributeList& rAttribs ); - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); - virtual void onStartRecord( SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; private: PivotTableField& mrTableField; @@ -59,10 +59,10 @@ public: PivotTableFilter& rTableFilter ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onStartElement( const AttributeList& rAttribs ); - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); - virtual void onStartRecord( SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; private: PivotTableFilter& mrTableFilter; @@ -78,9 +78,9 @@ public: const OUString& rFragmentPath ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); - virtual const ::oox::core::RecordInfo* getRecordInfos() const; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; private: PivotTable& mrPivotTable; diff --git a/sc/source/filter/inc/querytablefragment.hxx b/sc/source/filter/inc/querytablefragment.hxx index d4726e3d7d99..3539639793bc 100644 --- a/sc/source/filter/inc/querytablefragment.hxx +++ b/sc/source/filter/inc/querytablefragment.hxx @@ -37,10 +37,10 @@ public: const OUString& rFragmentPath ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual const ::oox::core::RecordInfo* getRecordInfos() const; + virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; private: QueryTable& mrQueryTable; diff --git a/sc/source/filter/inc/richstringcontext.hxx b/sc/source/filter/inc/richstringcontext.hxx index d9229e089e3d..e277f939caa7 100644 --- a/sc/source/filter/inc/richstringcontext.hxx +++ b/sc/source/filter/inc/richstringcontext.hxx @@ -35,8 +35,8 @@ public: explicit RichStringContext( ParentType& rParent, RichStringRef xString ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; private: RichStringRef mxString; /// Processed string. diff --git a/sc/source/filter/inc/rtfparse.hxx b/sc/source/filter/inc/rtfparse.hxx index 7a3d8b68f361..c70a2c590816 100644 --- a/sc/source/filter/inc/rtfparse.hxx +++ b/sc/source/filter/inc/rtfparse.hxx @@ -76,7 +76,7 @@ private: public: ScRTFParser( EditEngine* ); virtual ~ScRTFParser(); - virtual sal_uLong Read( SvStream&, const OUString& rBaseURL ); + virtual sal_uLong Read( SvStream&, const OUString& rBaseURL ) SAL_OVERRIDE; }; diff --git a/sc/source/filter/inc/scenariocontext.hxx b/sc/source/filter/inc/scenariocontext.hxx index a583f983e33a..7eafaf3bec24 100644 --- a/sc/source/filter/inc/scenariocontext.hxx +++ b/sc/source/filter/inc/scenariocontext.hxx @@ -36,11 +36,11 @@ public: explicit ScenarioContext( WorksheetContextBase& rParent, SheetScenarios& rSheetScenarios ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onStartElement( const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); - virtual void onStartRecord( SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; private: Scenario& mrScenario; @@ -54,11 +54,11 @@ public: explicit ScenariosContext( WorksheetFragmentBase& rFragment ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onStartElement( const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); - virtual void onStartRecord( SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; private: SheetScenarios& mrSheetScenarios; diff --git a/sc/source/filter/inc/scflt.hxx b/sc/source/filter/inc/scflt.hxx index 0c75fbdb47f2..518bad368128 100644 --- a/sc/source/filter/inc/scflt.hxx +++ b/sc/source/filter/inc/scflt.hxx @@ -534,7 +534,7 @@ public: FaceName[sizeof(FaceName)-1] = 0; } Sc10FontData( SvStream& rStream ); - virtual ScDataObject* Clone() const { return new Sc10FontData(*this); } + virtual ScDataObject* Clone() const SAL_OVERRIDE { return new Sc10FontData(*this); } }; @@ -570,7 +570,7 @@ public : memcpy(Reserved, rData.Reserved, sizeof(Reserved)); } Sc10NameData(SvStream& rStream); - virtual ScDataObject* Clone() const { return new Sc10NameData(*this); } + virtual ScDataObject* Clone() const SAL_OVERRIDE { return new Sc10NameData(*this); } }; @@ -623,7 +623,7 @@ public: memcpy(Reserved, rData.Reserved, sizeof(Reserved)); } Sc10PatternData(SvStream& rStream); -virtual ScDataObject* Clone() const { return new Sc10PatternData(*this); } +virtual ScDataObject* Clone() const SAL_OVERRIDE { return new Sc10PatternData(*this); } }; @@ -653,7 +653,7 @@ public: memcpy(&DataBaseRec, &rData.DataBaseRec, sizeof(DataBaseRec)); } Sc10DataBaseData(SvStream& rStream); -virtual ScDataObject* Clone() const { return new Sc10DataBaseData(*this); } +virtual ScDataObject* Clone() const SAL_OVERRIDE { return new Sc10DataBaseData(*this); } }; @@ -679,7 +679,7 @@ public: Sc10PageData( const Sc10PageFormat& rFormat ) : aPageFormat(rFormat) {} bool operator==( const Sc10PageData& rData ) const { return aPageFormat == rData.aPageFormat; } - virtual ScDataObject* Clone() const; + virtual ScDataObject* Clone() const SAL_OVERRIDE; }; // Seitenformat-Collection diff --git a/sc/source/filter/inc/sharedstringsfragment.hxx b/sc/source/filter/inc/sharedstringsfragment.hxx index a4384c21010b..c7e2633c22cd 100644 --- a/sc/source/filter/inc/sharedstringsfragment.hxx +++ b/sc/source/filter/inc/sharedstringsfragment.hxx @@ -35,11 +35,11 @@ public: const OUString& rFragmentPath ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual const ::oox::core::RecordInfo* getRecordInfos() const; - virtual void finalizeImport(); + virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; + virtual void finalizeImport() SAL_OVERRIDE; }; diff --git a/sc/source/filter/inc/sheetdatacontext.hxx b/sc/source/filter/inc/sheetdatacontext.hxx index e352cd0865b5..45593235ba5d 100644 --- a/sc/source/filter/inc/sheetdatacontext.hxx +++ b/sc/source/filter/inc/sheetdatacontext.hxx @@ -69,11 +69,11 @@ public: virtual ~SheetDataContext(); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); - virtual void onEndElement(); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; + virtual void onEndElement() SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; private: /** Different types of cell records. */ diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx index 8c8d5ad5f47c..ff2a8550e315 100644 --- a/sc/source/filter/inc/stylesbuffer.hxx +++ b/sc/source/filter/inc/stylesbuffer.hxx @@ -88,9 +88,9 @@ public: explicit ExcelGraphicHelper( const WorkbookHelper& rHelper ); /** Derived classes may implement to resolve a scheme color from the passed XML token identifier. */ - virtual sal_Int32 getSchemeColor( sal_Int32 nToken ) const; + virtual sal_Int32 getSchemeColor( sal_Int32 nToken ) const SAL_OVERRIDE; /** Derived classes may implement to resolve a palette index to an RGB color. */ - virtual sal_Int32 getPaletteColor( sal_Int32 nPaletteIdx ) const; + virtual sal_Int32 getPaletteColor( sal_Int32 nPaletteIdx ) const SAL_OVERRIDE; }; diff --git a/sc/source/filter/inc/stylesfragment.hxx b/sc/source/filter/inc/stylesfragment.hxx index e891e6d4f4ca..cdb90041d2bc 100644 --- a/sc/source/filter/inc/stylesfragment.hxx +++ b/sc/source/filter/inc/stylesfragment.hxx @@ -34,8 +34,8 @@ public: explicit IndexedColorsContext( WorkbookFragmentBase& rFragment ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; }; @@ -48,7 +48,7 @@ public: WorkbookContextBase( rParent ), mxFont( rxFont ) {} protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; private: FontRef mxFont; @@ -64,8 +64,8 @@ public: WorkbookContextBase( rParent ), mxBorder( rxBorder ) {} protected: - virtual void onStartElement( const AttributeList& rAttribs ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; private: BorderRef mxBorder; @@ -81,7 +81,7 @@ public: WorkbookContextBase( rParent ), mxFill( rxFill ), mfGradPos( -1.0 ) {} protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; private: FillRef mxFill; @@ -98,8 +98,8 @@ public: WorkbookContextBase( rParent ), mxXf( rxXf ), mbCellXf( bCellXf ) {} protected: - virtual void onStartElement( const AttributeList& rAttribs ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; private: XfRef mxXf; @@ -116,7 +116,7 @@ public: WorkbookContextBase( rParent ), mxDxf( rxDxf ) {} protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; private: DxfRef mxDxf; @@ -132,11 +132,11 @@ public: const OUString& rFragmentPath ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual const ::oox::core::RecordInfo* getRecordInfos() const; - virtual void finalizeImport(); + virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; + virtual void finalizeImport() SAL_OVERRIDE; }; diff --git a/sc/source/filter/inc/tablefragment.hxx b/sc/source/filter/inc/tablefragment.hxx index f6a6a0e3465a..6e5bd4d0cd50 100644 --- a/sc/source/filter/inc/tablefragment.hxx +++ b/sc/source/filter/inc/tablefragment.hxx @@ -37,10 +37,10 @@ public: const OUString& rFragmentPath ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual const ::oox::core::RecordInfo* getRecordInfos() const; + virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; private: Table& mrTable; diff --git a/sc/source/filter/inc/workbookfragment.hxx b/sc/source/filter/inc/workbookfragment.hxx index 7c15c34b5209..df53df149b8b 100644 --- a/sc/source/filter/inc/workbookfragment.hxx +++ b/sc/source/filter/inc/workbookfragment.hxx @@ -38,13 +38,13 @@ public: const OUString& rFragmentPath ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual const ::oox::core::RecordInfo* getRecordInfos() const; - virtual void finalizeImport(); + virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; + virtual void finalizeImport() SAL_OVERRIDE; private: void importExternalReference( const AttributeList& rAttribs ); diff --git a/sc/source/filter/inc/worksheetfragment.hxx b/sc/source/filter/inc/worksheetfragment.hxx index b4c80e913ab3..fdf78f80af02 100644 --- a/sc/source/filter/inc/worksheetfragment.hxx +++ b/sc/source/filter/inc/worksheetfragment.hxx @@ -33,11 +33,11 @@ public: explicit DataValidationsContext( WorksheetFragmentBase& rFragment ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); - virtual void onEndElement(); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; + virtual void onEndElement() SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; private: /** Imports the dataValidation element containing data validation settings. */ @@ -59,14 +59,14 @@ public: const OUString& rFragmentPath ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual const ::oox::core::RecordInfo* getRecordInfos() const; - virtual void initializeImport(); - virtual void finalizeImport(); + virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; + virtual void initializeImport() SAL_OVERRIDE; + virtual void finalizeImport() SAL_OVERRIDE; private: /** Imports page settings from a pageSetUpPr element. */ diff --git a/sc/source/filter/inc/xcl97esc.hxx b/sc/source/filter/inc/xcl97esc.hxx index 21c9837075ca..ba71aa5e039d 100644 --- a/sc/source/filter/inc/xcl97esc.hxx +++ b/sc/source/filter/inc/xcl97esc.hxx @@ -40,7 +40,7 @@ public: private: /** Overloaded to create a new temporary file and return its stream. */ - virtual SvStream* ImplQueryPictureStream(); + virtual SvStream* ImplQueryPictureStream() SAL_OVERRIDE; private: SAL_WNODEPRECATED_DECLARATIONS_PUSH @@ -99,9 +99,9 @@ public: virtual EscherExHostAppData* StartShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>& rxShape, - const Rectangle* pChildAnchor ); - virtual void EndShape( sal_uInt16 nShapeType, sal_uInt32 nShapeID ); - virtual EscherExHostAppData* EnterAdditionalTextGroup(); + const Rectangle* pChildAnchor ) SAL_OVERRIDE; + virtual void EndShape( sal_uInt16 nShapeType, sal_uInt32 nShapeID ) SAL_OVERRIDE; + virtual EscherExHostAppData* EnterAdditionalTextGroup() SAL_OVERRIDE; /// Flush and merge PicStream into EscherStream void EndDocument(); @@ -163,7 +163,7 @@ class XclEscherClientData : public EscherExClientRecord_Base { public: XclEscherClientData() {} - virtual void WriteData( EscherEx& rEx ) const; + virtual void WriteData( EscherEx& rEx ) const SAL_OVERRIDE; }; @@ -186,7 +186,7 @@ public: //! ONLY for the AdditionalText mimic inline void SetXclObj( XclObj* p ) { pXclObj = p; } - virtual void WriteData( EscherEx& rEx ) const; + virtual void WriteData( EscherEx& rEx ) const SAL_OVERRIDE; }; diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx index ff3b51e29397..023d929d0753 100644 --- a/sc/source/filter/inc/xcl97rec.hxx +++ b/sc/source/filter/inc/xcl97rec.hxx @@ -67,8 +67,8 @@ public: /// close groups and DgContainer opened in ctor void EndSheet(); - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; static void ResetCounters(); @@ -111,7 +111,7 @@ protected: void ImplWriteAnchor( const XclExpRoot& rRoot, const SdrObject* pSdrObj, const Rectangle* pChildAnchor ); // overwritten for writing MSODRAWING record - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; virtual void WriteSubRecs( XclExpStream& rStrm ); void SaveTextRecs( XclExpStream& rStrm ); @@ -154,7 +154,7 @@ public: //! actually writes ESCHER_ClientTextbox void SetText( const XclExpRoot& rRoot, const SdrTextObj& rObj ); - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; }; // --- class XclObjComment ------------------------------------------- @@ -179,8 +179,8 @@ public: const Rectangle& rRect, SdrObject* pCaption, bool bVisible ); - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; @@ -191,7 +191,7 @@ class XclObjDropDown : public XclObj private: bool bIsFiltered; - virtual void WriteSubRecs( XclExpStream& rStrm ); + virtual void WriteSubRecs( XclExpStream& rStrm ) SAL_OVERRIDE; protected: public: @@ -214,13 +214,13 @@ public: inline void SetHorAlign( sal_uInt8 nHorAlign ) { mnHorAlign = nHorAlign; } inline void SetVerAlign( sal_uInt8 nVerAlign ) { mnVerAlign = nVerAlign; } - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclExpStringRef mpString; /// Text and formatting data. @@ -239,13 +239,13 @@ private: const SdrObject& rOleObj; SotStorage* pRootStorage; - virtual void WriteSubRecs( XclExpStream& rStrm ); + virtual void WriteSubRecs( XclExpStream& rStrm ) SAL_OVERRIDE; public: XclObjOle( XclExpObjectManager& rObjMgr, const SdrObject& rObj ); virtual ~XclObjOle(); - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; }; @@ -254,7 +254,7 @@ public: class XclObjAny : public XclObj { protected: - virtual void WriteSubRecs( XclExpStream& rStrm ); + virtual void WriteSubRecs( XclExpStream& rStrm ) SAL_OVERRIDE; public: XclObjAny( XclExpObjectManager& rObjMgr, @@ -265,8 +265,8 @@ public: GetShape() const { return mxShape; } - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; static void WriteFromTo( XclExpXmlStream& rStrm, const XclObjAny& rObj ); static void WriteFromTo( XclExpXmlStream& rStrm, const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape, SCTAB nTab ); @@ -284,13 +284,13 @@ protected: sal_uInt32 nFileHistory; // bfh sal_uInt32 nLowestBiffVer; // sfo - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: ExcBof8_Base(); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; @@ -322,15 +322,15 @@ private: OUString sUnicodeName; XclExpString GetName() const; - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: ExcBundlesheet8( RootData& rRootData, SCTAB nTab ); ExcBundlesheet8( const OUString& rString ); - virtual sal_Size GetLen() const; + virtual sal_Size GetLen() const SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; @@ -339,8 +339,8 @@ public: class XclObproj : public ExcRecord { public: - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; @@ -350,12 +350,12 @@ class XclCodename : public ExcRecord { private: XclExpString aName; - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: XclCodename( const OUString& ); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; @@ -399,17 +399,17 @@ private: bool Append( sal_uInt16 nCol, sal_uInt16 nRow, const OUString& rTxt ); - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; protected: public: ExcEScenario( const XclExpRoot& rRoot, SCTAB nTab ); virtual ~ExcEScenario(); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; @@ -420,18 +420,18 @@ private: sal_uInt16 nActive; std::vector<ExcEScenario*> aScenes; - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; protected: public: ExcEScenarioManager( const XclExpRoot& rRoot, SCTAB nTab ); virtual ~ExcEScenarioManager(); - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; @@ -445,7 +445,7 @@ public: explicit XclExpSheetProtectOptions( const XclExpRoot& rRoot, SCTAB nTab ); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: sal_uInt16 mnOptions; /// Encoded sheet protection options. @@ -460,7 +460,7 @@ public: explicit XclExpSheetEnhancedProtection( const XclExpRoot& rRoot, const ScEnhancedProtection& rProt ); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: const XclExpRoot& mrRoot; @@ -474,14 +474,14 @@ class XclCalccount : public ExcRecord private: sal_uInt16 nCount; protected: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: XclCalccount( const ScDocument& ); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; @@ -492,14 +492,14 @@ class XclIteration : public ExcRecord private: sal_uInt16 nIter; protected: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: XclIteration( const ScDocument& ); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; @@ -510,14 +510,14 @@ class XclDelta : public ExcRecord private: double fDelta; protected: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: XclDelta( const ScDocument& ); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; @@ -528,7 +528,7 @@ class XclRefmode : public XclExpBoolRecord public: XclRefmode( const ScDocument& ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; @@ -540,7 +540,7 @@ public: virtual ~XclExpFileEncryption(); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: const XclExpRoot& mrRoot; @@ -555,7 +555,7 @@ public: explicit XclExpInterfaceHdr( sal_uInt16 nCodePage ); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; }; @@ -568,7 +568,7 @@ public: virtual ~XclExpInterfaceEnd(); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; }; @@ -582,7 +582,7 @@ public: virtual ~XclExpWriteAccess(); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; }; @@ -592,10 +592,10 @@ class XclExpFileSharing : public XclExpRecord public: explicit XclExpFileSharing( const XclExpRoot& rRoot, sal_uInt16 nPasswordHash, bool bRecommendReadOnly ); - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclExpString maUserName; @@ -612,7 +612,7 @@ public: virtual ~XclExpProt4Rev(); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; }; @@ -624,7 +624,7 @@ public: virtual ~XclExpProt4RevPass(); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; }; diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx index 45427dcf8d76..4a48d46f9442 100644 --- a/sc/source/filter/inc/xechart.hxx +++ b/sc/source/filter/inc/xechart.hxx @@ -170,7 +170,7 @@ public: virtual ~XclExpChGroupBase(); /** Saves the header record. Calls WriteSubRecords() to let derived classes write sub records. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; /** Derived classes return whether there are any records embedded in this group. */ virtual bool HasSubRecords() const; /** Derived classes implement writing any records embedded in this group. */ @@ -197,7 +197,7 @@ public: XclFutureRecType eRecType, sal_uInt16 nRecId, sal_Size nRecSize = 0 ); /** Writes missing CHFRBLOCKBEGIN records and this record. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; }; // Frame formatting =========================================================== @@ -211,7 +211,7 @@ public: inline XclChFramePos& GetFramePosData() { return maData; } private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChFramePos maData; /// Position of the frame. @@ -245,7 +245,7 @@ public: bool IsDefault( XclChFrameType eDefFrameType ) const; private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChLineFormat maData; /// Contents of the CHLINEFORMAT record. @@ -278,7 +278,7 @@ public: bool IsDefault( XclChFrameType eDefFrameType ) const; private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChAreaFormat maData; /// Contents of the CHAREAFORMAT record. @@ -302,17 +302,17 @@ public: bool IsValid() const; /** Writes the CHESCHERFORMAT record group to the stream, if complex formatting is extant. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; /** Returns true, if this record group contains a CHPICFORMAT record. */ - virtual bool HasSubRecords() const; + virtual bool HasSubRecords() const SAL_OVERRIDE; /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ); + virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; private: /** Inserts a color from the contained Escher property set into the color palette. */ sal_uInt32 RegisterColor( sal_uInt16 nPropId ); - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChEscherFormat maData; /// Fill properties for complex areas (CHESCHERFORMAT record). @@ -380,12 +380,12 @@ public: bool IsDeleteable() const; /** Writes the entire record group. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ); + virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChFrame maData; /// Contents of the CHFRAME record. @@ -421,10 +421,10 @@ public: inline bool HasString() const { return mxString && !mxString->IsEmpty(); } /** Writes the CHSOURCELINK record and optionally a CHSTRING record with explicit string data. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChSourceLink maData; /// Contents of the CHSOURCELINK record. @@ -454,7 +454,7 @@ public: explicit XclExpChObjectLink( sal_uInt16 nLinkTarget, const XclChDataPointPos& rPointPos ); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChObjectLink maData; /// Contents of the CHOBJECTLINK record. @@ -477,7 +477,7 @@ public: bool bShowPercent, bool bShowBubble ); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChFrLabelProps maData; /// Contents of the CHFRLABELPROPS record. @@ -523,9 +523,9 @@ public: explicit XclExpChText( const XclExpChRoot& rRoot ); /** Sets font color and color identifier to internal data structures. */ - virtual void SetFont( XclExpChFontRef xFont, const Color& rColor, sal_uInt32 nColorId ); + virtual void SetFont( XclExpChFontRef xFont, const Color& rColor, sal_uInt32 nColorId ) SAL_OVERRIDE; /** Sets text rotation to internal data structures. */ - virtual void SetRotation( sal_uInt16 nRotation ); + virtual void SetRotation( sal_uInt16 nRotation ) SAL_OVERRIDE; /** Converts all text settings of the passed title text object. */ void ConvertTitle( XTitleRef xTitle, sal_uInt16 nTarget, const OUString* pSubTitle = NULL ); @@ -543,10 +543,10 @@ public: sal_uInt16 GetAttLabelFlags() const; /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ); + virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChText maData; /// Contents of the CHTEXT record. @@ -587,7 +587,7 @@ private: /** Registers marker colors in palette and stores color identifiers. */ void RegisterColors( const XclExpChRoot& rRoot ); - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChMarkerFormat maData; /// Contents of the CHMARKERFORMAT record. @@ -623,7 +623,7 @@ public: void Convert( const ScfPropertySet& rPropSet ); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclCh3dDataFormat maData; /// Contents of the CH3DDATAFORMAT record. @@ -667,10 +667,10 @@ public: inline bool IsSeriesFormat() const { return maData.maPointPos.mnPointIdx == EXC_CHDATAFORMAT_ALLPOINTS; } /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ); + virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChDataFormat maData; /// Contents of the CHDATAFORMAT record. @@ -703,7 +703,7 @@ public: inline XclExpChTextRef GetDataLabel() const { return mxLabel; } private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChSerTrendLine maData; /// Contents of the CHSERTRENDLINE record. @@ -725,7 +725,7 @@ public: bool Convert( XclExpChSourceLink& rValueLink, sal_uInt16& rnValueCount, const ScfPropertySet& rPropSet ); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChSerErrorBar maData; /// Contents of the CHSERERRORBAR record. @@ -770,7 +770,7 @@ public: void ConvertCategSequence( XLabeledDataSeqRef xCategSeq ); /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ); + virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; private: /** Initializes members of this series to represent a child of the passed series. */ @@ -785,7 +785,7 @@ private: void CreateErrorBar( const ScfPropertySet& rPropSet, const OUString& rShowPropName, sal_uInt8 nBarId ); - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: typedef XclExpRecordList< XclExpChDataFormat > XclExpChDataFormatList; @@ -831,7 +831,7 @@ public: inline const XclChTypeInfo& GetTypeInfo() const { return maTypeInfo; } private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChType maData; /// Contents of the chart type record. @@ -855,7 +855,7 @@ public: inline bool IsClustered() const { return ::get_flag( maData.mnFlags, EXC_CHCHART3D_CLUSTER ); } private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChChart3d maData; /// Contents of the CHCHART3D record. @@ -879,10 +879,10 @@ public: void Convert( const ScfPropertySet& rPropSet ); /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ); + virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChLegend maData; /// Contents of the CHLEGEND record. @@ -909,10 +909,10 @@ public: void Convert( const ScfPropertySet& rPropSet ); /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ); + virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChObjectType meObjType; /// Type of the dropbar. @@ -968,7 +968,7 @@ public: inline bool IsCombinable2d() const { return !Is3dChart() && maTypeInfo.mbCombinable2d; } /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ); + virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; private: /** Returns an unused format index to be used for the next created series. */ @@ -983,7 +983,7 @@ private: bool CreateStockSeries( XDataSeriesRef xDataSeries, const OUString& rValueRole, bool bCloseSymbol ); - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: typedef XclExpRecordList< XclExpChSeries > XclExpChSeriesList; @@ -1019,8 +1019,8 @@ public: { ::set_flag( maLabelData.mnFlags, EXC_CHLABELRANGE_BETWEEN, bTicksBetween ); } private: - virtual void Save( XclExpStream& rStrm ); - virtual void WriteBody( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChLabelRange maLabelData; /// Contents of the CHLABELRANGE record. @@ -1042,7 +1042,7 @@ public: void ConvertAxisPosition( const ScfPropertySet& rPropSet ); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChValueRange maData; /// Contents of the CHVALUERANGE record. @@ -1065,7 +1065,7 @@ public: void SetRotation( sal_uInt16 nRotation ); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChTick maData; /// Contents of the CHTICK record. @@ -1093,9 +1093,9 @@ public: explicit XclExpChAxis( const XclExpChRoot& rRoot, sal_uInt16 nAxisType ); /** Sets font color and color identifier to internal data structures. */ - virtual void SetFont( XclExpChFontRef xFont, const Color& rColor, sal_uInt32 nColorId ); + virtual void SetFont( XclExpChFontRef xFont, const Color& rColor, sal_uInt32 nColorId ) SAL_OVERRIDE; /** Sets text rotation to internal data structures. */ - virtual void SetRotation( sal_uInt16 nRotation ); + virtual void SetRotation( sal_uInt16 nRotation ) SAL_OVERRIDE; /** Converts formatting and scaling settings from the passed axis. */ void Convert( XAxisRef xAxis, XAxisRef xCrossingAxis, @@ -1109,10 +1109,10 @@ public: inline sal_Int32 GetApiAxisDimension() const { return maData.GetApiAxisDimension(); } /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ); + virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChAxis maData; /// Contents of the CHAXIS record. @@ -1160,7 +1160,7 @@ public: bool Is3dChart() const; /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ); + virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; private: /** Returns first inserted chart type group. */ @@ -1174,7 +1174,7 @@ private: XCoordSystemRef xCoordSystem, const XclChExtTypeInfo& rTypeInfo, sal_Int32 nCrossingAxisDim ); - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: typedef XclExpRecordList< XclExpChTypeGroup > XclExpChTypeGroupList; @@ -1220,10 +1220,10 @@ public: void SetManualPlotArea(); /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ); + virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: typedef XclExpRecordList< XclExpChSeries > XclExpChSeriesList; @@ -1253,7 +1253,7 @@ public: const Size& rChartSize ); virtual ~XclExpChartDrawing(); - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: boost::shared_ptr< XclExpObjectManager > mxObjMgr; diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx index 314c0846db2f..545ff59f5ddf 100644 --- a/sc/source/filter/inc/xecontent.hxx +++ b/sc/source/filter/inc/xecontent.hxx @@ -60,8 +60,8 @@ public: sal_uInt32 Insert( XclExpStringRef xString ); /** Writes the complete SST and EXTSST records. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: typedef boost::scoped_ptr< XclExpSstImpl > XclExpSstImplPtr; @@ -82,8 +82,8 @@ public: sal_uInt32 GetBaseXFId( const ScAddress& rPos ) const; /** Writes the record, if it contains at least one merged cell range. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: ScRangeList maMergedRanges; /// All merged cell ranges of the sheet. @@ -106,7 +106,7 @@ public: /** Returns the cell representation text or 0, if not available. */ inline const OUString* GetRepr() const { return m_Repr.isEmpty() ? 0 : &m_Repr; } - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; virtual void WriteEmbeddedData( XclExpStream& rStrm ); void SetDisplay( bool bDisplay ) { mbSetDisplay = bDisplay; } @@ -119,7 +119,7 @@ private: const OUString& rUrl, const XclExpRoot& rRoot ) const; /** Writes the body of the HLINK record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: typedef boost::scoped_ptr< SvStream > SvStreamPtr; @@ -145,7 +145,7 @@ public: explicit XclExpLabelranges( const XclExpRoot& rRoot ); /** Writes the LABELRANGES record if it contains at least one range. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: /** Fills the specified range list with all label headers of the current sheet. @@ -172,11 +172,11 @@ public: explicit XclExpCF( const XclExpRoot& rRoot, const ScCondFormatEntry& rFormatEntry, sal_Int32 nPriority ); virtual ~XclExpCF(); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the body of the CF record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: typedef boost::scoped_ptr< XclExpCFImpl > XclExpCFImplPtr; @@ -189,7 +189,7 @@ public: explicit XclExpDateFormat( const XclExpRoot& rRoot, const ScCondDateFormatEntry& rFormatEntry, sal_Int32 nPriority ); virtual ~XclExpDateFormat(); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: const ScCondDateFormatEntry& mrFormatEntry; @@ -202,7 +202,7 @@ public: explicit XclExpCfvo( const XclExpRoot& rRoot, const ScColorScaleEntry& rFormatEntry, const ScAddress& rPos, bool bFirst = true); virtual ~XclExpCfvo() {} - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: const ScColorScaleEntry& mrEntry; ScAddress maSrcPos; @@ -215,7 +215,7 @@ public: explicit XclExpColScaleCol( const XclExpRoot& rRoot, const Color& rColor); virtual ~XclExpColScaleCol(); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: const Color& mrColor; }; @@ -236,12 +236,12 @@ public: bool IsValid() const; /** Writes the CONDFMT record with following CF records, if there is valid data. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the body of the CONDFMT record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: typedef XclExpRecordList< XclExpRecord > XclExpCFList; @@ -256,7 +256,7 @@ class XclExpColorScale: public XclExpRecord, protected XclExpRoot public: explicit XclExpColorScale( const XclExpRoot& rRoot, const ScColorScaleFormat& rFormat, sal_Int32 nPriority ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: typedef XclExpRecordList< XclExpCfvo > XclExpCfvoList; typedef XclExpRecordList< XclExpColScaleCol > XclExpColScaleColList; @@ -271,7 +271,7 @@ class XclExpDataBar : public XclExpRecord, protected XclExpRoot public: explicit XclExpDataBar( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, sal_Int32 nPriority, XclExtLstRef xExtLst ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: boost::scoped_ptr<XclExpCfvo> mpCfvoLowerLimit; boost::scoped_ptr<XclExpCfvo> mpCfvoUpperLimit; @@ -287,7 +287,7 @@ class XclExpIconSet : public XclExpRecord, protected XclExpRoot public: explicit XclExpIconSet( const XclExpRoot& rRoot, const ScIconSetFormat& rFormat, sal_Int32 nPriority ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: typedef XclExpRecordList< XclExpCfvo > XclExpCfvoList; @@ -306,8 +306,8 @@ public: explicit XclExpCondFormatBuffer( const XclExpRoot& rRoot, XclExtLstRef xExtLst ); /** Writes all contained CONDFMT records with their CF records. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: typedef XclExpRecordList< XclExpCondfmt > XclExpCondfmtList; @@ -335,11 +335,11 @@ public: @return false = Resulting range list empty - do not write this record. */ bool Finalize(); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the body of the DV record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: ScRangeList maScRanges; /// Calc range list with all affected cells. @@ -370,15 +370,15 @@ public: void InsertCellRange( const ScRange& rRange, sal_uLong nScHandle ); /** Writes the DVAL record and the DV record list. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Searches for or creates a XclExpDV record object with the specified handle. */ XclExpDV& SearchOrCreateDv( sal_uLong nScHandle ); /** Writes the body of the DVAL record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: typedef XclExpRecordList< XclExpDV > XclExpDVList; @@ -406,7 +406,7 @@ public: virtual ~XclExpWebQuery(); /** Writes all needed records for this web query. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclExpString maDestRange; /// Destination range. diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx index 660d5f38ceb0..a51e5306341c 100644 --- a/sc/source/filter/inc/xeescher.hxx +++ b/sc/source/filter/inc/xeescher.hxx @@ -54,7 +54,7 @@ public: /** Called from SVX DFF converter. @param rRect The object anchor rectangle to be exported (in twips). */ - virtual void WriteData( EscherEx& rEscherEx, const Rectangle& rRect ); + virtual void WriteData( EscherEx& rEscherEx, const Rectangle& rRect ) SAL_OVERRIDE; private: virtual void ImplSetFlags( const SdrObject& rSdrObj ); @@ -74,8 +74,8 @@ public: explicit XclExpDffSheetAnchor( const XclExpRoot& rRoot ); private: - virtual void ImplSetFlags( const SdrObject& rSdrObj ); - virtual void ImplCalcAnchorRect( const Rectangle& rRect, MapUnit eMapUnit ); + virtual void ImplSetFlags( const SdrObject& rSdrObj ) SAL_OVERRIDE; + virtual void ImplCalcAnchorRect( const Rectangle& rRect, MapUnit eMapUnit ) SAL_OVERRIDE; private: SCTAB mnScTab; /// Calc sheet index. @@ -91,8 +91,8 @@ public: const Size& rPageSize, sal_Int32 nScaleX, sal_Int32 nScaleY ); private: - virtual void ImplSetFlags( const SdrObject& rSdrObj ); - virtual void ImplCalcAnchorRect( const Rectangle& rRect, MapUnit eMapUnit ); + virtual void ImplSetFlags( const SdrObject& rSdrObj ) SAL_OVERRIDE; + virtual void ImplCalcAnchorRect( const Rectangle& rRect, MapUnit eMapUnit ) SAL_OVERRIDE; private: Size maPageSize; @@ -127,7 +127,7 @@ public: explicit XclExpMsoDrawingBase( XclEscherEx& rEscherEx, sal_uInt16 nRecId ); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; protected: XclEscherEx& mrEscherEx; /// Reference to the DFF converter containing the DFF stream. @@ -165,8 +165,8 @@ public: explicit XclExpImgData( const Graphic& rGraphic, sal_uInt16 nRecId ); /** Writes the BITMAP record. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: Graphic maGraphic; /// The VCL graphic. @@ -231,7 +231,7 @@ public: explicit XclExpShapeObj( XclExpObjectManager& rRoot, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); virtual ~XclExpShapeObj(); private: - virtual void WriteSubRecs( XclExpStream& rStrm ); + virtual void WriteSubRecs( XclExpStream& rStrm ) SAL_OVERRIDE; }; @@ -251,7 +251,7 @@ public: sal_uInt32 nStrmStart, sal_uInt32 nStrmSize ); private: - virtual void WriteSubRecs( XclExpStream& rStrm ); + virtual void WriteSubRecs( XclExpStream& rStrm ) SAL_OVERRIDE; private: OUString maClassName; /// Class name of the control. @@ -275,7 +275,7 @@ public: bool SetMacroLink( const ::com::sun::star::script::ScriptEventDescriptor& rEvent ); private: - virtual void WriteSubRecs( XclExpStream& rStrm ); + virtual void WriteSubRecs( XclExpStream& rStrm ) SAL_OVERRIDE; /** Writes a subrecord containing a cell link, or nothing, if no link present. */ void WriteCellLinkSubRec( XclExpStream& rStrm, sal_uInt16 nSubRecId ); @@ -319,8 +319,8 @@ public: virtual ~XclExpChartObj(); /** Writes the OBJ record and the entire chart substream. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; virtual void WriteChartObj( sax_fastparser::FSHelperPtr pDrawing, XclExpXmlStream& rStrm ); void WriteShapeTransformation( sax_fastparser::FSHelperPtr pFS, const XShapeRef& rXShape, bool bFlipH = false, bool bFlipV = false, sal_Int32 nRotation = 0 ); @@ -358,14 +358,14 @@ public: const OUString& rAddText ); /** Writes the NOTE record, if the respective Escher object is present. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; void WriteXml( sal_Int32 nAuthorId, XclExpXmlStream& rStrm ); const XclExpString& GetAuthor() const { return maAuthor; } private: /** Writes the body of the NOTE record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclExpString maAuthor; /// Name of the author. @@ -397,7 +397,7 @@ public: XclExpComments( SCTAB nTab, XclExpNoteList& rNotes ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: SCTAB mnTab; @@ -464,7 +464,7 @@ public: /** Creates a new DFF client anchor object for embedded objects according to the scaling data passed to the constructor. Caller takes ownership! */ - virtual XclExpDffAnchorBase* CreateDffAnchor() const; + virtual XclExpDffAnchorBase* CreateDffAnchor() const SAL_OVERRIDE; private: Size maPageSize; diff --git a/sc/source/filter/inc/xeextlst.hxx b/sc/source/filter/inc/xeextlst.hxx index c32e23e6f978..82a564c119a7 100644 --- a/sc/source/filter/inc/xeextlst.hxx +++ b/sc/source/filter/inc/xeextlst.hxx @@ -41,7 +41,7 @@ class XclExpExtCfvo : public XclExpRecordBase, protected XclExpRoot { public: XclExpExtCfvo( const XclExpRoot& rRoot, const ScColorScaleEntry& rEntry, const ScAddress& rPos, bool bFirst ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: ScColorScaleEntryType meType; @@ -73,7 +73,7 @@ class XclExpExtDataBar : public XclExpRecordBase, protected XclExpRoot { public: explicit XclExpExtDataBar( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, const ScAddress& rPos ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: databar::ScAxisPosition meAxisPosition; @@ -91,7 +91,7 @@ class XclExpExtCfRule : public XclExpRecordBase, protected XclExpRoot { public: XclExpExtCfRule( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, const ScAddress& rPos, const OString& rId ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: XclExpExtDataBarRef maDataBar; @@ -105,7 +105,7 @@ class XclExpExtConditionalFormatting : public XclExpRecordBase, protected XclExp { public: explicit XclExpExtConditionalFormatting( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, const ScAddress& rPos, const OString& rId ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: XclExpExtCfRuleRef maCfRule; @@ -118,9 +118,9 @@ class XclExpExtCondFormat : public XclExpExt { public: XclExpExtCondFormat( const XclExpRoot& rRoot ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; - virtual XclExpExtType GetType() { return XclExpExtDataBarType; } + virtual XclExpExtType GetType() SAL_OVERRIDE { return XclExpExtDataBarType; } void AddRecord( XclExpExtConditionalFormattingRef aFormat ); @@ -132,7 +132,7 @@ class XclExtLst : public XclExpRecordBase, public XclExpRoot { public: explicit XclExtLst( const XclExpRoot& rRoot); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; void AddRecord( XclExpExtRef aEntry ); diff --git a/sc/source/filter/inc/xelink.hxx b/sc/source/filter/inc/xelink.hxx index c5a5e19cc3ee..01477085c362 100644 --- a/sc/source/filter/inc/xelink.hxx +++ b/sc/source/filter/inc/xelink.hxx @@ -198,7 +198,7 @@ public: const OUString& rName, const ScExternalRefCache::TokenArrayRef pArray ); /** Writes the entire Link table. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: typedef boost::shared_ptr< XclExpLinkManagerImpl > XclExpLinkMgrImplPtr; diff --git a/sc/source/filter/inc/xename.hxx b/sc/source/filter/inc/xename.hxx index f607b5e52359..dfe639e2ef53 100644 --- a/sc/source/filter/inc/xename.hxx +++ b/sc/source/filter/inc/xename.hxx @@ -68,8 +68,8 @@ public: bool IsVolatile( sal_uInt16 nNameIdx ) const; /** Writes the entire list of NAME records. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: typedef boost::shared_ptr< XclExpNameManagerImpl > XclExpNameMgrImplRef; diff --git a/sc/source/filter/inc/xepage.hxx b/sc/source/filter/inc/xepage.hxx index 1972d6324e02..a726b362d01f 100644 --- a/sc/source/filter/inc/xepage.hxx +++ b/sc/source/filter/inc/xepage.hxx @@ -34,10 +34,10 @@ class XclExpHeaderFooter : public XclExpRecord public: explicit XclExpHeaderFooter( sal_uInt16 nRecId, const OUString& rHdrString ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the header or footer string. Writes an empty record, if no header/footer present. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: OUString maHdrString; /// Header or footer contents. @@ -51,10 +51,10 @@ class XclExpSetup : public XclExpRecord public: explicit XclExpSetup( const XclPageData& rPageData ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the contents of the SETUP record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: const XclPageData& mrData; /// Page settings data of current sheet. @@ -72,12 +72,12 @@ public: sal_uInt16 nMaxPos ); /** Writes the record, if the list is not empty. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the page break list. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: const ScfUInt16Vec& mrPageBreaks; /// Page settings data of current sheet. @@ -97,8 +97,8 @@ public: inline const XclPageData& GetPageData() const { return maData; } /** Writes all page settings records to the stream. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: XclPageData maData; /// Page settings data. @@ -117,7 +117,7 @@ public: inline const XclPageData& GetPageData() const { return maData; } /** Writes all page settings records to the stream. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclPageData maData; /// Page settings data. diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx index e5a171a058dc..902d9088dba6 100644 --- a/sc/source/filter/inc/xepivot.hxx +++ b/sc/source/filter/inc/xepivot.hxx @@ -55,7 +55,7 @@ public: bool EqualsBool( bool bValue ) const; private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: sal_uInt16 mnTypeFlag; /// Data type flag. @@ -100,7 +100,7 @@ public: void WriteIndex( XclExpStream& rStrm, sal_uInt32 nSrcRow ) const; /** Writes the pivot cache field and all items and other related records. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: typedef XclExpRecordList< XclExpPCItem > XclExpPCItemList; @@ -153,7 +153,7 @@ private: void WriteSxgroupinfo( XclExpStream& rStrm ); /** Writes the contents of the SXFIELD record for this field. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: const XclExpPivotCache& mrPCache; /// Parent pivot cache containing this field. @@ -264,7 +264,7 @@ public: private: /** Writes the SXVI record body describing the pivot table item. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: const XclExpPCItem* mpCacheItem; /// The referred pivot cache item. @@ -310,7 +310,7 @@ public: void WriteSxdi( XclExpStream& rStrm, sal_uInt16 nDataInfoIdx ) const; /** Writes the entire pivot table field. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: @@ -362,8 +362,8 @@ public: sal_uInt16 GetDataFieldIndex( const OUString& rName, sal_uInt16 nDefaultIdx ) const; /** Writes the entire pivot table. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: diff --git a/sc/source/filter/inc/xerecord.hxx b/sc/source/filter/inc/xerecord.hxx index 1c842644cd98..8f44da3d044c 100644 --- a/sc/source/filter/inc/xerecord.hxx +++ b/sc/source/filter/inc/xerecord.hxx @@ -51,7 +51,7 @@ public: XclExpDelegatingRecord( XclExpRecordBase* pRecord ); ~XclExpDelegatingRecord(); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: XclExpRecordBase* mpRecord; }; @@ -153,7 +153,7 @@ public: void SetRecHeader( sal_uInt16 nRecId, sal_Size nRecSize ); /** Writes the record header and calls WriteBody(). */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; protected: /** Writes the body of the record (without record header). @@ -203,11 +203,11 @@ public: XclExpValueRecord* SetAttribute( sal_Int32 nId ); /** Write the OOXML attribute and its value */ - void SaveXml( XclExpXmlStream& rStrm ); + void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the body of the record. */ - inline virtual void WriteBody( XclExpStream& rStrm ) { rStrm << maValue; } + inline virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE { rStrm << maValue; } // inlining prevents warning in wntmsci10 private: @@ -263,11 +263,11 @@ public: /** Sets a new Boolean record value. */ inline void SetBool( bool bValue ) { mbValue = bValue; } - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the body of the record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: bool mbValue; /// The record data. @@ -291,7 +291,7 @@ public: private: /** Writes the body of the record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: const void* mpData; /// The record data. @@ -306,7 +306,7 @@ public: sal_uInt16 nRecId, sal_Size nRecSize = 0 ); /** Writes the extended record header and calls WriteBody(). */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclFutureRecType meRecType; @@ -369,14 +369,14 @@ public: inline void RemoveAllRecords() { maRecs.clear(); } /** Writes the complete record list. */ - inline virtual void Save( XclExpStream& rStrm ) + inline virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE { // inlining prevents warning in wntmsci10 for( typename RecordVec::iterator aIt = maRecs.begin(), aEnd = maRecs.end(); aIt != aEnd; ++aIt ) (*aIt)->Save( rStrm ); } - inline virtual void SaveXml( XclExpXmlStream& rStrm ) + inline virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE { // inlining prevents warning in wntmsci10 for( typename RecordVec::iterator aIt = maRecs.begin(), aEnd = maRecs.end(); aIt != aEnd; ++aIt ) @@ -397,7 +397,7 @@ public: explicit XclExpSubStream( sal_uInt16 nSubStrmType ); /** Writes the complete substream, including leading BOF and trailing EOF. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: sal_uInt16 mnSubStrmType; /// Substream type, stored in leading BOF record. diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index 8d137ea69a70..f1482c7d7e1a 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -324,14 +324,14 @@ public: OUString* pRelationshipId = NULL ); // ignore - virtual bool exportDocument() throw(); + virtual bool exportDocument() throw() SAL_OVERRIDE; // only needed for import; ignore - virtual bool importDocument() throw(); - virtual oox::vml::Drawing* getVmlDrawing(); - virtual const oox::drawingml::Theme* getCurrentTheme() const; - virtual const oox::drawingml::table::TableStyleListPtr getTableStyles(); - virtual oox::drawingml::chart::ChartConverter* getChartConverter(); + virtual bool importDocument() throw() SAL_OVERRIDE; + virtual oox::vml::Drawing* getVmlDrawing() SAL_OVERRIDE; + virtual const oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE; + virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE; + virtual oox::drawingml::chart::ChartConverter* getChartConverter() SAL_OVERRIDE; /* Now create all the overloads in a typesafe way (i.e. without varargs) by creating a number of overloads @@ -364,8 +364,8 @@ public: #undef SAX_ARGS_FUNC private: - virtual ::oox::ole::VbaProject* implCreateVbaProject() const; - virtual OUString implGetImplementationName() const; + virtual ::oox::ole::VbaProject* implCreateVbaProject() const SAL_OVERRIDE; + virtual OUString implGetImplementationName() const SAL_OVERRIDE; ScDocShell *getDocShell(); sax_fastparser::FSHelperPtr& WriteAttributesInternal( sal_Int32 nAttribute, ... ); diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx index 944b436c1536..507b8d2ec59d 100644 --- a/sc/source/filter/inc/xestyle.hxx +++ b/sc/source/filter/inc/xestyle.hxx @@ -112,12 +112,12 @@ public: { return Color( GetColorData( nXclIndex ) ); } /** Saves the PALETTE record, if it differs from the default palette. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the contents of the PALETTE record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: typedef boost::shared_ptr< XclExpPaletteImpl > XclExpPaletteImplRef; @@ -178,11 +178,11 @@ public: @param nHash The hash value calculated from the font data. */ virtual bool Equals( const XclFontData& rFontData, sal_uInt32 nHash ) const; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the contents of the FONT record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclFontData maData; /// All font attributes. @@ -199,10 +199,10 @@ public: explicit XclExpBlindFont( const XclExpRoot& rRoot ); /** Returns always false to never find this font while searching the font list. */ - virtual bool Equals( const XclFontData& rFontData, sal_uInt32 nHash ) const; + virtual bool Equals( const XclFontData& rFontData, sal_uInt32 nHash ) const SAL_OVERRIDE; /** Skips writing this record. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; }; @@ -243,8 +243,8 @@ public: XclExpColorType eColorType, bool bAppFont = false ); /** Writes all FONT records contained in this buffer. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Initializes the default fonts for the current BIFF version. */ @@ -296,8 +296,8 @@ public: sal_uInt16 Insert( sal_uLong nScNumFmt ); /** Writes all FORMAT records contained in this buffer. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the FORMAT record with index nXclIx and format string rFormatStr. */ @@ -491,7 +491,7 @@ public: void SetXmlIds( sal_uInt32 nBorderId, sal_uInt32 nFillId ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; protected: explicit XclExpXF( const XclExpRoot& rRoot, bool bCellXF ); @@ -535,7 +535,7 @@ private: void WriteBody8( XclExpStream& rStrm ); /** Writes the contents of the XF record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; }; @@ -567,11 +567,11 @@ public: inline const OUString& GetName() const { return maName; } - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the contents of the STYLE record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: OUString maName; /// Name of the cell style. @@ -650,8 +650,8 @@ public: sal_Int32 GetXmlCellIndex( sal_uInt32 nXFId ) const; /** Writes all XF records contained in this buffer. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: typedef XclExpRecordList< XclExpXF > XclExpXFList; @@ -735,7 +735,7 @@ public: XclExpFont* pFont, XclExpNumFmt* pNumberFmt, XclExpCellProt* pProt, XclExpColor* pColor); virtual ~XclExpDxf(); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: boost::scoped_ptr<XclExpCellAlign> mpAlign; @@ -754,7 +754,7 @@ public: sal_Int32 GetDxfId(const OUString& rName); - virtual void SaveXml( XclExpXmlStream& rStrm); + virtual void SaveXml( XclExpXmlStream& rStrm) SAL_OVERRIDE; private: typedef boost::ptr_vector<XclExpDxf> DxfContainer; std::map<OUString, sal_Int32> maStyleNameToDxfId; @@ -770,7 +770,7 @@ class XclExpXmlStyleSheet : public XclExpRecordBase, protected XclExpRoot public: explicit XclExpXmlStyleSheet( const XclExpRoot& rRoot ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx index 5dd87e43b996..a5173d4a41d0 100644 --- a/sc/source/filter/inc/xetable.hxx +++ b/sc/source/filter/inc/xetable.hxx @@ -55,7 +55,7 @@ public: explicit XclExpStringRec( const XclExpRoot& rRoot, const OUString& rResult ); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclExpStringRef mxResult; @@ -113,12 +113,12 @@ public: explicit XclExpArray( XclTokenArrayRef xTokArr, const ScRange& rScRange ); /** Creates and returns the token array for a corresponding FORMULA cell record. */ - virtual XclTokenArrayRef CreateCellTokenArray( const XclExpRoot& rRoot ) const; + virtual XclTokenArrayRef CreateCellTokenArray( const XclExpRoot& rRoot ) const SAL_OVERRIDE; /** Returns true, if the array formula contains volatile functions. */ - virtual bool IsVolatile() const; + virtual bool IsVolatile() const SAL_OVERRIDE; private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclTokenArrayRef mxTokArr; /// The token array of a matrix formula. @@ -163,12 +163,12 @@ public: void ExtendRange( const ScAddress& rScPos ); /** Creates and returns the token array for a corresponding FORMULA cell record. */ - virtual XclTokenArrayRef CreateCellTokenArray( const XclExpRoot& rRoot ) const; + virtual XclTokenArrayRef CreateCellTokenArray( const XclExpRoot& rRoot ) const SAL_OVERRIDE; /** Returns true, if the shared formula contains volatile functions. */ - virtual bool IsVolatile() const; + virtual bool IsVolatile() const SAL_OVERRIDE; private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclTokenArrayRef mxTokArr; /// The token array of a shared formula. @@ -227,18 +227,18 @@ public: void Finalize(); /** Creates and returns the token array for a corresponding FORMULA cell record. */ - virtual XclTokenArrayRef CreateCellTokenArray( const XclExpRoot& rRoot ) const; + virtual XclTokenArrayRef CreateCellTokenArray( const XclExpRoot& rRoot ) const SAL_OVERRIDE; /** Returns true, if the multiple operations range is volatile. */ - virtual bool IsVolatile() const; + virtual bool IsVolatile() const SAL_OVERRIDE; /** Writes the record if it is valid. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: /** Returns true, if the passed cell position can be appended to this record. */ bool IsAppendable( sal_uInt16 nXclCol, sal_uInt16 nXclRow ) const; /** Writes the contents of the TABLEOP record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: sal_uInt16 mnLastAppXclCol;/// Column index of last appended cell. @@ -335,15 +335,15 @@ class XclExpSingleCellBase : public XclExpCellBase { public: /** Returns the last column, which is equal to the first column for single cells. */ - virtual sal_uInt16 GetLastXclCol() const; + virtual sal_uInt16 GetLastXclCol() const SAL_OVERRIDE; /** Return the XF identifier of the cell. */ - virtual sal_uInt32 GetFirstXFId() const; + virtual sal_uInt32 GetFirstXFId() const SAL_OVERRIDE; /** Returns true, if this record does not contain at least one valid cell. */ - virtual bool IsEmpty() const; + virtual bool IsEmpty() const SAL_OVERRIDE; /** Converts the XF identifier into the Excel XF index. */ - virtual void ConvertXFIndexes( const XclExpRoot& rRoot ); + virtual void ConvertXFIndexes( const XclExpRoot& rRoot ) SAL_OVERRIDE; /** Writes cell address, XF index, and calls WriteContents() for each cell. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; protected: explicit XclExpSingleCellBase( sal_uInt16 nRecId, sal_Size nContSize, @@ -361,7 +361,7 @@ protected: private: /** Writes cell address, XF index, and calls WriteContents() for each cell. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; /** Derived classes write the contents of the specified cell (without XF index). */ virtual void WriteContents( XclExpStream& rStrm ) = 0; @@ -382,9 +382,9 @@ public: const ScPatternAttr* pPattern, sal_uInt32 nForcedXFId, double fValue ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: - virtual void WriteContents( XclExpStream& rStrm ); + virtual void WriteContents( XclExpStream& rStrm ) SAL_OVERRIDE; private: double mfValue; /// The cell value. @@ -402,9 +402,9 @@ public: const ScPatternAttr* pPattern, sal_uInt32 nForcedXFId, bool bValue ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: - virtual void WriteContents( XclExpStream& rStrm ); + virtual void WriteContents( XclExpStream& rStrm ) SAL_OVERRIDE; private: bool mbValue; /// The cell value. @@ -435,15 +435,15 @@ public: const EditTextObject* pEditText, XclExpHyperlinkHelper& rHlinkHelper ); /** Returns true if the cell contains multi-line text. */ - virtual bool IsMultiLineText() const; + virtual bool IsMultiLineText() const SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Initializes the record contents. Called from constructors. */ void Init( const XclExpRoot& rRoot, const ScPatternAttr* pPattern, XclExpStringRef xText ); - virtual void WriteContents( XclExpStream& rStrm ); + virtual void WriteContents( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclExpStringRef mxText; /// The cell text. @@ -469,11 +469,11 @@ public: XclExpTableopBuffer& rTableopBfr ); /** Writes the FORMULA record and additional records related to the formula. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: - virtual void WriteContents( XclExpStream& rStrm ); + virtual void WriteContents( XclExpStream& rStrm ) SAL_OVERRIDE; private: ScFormulaCell& mrScFmlaCell; /// The Calc formula cell. @@ -499,18 +499,18 @@ class XclExpMultiCellBase : public XclExpCellBase { public: /** Returns the column index of the last cell this record describes. */ - virtual sal_uInt16 GetLastXclCol() const; + virtual sal_uInt16 GetLastXclCol() const SAL_OVERRIDE; /** Return the XF identifier of the first contained cell. */ - virtual sal_uInt32 GetFirstXFId() const; + virtual sal_uInt32 GetFirstXFId() const SAL_OVERRIDE; /** Returns true, if this record does not contain at least one valid cell. */ - virtual bool IsEmpty() const; + virtual bool IsEmpty() const SAL_OVERRIDE; /** Convert all XF identifiers into the Excel XF indexes. */ - virtual void ConvertXFIndexes( const XclExpRoot& rRoot ); + virtual void ConvertXFIndexes( const XclExpRoot& rRoot ) SAL_OVERRIDE; /** Writes the record, calls WriteContents() for each contained cell. @descr May write several records, if unused XF indexes are contained. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; protected: explicit XclExpMultiCellBase( sal_uInt16 nRecId, sal_uInt16 nMulRecId, @@ -569,16 +569,16 @@ public: const ScPatternAttr* pPattern, sal_uInt32 nForcedXFId ); /** Tries to merge the contents of the passed cell to own data. */ - virtual bool TryMerge( const XclExpCellBase& rCell ); + virtual bool TryMerge( const XclExpCellBase& rCell ) SAL_OVERRIDE; /** Inserts the Excel XF index(es) into the passed vector. */ - virtual void GetBlankXFIndexes( ScfUInt16Vec& rXFIndexes ) const; + virtual void GetBlankXFIndexes( ScfUInt16Vec& rXFIndexes ) const SAL_OVERRIDE; /** Tries to remove unused Excel XF index(es). */ - virtual void RemoveUnusedBlankCells( const ScfUInt16Vec& rXFIndexes ); + virtual void RemoveUnusedBlankCells( const ScfUInt16Vec& rXFIndexes ) SAL_OVERRIDE; private: /** Writes the remaining contents of the specified cell (without XF index). */ - virtual void WriteContents( XclExpStream& rStrm, sal_uInt16 nRelCol ); - virtual void WriteXmlContents( XclExpXmlStream& rStrm, const XclAddress& rAddress, sal_uInt32 nXFId, sal_uInt16 nRelCol ); + virtual void WriteContents( XclExpStream& rStrm, sal_uInt16 nRelCol ) SAL_OVERRIDE; + virtual void WriteXmlContents( XclExpXmlStream& rStrm, const XclAddress& rAddress, sal_uInt32 nXFId, sal_uInt16 nRelCol ) SAL_OVERRIDE; }; @@ -594,12 +594,12 @@ public: sal_Int32 nRkValue ); /** Tries to merge the contents of the passed cell to own data. */ - virtual bool TryMerge( const XclExpCellBase& rCell ); + virtual bool TryMerge( const XclExpCellBase& rCell ) SAL_OVERRIDE; private: /** Writes the remaining contents of the specified cell (without XF index). */ - virtual void WriteContents( XclExpStream& rStrm, sal_uInt16 nRelCol ); - virtual void WriteXmlContents( XclExpXmlStream& rStrm, const XclAddress& rAddress, sal_uInt32 nXFId, sal_uInt16 nRelCol ); + virtual void WriteContents( XclExpStream& rStrm, sal_uInt16 nRelCol ) SAL_OVERRIDE; + virtual void WriteXmlContents( XclExpXmlStream& rStrm, const XclAddress& rAddress, sal_uInt32 nXFId, sal_uInt16 nRelCol ) SAL_OVERRIDE; private: ScfInt32Vec maRkValues; /// The cell values. @@ -681,7 +681,7 @@ public: explicit XclExpGuts( const XclExpRoot& rRoot ); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: sal_uInt16 mnColLevels; /// Number of visible column outline levels. @@ -703,10 +703,10 @@ public: sal_uInt16 nFirstUsedXclCol, sal_uInt32 nFirstUsedXclRow, sal_uInt16 nFirstFreeXclCol, sal_uInt32 nFirstFreeXclRow ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the contents of the DIMENSIONS record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: sal_uInt32 mnFirstUsedXclRow; /// First used row. @@ -775,11 +775,11 @@ public: /** Returns true, if the column has default format and width. */ bool IsDefault( const XclExpDefcolwidth& rDefColWidth ) const; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the contents of this COLINFO record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclExpXFId maXFId; /// The XF identifier for column default format. @@ -812,8 +812,8 @@ public: void Finalize( ScfUInt16Vec& rXFIndexes ); /** Writes all COLINFO records of this buffer. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: typedef XclExpRecordList< XclExpColinfo > XclExpColinfoList; @@ -856,7 +856,7 @@ public: XclExpDefaultRowData& GetDefaultData() { return maDefData; } private: /** Writes the contents of the record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclExpDefaultRowData maDefData; /// Record data. @@ -924,8 +924,8 @@ public: void WriteCellList( XclExpStream& rStrm ); /** Writes the ROW record if the row is not disabled (see DisableIfDefault() function). */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; inline sal_uInt32 GetXclRowRpt() const { return mnXclRowRpt; } inline void SetXclRowRpt( sal_uInt32 nRpt ){ mnXclRowRpt = nRpt; } @@ -936,7 +936,7 @@ private: void InsertCell( XclExpCellRef xCell, size_t nPos, bool bIsMergedBase ); /** Writes the contents of the ROW record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: typedef XclExpRecordList< XclExpCellBase > XclExpCellList; @@ -978,8 +978,8 @@ public: void Finalize( XclExpDefaultRowData& rDefRowData, const ScfUInt16Vec& rColXFIndexes ); /** Writes the DIMENSIONS record, all ROW records and all cell records. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; XclExpDimensions* GetDimensions(); @@ -1045,8 +1045,8 @@ public: EXC_ID_MERGEDCELLS, EXC_ID_HLINK, EXC_ID_DVAL. */ XclExpRecordRef CreateRecord( sal_uInt16 nRecId ) const; /** Saves the entire cell table. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: typedef XclExpRecordList< XclExpNote > XclExpNoteList; diff --git a/sc/source/filter/inc/xeview.hxx b/sc/source/filter/inc/xeview.hxx index bacfdf1b12d5..cbfb8395f3f3 100644 --- a/sc/source/filter/inc/xeview.hxx +++ b/sc/source/filter/inc/xeview.hxx @@ -32,11 +32,11 @@ class XclExpWindow1 : public XclExpRecord public: explicit XclExpWindow1( const XclExpRoot& rRoot ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the contents of the WINDOW1 record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: sal_uInt16 mnFlags; /// Option flags. @@ -54,7 +54,7 @@ public: private: /** Writes the contents of the WINDOW2 record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: Color maGridColor; /// Grid color (<=BIFF5). @@ -77,7 +77,7 @@ private: /** Tries to shorten numerator and denominator by the passed value. */ void Shorten( sal_uInt16 nFactor ); /** Writes the contents of the SCL record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: sal_uInt16 mnNum; /// Numerator of the zoom factor. @@ -92,11 +92,11 @@ class XclExpPane : public XclExpRecord public: explicit XclExpPane( const XclTabViewData& rData ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the contents of the PANE record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: sal_uInt16 mnSplitX; /// Split X position, or frozen column. @@ -114,10 +114,10 @@ class XclExpSelection : public XclExpRecord public: explicit XclExpSelection( const XclTabViewData& rData, sal_uInt8 nPane ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the contents of the SELECTION record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclSelectionData maSelData; /// Selection data. @@ -132,7 +132,7 @@ public: /* virtual void SaveXml( XclExpXmlStream& rStrm ); TODO Fix XML Saving Stream */ private: /** Writes the contents of the SHEETEXT record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: const XclTabViewData& mrTabViewData; /// view settings data of current sheet. @@ -148,8 +148,8 @@ public: explicit XclExpTabViewSettings( const XclExpRoot& rRoot, SCTAB nScTab ); /** Writes all view settings records to the stream. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Creates selection data for the specified pane. */ diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx index d43e12fc8880..3e8a346833af 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -288,9 +288,9 @@ public: explicit XclImpChEscherFormat( const XclImpRoot& rRoot ); /** Reads the CHESCHERFORMAT record (complex fill data) (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ); + virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Reads a record from the CHESCHERFORMAT group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ); + virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Converts and writes the contained data to the passed property set. */ void Convert( const XclImpChRoot& rRoot, ScfPropertySet& rPropSet, @@ -321,7 +321,7 @@ public: explicit XclImpChFrameBase( const XclChFormatInfo& rFmtInfo ); /** Reads a frame formatting record (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ); + virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Returns true, if the line format is set to automatic. */ inline bool IsAutoLine() const { return !mxLineFmt || mxLineFmt->IsAuto(); } @@ -371,7 +371,7 @@ public: XclChObjectType eObjType ); /** Reads the CHFRAME record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ); + virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Sets formatting from BIFF3-BIFF5 OBJ record, if own formatting is invisible. */ void UpdateObjFrame( const XclObjLineData& rLineData, const XclObjFillData& rFillData ); @@ -493,16 +493,16 @@ public: explicit XclImpChText( const XclImpChRoot& rRoot ); /** Reads the CHTEXT record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ); + virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Reads a record from the CHTEXT group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ); + virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Returns the leading font index for the text object. */ - virtual sal_uInt16 GetFontIndex() const; + virtual sal_uInt16 GetFontIndex() const SAL_OVERRIDE; /** Returns the leading font color for the text object. */ - virtual Color GetFontColor() const; + virtual Color GetFontColor() const SAL_OVERRIDE; /** Returns the rotation value for the text object. */ - virtual sal_uInt16 GetRotation() const; + virtual sal_uInt16 GetRotation() const SAL_OVERRIDE; /** Sets explicit string data for this text object. */ void SetString( const OUString& rString ); @@ -666,9 +666,9 @@ public: explicit XclImpChDataFormat( const XclImpChRoot& rRoot ); /** Reads the CHDATAFORMAT record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ); + virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Reads a record from the CHDATAFORMAT group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ); + virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Sets this object to the specified data point position. */ void SetPointPos( const XclChDataPointPos& rPointPos, sal_uInt16 nFormatIdx ); @@ -805,9 +805,9 @@ public: explicit XclImpChSeries( const XclImpChRoot& rRoot, sal_uInt16 nSeriesIdx ); /** Reads the CHSERIES record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ); + virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Reads a record from the CHSERIES group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ); + virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Sets a data point or series format (CHDATAFORMAT group) for this series. */ void SetDataFormat( const XclImpChDataFormatRef& xDataFmt ); @@ -962,9 +962,9 @@ public: explicit XclImpChLegend( const XclImpChRoot& rRoot ); /** Reads the CHLEGEND record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ); + virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Reads a record from the CHLEGEND group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ); + virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Final processing after reading the entire chart. */ void Finalize(); @@ -993,7 +993,7 @@ public: explicit XclImpChDropBar( sal_uInt16 nDropBar ); /** Reads the CHDROPBAR record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ); + virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Converts and writes the contained frame data to the passed property set. */ void Convert( const XclImpChRoot& rRoot, ScfPropertySet& rPropSet ) const; @@ -1028,9 +1028,9 @@ public: explicit XclImpChTypeGroup( const XclImpChRoot& rRoot ); /** Reads the CHTYPEGROUP record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ); + virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Reads a record from the CHTYPEGROUP group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ); + virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Final processing after reading the entire chart. */ void Finalize(); @@ -1211,18 +1211,18 @@ public: explicit XclImpChAxis( const XclImpChRoot& rRoot, sal_uInt16 nAxisType = EXC_CHAXIS_NONE ); /** Reads the CHAXIS record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ); + virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Reads a record from the CHAXIS group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ); + virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Final processing after reading the entire chart. */ void Finalize(); /** Returns the font index for the axis labels. */ - virtual sal_uInt16 GetFontIndex() const; + virtual sal_uInt16 GetFontIndex() const SAL_OVERRIDE; /** Returns the font color for the axis labels. */ - virtual Color GetFontColor() const; + virtual Color GetFontColor() const SAL_OVERRIDE; /** Returns the rotation value for axis labels. */ - virtual sal_uInt16 GetRotation() const; + virtual sal_uInt16 GetRotation() const SAL_OVERRIDE; /** Returns the type of this axis. */ inline sal_uInt16 GetAxisType() const { return maData.mnType; } @@ -1284,9 +1284,9 @@ public: explicit XclImpChAxesSet( const XclImpChRoot& rRoot, sal_uInt16 nAxesSetId ); /** Reads the CHAXESSET record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ); + virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Reads a record from the CHAXESSET group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ); + virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Final processing after reading the entire chart. */ void Finalize(); @@ -1368,9 +1368,9 @@ public: virtual ~XclImpChChart(); /** Reads the CHCHART record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ); + virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Reads a record from the CHCHART group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ); + virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Reads a CHDEFAULTTEXT group (default text formats). */ void ReadChDefaultText( XclImpStream& rStrm ); /** Reads a CHDATAFORMAT group describing a series format or a data point format. */ @@ -1453,9 +1453,9 @@ public: const Rectangle& rChartRect ); /** Calculate the resulting rectangle of the passed anchor. */ - virtual Rectangle CalcAnchorRect( const XclObjAnchor& rAnchor, bool bDffAnchor ) const; + virtual Rectangle CalcAnchorRect( const XclObjAnchor& rAnchor, bool bDffAnchor ) const SAL_OVERRIDE; /** Called whenever an object has been inserted into the draw page. */ - virtual void OnObjectInserted( const XclImpDrawObjBase& rDrawObj ); + virtual void OnObjectInserted( const XclImpDrawObjBase& rDrawObj ) SAL_OVERRIDE; private: Rectangle maChartRect; /// Position and size of the chart shape in 1/100 mm. diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx index bc0f6d4fd30f..4eaf60cd4568 100644 --- a/sc/source/filter/inc/xiescher.hxx +++ b/sc/source/filter/inc/xiescher.hxx @@ -238,15 +238,15 @@ public: protected: /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */ - virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ); + virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */ - virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ); + virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ); + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Returns a progress bar size that takes all group children into account. */ - virtual sal_Size DoGetProgressSize() const; + virtual sal_Size DoGetProgressSize() const SAL_OVERRIDE; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const; + virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; protected: XclImpDrawObjVector maChildren; /// Grouped objects. @@ -263,13 +263,13 @@ public: protected: /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */ - virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ); + virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */ - virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ); + virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ); + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const; + virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; protected: XclObjLineData maLineData; /// BIFF5 line formatting. @@ -293,13 +293,13 @@ protected: void ConvertRectStyle( SdrObject& rSdrObj ) const; /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */ - virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ); + virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */ - virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ); + virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ); + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const; + virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; protected: XclObjFillData maFillData; /// BIFF5 fill formatting. @@ -317,7 +317,7 @@ public: protected: /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const; + virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; }; @@ -330,13 +330,13 @@ public: protected: /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */ - virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ); + virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */ - virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ); + virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ); + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const; + virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; protected: XclObjFillData maFillData; /// BIFF5 fill formatting. @@ -357,11 +357,11 @@ protected: void ReadCoordList( XclImpStream& rStrm ); /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */ - virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ); + virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ); + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const; + virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; protected: typedef ::std::vector< Point > PointVector; @@ -396,15 +396,15 @@ public: protected: /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */ - virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ); + virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */ - virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ); + virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ); + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const; + virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; /** Inserts the contained text data at the passed object. */ - virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const; + virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const SAL_OVERRIDE; protected: XclImpObjTextData maTextData; /// Textbox data from BIFF5 OBJ or BIFF8 TXO record. @@ -424,19 +424,19 @@ public: protected: /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */ - virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ); + virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */ - virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ); + virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ); + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the specified subrecord of a BIFF8 OBJ record from stream. */ - virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ); + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) SAL_OVERRIDE; /** Returns the needed size on the progress bar. */ - virtual sal_Size DoGetProgressSize() const; + virtual sal_Size DoGetProgressSize() const SAL_OVERRIDE; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const; + virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; /** Converts the chart document. */ - virtual void DoPostProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const; + virtual void DoPostProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const SAL_OVERRIDE; private: /** Calculates the object anchor of a sheet chart (chart fills one page). */ @@ -462,7 +462,7 @@ public: protected: /** Inserts the note into the document, sets visibility. */ - virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const; + virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const SAL_OVERRIDE; private: ScAddress maScPos; /// Cell position of the note object. @@ -540,9 +540,9 @@ protected: void ConvertLabel( ScfPropertySet& rPropSet ) const; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const; + virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; /** Additional processing on the SdrObject, calls new virtual function DoProcessControl(). */ - virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const; + virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const SAL_OVERRIDE; /** Derived classes return the service name of the control component to be created. */ virtual OUString DoGetServiceName() const = 0; @@ -560,11 +560,11 @@ public: protected: /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const SAL_OVERRIDE; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const; + virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; }; @@ -577,15 +577,15 @@ public: protected: /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ); + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the specified subrecord of a BIFF8 OBJ record from stream. */ - virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ); + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) SAL_OVERRIDE; /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const SAL_OVERRIDE; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const; + virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; protected: sal_uInt16 mnState; @@ -602,15 +602,15 @@ public: protected: /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ); + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the specified subrecord of a BIFF8 OBJ record from stream. */ - virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ); + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) SAL_OVERRIDE; /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const SAL_OVERRIDE; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const; + virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; protected: void ApplyGrouping( XclImpOptionButtonObj& rLeader, sal_Int32 nRefVal ); @@ -628,11 +628,11 @@ public: protected: /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const SAL_OVERRIDE; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const; + virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; }; @@ -645,15 +645,15 @@ public: protected: /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ); + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the specified subrecord of a BIFF8 OBJ record from stream. */ - virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ); + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) SAL_OVERRIDE; /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const SAL_OVERRIDE; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const; + virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; protected: sal_uInt16 mnGroupBoxFlags; @@ -669,11 +669,11 @@ public: protected: /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const SAL_OVERRIDE; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const; + virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; }; @@ -689,15 +689,15 @@ protected: bool IsNumeric() const; /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ); + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the specified subrecord of a BIFF8 OBJ record from stream. */ - virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ); + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) SAL_OVERRIDE; /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const SAL_OVERRIDE; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const; + virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; protected: sal_uInt16 mnContentType; @@ -719,7 +719,7 @@ protected: void ReadSbs( XclImpStream& rStrm ); /** Reads the contents of the specified subrecord of a BIFF8 OBJ record from stream. */ - virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ); + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) SAL_OVERRIDE; protected: sal_uInt16 mnValue; @@ -742,13 +742,13 @@ public: protected: /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ); + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const SAL_OVERRIDE; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const; + virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; }; @@ -761,13 +761,13 @@ public: protected: /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ); + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const SAL_OVERRIDE; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const; + virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; }; @@ -805,15 +805,15 @@ protected: void ReadFullLbsData( XclImpStream& rStrm, sal_Size nRecLeft ); /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ); + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the specified subrecord of a BIFF8 OBJ record from stream. */ - virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ); + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) SAL_OVERRIDE; /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const SAL_OVERRIDE; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const; + virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; protected: ScfUInt8Vec maSelection; @@ -835,15 +835,15 @@ protected: void ReadFullLbsData( XclImpStream& rStrm ); /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ); + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the specified subrecord of a BIFF8 OBJ record from stream. */ - virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ); + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) SAL_OVERRIDE; /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const SAL_OVERRIDE; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const; + virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; protected: sal_uInt16 mnLeft; @@ -863,7 +863,7 @@ class XclImpPictureObj : public XclImpRectObj, public XclImpControlHelper public: explicit XclImpPictureObj( const XclImpRoot& rRoot ); /** Returns the ObjectName - can use non-obvious lookup for override in the associated vba document module stream**/ - virtual OUString GetObjName() const; + virtual OUString GetObjName() const SAL_OVERRIDE; /** Returns the graphic imported from the IMGDATA record. */ inline const Graphic& GetGraphic() const { return maGraphic; } @@ -884,17 +884,17 @@ public: protected: /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */ - virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ); + virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */ - virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ); + virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ); + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the specified subrecord of a BIFF8 OBJ record from stream. */ - virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ); + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) SAL_OVERRIDE; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const; + virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; /** Overloaded to do additional processing on the SdrObject. */ - virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const; + virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const SAL_OVERRIDE; private: /** Reads and sets the picture flags from a BIFF3-BIFF5 OBJ picture record. */ @@ -969,7 +969,7 @@ public: protected: /** Returns a color from the Excel color palette. */ - virtual bool GetColorFromPalette( sal_uInt16 nIndex, Color& rColor ) const; + virtual bool GetColorFromPalette( sal_uInt16 nIndex, Color& rColor ) const SAL_OVERRIDE; }; @@ -1021,16 +1021,16 @@ private: SvStream& rDffStrm, DffRecordHeader& rHeader, void* pClientData, - DffObjData& rObjData ); + DffObjData& rObjData ) SAL_OVERRIDE; /** Processes an DFF object, reads properties from DFF stream. */ virtual SdrObject* ProcessObj( SvStream& rDffStrm, DffObjData& rDffObjData, void* pClientData, Rectangle& rTextRect, - SdrObject* pOldSdrObj = 0 ); + SdrObject* pOldSdrObj = 0 ) SAL_OVERRIDE; /** Returns the BLIP stream position, based on the passed DFF stream position. */ - virtual sal_uLong Calc_nBLIPPos( sal_uLong nOrgVal, sal_uLong nStreamPos ) const; + virtual sal_uLong Calc_nBLIPPos( sal_uLong nOrgVal, sal_uLong nStreamPos ) const SAL_OVERRIDE; // virtual functions of SvxMSConvertOCXControls @@ -1041,7 +1041,7 @@ private: const ::com::sun::star::awt::Size& rSize, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >* pxShape, - bool bFloatingCtrl ); + bool bFloatingCtrl ) SAL_OVERRIDE; private: /** Data per registered drawing manager, will be stacked for recursive calls. */ @@ -1186,9 +1186,9 @@ public: void ConvertObjects( XclImpDffConverter& rDffConv ); /** Calculate the resulting rectangle of the passed anchor. */ - virtual Rectangle CalcAnchorRect( const XclObjAnchor& rAnchor, bool bDffAnchor ) const; + virtual Rectangle CalcAnchorRect( const XclObjAnchor& rAnchor, bool bDffAnchor ) const SAL_OVERRIDE; /** On call, updates the used area of the sheet. */ - virtual void OnObjectInserted( const XclImpDrawObjBase& rDrawObj ); + virtual void OnObjectInserted( const XclImpDrawObjBase& rDrawObj ) SAL_OVERRIDE; private: /** Reads a BIFF3-BIFF5 NOTE record. */ diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx index 6ee3d64b20dc..8d551e38db86 100644 --- a/sc/source/filter/inc/xistream.hxx +++ b/sc/source/filter/inc/xistream.hxx @@ -57,8 +57,8 @@ public: XclImpDecrypterRef Clone() const; /** Implementation of the ::comphelper::IDocPasswordVerifier interface */ - virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ); - virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ); + virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) SAL_OVERRIDE; + virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) SAL_OVERRIDE; /** Updates the decrypter on start of a new record or after seeking stream. */ void Update( SvStream& rStrm, sal_uInt16 nRecSize ); @@ -103,15 +103,15 @@ private: explicit XclImpBiff5Decrypter( const XclImpBiff5Decrypter& rSrc ); /** Implementation of cloning this object. */ - virtual XclImpBiff5Decrypter* OnClone() const; + virtual XclImpBiff5Decrypter* OnClone() const SAL_OVERRIDE; /** Implements password verification and initialization of the decoder. */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > - OnVerifyPassword( const OUString& rPassword ); - virtual bool OnVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ); + OnVerifyPassword( const OUString& rPassword ) SAL_OVERRIDE; + virtual bool OnVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) SAL_OVERRIDE; /** Implementation of updating the decrypter. */ - virtual void OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize ); + virtual void OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize ) SAL_OVERRIDE; /** Implementation of the decryption. */ - virtual sal_uInt16 OnRead( SvStream& rStrm, sal_uInt8* pnData, sal_uInt16 nBytes ); + virtual sal_uInt16 OnRead( SvStream& rStrm, sal_uInt8* pnData, sal_uInt16 nBytes ) SAL_OVERRIDE; private: ::msfilter::MSCodec_XorXLS95 maCodec; /// Crypto algorithm implementation. @@ -134,15 +134,15 @@ private: explicit XclImpBiff8Decrypter( const XclImpBiff8Decrypter& rSrc ); /** Implementation of cloning this object. */ - virtual XclImpBiff8Decrypter* OnClone() const; + virtual XclImpBiff8Decrypter* OnClone() const SAL_OVERRIDE; /** Implements password verification and initialization of the decoder. */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > - OnVerifyPassword( const OUString& rPassword ); - virtual bool OnVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ); + OnVerifyPassword( const OUString& rPassword ) SAL_OVERRIDE; + virtual bool OnVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) SAL_OVERRIDE; /** Implementation of updating the decrypter. */ - virtual void OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize ); + virtual void OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize ) SAL_OVERRIDE; /** Implementation of the decryption. */ - virtual sal_uInt16 OnRead( SvStream& rStrm, sal_uInt8* pnData, sal_uInt16 nBytes ); + virtual sal_uInt16 OnRead( SvStream& rStrm, sal_uInt8* pnData, sal_uInt16 nBytes ) SAL_OVERRIDE; /** Returns the block number corresponding to the passed stream position. */ sal_uInt32 GetBlock( sal_Size nStrmPos ) const; diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx index e5a2874d5271..4d1bb08beb17 100644 --- a/sc/source/filter/oox/formulabuffer.cxx +++ b/sc/source/filter/oox/formulabuffer.cxx @@ -334,7 +334,7 @@ public: virtual ~WorkerThread() {} protected: - virtual void execute() + virtual void execute() SAL_OVERRIDE { processSheetFormulaCells(mrDoc, mrItem, *mpFormatter, mrExternalLinks); } diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx index 1f218582bc47..731be0fcd5b2 100644 --- a/sc/source/filter/oox/formulaparser.cxx +++ b/sc/source/filter/oox/formulaparser.cxx @@ -547,8 +547,8 @@ private: private: // finalize token sequence ------------------------------------------------ - virtual const FunctionInfo* resolveBadFuncName( const OUString& rTokenData ) const; - virtual OUString resolveDefinedName( sal_Int32 nTokenIndex ) const; + virtual const FunctionInfo* resolveBadFuncName( const OUString& rTokenData ) const SAL_OVERRIDE; + virtual OUString resolveDefinedName( sal_Int32 nTokenIndex ) const SAL_OVERRIDE; protected: const sal_Int32 mnMaxApiCol; /// Maximum column index in own document. @@ -1246,12 +1246,12 @@ public: virtual ApiTokenSequence importOoxFormula( const CellAddress& rBaseAddr, - const OUString& rFormulaString ); + const OUString& rFormulaString ) SAL_OVERRIDE; virtual ApiTokenSequence importBiff12Formula( const CellAddress& rBaseAddr, FormulaType eType, - SequenceInputStream& rStrm ); + SequenceInputStream& rStrm ) SAL_OVERRIDE; private: // import token contents and create API formula token --------------------- @@ -1852,7 +1852,7 @@ public: virtual ApiTokenSequence importBiffFormula( const CellAddress& rBaseAddr, FormulaType eType, - BiffInputStream& rStrm, const sal_uInt16* pnFmlaSize ); + BiffInputStream& rStrm, const sal_uInt16* pnFmlaSize ) SAL_OVERRIDE; private: // import token contents and create API formula token --------------------- diff --git a/sc/source/filter/oox/ooxformulaparser.cxx b/sc/source/filter/oox/ooxformulaparser.cxx index 2fb9aad1d4b2..eeb0e06d027d 100644 --- a/sc/source/filter/oox/ooxformulaparser.cxx +++ b/sc/source/filter/oox/ooxformulaparser.cxx @@ -45,7 +45,7 @@ public: Sequence< FormulaToken > parseFormula( const OUString& rFormula, const CellAddress& rReferencePos ); protected: - virtual const FunctionInfo* resolveBadFuncName( const OUString& rTokenData ) const; + virtual const FunctionInfo* resolveBadFuncName( const OUString& rTokenData ) const SAL_OVERRIDE; private: ApiParserWrapper maApiParser; diff --git a/sc/source/filter/oox/threadpool.cxx b/sc/source/filter/oox/threadpool.cxx index d02095b81ff6..1055e5997de5 100644 --- a/sc/source/filter/oox/threadpool.cxx +++ b/sc/source/filter/oox/threadpool.cxx @@ -21,7 +21,7 @@ public: salhelper::Thread("sheet-import-thread-pool"), mpPool( pPool ) {} - virtual void execute() + virtual void execute() SAL_OVERRIDE { ThreadTask *pTask; while ( ( pTask = waitForWork() ) ) diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx index 149ad06d9768..170348fae63e 100644 --- a/sc/source/filter/oox/workbookfragment.cxx +++ b/sc/source/filter/oox/workbookfragment.cxx @@ -226,7 +226,7 @@ public: { } - virtual void doWork() + virtual void doWork() SAL_OVERRIDE { // We hold the solar mutex in all threads except for // the small safe section of the inner loop in @@ -264,11 +264,11 @@ class ProgressBarTimer : Timer } virtual ~ProgressWrapper() {} // IProgressBar - virtual double getPosition() const { return mfPosition; } - virtual void setPosition( double fPosition ) { mfPosition = fPosition; } + virtual double getPosition() const SAL_OVERRIDE { return mfPosition; } + virtual void setPosition( double fPosition ) SAL_OVERRIDE { mfPosition = fPosition; } // ISegmentProgressBar - virtual double getFreeLength() const { return 0.0; } - virtual ISegmentProgressBarRef createSegment( double /* fLength */ ) + virtual double getFreeLength() const SAL_OVERRIDE { return 0.0; } + virtual ISegmentProgressBarRef createSegment( double /* fLength */ ) SAL_OVERRIDE { return ISegmentProgressBarRef(); } @@ -292,7 +292,7 @@ public: aSegments.push_back( ISegmentProgressBarRef( new ProgressWrapper( xProgress ) ) ); return aSegments.back(); } - virtual void Timeout() + virtual void Timeout() SAL_OVERRIDE { for( size_t i = 0; i < aSegments.size(); i++) static_cast< ProgressWrapper *>( aSegments[ i ].get() )->UpdateBar(); diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index 2dceb6c6f891..a2abf59ce175 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -337,11 +337,11 @@ public: void finalizeDrawingImport(); /// Allow the threaded importer to override our progress bar impl. - virtual ISegmentProgressBarRef getRowProgress() + virtual ISegmentProgressBarRef getRowProgress() SAL_OVERRIDE { return mxRowProgress; } - virtual void setCustomRowProgress( const ISegmentProgressBarRef &rxRowProgress ) + virtual void setCustomRowProgress( const ISegmentProgressBarRef &rxRowProgress ) SAL_OVERRIDE { mxRowProgress = rxRowProgress; mbFastRowProgress = true; diff --git a/sc/source/filter/starcalc/collect.hxx b/sc/source/filter/starcalc/collect.hxx index 8e7d3086f488..691d691f8887 100644 --- a/sc/source/filter/starcalc/collect.hxx +++ b/sc/source/filter/starcalc/collect.hxx @@ -42,7 +42,7 @@ public: ScCollection(const ScCollection& rCollection); virtual ~ScCollection(); - virtual ScDataObject* Clone() const; + virtual ScDataObject* Clone() const SAL_OVERRIDE; bool AtInsert(sal_uInt16 nIndex, ScDataObject* pScDataObject); bool Insert(ScDataObject* pScDataObject); diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx index bcfab7b56084..0d316b8e0993 100644 --- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx @@ -1323,10 +1323,10 @@ void XclExpChTr0x014A::SaveXml( XclExpXmlStream& rStrm ) class ExcXmlRecord : public ExcRecord { public: - virtual sal_Size GetLen() const; - virtual sal_uInt16 GetNum() const; - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ) = 0; + virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE = 0; }; sal_Size ExcXmlRecord::GetLen() const @@ -1353,7 +1353,7 @@ public: }; StartXmlElement( sal_Int32 nElement, sal_Int32 eBehavior ) : mnElement( nElement ), meBehavior( (Behavior) eBehavior ) {} - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: sal_Int32 mnElement; Behavior meBehavior; @@ -1382,7 +1382,7 @@ class EndXmlElement : public ExcXmlRecord sal_Int32 mnElement; public: EndXmlElement( sal_Int32 nElement ) : mnElement( nElement) {} - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; void EndXmlElement::SaveXml( XclExpXmlStream& rStrm ) @@ -1394,7 +1394,7 @@ class EndHeaderElement : public EndXmlElement { public: EndHeaderElement() : EndXmlElement( XML_header ) {} - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; void EndHeaderElement::SaveXml( XclExpXmlStream& rStrm ) diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index ef67dcc38246..661f87305c20 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -540,11 +540,11 @@ class VmlCommentExporter : public VMLExport public: VmlCommentExporter ( sax_fastparser::FSHelperPtr p, ScAddress aScPos, SdrCaptionObj* pCaption, bool bVisible, Rectangle &aFrom, Rectangle &aTo ); protected: - virtual void Commit( EscherPropertyContainer& rProps, const Rectangle& rRect ); + virtual void Commit( EscherPropertyContainer& rProps, const Rectangle& rRect ) SAL_OVERRIDE; using VMLExport::StartShape; - virtual sal_Int32 StartShape(); + virtual sal_Int32 StartShape() SAL_OVERRIDE; using VMLExport::EndShape; - virtual void EndShape( sal_Int32 nShapeElement ); + virtual void EndShape( sal_Int32 nShapeElement ) SAL_OVERRIDE; }; diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx index 337948a1714e..4a4ab5e82059 100644 --- a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx +++ b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx @@ -51,13 +51,13 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; void SetNullDate(const com::sun::star::util::Date& aDate) { aNullDate = aDate; } void SetIterationStatus(const bool bValue) { bIsIterationEnabled = bValue; } void SetIterationCount(const sal_Int32 nValue) { nIterationCount = nValue; } void SetIterationEpsilon(const double fValue) { fIterationEpsilon = fValue; } - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLNullDateContext : public SvXMLImportContext @@ -75,9 +75,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLIterationContext : public SvXMLImportContext @@ -95,9 +95,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx index e71bc2b4d93f..cceaaa5e0af1 100644 --- a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx +++ b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx @@ -63,8 +63,8 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList - ); - virtual void EndElement(); + ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; }; diff --git a/sc/source/filter/xml/XMLCodeNameProvider.hxx b/sc/source/filter/xml/XMLCodeNameProvider.hxx index 9b866964e186..452bc4e46956 100644 --- a/sc/source/filter/xml/XMLCodeNameProvider.hxx +++ b/sc/source/filter/xml/XMLCodeNameProvider.hxx @@ -39,21 +39,21 @@ public: virtual ~XMLCodeNameProvider(); virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw (::com::sun::star::uno::RuntimeException, std::exception ); + throw (::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException, std::exception ); + throw (::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; static void set( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& xNameAccess, ScDocument *pDoc ); }; diff --git a/sc/source/filter/xml/XMLConsolidationContext.hxx b/sc/source/filter/xml/XMLConsolidationContext.hxx index 49f5d6ce7ed2..01480b506a93 100644 --- a/sc/source/filter/xml/XMLConsolidationContext.hxx +++ b/sc/source/filter/xml/XMLConsolidationContext.hxx @@ -56,8 +56,8 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList - ); - virtual void EndElement(); + ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; }; diff --git a/sc/source/filter/xml/XMLDDELinksContext.hxx b/sc/source/filter/xml/XMLDDELinksContext.hxx index 87d25aab9a9f..fe61adf1e504 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.hxx +++ b/sc/source/filter/xml/XMLDDELinksContext.hxx @@ -41,9 +41,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; struct ScDDELinkCell @@ -81,7 +81,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; void SetApplication(const OUString& sValue) { sApplication = sValue; } void SetTopic(const OUString& sValue) { sTopic = sValue; } @@ -93,7 +93,7 @@ public: void AddCellToRow(const ScDDELinkCell& aCell); void AddRowsToTable(const sal_Int32 nRows); - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLDDESourceContext : public SvXMLImportContext @@ -114,9 +114,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLDDETableContext : public SvXMLImportContext @@ -137,9 +137,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLDDEColumnContext : public SvXMLImportContext @@ -160,9 +160,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLDDERowContext : public SvXMLImportContext @@ -184,9 +184,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLDDECellContext : public SvXMLImportContext @@ -214,9 +214,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/XMLDetectiveContext.hxx b/sc/source/filter/xml/XMLDetectiveContext.hxx index ef099baf3fc2..8bea285e37ab 100644 --- a/sc/source/filter/xml/XMLDetectiveContext.hxx +++ b/sc/source/filter/xml/XMLDetectiveContext.hxx @@ -98,8 +98,8 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList - ); - virtual void EndElement(); + ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; }; @@ -129,8 +129,8 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList - ); - virtual void EndElement(); + ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; }; @@ -158,8 +158,8 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList - ); - virtual void EndElement(); + ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; }; diff --git a/sc/source/filter/xml/XMLEmptyContext.hxx b/sc/source/filter/xml/XMLEmptyContext.hxx index 71092a2492ba..3e6232dc14bb 100644 --- a/sc/source/filter/xml/XMLEmptyContext.hxx +++ b/sc/source/filter/xml/XMLEmptyContext.hxx @@ -40,9 +40,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx index b03132435d88..95c837ddd662 100644 --- a/sc/source/filter/xml/XMLExportIterator.hxx +++ b/sc/source/filter/xml/XMLExportIterator.hxx @@ -81,7 +81,7 @@ class ScMyShapesContainer : ScMyIteratorBase private: ScMyShapeList aShapeList; protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) SAL_OVERRIDE; public: ScMyShapesContainer(); virtual ~ScMyShapesContainer(); @@ -90,8 +90,8 @@ public: void AddNewShape(const ScMyShape& aShape); bool HasShapes() { return !aShapeList.empty(); } const ScMyShapeList* GetShapes() const { return &aShapeList; } - virtual void SetCellData( ScMyCell& rMyCell ); - virtual void Sort(); + virtual void SetCellData( ScMyCell& rMyCell ) SAL_OVERRIDE; + virtual void Sort() SAL_OVERRIDE; void SkipTable(SCTAB nSkip); }; @@ -110,7 +110,7 @@ class ScMyNoteShapesContainer : ScMyIteratorBase private: ScMyNoteShapeList aNoteShapeList; protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) SAL_OVERRIDE; public: ScMyNoteShapesContainer(); virtual ~ScMyNoteShapesContainer(); @@ -119,8 +119,8 @@ public: void AddNewNote(const ScMyNoteShape& aNote); bool HasNotes() { return !aNoteShapeList.empty(); } const ScMyNoteShapeList* GetNotes() const { return &aNoteShapeList; } - virtual void SetCellData( ScMyCell& rMyCell ); - virtual void Sort(); + virtual void SetCellData( ScMyCell& rMyCell ) SAL_OVERRIDE; + virtual void Sort() SAL_OVERRIDE; void SkipTable(SCTAB nSkip); }; @@ -141,15 +141,15 @@ class ScMyMergedRangesContainer : ScMyIteratorBase private: ScMyMergedRangeList aRangeList; protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) SAL_OVERRIDE; public: ScMyMergedRangesContainer(); virtual ~ScMyMergedRangesContainer(); void AddRange(const com::sun::star::table::CellRangeAddress aMergedRange); using ScMyIteratorBase::UpdateAddress; - virtual void SetCellData( ScMyCell& rMyCell ); - virtual void Sort(); // + remove doublets + virtual void SetCellData( ScMyCell& rMyCell ) SAL_OVERRIDE; + virtual void Sort() SAL_OVERRIDE; // + remove doublets void SkipTable(SCTAB nSkip); }; @@ -180,7 +180,7 @@ class ScMyAreaLinksContainer : ScMyIteratorBase private: ScMyAreaLinkList aAreaLinkList; protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) SAL_OVERRIDE; public: ScMyAreaLinksContainer(); virtual ~ScMyAreaLinksContainer(); @@ -189,8 +189,8 @@ public: { aAreaLinkList.push_back( rAreaLink ); } using ScMyIteratorBase::UpdateAddress; - virtual void SetCellData( ScMyCell& rMyCell ); - virtual void Sort(); + virtual void SetCellData( ScMyCell& rMyCell ) SAL_OVERRIDE; + virtual void Sort() SAL_OVERRIDE; void SkipTable(SCTAB nSkip); }; @@ -209,15 +209,15 @@ class ScMyEmptyDatabaseRangesContainer : ScMyIteratorBase private: ScMyEmptyDatabaseRangeList aDatabaseList; protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) SAL_OVERRIDE; public: ScMyEmptyDatabaseRangesContainer(); virtual ~ScMyEmptyDatabaseRangesContainer(); void AddNewEmptyDatabaseRange(const com::sun::star::table::CellRangeAddress& aCellRangeAddress); using ScMyIteratorBase::UpdateAddress; - virtual void SetCellData( ScMyCell& rMyCell ); - virtual void Sort(); + virtual void SetCellData( ScMyCell& rMyCell ) SAL_OVERRIDE; + virtual void Sort() SAL_OVERRIDE; void SkipTable(SCTAB nSkip); }; @@ -240,7 +240,7 @@ class ScMyDetectiveObjContainer : ScMyIteratorBase private: ScMyDetectiveObjList aDetectiveObjList; protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) SAL_OVERRIDE; public: ScMyDetectiveObjContainer(); virtual ~ScMyDetectiveObjContainer(); @@ -253,8 +253,8 @@ public: bool bHasError ); using ScMyIteratorBase::UpdateAddress; - virtual void SetCellData( ScMyCell& rMyCell ); - virtual void Sort(); + virtual void SetCellData( ScMyCell& rMyCell ) SAL_OVERRIDE; + virtual void Sort() SAL_OVERRIDE; void SkipTable(SCTAB nSkip); }; @@ -276,7 +276,7 @@ class ScMyDetectiveOpContainer : ScMyIteratorBase private: ScMyDetectiveOpList aDetectiveOpList; protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) SAL_OVERRIDE; public: ScMyDetectiveOpContainer(); virtual ~ScMyDetectiveOpContainer(); @@ -284,8 +284,8 @@ public: void AddOperation( ScDetOpType eOpType, const ScAddress& rPosition, sal_uInt32 nIndex ); using ScMyIteratorBase::UpdateAddress; - virtual void SetCellData( ScMyCell& rMyCell ); - virtual void Sort(); + virtual void SetCellData( ScMyCell& rMyCell ) SAL_OVERRIDE; + virtual void Sort() SAL_OVERRIDE; void SkipTable(SCTAB nSkip); }; diff --git a/sc/source/filter/xml/XMLStylesExportHelper.hxx b/sc/source/filter/xml/XMLStylesExportHelper.hxx index 22bd61250e36..44173dc990db 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.hxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.hxx @@ -245,11 +245,11 @@ public: ScColumnStyles(); ~ScColumnStyles(); - virtual void AddNewTable(const sal_Int32 nTable, const sal_Int32 nFields); + virtual void AddNewTable(const sal_Int32 nTable, const sal_Int32 nFields) SAL_OVERRIDE; sal_Int32 GetStyleNameIndex(const sal_Int32 nTable, const sal_Int32 nField, bool& bIsVisible); void AddFieldStyleName(const sal_Int32 nTable, const sal_Int32 nField, const sal_Int32 nStringIndex, const bool bIsVisible); - virtual OUString* GetStyleName(const sal_Int32 nTable, const sal_Int32 nField); + virtual OUString* GetStyleName(const sal_Int32 nTable, const sal_Int32 nField) SAL_OVERRIDE; }; class ScRowStyles : public ScColumnRowStylesBase @@ -272,11 +272,11 @@ public: ScRowStyles(); ~ScRowStyles(); - virtual void AddNewTable(const sal_Int32 nTable, const sal_Int32 nFields); + virtual void AddNewTable(const sal_Int32 nTable, const sal_Int32 nFields) SAL_OVERRIDE; sal_Int32 GetStyleNameIndex(const sal_Int32 nTable, const sal_Int32 nField); void AddFieldStyleName(const sal_Int32 nTable, const sal_Int32 nField, const sal_Int32 nStringIndex); void AddFieldStyleName(const sal_Int32 nTable, const sal_Int32 nStartField, const sal_Int32 nStringIndex, const sal_Int32 nEndField); - virtual OUString* GetStyleName(const sal_Int32 nTable, const sal_Int32 nField); + virtual OUString* GetStyleName(const sal_Int32 nTable, const sal_Int32 nField) SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx index efe7801e9f13..f4f02f163e5d 100644 --- a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx +++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx @@ -69,9 +69,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class XMLHeaderFooterRegionContext: public SvXMLImportContext @@ -96,9 +96,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; diff --git a/sc/source/filter/xml/XMLTableMasterPageExport.hxx b/sc/source/filter/xml/XMLTableMasterPageExport.hxx index 92849f757b26..e38f83244820 100644 --- a/sc/source/filter/xml/XMLTableMasterPageExport.hxx +++ b/sc/source/filter/xml/XMLTableMasterPageExport.hxx @@ -41,12 +41,12 @@ protected: virtual void exportHeaderFooterContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >& rText, - bool bAutoStyles, bool bProgress ); + bool bAutoStyles, bool bProgress ) SAL_OVERRIDE; virtual void exportMasterPageContent( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & rPropSet, - bool bAutoStyles ); + bool bAutoStyles ) SAL_OVERRIDE; public: XMLTableMasterPageExport( ScXMLExport& rExp ); diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx index a052d95a6763..41515c89f17f 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx @@ -40,7 +40,7 @@ public: void SetLayer(com::sun::star::uno::Reference<com::sun::star::drawing::XShape>& rShape, sal_Int16 nLayerID, const OUString& sType) const; virtual void finishShape(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes); + com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes) SAL_OVERRIDE; void SetCell (const ::com::sun::star::table::CellAddress& rAddress) { aStartCell = rAddress; } diff --git a/sc/source/filter/xml/XMLTableShapesContext.hxx b/sc/source/filter/xml/XMLTableShapesContext.hxx index 21463a194c8e..529cb26eca84 100644 --- a/sc/source/filter/xml/XMLTableShapesContext.hxx +++ b/sc/source/filter/xml/XMLTableShapesContext.hxx @@ -39,9 +39,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/XMLTableSourceContext.hxx b/sc/source/filter/xml/XMLTableSourceContext.hxx index 4f61e9869b20..edefbc3c71f2 100644 --- a/sc/source/filter/xml/XMLTableSourceContext.hxx +++ b/sc/source/filter/xml/XMLTableSourceContext.hxx @@ -47,9 +47,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx index c0ef84be5c25..e80cb8d7d130 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx @@ -64,9 +64,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; @@ -88,9 +88,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; @@ -127,9 +127,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; @@ -151,9 +151,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; @@ -175,9 +175,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; @@ -199,9 +199,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; @@ -223,9 +223,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; @@ -257,11 +257,11 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void Characters( const OUString& rChars ); + virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; @@ -298,13 +298,13 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; void CreateTextPContext(sal_Bool bIsNewParagraph); sal_Bool IsEditCell() { return pEditTextObj != 0; } void SetText(const OUString& sTempText) { sText = sTempText; } - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; @@ -338,9 +338,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; @@ -363,8 +363,8 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void EndElement(); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; }; @@ -386,8 +386,8 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void EndElement(); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; }; @@ -409,8 +409,8 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void EndElement(); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; }; @@ -432,8 +432,8 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void EndElement(); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; }; @@ -455,8 +455,8 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void EndElement(); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; }; @@ -478,8 +478,8 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void EndElement(); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; }; @@ -503,8 +503,8 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void EndElement(); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; }; @@ -526,8 +526,8 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void EndElement(); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; }; diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.hxx b/sc/source/filter/xml/XMLTrackedChangesContext.hxx index 63d3a1b160c1..60b1717860b0 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.hxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.hxx @@ -45,8 +45,8 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void EndElement(); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/celltextparacontext.hxx b/sc/source/filter/xml/celltextparacontext.hxx index 68adaae1f4ab..9878dbc515b0 100644 --- a/sc/source/filter/xml/celltextparacontext.hxx +++ b/sc/source/filter/xml/celltextparacontext.hxx @@ -25,11 +25,11 @@ class ScXMLCellTextParaContext : public ScXMLImportContext public: ScXMLCellTextParaContext(ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName, ScXMLTableRowCellContext& rParent); - virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); - virtual void EndElement(); - virtual void Characters(const OUString& rChars); + virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; + virtual void Characters(const OUString& rChars) SAL_OVERRIDE; virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; void PushSpan(const OUString& rSpan, const OUString& rStyleName); void PushFieldSheetName(const OUString& rStyleName); @@ -49,11 +49,11 @@ class ScXMLCellTextSpanContext : public ScXMLImportContext public: ScXMLCellTextSpanContext(ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName, ScXMLCellTextParaContext& rParent); - virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); - virtual void EndElement(); - virtual void Characters(const OUString& rChars); + virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; + virtual void Characters(const OUString& rChars) SAL_OVERRIDE; virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; }; /** @@ -68,11 +68,11 @@ public: void SetStyleName(const OUString& rStyleName); - virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); - virtual void EndElement(); - virtual void Characters(const OUString& rChars); + virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; + virtual void Characters(const OUString& rChars) SAL_OVERRIDE; virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; }; /** @@ -87,11 +87,11 @@ public: void SetStyleName(const OUString& rStyleName); - virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); - virtual void EndElement(); - virtual void Characters(const OUString& rChars); + virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; + virtual void Characters(const OUString& rChars) SAL_OVERRIDE; virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; }; /** @@ -106,11 +106,11 @@ public: void SetStyleName(const OUString& rStyleName); - virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); - virtual void EndElement(); - virtual void Characters(const OUString& rChars); + virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; + virtual void Characters(const OUString& rChars) SAL_OVERRIDE; virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; }; /** @@ -127,11 +127,11 @@ public: void SetStyleName(const OUString& rStyleName); - virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); - virtual void EndElement(); - virtual void Characters(const OUString& rChars); + virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; + virtual void Characters(const OUString& rChars) SAL_OVERRIDE; virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; }; /** @@ -149,10 +149,10 @@ public: void SetStyleName(const OUString& rStyleName); - virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); - virtual void EndElement(); + virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/datastreamimport.hxx b/sc/source/filter/xml/datastreamimport.hxx index c77f235dc69e..ec42fa321fcc 100644 --- a/sc/source/filter/xml/datastreamimport.hxx +++ b/sc/source/filter/xml/datastreamimport.hxx @@ -30,7 +30,7 @@ public: virtual ~ScXMLDataStreamContext(); - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/xmlannoi.hxx b/sc/source/filter/xml/xmlannoi.hxx index 1bb28ec1da9a..ed45bff4426b 100644 --- a/sc/source/filter/xml/xmlannoi.hxx +++ b/sc/source/filter/xml/xmlannoi.hxx @@ -78,13 +78,13 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); + virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; - virtual void Characters( const OUString& rChars ); + virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; void SetShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape, diff --git a/sc/source/filter/xml/xmlbodyi.hxx b/sc/source/filter/xml/xmlbodyi.hxx index 8eec88f0390c..1db3e594732d 100644 --- a/sc/source/filter/xml/xmlbodyi.hxx +++ b/sc/source/filter/xml/xmlbodyi.hxx @@ -48,9 +48,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void EndElement(); - virtual void Characters( const OUString& rChars ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; + virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx index 6fbcca51508b..db0cd2f53d2a 100644 --- a/sc/source/filter/xml/xmlcelli.hxx +++ b/sc/source/filter/xml/xmlcelli.hxx @@ -142,7 +142,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; void PushParagraphSpan(const OUString& rSpan, const OUString& rStyleName); void PushParagraphFieldDate(const OUString& rStyleName); @@ -155,7 +155,7 @@ public: void SetDetectiveObj( const ScAddress& rPosition ); void SetCellRangeSource( const ScAddress& rPosition ); - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/xmlcoli.hxx b/sc/source/filter/xml/xmlcoli.hxx index 6c94cbd82b69..e99040ec86c8 100644 --- a/sc/source/filter/xml/xmlcoli.hxx +++ b/sc/source/filter/xml/xmlcoli.hxx @@ -46,9 +46,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLTableColsContext : public SvXMLImportContext @@ -77,9 +77,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/xmlcondformat.hxx b/sc/source/filter/xml/xmlcondformat.hxx index a9eac56a608e..fdfb0054c813 100644 --- a/sc/source/filter/xml/xmlcondformat.hxx +++ b/sc/source/filter/xml/xmlcondformat.hxx @@ -34,9 +34,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLConditionalFormatContext : public SvXMLImportContext @@ -54,9 +54,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; private: ScConditionalFormat* mpFormat; @@ -79,7 +79,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; private: ScColorScaleFormat* pColorScaleFormat; @@ -102,7 +102,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; private: ScDataBarFormat* mpDataBarFormat; @@ -130,7 +130,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; }; class ScXMLColorScaleFormatEntryContext : public SvXMLImportContext diff --git a/sc/source/filter/xml/xmlconti.hxx b/sc/source/filter/xml/xmlconti.hxx index 4d9355c42a31..dddef5b54d43 100644 --- a/sc/source/filter/xml/xmlconti.hxx +++ b/sc/source/filter/xml/xmlconti.hxx @@ -45,11 +45,11 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void Characters( const OUString& rChars ); + virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx index 15b2cfb3c131..37f6bf621447 100644 --- a/sc/source/filter/xml/xmlcvali.cxx +++ b/sc/source/filter/xml/xmlcvali.cxx @@ -71,9 +71,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; void SetHelpMessage(const OUString& sTitle, const OUString& sMessage, const sal_Bool bDisplay); void SetErrorMessage(const OUString& sTitle, const OUString& sMessage, const OUString& sMessageType, const sal_Bool bDisplay); @@ -105,9 +105,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLErrorMessageContext : public SvXMLImportContext @@ -136,9 +136,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLErrorMacroContext : public SvXMLImportContext @@ -164,8 +164,8 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void EndElement(); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; }; diff --git a/sc/source/filter/xml/xmlcvali.hxx b/sc/source/filter/xml/xmlcvali.hxx index efc6cca4fbc8..a386ad4c01d9 100644 --- a/sc/source/filter/xml/xmlcvali.hxx +++ b/sc/source/filter/xml/xmlcvali.hxx @@ -45,9 +45,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/xmldpimp.hxx b/sc/source/filter/xml/xmldpimp.hxx index e27107bc9719..ca132807b3e7 100644 --- a/sc/source/filter/xml/xmldpimp.hxx +++ b/sc/source/filter/xml/xmldpimp.hxx @@ -64,9 +64,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLDataPilotTableContext : public SvXMLImportContext @@ -133,9 +133,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; void SetGrandTotal(::xmloff::token::XMLTokenEnum eOrientation, bool bVisible, const OUString& rDisplayName); void SetDatabaseName(const OUString& sValue) { sDatabaseName = sValue; } @@ -178,9 +178,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLDPSourceTableContext : public SvXMLImportContext @@ -203,9 +203,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLDPSourceQueryContext : public SvXMLImportContext @@ -228,9 +228,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLSourceServiceContext : public SvXMLImportContext @@ -253,9 +253,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLDataPilotGrandTotalContext : public SvXMLImportContext @@ -281,9 +281,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLSourceCellRangeContext : public SvXMLImportContext @@ -306,9 +306,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; struct ScXMLDataPilotGroup @@ -356,9 +356,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; void SetShowEmpty(const bool bValue) { if (pDim) pDim->SetShowEmpty(bValue); } void SetSubTotals(const sal_uInt16* pFunctions, const sal_Int16 nCount) { if(pDim) pDim->SetSubTotals(nCount, pFunctions); } @@ -422,9 +422,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLDataPilotDisplayInfoContext : public SvXMLImportContext @@ -507,9 +507,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; void AddFunction(sal_Int16 nFunction); void SetDisplayName(const OUString& rName); }; @@ -534,9 +534,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLDataPilotMembersContext : public SvXMLImportContext @@ -559,9 +559,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLDataPilotMemberContext : public SvXMLImportContext @@ -590,9 +590,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLDataPilotGroupsContext : public SvXMLImportContext @@ -615,9 +615,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLDataPilotGroupContext : public SvXMLImportContext @@ -643,9 +643,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; void AddMember(const OUString& sMember) { aMembers.push_back(sMember); } }; @@ -672,9 +672,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/xmldrani.hxx b/sc/source/filter/xml/xmldrani.hxx index 5147646fc501..c802a11f0d52 100644 --- a/sc/source/filter/xml/xmldrani.hxx +++ b/sc/source/filter/xml/xmldrani.hxx @@ -55,9 +55,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; struct ScSubTotalRule @@ -117,9 +117,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; void SetDatabaseName(const OUString& sTempDatabaseName) { sDatabaseName = sTempDatabaseName; } void SetConnectionResource(const OUString& sTempConRes) { sConnectionResource = sTempConRes; } @@ -160,9 +160,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLSourceTableContext : public SvXMLImportContext @@ -186,9 +186,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLSourceQueryContext : public SvXMLImportContext @@ -212,9 +212,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLConResContext : public SvXMLImportContext @@ -237,9 +237,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLSubTotalRulesContext : public SvXMLImportContext @@ -262,9 +262,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLSortGroupsContext : public SvXMLImportContext @@ -287,9 +287,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLSubTotalRuleContext : public SvXMLImportContext @@ -313,9 +313,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; void AddSubTotalColumn(const com::sun::star::sheet::SubTotalColumn aSubTotalColumn) { aSubTotalRule.aSubTotalColumns.realloc(aSubTotalRule.aSubTotalColumns.getLength() + 1); @@ -344,9 +344,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 08af19436996..8799b5887a9d 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -435,7 +435,7 @@ public: ~ScXMLShapeExport(); /** is called before a shape element for the given XShape is exported */ - virtual void onExport( const uno::Reference < drawing::XShape >& xShape ); + virtual void onExport( const uno::Reference < drawing::XShape >& xShape ) SAL_OVERRIDE; }; ScXMLShapeExport::~ScXMLShapeExport() diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx index d3f89fa9e060..af5c6ee703fa 100644 --- a/sc/source/filter/xml/xmlexprt.hxx +++ b/sc/source/filter/xml/xmlexprt.hxx @@ -138,13 +138,13 @@ class ScXMLExport : public SvXMLExport void CollectShapesAutoStyles(const sal_Int32 nTableCount); void WriteTablesView(const com::sun::star::uno::Any& aTableView); void WriteView(const com::sun::star::uno::Any& aView); - virtual void _ExportFontDecls(); - virtual void _ExportStyles( bool bUsed ); - virtual void _ExportAutoStyles(); - virtual void _ExportMasterStyles(); - virtual void SetBodyAttributes(); - virtual void _ExportContent(); - virtual void _ExportMeta(); + virtual void _ExportFontDecls() SAL_OVERRIDE; + virtual void _ExportStyles( bool bUsed ) SAL_OVERRIDE; + virtual void _ExportAutoStyles() SAL_OVERRIDE; + virtual void _ExportMasterStyles() SAL_OVERRIDE; + virtual void SetBodyAttributes() SAL_OVERRIDE; + virtual void _ExportContent() SAL_OVERRIDE; + virtual void _ExportMeta() SAL_OVERRIDE; void CollectInternalShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); @@ -232,10 +232,10 @@ class ScXMLExport : public SvXMLExport const ScXMLEditAttributeMap& GetEditAttributeMap() const; protected: - virtual SvXMLAutoStylePoolP* CreateAutoStylePool(); - virtual XMLPageExport* CreatePageExport(); - virtual XMLShapeExport* CreateShapeExport(); - virtual XMLFontAutoStylePool* CreateFontAutoStylePool(); + virtual SvXMLAutoStylePoolP* CreateAutoStylePool() SAL_OVERRIDE; + virtual XMLPageExport* CreatePageExport() SAL_OVERRIDE; + virtual XMLShapeExport* CreateShapeExport() SAL_OVERRIDE; + virtual XMLFontAutoStylePool* CreateFontAutoStylePool() SAL_OVERRIDE; public: ScXMLExport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, @@ -255,10 +255,10 @@ public: void SetSourceStream( const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xNewStream ); void GetChangeTrackViewSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProps); - virtual void GetViewSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProps); - virtual void GetConfigurationSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProps); + virtual void GetViewSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProps) SAL_OVERRIDE; + virtual void GetConfigurationSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProps) SAL_OVERRIDE; - virtual void exportAnnotationMeta( const com::sun::star::uno::Reference < com::sun::star::drawing::XShape >& xShape); + virtual void exportAnnotationMeta( const com::sun::star::uno::Reference < com::sun::star::drawing::XShape >& xShape) SAL_OVERRIDE; void CreateSharedData(const sal_Int32 nTableCount); void SetSharedData(ScMySharedData* pTemp) { pSharedData = pTemp; } @@ -266,22 +266,22 @@ public: XMLNumberFormatAttributesExportHelper* GetNumberFormatAttributesExportHelper(); // Export the document. - virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ); + virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ) SAL_OVERRIDE; // XExporter - virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFilter - virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL cancel() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL cancel() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void DisposingModel(); + virtual void DisposingModel() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/xmlexternaltabi.hxx b/sc/source/filter/xml/xmlexternaltabi.hxx index 050a751d1ffa..d5b8698d80ac 100644 --- a/sc/source/filter/xml/xmlexternaltabi.hxx +++ b/sc/source/filter/xml/xmlexternaltabi.hxx @@ -40,9 +40,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; private: ScXMLImport& mrScImport; ScXMLExternalTabData& mrExternalRefInfo; @@ -69,9 +69,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; private: ScXMLImport& mrScImport; ScXMLExternalTabData& mrExternalRefInfo; @@ -93,9 +93,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; private: ScXMLImport& mrScImport; ScXMLExternalTabData& mrExternalRefInfo; @@ -118,9 +118,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; void SetCellString(const OUString& rStr); @@ -152,11 +152,11 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void Characters(const OUString& rChar); + virtual void Characters(const OUString& rChar) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; private: ScXMLExternalRefCellContext& mrParent; diff --git a/sc/source/filter/xml/xmlfilti.hxx b/sc/source/filter/xml/xmlfilti.hxx index b84be06e099d..3b3bf78d3e2d 100644 --- a/sc/source/filter/xml/xmlfilti.hxx +++ b/sc/source/filter/xml/xmlfilti.hxx @@ -73,9 +73,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; void OpenConnection(bool b); void CloseConnection(); @@ -104,9 +104,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLOrContext : public SvXMLImportContext @@ -131,9 +131,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLConditionContext : public SvXMLImportContext @@ -165,9 +165,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; void GetOperator(const OUString& aOpStr, ScQueryParam& rParam, ScQueryEntry& rEntry) const; void AddSetItem(const ScQueryEntry::Item& rItem); @@ -190,9 +190,9 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; // Datapilot (Core) @@ -230,9 +230,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; void SetIsCaseSensitive(const bool bTemp) { bIsCaseSensitive = bTemp; } void SetUseRegularExpressions(const bool bTemp) { if (!bUseRegularExpressions) bUseRegularExpressions = bTemp;} @@ -283,9 +283,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLDPOrContext : public SvXMLImportContext @@ -308,9 +308,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLDPConditionContext : public SvXMLImportContext @@ -339,11 +339,11 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; void getOperatorXML( const OUString& sTempOperator, ScQueryOp& aFilterOperator, bool& bUseRegularExpressions) const; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index b145b0e5ca63..b9c5acebdc37 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -268,7 +268,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const uno::Reference<xml::sax::XAttributeList>& xAttrList ); + const uno::Reference<xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; }; ScXMLDocContext_Impl::ScXMLDocContext_Impl( ScXMLImport& rImport, sal_uInt16 nPrfx, @@ -297,7 +297,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 i_nPrefix, const OUString& i_rLocalName, - const uno::Reference<xml::sax::XAttributeList>& i_xAttrList); + const uno::Reference<xml::sax::XAttributeList>& i_xAttrList) SAL_OVERRIDE; }; ScXMLFlatDocContext_Impl::ScXMLFlatDocContext_Impl( ScXMLImport& i_rImport, @@ -344,7 +344,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const uno::Reference< xml::sax::XAttributeList > & xAttrList ); + const uno::Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; }; ScXMLBodyContext_Impl::ScXMLBodyContext_Impl( ScXMLImport& rImport, diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index 827d8e9462c1..601be5531b85 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -975,8 +975,8 @@ protected: virtual SvXMLImportContext *CreateContext(sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual XMLShapeImportHelper* CreateShapeImport(); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + virtual XMLShapeImportHelper* CreateShapeImport() SAL_OVERRIDE; public: // #110680# @@ -1002,7 +1002,7 @@ public: const ::com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void SetStatistics( - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue> & i_rStats); + const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue> & i_rStats) SAL_OVERRIDE; ScDocumentImport& GetDoc(); @@ -1146,8 +1146,8 @@ public: void InsertStyles(); void SetChangeTrackingViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rChangeProps); - virtual void SetViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aViewProps); - virtual void SetConfigurationSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aConfigProps); + virtual void SetViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aViewProps) SAL_OVERRIDE; + virtual void SetConfigurationSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aConfigProps) SAL_OVERRIDE; void SetTableStyle(const OUString& rValue) { aTableStyles.push_back(rValue); } std::vector<OUString> GetTableStyle() { return aTableStyles; } @@ -1179,16 +1179,16 @@ public: void SetStylesToRangesFinished(); // XImporter - virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL startDocument(void) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL endDocument() throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; - virtual void DisposingModel(); + virtual void DisposingModel() SAL_OVERRIDE; /** * Use this class to manage solar mutex locking instead of calling diff --git a/sc/source/filter/xml/xmllabri.hxx b/sc/source/filter/xml/xmllabri.hxx index 3ca64e632f97..d176ba067d77 100644 --- a/sc/source/filter/xml/xmllabri.hxx +++ b/sc/source/filter/xml/xmllabri.hxx @@ -45,8 +45,8 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList - ); - virtual void EndElement(); + ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; }; @@ -75,8 +75,8 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList - ); - virtual void EndElement(); + ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/xmlnexpi.hxx b/sc/source/filter/xml/xmlnexpi.hxx index 34543d7626c2..c99dcf51829f 100644 --- a/sc/source/filter/xml/xmlnexpi.hxx +++ b/sc/source/filter/xml/xmlnexpi.hxx @@ -51,7 +51,7 @@ public: { public: GlobalInserter(ScXMLImport& rImport); - virtual void insert(ScMyNamedExpression* pExp); + virtual void insert(ScMyNamedExpression* pExp) SAL_OVERRIDE; private: ScXMLImport& mrImport; }; @@ -65,7 +65,7 @@ public: { public: SheetLocalInserter(ScXMLImport& rImport, SCTAB nTab); - virtual void insert(ScMyNamedExpression* pExp); + virtual void insert(ScMyNamedExpression* pExp) SAL_OVERRIDE; private: ScXMLImport& mrImport; SCTAB mnTab; @@ -82,9 +82,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; private: ::boost::shared_ptr<Inserter> mpInserter; @@ -108,9 +108,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; private: ScXMLNamedExpressionsContext::Inserter* mpInserter; @@ -134,9 +134,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; private: ScXMLNamedExpressionsContext::Inserter* mpInserter; diff --git a/sc/source/filter/xml/xmlrowi.hxx b/sc/source/filter/xml/xmlrowi.hxx index 83e13d59cc88..e6934ef9dccd 100644 --- a/sc/source/filter/xml/xmlrowi.hxx +++ b/sc/source/filter/xml/xmlrowi.hxx @@ -47,9 +47,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLTableRowsContext : public SvXMLImportContext @@ -76,9 +76,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/xmlsceni.hxx b/sc/source/filter/xml/xmlsceni.hxx index 0690f08409c3..e59d359fd226 100644 --- a/sc/source/filter/xml/xmlsceni.hxx +++ b/sc/source/filter/xml/xmlsceni.hxx @@ -54,9 +54,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/xmlsorti.hxx b/sc/source/filter/xml/xmlsorti.hxx index de952a48d692..a212b841ee83 100644 --- a/sc/source/filter/xml/xmlsorti.hxx +++ b/sc/source/filter/xml/xmlsorti.hxx @@ -59,9 +59,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; void AddSortField(const OUString& sFieldNumber, const OUString& sDataType, const OUString& sOrder); }; @@ -90,9 +90,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/xmlstyle.hxx b/sc/source/filter/xml/xmlstyle.hxx index 4dc79a202ad9..8ea57bbca5b7 100644 --- a/sc/source/filter/xml/xmlstyle.hxx +++ b/sc/source/filter/xml/xmlstyle.hxx @@ -109,7 +109,7 @@ protected: bool bEnableFoFontFamily, ::std::vector< XMLPropertyState >& rProperties, ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > rPropSet ) const; + ::com::sun::star::beans::XPropertySet > rPropSet ) const SAL_OVERRIDE; public: ScXMLCellExportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper ); @@ -119,7 +119,7 @@ public: const XMLPropertyState& rProperty, sal_uInt16 nFlags, const ::std::vector< XMLPropertyState > *pProperties = 0, - sal_uInt32 nIdx = 0 ) const; + sal_uInt32 nIdx = 0 ) const SAL_OVERRIDE; /** this method is called for every item that has the MID_FLAG_SPECIAL_ITEM_EXPORT flag set */ virtual void handleSpecialItem( @@ -128,7 +128,7 @@ public: const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, const ::std::vector< XMLPropertyState > *pProperties = 0, - sal_uInt32 nIdx = 0 ) const; + sal_uInt32 nIdx = 0 ) const SAL_OVERRIDE; }; class ScXMLRowExportPropertyMapper : public SvXMLExportPropertyMapper @@ -139,7 +139,7 @@ protected: bool bEnableFoFontFamily, ::std::vector< XMLPropertyState >& rProperties, ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > rPropSet ) const; + ::com::sun::star::beans::XPropertySet > rPropSet ) const SAL_OVERRIDE; public: ScXMLRowExportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper ); @@ -160,7 +160,7 @@ public: const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, const ::std::vector< XMLPropertyState > *pProperties = 0, - sal_uInt32 nIdx = 0 ) const; + sal_uInt32 nIdx = 0 ) const SAL_OVERRIDE; }; class ScXMLTableExportPropertyMapper : public SvXMLExportPropertyMapper @@ -178,7 +178,7 @@ public: const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, const ::std::vector< XMLPropertyState > *pProperties = 0, - sal_uInt32 nIdx = 0 ) const; + sal_uInt32 nIdx = 0 ) const SAL_OVERRIDE; }; class ScXMLAutoStylePoolP : public SvXMLAutoStylePoolP @@ -192,7 +192,7 @@ class ScXMLAutoStylePoolP : public SvXMLAutoStylePoolP const SvXMLExportPropertyMapper& rPropExp, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap - ) const; + ) const SAL_OVERRIDE; virtual void exportStyleContent( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler, @@ -201,7 +201,7 @@ class ScXMLAutoStylePoolP : public SvXMLAutoStylePoolP const SvXMLExportPropertyMapper& rPropExp , const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap - ) const; + ) const SAL_OVERRIDE; public: ScXMLAutoStylePoolP(ScXMLExport& rScXMLExport); @@ -212,10 +212,10 @@ class ScXMLStyleExport : public XMLStyleExport { virtual void exportStyleAttributes( const ::com::sun::star::uno::Reference< - ::com::sun::star::style::XStyle > & rStyle ); + ::com::sun::star::style::XStyle > & rStyle ) SAL_OVERRIDE; virtual void exportStyleContent( const ::com::sun::star::uno::Reference< - ::com::sun::star::style::XStyle > & rStyle ); + ::com::sun::star::style::XStyle > & rStyle ) SAL_OVERRIDE; public: ScXMLStyleExport( SvXMLExport& rExp, @@ -229,133 +229,133 @@ class XMLScPropHdlFactory : public XMLPropertyHandlerFactory public: XMLScPropHdlFactory(); virtual ~XMLScPropHdlFactory(); - virtual const XMLPropertyHandler* GetPropertyHandler( sal_Int32 nType ) const; + virtual const XMLPropertyHandler* GetPropertyHandler( sal_Int32 nType ) const SAL_OVERRIDE; }; class XmlScPropHdl_CellProtection : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_CellProtection(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; class XmlScPropHdl_PrintContent : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_PrintContent(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; class XmlScPropHdl_JustifyMethod : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_JustifyMethod(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; class XmlScPropHdl_HoriJustify : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_HoriJustify(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; class XmlScPropHdl_HoriJustifySource : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_HoriJustifySource(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; class XmlScPropHdl_HoriJustifyRepeat : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_HoriJustifyRepeat(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; class XmlScPropHdl_Orientation : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_Orientation(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; class XmlScPropHdl_RotateAngle : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_RotateAngle(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; class XmlScPropHdl_RotateReference : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_RotateReference(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; class XmlScPropHdl_VertJustify : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_VertJustify(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; class XmlScPropHdl_BreakBefore : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_BreakBefore(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; class XmlScPropHdl_IsTextWrapped : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_IsTextWrapped(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; class XmlScPropHdl_IsEqual : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_IsEqual() {} - virtual bool equals( const ::com::sun::star::uno::Any& /* r1 */, const ::com::sun::star::uno::Any& /* r2 */ ) const { return true; } - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual bool equals( const ::com::sun::star::uno::Any& /* r1 */, const ::com::sun::star::uno::Any& /* r2 */ ) const SAL_OVERRIDE { return true; } + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; class XmlScPropHdl_Vertical : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_Vertical(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index 58b13ca1c9a0..56047632c540 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -292,7 +292,7 @@ class XMLTableCellPropsContext : public SvXMLPropertySetContext const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList, ::std::vector< XMLPropertyState > &rProperties, - const XMLPropertyState& rProp ); + const XMLPropertyState& rProp ) SAL_OVERRIDE; }; XMLTableCellPropsContext::XMLTableCellPropsContext( diff --git a/sc/source/filter/xml/xmlstyli.hxx b/sc/source/filter/xml/xmlstyli.hxx index 17e63f20aa46..51e73ce10507 100644 --- a/sc/source/filter/xml/xmlstyli.hxx +++ b/sc/source/filter/xml/xmlstyli.hxx @@ -48,7 +48,7 @@ public: /** This method is called when all attributes have been processed. It may be used to remove items that are incomplete */ virtual void finished( - ::std::vector< XMLPropertyState >& rProperties, sal_Int32 nStartIndex, sal_Int32 nEndIndex ) const; + ::std::vector< XMLPropertyState >& rProperties, sal_Int32 nStartIndex, sal_Int32 nEndIndex ) const SAL_OVERRIDE; }; class ScXMLRowImportPropertyMapper : public SvXMLImportPropertyMapper @@ -64,7 +64,7 @@ public: /** This method is called when all attributes have been processed. It may be used to remove items that are incomplete */ virtual void finished( - ::std::vector< XMLPropertyState >& rProperties, sal_Int32 nStartIndex, sal_Int32 nEndIndex ) const; + ::std::vector< XMLPropertyState >& rProperties, sal_Int32 nStartIndex, sal_Int32 nEndIndex ) const SAL_OVERRIDE; }; class XMLTableStyleContext : public XMLPropStyleContext @@ -85,7 +85,7 @@ protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, const OUString& rLocalName, - const OUString& rValue ); + const OUString& rValue ) SAL_OVERRIDE; public: @@ -100,12 +100,12 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; virtual void FillPropertySet(const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & rPropSet ); + ::com::sun::star::beans::XPropertySet > & rPropSet ) SAL_OVERRIDE; - virtual void SetDefaults(); + virtual void SetDefaults() SAL_OVERRIDE; void AddProperty(sal_Int16 nContextID, const com::sun::star::uno::Any& aValue); XMLPropertyState* FindProperty(const sal_Int16 nContextID); @@ -156,13 +156,13 @@ protected: sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; virtual SvXMLStyleContext *CreateDefaultStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; public: @@ -172,14 +172,14 @@ public: const bool bAutoStyles ); virtual ~XMLTableStylesContext(); - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; virtual UniReference < SvXMLImportPropertyMapper > GetImportPropertyMapper( - sal_uInt16 nFamily ) const; + sal_uInt16 nFamily ) const SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference < ::com::sun::star::container::XNameContainer > - GetStylesContainer( sal_uInt16 nFamily ) const; - virtual OUString GetServiceName( sal_uInt16 nFamily ) const; + GetStylesContainer( sal_uInt16 nFamily ) const SAL_OVERRIDE; + virtual OUString GetServiceName( sal_uInt16 nFamily ) const SAL_OVERRIDE; sal_Int32 GetIndex(const sal_Int16 nContextID); }; @@ -190,14 +190,14 @@ protected: virtual SvXMLStyleContext *CreateStyleChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; - virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const; + virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); @@ -208,7 +208,7 @@ public: ::com::sun::star::xml::sax::XAttributeList > & xAttrList); virtual ~ScXMLMasterStylesContext(); - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; namespace com { namespace sun { namespace star { @@ -237,7 +237,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; virtual SvXMLImportContext *CreateHeaderFooterContext( sal_uInt16 nPrefix, @@ -245,9 +245,9 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const bool bFooter, const bool bLeft, - const bool bFirst ); + const bool bFirst ) SAL_OVERRIDE; - virtual void Finish( bool bOverwrite ); + virtual void Finish( bool bOverwrite ) SAL_OVERRIDE; }; class ScCellTextStyleContext : public XMLTextStyleContext @@ -269,7 +269,7 @@ public: // overload FillPropertySet to store style information virtual void FillPropertySet( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & rPropSet ); + ::com::sun::star::beans::XPropertySet > & rPropSet ) SAL_OVERRIDE; }; diff --git a/sc/source/filter/xml/xmltabi.hxx b/sc/source/filter/xml/xmltabi.hxx index d88b504f1984..53430add3dbf 100644 --- a/sc/source/filter/xml/xmltabi.hxx +++ b/sc/source/filter/xml/xmltabi.hxx @@ -60,9 +60,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; @@ -82,9 +82,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif |