diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
| commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
| tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /sc/source/filter/inc | |
| parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sc/source/filter/inc')
65 files changed, 962 insertions, 962 deletions
diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx index 0d28137ba98b..c88284d56d03 100644 --- a/sc/source/filter/inc/XclExpChangeTrack.hxx +++ b/sc/source/filter/inc/XclExpChangeTrack.hxx @@ -32,9 +32,9 @@ class ExcXmlRecord : public ExcRecord { public: - virtual sal_Size GetLen() const SAL_OVERRIDE; - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual sal_Size GetLen() const override; + virtual sal_uInt16 GetNum() const override; + virtual void Save( XclExpStream& rStrm ) override; }; // XclExpUserBView - one UserBView record for each user @@ -45,15 +45,15 @@ private: XclExpString sUsername; sal_uInt8 aGUID[ 16 ]; - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: XclExpUserBView( const OUString& rUsername, const sal_uInt8* pGUID ); inline const sal_uInt8* GetGUID() const { return aGUID; } - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; // XclExpUserBViewList - list of UserBView records @@ -74,7 +74,7 @@ public: inline iterator begin () { return aViews.begin(); } inline iterator end () { return aViews.end(); } - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; }; // XclExpUsersViewBegin - begin of view block (one per sheet) @@ -85,12 +85,12 @@ private: sal_uInt8 aGUID[ 16 ]; sal_uInt32 nCurrTab; - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: XclExpUsersViewBegin( const sal_uInt8* pGUID, sal_uInt32 nTab ); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; // XclExpUsersViewEnd - end of view block (one per sheet) @@ -98,11 +98,11 @@ public: class XclExpUsersViewEnd : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; // dummy record for "User Names" stream @@ -110,11 +110,11 @@ public: class XclExpChTr0x0191 : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; // dummy record for "User Names" stream @@ -122,11 +122,11 @@ public: class XclExpChTr0x0198 : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; // dummy record for "User Names" stream @@ -134,11 +134,11 @@ public: class XclExpChTr0x0192 : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; // dummy record for "User Names" stream @@ -146,11 +146,11 @@ public: class XclExpChTr0x0197 : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; // dummy record without content @@ -164,8 +164,8 @@ public: inline XclExpChTrEmpty( sal_uInt16 nNum ) : nRecNum( nNum ) {} virtual ~XclExpChTrEmpty(); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; // dummy record for "Revision Log" stream @@ -173,13 +173,13 @@ public: class XclExpChTr0x0195 : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: virtual ~XclExpChTr0x0195(); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; // dummy record for "Revision Log" stream @@ -190,14 +190,14 @@ private: XclExpString sUsername; DateTime aDateTime; - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: inline XclExpChTr0x0194( const ScChangeTrack& rChangeTrack ); virtual ~XclExpChTr0x0194(); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; inline XclExpChTr0x0194::XclExpChTr0x0194( const ScChangeTrack& rChangeTrack ) : @@ -214,7 +214,7 @@ private: sal_uInt8 aGUID[ 16 ]; sal_uInt32 nCount; - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: inline XclExpChTrHeader() : nCount( 0 ) {} @@ -223,10 +223,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 SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; class XclExpXmlChTrHeaders : public ExcXmlRecord @@ -235,7 +235,7 @@ class XclExpXmlChTrHeaders : public ExcXmlRecord public: void SetGUID( const sal_uInt8* pGUID ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; class XclExpChTrTabIdBuffer; @@ -258,7 +258,7 @@ public: const OUString& rUserName, const DateTime& rDateTime, const sal_uInt8* pGUID, sal_Int32 nLogNumber, const XclExpChTrTabIdBuffer& rBuf ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; void AppendAction( XclExpChTrAction* pAction ); }; @@ -272,7 +272,7 @@ private: DateTime aDateTime; sal_uInt8 aGUID[ 16 ]; - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: XclExpChTrInfo( const OUString& rUsername, const DateTime& rDateTime, @@ -280,8 +280,8 @@ public: virtual ~XclExpChTrInfo(); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; // XclExpChTrTabIdBuffer - buffer for tab id's @@ -321,7 +321,7 @@ private: inline void Clear() { if( pBuffer ) delete[] pBuffer; pBuffer = NULL; } - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: inline XclExpChTrTabId( sal_uInt16 nCount ) : @@ -331,8 +331,8 @@ public: void Copy( const XclExpChTrTabIdBuffer& rBuffer ); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; // XclExpChTrAction - base class for action records @@ -367,7 +367,7 @@ protected: inline void WriteTabId( XclExpStream& rStrm, SCTAB nTabId ) const; // save header data, call SaveActionData() - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; static inline sal_Size GetHeaderByteCount() { return 12; } // override to save action data without header, called by SaveCont() @@ -399,8 +399,8 @@ public: // could override to use more indexes per action void SetIndex( sal_uInt32& rIndex ); - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual sal_Size GetLen() const override; inline XclExpChTrAction* GetAddAction() { return pAddAction; } inline sal_uInt32 GetActionNumber() const { return nIndex; } @@ -474,7 +474,7 @@ protected: const XclExpRoot& rRoot, const ScCellValue& rScCell, XclExpChTrData*& rpData, sal_uInt32& rXclLength1, sal_uInt16& rXclLength2 ); - virtual void SaveActionData( XclExpStream& rStrm ) const SAL_OVERRIDE; + virtual void SaveActionData( XclExpStream& rStrm ) const override; public: XclExpChTrCellContent( @@ -483,10 +483,10 @@ public: const XclExpChTrTabIdBuffer& rTabIdBuffer ); virtual ~XclExpChTrCellContent(); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetActionByteCount() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetActionByteCount() const override; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; // XclExpChTrInsert - insert/delete columns/rows @@ -500,9 +500,9 @@ protected: XclExpChTrInsert( const XclExpChTrInsert& rCopy ); - virtual void SaveActionData( XclExpStream& rStrm ) const SAL_OVERRIDE; - virtual void PrepareSaveAction( XclExpStream& rStrm ) const SAL_OVERRIDE; - virtual void CompleteSaveAction( XclExpStream& rStrm ) const SAL_OVERRIDE; + virtual void SaveActionData( XclExpStream& rStrm ) const override; + virtual void PrepareSaveAction( XclExpStream& rStrm ) const override; + virtual void CompleteSaveAction( XclExpStream& rStrm ) const override; public: XclExpChTrInsert( @@ -512,10 +512,10 @@ public: ScChangeTrack& rChangeTrack ); virtual ~XclExpChTrInsert(); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetActionByteCount() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetActionByteCount() const override; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; // XclExpChTrInsertTab - insert table @@ -526,7 +526,7 @@ private: SCTAB nTab; protected: - virtual void SaveActionData( XclExpStream& rStrm ) const SAL_OVERRIDE; + virtual void SaveActionData( XclExpStream& rStrm ) const override; public: XclExpChTrInsertTab( @@ -535,10 +535,10 @@ public: const XclExpChTrTabIdBuffer& rTabIdBuffer ); virtual ~XclExpChTrInsertTab(); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetActionByteCount() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetActionByteCount() const override; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; // XclExpChTrMoveRange - move cell range @@ -549,9 +549,9 @@ protected: ScRange aSourceRange; ScRange aDestRange; - virtual void SaveActionData( XclExpStream& rStrm ) const SAL_OVERRIDE; - virtual void PrepareSaveAction( XclExpStream& rStrm ) const SAL_OVERRIDE; - virtual void CompleteSaveAction( XclExpStream& rStrm ) const SAL_OVERRIDE; + virtual void SaveActionData( XclExpStream& rStrm ) const override; + virtual void PrepareSaveAction( XclExpStream& rStrm ) const override; + virtual void CompleteSaveAction( XclExpStream& rStrm ) const override; public: XclExpChTrMoveRange( @@ -561,10 +561,10 @@ public: ScChangeTrack& rChangeTrack ); virtual ~XclExpChTrMoveRange(); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetActionByteCount() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetActionByteCount() const override; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; // XclExpChTr0x019A - additional data for delete action @@ -572,16 +572,16 @@ public: class XclExpChTr0x014A : public XclExpChTrInsert { protected: - virtual void SaveActionData( XclExpStream& rStrm ) const SAL_OVERRIDE; + virtual void SaveActionData( XclExpStream& rStrm ) const override; public: XclExpChTr0x014A( const XclExpChTrInsert& rAction ); virtual ~XclExpChTr0x014A(); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetActionByteCount() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetActionByteCount() const override; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; // XclExpChangeTrack - exports the "Revision Log" stream diff --git a/sc/source/filter/inc/XclImpChangeTrack.hxx b/sc/source/filter/inc/XclImpChangeTrack.hxx index ce80abdbe480..758b2b35719b 100644 --- a/sc/source/filter/inc/XclImpChangeTrack.hxx +++ b/sc/source/filter/inc/XclImpChangeTrack.hxx @@ -149,7 +149,7 @@ class XclImpChTrFmlConverter : public ExcelToSc8 private: XclImpChangeTrack& rChangeTrack; - virtual bool Read3DTabReference( sal_uInt16 nIxti, SCTAB& rFirstTab, SCTAB& rLastTab, ExternalTabInfo& rExtInfo ) SAL_OVERRIDE; + virtual bool Read3DTabReference( sal_uInt16 nIxti, SCTAB& rFirstTab, SCTAB& rLastTab, ExternalTabInfo& rExtInfo ) override; public: XclImpChTrFmlConverter( XclImpRoot& rRoot, XclImpChangeTrack& rXclChTr ); diff --git a/sc/source/filter/inc/autofilterbuffer.hxx b/sc/source/filter/inc/autofilterbuffer.hxx index a23cbda61789..83a45ace1916 100644 --- a/sc/source/filter/inc/autofilterbuffer.hxx +++ b/sc/source/filter/inc/autofilterbuffer.hxx @@ -74,12 +74,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 ) SAL_OVERRIDE; + virtual void importAttribs( sal_Int32 nElement, const AttributeList& rAttribs ) override; /** Imports filter settings from the FILTERS and FILTER records. */ - virtual void importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; /** Returns converted UNO API filter settings representing all filter settings. */ - virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount ) SAL_OVERRIDE; + virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount ) override; private: typedef ::std::vector< OUString > FilterValueVector; @@ -96,12 +96,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 ) SAL_OVERRIDE; + virtual void importAttribs( sal_Int32 nElement, const AttributeList& rAttribs ) override; /** Imports filter settings from the FILTERS and FILTER records. */ - virtual void importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; /** Returns converted UNO API filter settings representing all filter settings. */ - virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount ) SAL_OVERRIDE; + virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount ) override; private: double mfValue; /// Number of items or percentage. @@ -135,12 +135,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 ) SAL_OVERRIDE; + virtual void importAttribs( sal_Int32 nElement, const AttributeList& rAttribs ) override; /** Imports filter settings from the FILTERS and FILTER records. */ - virtual void importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; /** Returns converted UNO API filter settings representing all filter settings. */ - virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount ) SAL_OVERRIDE; + virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount ) override; private: /** Appends 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 410495c857c5..9a58a8a998e0 100644 --- a/sc/source/filter/inc/autofiltercontext.hxx +++ b/sc/source/filter/inc/autofiltercontext.hxx @@ -35,11 +35,11 @@ public: explicit FilterSettingsContext( WorksheetContextBase& rParent, FilterSettingsBase& rFilterSettings ); protected: - 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 onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual void onStartRecord( SequenceInputStream& rStrm ) override; private: FilterSettingsBase& mrFilterSettings; @@ -51,11 +51,11 @@ public: explicit FilterColumnContext( WorksheetContextBase& rParent, FilterColumn& rFilterColumn ); protected: - 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 onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual void onStartRecord( SequenceInputStream& rStrm ) override; private: FilterColumn& mrFilterColumn; @@ -67,11 +67,11 @@ public: explicit AutoFilterContext( WorksheetFragmentBase& rFragment, AutoFilter& rAutoFilter ); protected: - 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 onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual void onStartRecord( SequenceInputStream& rStrm ) override; private: AutoFilter& mrAutoFilter; diff --git a/sc/source/filter/inc/biffcodec.hxx b/sc/source/filter/inc/biffcodec.hxx index f541ef9d7b8a..3aafeae8aa1c 100644 --- a/sc/source/filter/inc/biffcodec.hxx +++ b/sc/source/filter/inc/biffcodec.hxx @@ -41,8 +41,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 ) SAL_OVERRIDE; - virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) SAL_OVERRIDE; + virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) override; + virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) override; /** Returns true, if the decoder has been initialized correctly. */ inline bool isValid() const { return mbValid; } @@ -84,18 +84,18 @@ private: BiffDecoder_XOR( const BiffDecoder_XOR& rDecoder ); /** Returns a clone of the decoder for usage in new streams. */ - virtual BiffDecoder_XOR* implClone() SAL_OVERRIDE; + virtual BiffDecoder_XOR* implClone() override; /** Implements password verification and initialization of the decoder. */ - 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; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const OUString& rPassword ) override; + virtual bool implVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) 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_OVERRIDE; + sal_uInt16 nBytes ) override; private: ::oox::core::BinaryCodec_XOR maCodec; /// Cipher algorithm implementation. @@ -112,18 +112,18 @@ private: BiffDecoder_RCF( const BiffDecoder_RCF& rDecoder ); /** Returns a clone of the decoder for usage in new streams. */ - virtual BiffDecoder_RCF* implClone() SAL_OVERRIDE; + virtual BiffDecoder_RCF* implClone() override; /** Implements password verification and initialization of the decoder. */ - 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; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const OUString& rPassword ) override; + virtual bool implVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) 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_OVERRIDE; + sal_uInt16 nBytes ) 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 13f9dbaa5e03..d048da1ad631 100644 --- a/sc/source/filter/inc/biffinputstream.hxx +++ b/sc/source/filter/inc/biffinputstream.hxx @@ -197,24 +197,24 @@ public: // BinaryStreamBase interface (seeking) ----------------------------------- /** Returns the data size of the whole record without record headers. */ - virtual sal_Int64 size() const SAL_OVERRIDE; + virtual sal_Int64 size() const override; /** Returns the position inside of the whole record content. */ - virtual sal_Int64 tell() const SAL_OVERRIDE; + virtual sal_Int64 tell() const override; /** Seeks in record content to the specified position. */ - virtual void seek( sal_Int64 nRecPos ) SAL_OVERRIDE; + virtual void seek( sal_Int64 nRecPos ) override; /** Closes the input stream but not the wrapped stream. */ - virtual void close() SAL_OVERRIDE; + virtual void close() 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 ) SAL_OVERRIDE; + virtual sal_Int32 readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ) 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 ) SAL_OVERRIDE; + virtual sal_Int32 readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) override; /** Seeks forward inside the current record. */ - virtual void skip( sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; + virtual void skip( sal_Int32 nBytes, size_t nAtomSize = 1 ) 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 b573ccffbdb5..f15a94bc4049 100644 --- a/sc/source/filter/inc/chartsheetfragment.hxx +++ b/sc/source/filter/inc/chartsheetfragment.hxx @@ -33,14 +33,14 @@ public: const OUString& rFragmentPath ); protected: - 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 onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; - virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; - virtual void initializeImport() SAL_OVERRIDE; - virtual void finalizeImport() SAL_OVERRIDE; + virtual const ::oox::core::RecordInfo* getRecordInfos() const override; + virtual void initializeImport() override; + virtual void finalizeImport() 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 7da902064426..778938a4b6a4 100644 --- a/sc/source/filter/inc/commentsfragment.hxx +++ b/sc/source/filter/inc/commentsfragment.hxx @@ -33,14 +33,14 @@ public: const WorksheetHelper& rHelper, const OUString& rFragmentPath ); protected: - 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 onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; + virtual void onEndElement() override; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual void onEndRecord() SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual void onEndRecord() override; - virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; + virtual const ::oox::core::RecordInfo* getRecordInfos() const 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 ff85e1832ab8..866ba271d3d5 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 ) SAL_OVERRIDE; - virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) 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 ) SAL_OVERRIDE; - virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; private: CondFormatRuleRef mxRule; @@ -59,10 +59,10 @@ class IconSetContext : public WorksheetContextBase public: explicit IconSetContext( WorksheetContextBase& rParent, IconSetRule* pIconSet ); - 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 onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; + virtual void onCharacters(const OUString& rChars) override; + virtual void onEndElement() override; private: IconSetRule* mpIconSet; @@ -75,14 +75,14 @@ public: explicit CondFormatContext( WorksheetFragmentBase& rFragment ); protected: - 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; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; + virtual void onEndElement() override; + + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual void onStartRecord( SequenceInputStream& rStrm ) override; + virtual void onEndRecord() override; private: CondFormatRef mxCondFmt; diff --git a/sc/source/filter/inc/connectionsfragment.hxx b/sc/source/filter/inc/connectionsfragment.hxx index fa9bcb08042e..9dc23c736304 100644 --- a/sc/source/filter/inc/connectionsfragment.hxx +++ b/sc/source/filter/inc/connectionsfragment.hxx @@ -33,11 +33,11 @@ public: explicit ConnectionContext( WorkbookFragmentBase& rParent, Connection& rConnection ); protected: - 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 onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual void onStartRecord( SequenceInputStream& rStrm ) override; private: Connection& mrConnection; @@ -51,11 +51,11 @@ public: const OUString& rFragmentPath ); protected: - 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 ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; - virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; - virtual void finalizeImport() SAL_OVERRIDE; + virtual const ::oox::core::RecordInfo* getRecordInfos() const override; + virtual void finalizeImport() override; }; } // namespace xls diff --git a/sc/source/filter/inc/drawingfragment.hxx b/sc/source/filter/inc/drawingfragment.hxx index 4e36ad63a199..401ee46d46bb 100644 --- a/sc/source/filter/inc/drawingfragment.hxx +++ b/sc/source/filter/inc/drawingfragment.hxx @@ -49,7 +49,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape ); private: - virtual void attachMacro( const OUString& rMacroUrl ) SAL_OVERRIDE; + virtual void attachMacro( const OUString& rMacroUrl ) override; private: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxShape; @@ -66,7 +66,7 @@ public: protected: virtual void finalizeXShape( ::oox::core::XmlFilterBase& rFilter, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes ) SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes ) override; private: OUString maMacroName; @@ -95,7 +95,7 @@ protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, - const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + const ::oox::AttributeList& rAttribs ) override; }; /** Fragment handler for a complete sheet drawing. */ @@ -107,9 +107,9 @@ public: const OUString& rFragmentPath ); protected: - 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 onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; + virtual void onEndElement() override; private: typedef ::std::unique_ptr< ShapeAnchor > ShapeAnchorRef; @@ -130,7 +130,7 @@ public: sal_Int32 nCtrlIndex, sal_Int32 nCtrlType, sal_Int32 nDropStyle ); private: - virtual void attachMacro( const OUString& rMacroUrl ) SAL_OVERRIDE; + virtual void attachMacro( const OUString& rMacroUrl ) override; private: ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > mxCtrlFormIC; @@ -148,28 +148,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 SAL_OVERRIDE; + virtual bool isShapeSupported( const ::oox::vml::ShapeBase& rShape ) const override; /** Returns additional base names for automatic shape name creation. */ - virtual OUString getShapeBaseName( const ::oox::vml::ShapeBase& rShape ) const SAL_OVERRIDE; + virtual OUString getShapeBaseName( const ::oox::vml::ShapeBase& rShape ) const override; /** Calculates the shape rectangle from a cell anchor string. */ virtual bool convertClientAnchor( ::com::sun::star::awt::Rectangle& orShapeRect, - const OUString& rShapeAnchor ) const SAL_OVERRIDE; + const OUString& rShapeAnchor ) const 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 SAL_OVERRIDE; + const ::com::sun::star::awt::Rectangle& rShapeRect ) const 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 ) SAL_OVERRIDE; + const ::oox::vml::ShapeBase& rShape, bool bGroupChild ) override; private: /** Converts the passed VML textbox text color to an OLE color. */ @@ -201,7 +201,7 @@ public: const OUString& rFragmentPath ); protected: - virtual void finalizeImport() SAL_OVERRIDE; + virtual void finalizeImport() override; }; } // namespace xls diff --git a/sc/source/filter/inc/eeimport.hxx b/sc/source/filter/inc/eeimport.hxx index 629394ab47fe..3b1217dbf808 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 ) SAL_OVERRIDE; - virtual ScRange GetRange() SAL_OVERRIDE { return maRange; } + virtual sal_uLong Read( SvStream& rStream, const OUString& rBaseURL ) override; + virtual ScRange GetRange() override { return maRange; } virtual void WriteToDocument( bool bSizeColsRows = false, double nOutputFactor = 1.0, SvNumberFormatter* pFormatter = NULL, - bool bConvertDate = true ) SAL_OVERRIDE; + bool bConvertDate = true ) override; }; #endif diff --git a/sc/source/filter/inc/excelchartconverter.hxx b/sc/source/filter/inc/excelchartconverter.hxx index c4afd77e6953..7e594b2c9cda 100644 --- a/sc/source/filter/inc/excelchartconverter.hxx +++ b/sc/source/filter/inc/excelchartconverter.hxx @@ -34,13 +34,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 ) SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& rxChartDoc ) override; /** Creates a data sequence from the passed formula. */ virtual css::uno::Reference<css::chart2::data::XDataSequence> createDataSequence( const css::uno::Reference<css::chart2::data::XDataProvider>& rxDataProvider, - const oox::drawingml::chart::DataSequenceModel& rDataSeq, const OUString& rRole ) SAL_OVERRIDE; + const oox::drawingml::chart::DataSequenceModel& rDataSeq, const OUString& rRole ) override; }; } // namespace xls diff --git a/sc/source/filter/inc/excelfilter.hxx b/sc/source/filter/inc/excelfilter.hxx index 75d78644378c..637e7fe29a9b 100644 --- a/sc/source/filter/inc/excelfilter.hxx +++ b/sc/source/filter/inc/excelfilter.hxx @@ -39,21 +39,21 @@ public: WorkbookGlobals& getWorkbookGlobals() const; void unregisterWorkbookGlobals(); - virtual bool importDocument() SAL_OVERRIDE; - virtual bool exportDocument() throw() SAL_OVERRIDE; + virtual bool importDocument() override; + virtual bool exportDocument() throw() override; - 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 const ::oox::drawingml::Theme* getCurrentTheme() const override; + virtual ::oox::vml::Drawing* getVmlDrawing() override; + virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() override; + virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() override; + virtual void useInternalChartDataTable( bool bInternal ) 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 ) 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 ) override; private: - virtual GraphicHelper* implCreateGraphicHelper() const SAL_OVERRIDE; - virtual ::oox::ole::VbaProject* implCreateVbaProject() const SAL_OVERRIDE; - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual GraphicHelper* implCreateGraphicHelper() const override; + virtual ::oox::ole::VbaProject* implCreateVbaProject() const override; + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; WorkbookGlobals* mpBookGlob; }; diff --git a/sc/source/filter/inc/excelvbaproject.hxx b/sc/source/filter/inc/excelvbaproject.hxx index 56d41cf170b7..47d37fec2edc 100644 --- a/sc/source/filter/inc/excelvbaproject.hxx +++ b/sc/source/filter/inc/excelvbaproject.hxx @@ -39,7 +39,7 @@ public: protected: /** Adds dummy modules for sheets without imported code name. */ - virtual void prepareImport() SAL_OVERRIDE; + virtual void prepareImport() 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 4a2362e0f808..9648e9277500 100644 --- a/sc/source/filter/inc/excform.hxx +++ b/sc/source/filter/inc/excform.hxx @@ -49,9 +49,9 @@ public: ExcelToSc( XclImpRoot& rRoot ); virtual ~ExcelToSc(); virtual ConvErr Convert( const ScTokenArray*&, XclImpStream& rStrm, sal_Size nFormulaLen, - bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula ) SAL_OVERRIDE; + bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula ) override; - virtual ConvErr Convert( _ScRangeListTabs&, XclImpStream& rStrm, sal_Size nFormulaLen, SCsTAB nTab, 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 ) override; virtual ConvErr ConvertExternName( const ScTokenArray*& rpArray, XclImpStream& rStrm, sal_Size nFormulaLen, const OUString& rUrl, const ::std::vector<OUString>& rTabNames ); @@ -122,16 +122,16 @@ public: ExcelToSc8( XclImpRoot& rRoot ); virtual ~ExcelToSc8(); - virtual ConvErr Convert( const ScTokenArray*& rpTokArray, XclImpStream& rStrm, sal_Size nFormulaLen, bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula ) SAL_OVERRIDE; + virtual ConvErr Convert( const ScTokenArray*& rpTokArray, XclImpStream& rStrm, sal_Size nFormulaLen, bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula ) override; - virtual ConvErr Convert( _ScRangeListTabs&, XclImpStream& rStrm, sal_Size nFormulaLen, SCsTAB nTab, 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 ) override; virtual ConvErr ConvertExternName( const ScTokenArray*& rpArray, XclImpStream& rStrm, sal_Size nFormulaLen, - const OUString& rUrl, const ::std::vector<OUString>& rTabNames ) SAL_OVERRIDE; + const OUString& rUrl, const ::std::vector<OUString>& rTabNames ) override; static inline bool IsComplRowRange( const sal_uInt16 nRow1, const sal_uInt16 nRow2 ); - virtual bool GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, sal_Size nLen ) SAL_OVERRIDE; + virtual bool GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, sal_Size nLen ) override; }; inline bool ExcelToSc8::IsComplRowRange( const sal_uInt16 nRow1, const sal_uInt16 nRow2 ) diff --git a/sc/source/filter/inc/excimp8.hxx b/sc/source/filter/inc/excimp8.hxx index 2ce1135e916e..dc01c5ebcf86 100644 --- a/sc/source/filter/inc/excimp8.hxx +++ b/sc/source/filter/inc/excimp8.hxx @@ -38,7 +38,7 @@ public: ImportExcel8( XclImpRootData& rImpData, SvStream& rStrm ); virtual ~ImportExcel8(); - virtual FltError Read() SAL_OVERRIDE; + virtual FltError Read() override; void Calccount(); // 0x0C void Precision(); // 0x0E @@ -56,8 +56,8 @@ public: void FeatHdr(); // 0x0867 void Feat(); // 0x0868 - virtual void EndSheet() SAL_OVERRIDE; - virtual void PostDocLoad() SAL_OVERRIDE; + virtual void EndSheet() override; + virtual void PostDocLoad() override; private: void LoadDocumentProperties(); diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx index 6a12db863ac8..e78373754fce 100644 --- a/sc/source/filter/inc/excrecds.hxx +++ b/sc/source/filter/inc/excrecds.hxx @@ -48,8 +48,8 @@ struct ScQueryEntry; class ExcRecord : public XclExpRecord { public: - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; virtual sal_uInt16 GetNum() const = 0; virtual sal_Size GetLen() const = 0; @@ -59,7 +59,7 @@ protected: private: /** Writes the body of the record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; }; //--------------------------------------------------------- class ExcEmptyRec - @@ -69,9 +69,9 @@ class ExcEmptyRec : public ExcRecord private: protected: public: - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; //--------------------------------------------------------- class ExcDummyRec - @@ -80,8 +80,8 @@ class ExcDummyRec : public ExcRecord { protected: public: - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual sal_uInt16 GetNum() const override; virtual const sal_uInt8* GetData() const = 0; // byte data must contain header and body }; @@ -91,7 +91,7 @@ public: class ExcBoolRecord : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; protected: bool bVal; @@ -101,7 +101,7 @@ protected: public: inline ExcBoolRecord( const bool bDefault ) : bVal( bDefault ) {} - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_Size GetLen() const override; }; //--------------------------------------------------------- class ExcBof_Base - @@ -124,12 +124,12 @@ public: class ExcBof : public ExcBof_Base { private: - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: ExcBof(); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; //------------------------------------------------------------- class ExcBofW - @@ -138,12 +138,12 @@ public: class ExcBofW : public ExcBof_Base { private: - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: ExcBofW(); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; //-------------------------------------------------------------- class ExcEof - @@ -152,8 +152,8 @@ class ExcEof : public ExcRecord { private: public: - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; //--------------------------------------------------------- class ExcDummy_00 - @@ -165,8 +165,8 @@ private: static const sal_uInt8 pMyData[]; static const sal_Size nMyLen; public: - virtual sal_Size GetLen() const SAL_OVERRIDE; - virtual const sal_uInt8* GetData() const SAL_OVERRIDE; + virtual sal_Size GetLen() const override; + virtual const sal_uInt8* GetData() const override; }; // EXC_ID_WINDOWPROTECTION @@ -175,7 +175,7 @@ class XclExpWindowProtection : public XclExpBoolRecord public: XclExpWindowProtection(bool bValue); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; // EXC_ID_PROTECT Document Protection @@ -190,7 +190,7 @@ class XclExpSheetProtection : public XclExpProtection SCTAB mnTab; public: XclExpSheetProtection(bool bValue, SCTAB nTab); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; class XclExpPassHash : public XclExpRecord @@ -200,7 +200,7 @@ public: virtual ~XclExpPassHash(); private: - virtual void WriteBody(XclExpStream& rStrm) SAL_OVERRIDE; + virtual void WriteBody(XclExpStream& rStrm) override; private: sal_uInt16 mnHash; @@ -215,8 +215,8 @@ private: static const sal_uInt8 pMyData[]; static const sal_Size nMyLen; public: - virtual sal_Size GetLen() const SAL_OVERRIDE; - virtual const sal_uInt8* GetData() const SAL_OVERRIDE; + virtual sal_Size GetLen() const override; + virtual const sal_uInt8* GetData() const override; }; class ExcDummy_041 : public ExcDummyRec @@ -225,8 +225,8 @@ private: static const sal_uInt8 pMyData[]; static const sal_Size nMyLen; public: - virtual sal_Size GetLen() const SAL_OVERRIDE; - virtual const sal_uInt8* GetData() const SAL_OVERRIDE; + virtual sal_Size GetLen() const override; + virtual const sal_uInt8* GetData() const override; }; //------------------------------------------------------------- class Exc1904 - @@ -235,9 +235,9 @@ class Exc1904 : public ExcBoolRecord { public: Exc1904( ScDocument& rDoc ); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: bool bDateCompatibility; }; @@ -260,7 +260,7 @@ public: inline void SetStreamPos(sal_uInt64 const nStrPos) { m_nStrPos = nStrPos; } void UpdateStreamPos( XclExpStream& rStrm ); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; }; class ExcBundlesheet : public ExcBundlesheetBase @@ -268,11 +268,11 @@ class ExcBundlesheet : public ExcBundlesheetBase private: OString aName; - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: ExcBundlesheet( RootData& rRootData, SCTAB nTab ); - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_Size GetLen() const override; }; //--------------------------------------------------------- class ExcDummy_02 - @@ -284,8 +284,8 @@ private: static const sal_uInt8 pMyData[]; static const sal_Size nMyLen; public: - virtual sal_Size GetLen() const SAL_OVERRIDE; - virtual const sal_uInt8* GetData() const SAL_OVERRIDE; + virtual sal_Size GetLen() const override; + virtual const sal_uInt8* GetData() const override; }; /** This record contains the Windows country IDs for the UI and document language. */ @@ -299,7 +299,7 @@ private: sal_uInt16 mnDocCountry; /// The document country ID. /** Writes the body of the COUNTRY record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; }; // XclExpWsbool =============================================================== @@ -319,7 +319,7 @@ public: explicit XclExpXmlSheetPr( bool bFitToPages, SCTAB nScTab, const Color& rTabColor, XclExpFilterManager* pManager ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: SCTAB mnScTab; @@ -383,7 +383,7 @@ private: sal_uInt8 nOp, double fVal, OUString* pText, bool bSimple = false ); - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; public: XclExpAutofilter( const XclExpRoot& rRoot, sal_uInt16 nC ); @@ -395,7 +395,7 @@ public: bool AddEntry( const ScQueryEntry& rEntry ); bool AddMultiValueEntry( const ScQueryEntry& rEntry ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; class ExcAutoFilterRecs : public XclExpRecordBase, protected XclExpRoot @@ -406,8 +406,8 @@ public: void AddObjRecs(); - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; bool HasFilterMode() const; diff --git a/sc/source/filter/inc/exp_op.hxx b/sc/source/filter/inc/exp_op.hxx index 1272a031af92..cce22e2a13c6 100644 --- a/sc/source/filter/inc/exp_op.hxx +++ b/sc/source/filter/inc/exp_op.hxx @@ -59,7 +59,7 @@ protected: public: ExportBiff5( XclExpRootData& rExpData, SvStream& rStrm ); virtual ~ExportBiff5(); - FltError Write() SAL_OVERRIDE; + FltError Write() override; }; class ExportBiff8 : public ExportBiff5 diff --git a/sc/source/filter/inc/externallinkfragment.hxx b/sc/source/filter/inc/externallinkfragment.hxx index 4b67a319ac27..af728e5b802d 100644 --- a/sc/source/filter/inc/externallinkfragment.hxx +++ b/sc/source/filter/inc/externallinkfragment.hxx @@ -41,10 +41,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 ) SAL_OVERRIDE; - virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; private: /** Imports cell settings from a c element. */ @@ -80,13 +80,13 @@ public: ExternalLink& rExtLink ); protected: - 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 onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; + virtual void onEndElement() override; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; - virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; + virtual const ::oox::core::RecordInfo* getRecordInfos() const 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 d77d51ae50d0..51fd498acf1e 100644 --- a/sc/source/filter/inc/extlstcontext.hxx +++ b/sc/source/filter/inc/extlstcontext.hxx @@ -29,8 +29,8 @@ class ExtCfRuleContext : public WorksheetContextBase public: explicit ExtCfRuleContext( WorksheetContextBase& rFragment, ScDataBarFormatData* pDataBar ); - 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 onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; private: ScDataBarFormatData* mpTarget; @@ -43,10 +43,10 @@ class ExtConditionalFormattingContext : public WorksheetContextBase public: explicit ExtConditionalFormattingContext(WorksheetContextBase& rFragment); - 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& rCharacters) SAL_OVERRIDE; - virtual void onEndElement() SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; + virtual void onCharacters(const OUString& rCharacters) override; + virtual void onEndElement() override; private: OUString aChars; @@ -68,9 +68,9 @@ public: explicit ExtLstLocalContext( WorksheetContextBase& rFragment, ScDataBarFormatData* pTarget ); // until now a ExtLst always extends an existing entry protected: - 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 ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; private: ScDataBarFormatData* mpTarget; @@ -85,8 +85,8 @@ public: explicit ExtGlobalContext( WorksheetContextBase& rFragment ); protected: - 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 onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; private: }; @@ -101,7 +101,7 @@ public: explicit ExtLstGlobalContext( WorksheetFragment& rFragment ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; class ExtGlobalWorkbookContext : public WorkbookContextBase @@ -110,8 +110,8 @@ public: explicit ExtGlobalWorkbookContext( WorkbookContextBase& rFragment ); protected: - 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 onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; private: }; @@ -122,7 +122,7 @@ public: explicit ExtLstGlobalWorkbookContext( WorkbookFragment& rFragment ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; } //namespace xls diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx index 8200b6ee7132..5a920c870620 100644 --- a/sc/source/filter/inc/ftools.hxx +++ b/sc/source/filter/inc/ftools.hxx @@ -267,36 +267,36 @@ public: ScFormatFilterPluginImpl(); virtual ~ScFormatFilterPluginImpl(); // various import filters - 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; + virtual FltError ScImportLotus123( SfxMedium&, ScDocument*, rtl_TextEncoding eSrc = RTL_TEXTENCODING_DONTKNOW ) override; + virtual FltError ScImportQuattroPro( SfxMedium &rMedium, ScDocument *pDoc ) override; + virtual FltError ScImportExcel( SfxMedium&, ScDocument*, const EXCIMPFORMAT ) 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* ) SAL_OVERRIDE; + virtual FltError ScImportStarCalc10( SvStream&, ScDocument* ) override; virtual FltError ScImportDif( SvStream&, ScDocument*, const ScAddress& rInsPos, - 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; + const rtl_TextEncoding eSrc = RTL_TEXTENCODING_DONTKNOW, sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) override; + virtual FltError ScImportRTF( SvStream&, const OUString& rBaseURL, ScDocument*, ScRange& rRange ) override; virtual FltError ScImportHTML( SvStream&, const OUString& rBaseURL, ScDocument*, ScRange& rRange, double nOutputFactor = 1.0, bool bCalcWidthHeight = true, - SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) SAL_OVERRIDE; + SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) override; - 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; + virtual ScEEAbsImport *CreateRTFImport( ScDocument* pDoc, const ScRange& rRange ) override; + virtual ScEEAbsImport *CreateHTMLImport( ScDocument* pDocP, const OUString& rBaseURL, const ScRange& rRange, bool bCalcWidthHeight ) override; + virtual OUString GetHTMLRangeNameList( ScDocument* pDoc, const OUString& rOrigName ) override; // various export filters - virtual FltError ScExportExcel5( SfxMedium&, ScDocument*, ExportFormatExcel eFormat, rtl_TextEncoding eDest ) SAL_OVERRIDE; + virtual FltError ScExportExcel5( SfxMedium&, ScDocument*, ExportFormatExcel eFormat, rtl_TextEncoding eDest ) override; virtual FltError ScExportDif( SvStream&, ScDocument*, const ScAddress& rOutPos, const rtl_TextEncoding eDest, - sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) SAL_OVERRIDE; + sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) override; virtual FltError ScExportDif( SvStream&, ScDocument*, const ScRange& rRange, const rtl_TextEncoding eDest, - sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) SAL_OVERRIDE; + sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) override; virtual FltError ScExportHTML( SvStream&, const OUString& rBaseURL, ScDocument*, const ScRange& rRange, const rtl_TextEncoding eDest, bool bAll, - const OUString& rStreamPath, OUString& rNonConvertibleChars, const OUString& rFilterOptions ) SAL_OVERRIDE; - virtual FltError ScExportRTF( SvStream&, ScDocument*, const ScRange& rRange, const rtl_TextEncoding eDest ) SAL_OVERRIDE; + const OUString& rStreamPath, OUString& rNonConvertibleChars, const OUString& rFilterOptions ) override; + virtual FltError ScExportRTF( SvStream&, ScDocument*, const ScRange& rRange, const rtl_TextEncoding eDest ) override; - virtual ScOrcusFilters* GetOrcusFilters() SAL_OVERRIDE; + virtual ScOrcusFilters* GetOrcusFilters() override; }; #endif diff --git a/sc/source/filter/inc/htmlimp.hxx b/sc/source/filter/inc/htmlimp.hxx index 13c943362f2d..858e5beeb25c 100644 --- a/sc/source/filter/inc/htmlimp.hxx +++ b/sc/source/filter/inc/htmlimp.hxx @@ -34,7 +34,7 @@ public: const ScHTMLParser* GetParser() const { return static_cast<ScHTMLParser*>(mpParser); } virtual void WriteToDocument( bool bSizeColsRows = false, double nOutputFactor = 1.0, - SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) SAL_OVERRIDE; + SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) 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 27d2b85fdf3b..6cc2bc82ff56 100644 --- a/sc/source/filter/inc/htmlpars.hxx +++ b/sc/source/filter/inc/htmlpars.hxx @@ -86,7 +86,7 @@ public: explicit ScHTMLParser( EditEngine* pEditEngine, ScDocument* pDoc ); virtual ~ScHTMLParser(); - virtual sal_uLong Read( SvStream& rStrm, const OUString& rBaseURL ) SAL_OVERRIDE = 0; + virtual sal_uLong Read( SvStream& rStrm, const OUString& rBaseURL ) override = 0; ScHTMLStyles& GetStyles() { return maStyles;} ScDocument& GetDoc() { return *mpDoc;} @@ -217,8 +217,8 @@ private: public: ScHTMLLayoutParser( EditEngine*, const OUString& rBaseURL, const Size& aPageSize, ScDocument* ); virtual ~ScHTMLLayoutParser(); - virtual sal_uLong Read( SvStream&, const OUString& rBaseURL ) SAL_OVERRIDE; - virtual const ScHTMLTable* GetGlobalTable() const SAL_OVERRIDE; + virtual sal_uLong Read( SvStream&, const OUString& rBaseURL ) override; + virtual const ScHTMLTable* GetGlobalTable() const override; }; // HTML DATA QUERY PARSER @@ -585,10 +585,10 @@ public: explicit ScHTMLQueryParser( EditEngine* pEditEngine, ScDocument* pDoc ); virtual ~ScHTMLQueryParser(); - virtual sal_uLong Read( SvStream& rStrm, const OUString& rBaseURL ) SAL_OVERRIDE; + virtual sal_uLong Read( SvStream& rStrm, const OUString& rBaseURL ) override; /** Returns the "global table" which contains the entire HTML document. */ - virtual const ScHTMLTable* GetGlobalTable() const SAL_OVERRIDE; + virtual const ScHTMLTable* GetGlobalTable() const 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 090189df385a..df0111578053 100644 --- a/sc/source/filter/inc/imp_op.hxx +++ b/sc/source/filter/inc/imp_op.hxx @@ -203,7 +203,7 @@ public: virtual ~ImportExcel(); - virtual FltError Read() SAL_OVERRIDE; + virtual FltError Read() override; }; #endif diff --git a/sc/source/filter/inc/lotform.hxx b/sc/source/filter/inc/lotform.hxx index cc819cfdf993..bcde57911709 100644 --- a/sc/source/filter/inc/lotform.hxx +++ b/sc/source/filter/inc/lotform.hxx @@ -90,7 +90,7 @@ public: LotusToSc(LotusContext &rContext, SvStream& aStr, svl::SharedStringPool& rSPool, rtl_TextEncoding eSrc, bool b); virtual ConvErr Convert( const ScTokenArray*& rpErg, sal_Int32& nRest, - const FORMULA_TYPE eFT = FT_CellFormula ) SAL_OVERRIDE; + const FORMULA_TYPE eFT = FT_CellFormula ) override; void Reset( const ScAddress& rEingPos ); inline void SetWK3(); diff --git a/sc/source/filter/inc/lotimpop.hxx b/sc/source/filter/inc/lotimpop.hxx index fb6704cc1ba9..f0cfccc7ae4f 100644 --- a/sc/source/filter/inc/lotimpop.hxx +++ b/sc/source/filter/inc/lotimpop.hxx @@ -79,7 +79,7 @@ public: virtual ~ImportLotus(); - FltError Read() SAL_OVERRIDE; + FltError Read() 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 c70e277a22cf..91df7282977e 100644 --- a/sc/source/filter/inc/ooxformulaparser.hxx +++ b/sc/source/filter/inc/ooxformulaparser.hxx @@ -48,26 +48,26 @@ public: // com.sun.star.lang.XServiceInfo interface ------------------------------- virtual ::rtl::OUString SAL_CALL - getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rService ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL - getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // com.sun.star.lang.XInitialization interface ---------------------------- virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rArgs ) - throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception ) override; // com.sun.star.sheet.XFilterFormulaParser interface ---------------------- virtual ::rtl::OUString SAL_CALL getSupportedNamespace() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // com.sun.star.sheet.XFormulaParser interface ---------------------------- @@ -75,13 +75,13 @@ public: parseFormula( const ::rtl::OUString& rFormula, const ::com::sun::star::table::CellAddress& rReferencePos ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) 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 ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; private: typedef std::shared_ptr< OOXMLFormulaParserImpl > ParserImplRef; diff --git a/sc/source/filter/inc/orcusfiltersimpl.hxx b/sc/source/filter/inc/orcusfiltersimpl.hxx index 175308d869ce..ce909d7af7d0 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 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 bool importCSV(ScDocument& rDoc, SfxMedium& rMedium) const override; + virtual bool importGnumeric(ScDocument& rDoc, SfxMedium& rMedium) const override; + virtual bool importXLSX(ScDocument& rDoc, SfxMedium& rMedium) const override; + virtual bool importODS(ScDocument& rDoc, SfxMedium& rMedium) const override; - virtual ScOrcusXMLContext* createXMLContext(ScDocument& rDoc, const OUString& rPath) const SAL_OVERRIDE; + virtual ScOrcusXMLContext* createXMLContext(ScDocument& rDoc, const OUString& rPath) const 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) SAL_OVERRIDE; + virtual bool loadXMLStructure(SvTreeListBox& rTreeCtrl, ScOrcusXMLTreeParam& rParam) override; - virtual bool importXML(const ScOrcusImportXMLParam& rParam) SAL_OVERRIDE; + virtual bool importXML(const ScOrcusImportXMLParam& rParam) override; }; #endif diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx index d8a805615f38..004f56275dd6 100644 --- a/sc/source/filter/inc/orcusinterface.hxx +++ b/sc/source/filter/inc/orcusinterface.hxx @@ -50,10 +50,10 @@ class ScOrcusGlobalSettings : public orcus::spreadsheet::iface::import_global_se public: ScOrcusGlobalSettings(ScDocumentImport& rDoc); - virtual void set_origin_date(int year, int month, int day) SAL_OVERRIDE; + virtual void set_origin_date(int year, int month, int day) override; - virtual void set_default_formula_grammar(orcus::spreadsheet::formula_grammar_t grammar) SAL_OVERRIDE; - virtual orcus::spreadsheet::formula_grammar_t get_default_formula_grammar() const SAL_OVERRIDE; + virtual void set_default_formula_grammar(orcus::spreadsheet::formula_grammar_t grammar) override; + virtual orcus::spreadsheet::formula_grammar_t get_default_formula_grammar() const override; }; class ScOrcusSharedStrings : public orcus::spreadsheet::iface::import_shared_strings @@ -64,21 +64,21 @@ class ScOrcusSharedStrings : public orcus::spreadsheet::iface::import_shared_str public: ScOrcusSharedStrings(ScOrcusFactory& rFactory); - 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 size_t append(const char* s, size_t n) override; + virtual size_t add(const char* s, size_t n) override; - 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_bold(bool b) override; + virtual void set_segment_italic(bool b) override; + virtual void set_segment_font(size_t font_index) override; + virtual void set_segment_font_name(const char* s, size_t n) override; + virtual void set_segment_font_size(double point) 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) SAL_OVERRIDE; - virtual void append_segment(const char* s, size_t n) SAL_OVERRIDE; + orcus::spreadsheet::color_elem_t blue) override; + virtual void append_segment(const char* s, size_t n) override; - virtual size_t commit_segments() SAL_OVERRIDE; + virtual size_t commit_segments() override; }; class ScOrcusConditionalFormat : public orcus::spreadsheet::iface::import_conditional_format @@ -88,50 +88,50 @@ public: virtual ~ScOrcusConditionalFormat(); virtual void set_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; + orcus::spreadsheet::color_elem_t green, orcus::spreadsheet::color_elem_t blue) override; - virtual void set_formula(const char* p, size_t n) SAL_OVERRIDE; + virtual void set_formula(const char* p, size_t n) override; - virtual void set_condition_type(orcus::spreadsheet::condition_type_t type) SAL_OVERRIDE; + virtual void set_condition_type(orcus::spreadsheet::condition_type_t type) override; - virtual void set_date(orcus::spreadsheet::condition_date_t date) SAL_OVERRIDE; + virtual void set_date(orcus::spreadsheet::condition_date_t date) override; - virtual void commit_condition() SAL_OVERRIDE; + virtual void commit_condition() override; - virtual void set_icon_name(const char* p, size_t n) SAL_OVERRIDE; + virtual void set_icon_name(const char* p, size_t n) override; - virtual void set_databar_gradient(bool gradient) SAL_OVERRIDE; + virtual void set_databar_gradient(bool gradient) override; - virtual void set_databar_axis(orcus::spreadsheet::databar_axis_t axis) SAL_OVERRIDE; + virtual void set_databar_axis(orcus::spreadsheet::databar_axis_t axis) override; virtual void set_databar_color_positive(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; + orcus::spreadsheet::color_elem_t green, orcus::spreadsheet::color_elem_t blue) override; virtual void set_databar_color_negative(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; + orcus::spreadsheet::color_elem_t green, orcus::spreadsheet::color_elem_t blue) override; - virtual void set_min_databar_length(double length) SAL_OVERRIDE; + virtual void set_min_databar_length(double length) override; - virtual void set_max_databar_length(double length) SAL_OVERRIDE; + virtual void set_max_databar_length(double length) override; - virtual void set_show_value(bool show) SAL_OVERRIDE; + virtual void set_show_value(bool show) override; - virtual void set_iconset_reverse(bool reverse) SAL_OVERRIDE; + virtual void set_iconset_reverse(bool reverse) override; - virtual void set_xf_id(size_t xf) SAL_OVERRIDE; + virtual void set_xf_id(size_t xf) override; - virtual void set_operator(orcus::spreadsheet::condition_operator_t condition_type) SAL_OVERRIDE; + virtual void set_operator(orcus::spreadsheet::condition_operator_t condition_type) override; - virtual void set_type(orcus::spreadsheet::conditional_format_t type) SAL_OVERRIDE; + virtual void set_type(orcus::spreadsheet::conditional_format_t type) override; - virtual void commit_entry() SAL_OVERRIDE; + virtual void commit_entry() override; - virtual void set_range(const char* p, size_t n) SAL_OVERRIDE; + virtual void set_range(const char* p, size_t n) override; virtual void set_range(orcus::spreadsheet::row_t row_start, orcus::spreadsheet::col_t col_start, - orcus::spreadsheet::row_t row_end, orcus::spreadsheet::col_t col_end) SAL_OVERRIDE; + orcus::spreadsheet::row_t row_end, orcus::spreadsheet::col_t col_end) override; - virtual void commit_format() SAL_OVERRIDE; + virtual void commit_format() override; private: @@ -151,15 +151,15 @@ public: virtual ~ScOrcusAutoFilter(); - virtual void set_range(const char* p_ref, size_t n_ref) SAL_OVERRIDE; + virtual void set_range(const char* p_ref, size_t n_ref) override; - virtual void set_column(orcus::spreadsheet::col_t col) SAL_OVERRIDE; + virtual void set_column(orcus::spreadsheet::col_t col) override; - virtual void append_column_match_value(const char* p, size_t n) SAL_OVERRIDE; + virtual void append_column_match_value(const char* p, size_t n) override; - virtual void commit_column() SAL_OVERRIDE; + virtual void commit_column() override; - virtual void commit() SAL_OVERRIDE; + virtual void commit() override; private: ScDocument& mrDoc; @@ -175,15 +175,15 @@ public: ScOrcusSheetProperties(SCTAB nTab, ScDocumentImport& rDoc); virtual ~ScOrcusSheetProperties(); - virtual void set_column_width(orcus::spreadsheet::col_t col, double width, orcus::length_unit_t unit) SAL_OVERRIDE; + virtual void set_column_width(orcus::spreadsheet::col_t col, double width, orcus::length_unit_t unit) override; - virtual void set_column_hidden(orcus::spreadsheet::col_t col, bool hidden) SAL_OVERRIDE; + virtual void set_column_hidden(orcus::spreadsheet::col_t col, bool hidden) override; - virtual void set_row_height(orcus::spreadsheet::row_t row, double height, orcus::length_unit_t unit) SAL_OVERRIDE; + virtual void set_row_height(orcus::spreadsheet::row_t row, double height, orcus::length_unit_t unit) override; - virtual void set_row_hidden(orcus::spreadsheet::row_t row, bool hidden) SAL_OVERRIDE; + virtual void set_row_hidden(orcus::spreadsheet::row_t row, bool hidden) override; - virtual void set_merge_cell_range(const char* p_range, size_t n_range) SAL_OVERRIDE; + virtual void set_merge_cell_range(const char* p_range, size_t n_range) override; }; class ScOrcusSheet : public orcus::spreadsheet::iface::import_sheet @@ -207,44 +207,44 @@ class ScOrcusSheet : public orcus::spreadsheet::iface::import_sheet public: ScOrcusSheet(ScDocumentImport& rDoc, SCTAB nTab, ScOrcusFactory& rFactory); - virtual orcus::spreadsheet::iface::import_auto_filter* get_auto_filter() SAL_OVERRIDE { return &maAutoFilter; } - virtual orcus::spreadsheet::iface::import_table* get_table() SAL_OVERRIDE; - virtual orcus::spreadsheet::iface::import_sheet_properties* get_sheet_properties() SAL_OVERRIDE; - virtual orcus::spreadsheet::iface::import_conditional_format* get_conditional_format() SAL_OVERRIDE; + virtual orcus::spreadsheet::iface::import_auto_filter* get_auto_filter() override { return &maAutoFilter; } + virtual orcus::spreadsheet::iface::import_table* get_table() override; + virtual orcus::spreadsheet::iface::import_sheet_properties* get_sheet_properties() override; + virtual orcus::spreadsheet::iface::import_conditional_format* get_conditional_format() override; // Orcus import interface - 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_auto(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, const char* p, size_t n) override; + virtual void set_string(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, size_t sindex) override; + virtual void set_value(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, double value) override; + virtual void set_bool(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, bool value) 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) SAL_OVERRIDE; + orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, int year, int month, int day, int hour, int minute, double second) override; - virtual void set_format(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, size_t xf_index) SAL_OVERRIDE; + virtual void set_format(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, size_t xf_index) override; virtual void set_format(orcus::spreadsheet::row_t row_start, orcus::spreadsheet::col_t col_start, - orcus::spreadsheet::row_t row_end, orcus::spreadsheet::col_t col_end, size_t xf_index) SAL_OVERRIDE; + orcus::spreadsheet::row_t row_end, orcus::spreadsheet::col_t col_end, size_t xf_index) 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) 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_formula_result(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, double val) 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) override; + virtual void set_formula_result(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, const char* p, size_t n) override; + virtual void set_formula_result(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, double val) 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) SAL_OVERRIDE; + const char* p_formula, size_t n_formula) 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) SAL_OVERRIDE; + const char* p_formula, size_t n_formula, const char* p_range, size_t n_range) override; - virtual void set_shared_formula(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, size_t sindex) SAL_OVERRIDE; + virtual void set_shared_formula(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, size_t sindex) 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) SAL_OVERRIDE; + const char* p, size_t n, orcus::spreadsheet::row_t array_rows, orcus::spreadsheet::col_t array_cols) 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) SAL_OVERRIDE; + const char* p, size_t n, const char* p_range, size_t n_range) override; SCTAB getIndex() const { return mnTab; } }; @@ -357,81 +357,81 @@ public: // font - 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_count(size_t n) override; + virtual void set_font_bold(bool b) override; + virtual void set_font_italic(bool b) override; + virtual void set_font_name(const char* s, size_t n) override; + virtual void set_font_size(double point) override; + virtual void set_font_underline(orcus::spreadsheet::underline_t e) 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) SAL_OVERRIDE; - virtual size_t commit_font() SAL_OVERRIDE; + orcus::spreadsheet::color_elem_t blue) override; + virtual size_t commit_font() override; // 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; + virtual void set_fill_count(size_t n) override; + virtual void set_fill_pattern_type(const char* s, size_t n) 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) 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) override; + virtual size_t commit_fill() override; // border - 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_count(size_t n) override; + virtual void set_border_style(orcus::spreadsheet::border_direction_t dir, const char* s, size_t n) 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) SAL_OVERRIDE; - virtual size_t commit_border() SAL_OVERRIDE; + orcus::spreadsheet::color_elem_t blue) override; + virtual size_t commit_border() override; // 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; + virtual void set_cell_hidden(bool b) override; + virtual void set_cell_locked(bool b) override; + virtual size_t commit_cell_protection() override; // 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; + virtual void set_number_format_count(size_t n) override; + virtual void set_number_format_identifier(size_t n) override; + virtual void set_number_format_code(const char* s, size_t n) override; + virtual size_t commit_number_format() override; // cell style xf - virtual void set_cell_style_xf_count(size_t n) SAL_OVERRIDE; - virtual size_t commit_cell_style_xf() SAL_OVERRIDE; + virtual void set_cell_style_xf_count(size_t n) override; + virtual size_t commit_cell_style_xf() override; // cell xf - virtual void set_cell_xf_count(size_t n) SAL_OVERRIDE; - virtual size_t commit_cell_xf() SAL_OVERRIDE; + virtual void set_cell_xf_count(size_t n) override; + virtual size_t commit_cell_xf() override; // dxf - virtual void set_dxf_count(size_t count) SAL_OVERRIDE; - virtual size_t commit_dxf() SAL_OVERRIDE; + virtual void set_dxf_count(size_t count) override; + virtual size_t commit_dxf() override; // xf (cell format) - used both by cell xf and cell style xf. - 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; + virtual void set_xf_number_format(size_t index) override; + virtual void set_xf_font(size_t index) override; + virtual void set_xf_fill(size_t index) override; + virtual void set_xf_border(size_t index) override; + virtual void set_xf_protection(size_t index) override; + virtual void set_xf_style_xf(size_t index) override; + virtual void set_xf_apply_alignment(bool b) override; + virtual void set_xf_horizontal_alignment(orcus::spreadsheet::hor_alignment_t align) override; + virtual void set_xf_vertical_alignment(orcus::spreadsheet::ver_alignment_t align) override; // cell style entry - 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; + virtual void set_cell_style_count(size_t n) override; + virtual void set_cell_style_name(const char* s, size_t n) override; + virtual void set_cell_style_xf(size_t index) override; + virtual void set_cell_style_builtin(size_t index) override; + virtual size_t commit_cell_style() override; }; class ScOrcusFactory : public orcus::spreadsheet::iface::import_factory @@ -465,13 +465,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) 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; + virtual orcus::spreadsheet::iface::import_sheet* append_sheet(const char *sheet_name, size_t sheet_name_length) override; + virtual orcus::spreadsheet::iface::import_sheet* get_sheet(const char *sheet_name, size_t sheet_name_length) override; + virtual orcus::spreadsheet::iface::import_sheet* get_sheet(orcus::spreadsheet::sheet_t sheet_index) override; + virtual orcus::spreadsheet::iface::import_global_settings* get_global_settings() override; + virtual orcus::spreadsheet::iface::import_shared_strings* get_shared_strings() override; + virtual orcus::spreadsheet::iface::import_styles* get_styles() override; + virtual void finalize() override; size_t appendString(const OUString& rStr); size_t addString(const OUString& rStr); @@ -497,33 +497,33 @@ public: ScOrcusTable(SCTAB nTab, ScDocument& rDoc); virtual ~ScOrcusTable(); - virtual orcus::spreadsheet::iface::import_auto_filter* get_auto_filter() SAL_OVERRIDE; + virtual orcus::spreadsheet::iface::import_auto_filter* get_auto_filter() override; - virtual void set_identifier(size_t id) SAL_OVERRIDE; + virtual void set_identifier(size_t id) override; - virtual void set_range(const char* p_ref, size_t n_ref) SAL_OVERRIDE; + virtual void set_range(const char* p_ref, size_t n_ref) override; - virtual void set_totals_row_count(size_t row_count) SAL_OVERRIDE; + virtual void set_totals_row_count(size_t row_count) override; - virtual void set_name(const char* p, size_t n) SAL_OVERRIDE; + virtual void set_name(const char* p, size_t n) override; - virtual void set_display_name(const char* p, size_t n) SAL_OVERRIDE; + virtual void set_display_name(const char* p, size_t n) override; - virtual void set_column_count(size_t n) SAL_OVERRIDE; + virtual void set_column_count(size_t n) override; - virtual void set_column_identifier(size_t id) SAL_OVERRIDE; - virtual void set_column_name(const char* p, size_t n) SAL_OVERRIDE; - virtual void set_column_totals_row_label(const char* p, size_t n) SAL_OVERRIDE; - virtual void set_column_totals_row_function(orcus::spreadsheet::totals_row_function_t func) SAL_OVERRIDE; - virtual void commit_column() SAL_OVERRIDE; + virtual void set_column_identifier(size_t id) override; + virtual void set_column_name(const char* p, size_t n) override; + virtual void set_column_totals_row_label(const char* p, size_t n) override; + virtual void set_column_totals_row_function(orcus::spreadsheet::totals_row_function_t func) override; + virtual void commit_column() override; - virtual void set_style_name(const char* p, size_t n) SAL_OVERRIDE; - virtual void set_style_show_first_column(bool b) SAL_OVERRIDE; - virtual void set_style_show_last_column(bool b) SAL_OVERRIDE; - virtual void set_style_show_row_stripes(bool b) SAL_OVERRIDE; - virtual void set_style_show_column_stripes(bool b) SAL_OVERRIDE; + virtual void set_style_name(const char* p, size_t n) override; + virtual void set_style_show_first_column(bool b) override; + virtual void set_style_show_last_column(bool b) override; + virtual void set_style_show_row_stripes(bool b) override; + virtual void set_style_show_column_stripes(bool b) override; - virtual void commit() SAL_OVERRIDE; + virtual void commit() override; }; #endif diff --git a/sc/source/filter/inc/pivotcachefragment.hxx b/sc/source/filter/inc/pivotcachefragment.hxx index 6def209da0fd..1de3815064a7 100644 --- a/sc/source/filter/inc/pivotcachefragment.hxx +++ b/sc/source/filter/inc/pivotcachefragment.hxx @@ -36,10 +36,10 @@ public: PivotCacheField& rCacheField ); protected: - 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; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual void onStartRecord( SequenceInputStream& rStrm ) override; private: PivotCacheField& mrCacheField; @@ -54,10 +54,10 @@ public: PivotCache& rPivotCache ); protected: - 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; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual const ::oox::core::RecordInfo* getRecordInfos() const override; + virtual void finalizeImport() override; private: PivotCache& mrPivotCache; @@ -72,9 +72,9 @@ public: const PivotCache& rPivotCache ); protected: - 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 ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual const ::oox::core::RecordInfo* getRecordInfos() const override; private: void startCacheRecord(); @@ -97,7 +97,7 @@ public: PivotCache& rPivotCache ); /** Imports the entire fragment, returns true, if EOF record has been reached. */ - virtual bool importFragment() SAL_OVERRIDE; + virtual bool importFragment() override; private: PivotCache& mrPivotCache; @@ -112,7 +112,7 @@ public: /** Reads the current record from stream and tries to insert a cell into the source data sheet. */ - virtual void importRecord( BiffInputStream& rStrm ) SAL_OVERRIDE; + virtual void importRecord( BiffInputStream& rStrm ) override; private: void startNextRow(); diff --git a/sc/source/filter/inc/pivottablefragment.hxx b/sc/source/filter/inc/pivottablefragment.hxx index dd195a463ddb..74f893b63da9 100644 --- a/sc/source/filter/inc/pivottablefragment.hxx +++ b/sc/source/filter/inc/pivottablefragment.hxx @@ -38,10 +38,10 @@ public: PivotTableField& rTableField ); protected: - 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; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual void onStartRecord( SequenceInputStream& rStrm ) override; private: PivotTableField& mrTableField; @@ -55,10 +55,10 @@ public: PivotTableFilter& rTableFilter ); protected: - 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; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual void onStartRecord( SequenceInputStream& rStrm ) override; private: PivotTableFilter& mrTableFilter; @@ -72,9 +72,9 @@ public: const OUString& rFragmentPath ); protected: - 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 ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual const ::oox::core::RecordInfo* getRecordInfos() const override; private: PivotTable& mrPivotTable; diff --git a/sc/source/filter/inc/querytablefragment.hxx b/sc/source/filter/inc/querytablefragment.hxx index ebd9913398db..10d60242f0b2 100644 --- a/sc/source/filter/inc/querytablefragment.hxx +++ b/sc/source/filter/inc/querytablefragment.hxx @@ -35,10 +35,10 @@ public: const OUString& rFragmentPath ); protected: - 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 ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; - virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; + virtual const ::oox::core::RecordInfo* getRecordInfos() const override; private: QueryTable& mrQueryTable; diff --git a/sc/source/filter/inc/revisionfragment.hxx b/sc/source/filter/inc/revisionfragment.hxx index f16a9e996f65..ee4e2757e334 100644 --- a/sc/source/filter/inc/revisionfragment.hxx +++ b/sc/source/filter/inc/revisionfragment.hxx @@ -29,13 +29,13 @@ public: protected: virtual oox::core::ContextHandlerRef onCreateContext( - sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + sal_Int32 nElement, const AttributeList& rAttribs ) override; - virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; - virtual void onEndElement() SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; + virtual void onEndElement() override; - virtual void finalizeImport() SAL_OVERRIDE; + virtual void finalizeImport() override; private: void importHeader( const AttributeList& rAttribs ); @@ -54,13 +54,13 @@ public: protected: virtual oox::core::ContextHandlerRef onCreateContext( - sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + sal_Int32 nElement, const AttributeList& rAttribs ) override; - virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; - virtual void onEndElement() SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; + virtual void onEndElement() override; - virtual void finalizeImport() SAL_OVERRIDE; + virtual void finalizeImport() override; private: void importCommon( const AttributeList& rAttribs ); diff --git a/sc/source/filter/inc/richstringcontext.hxx b/sc/source/filter/inc/richstringcontext.hxx index e9abc4f56f86..67685c8f9c93 100644 --- a/sc/source/filter/inc/richstringcontext.hxx +++ b/sc/source/filter/inc/richstringcontext.hxx @@ -34,8 +34,8 @@ public: explicit RichStringContext( ParentType& rParent, RichStringRef xString ); protected: - 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 onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; private: RichStringRef mxString; /// Processed string. diff --git a/sc/source/filter/inc/rtfparse.hxx b/sc/source/filter/inc/rtfparse.hxx index 857ed87fe0f3..cdc5dde1c9eb 100644 --- a/sc/source/filter/inc/rtfparse.hxx +++ b/sc/source/filter/inc/rtfparse.hxx @@ -72,7 +72,7 @@ private: public: ScRTFParser( EditEngine* ); virtual ~ScRTFParser(); - virtual sal_uLong Read( SvStream&, const OUString& rBaseURL ) SAL_OVERRIDE; + virtual sal_uLong Read( SvStream&, const OUString& rBaseURL ) override; }; #endif diff --git a/sc/source/filter/inc/scenariocontext.hxx b/sc/source/filter/inc/scenariocontext.hxx index f783be067751..300e61f3f83b 100644 --- a/sc/source/filter/inc/scenariocontext.hxx +++ b/sc/source/filter/inc/scenariocontext.hxx @@ -34,11 +34,11 @@ public: explicit ScenarioContext( WorksheetContextBase& rParent, SheetScenarios& rSheetScenarios ); protected: - 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 onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual void onStartRecord( SequenceInputStream& rStrm ) override; private: Scenario& mrScenario; @@ -50,11 +50,11 @@ public: explicit ScenariosContext( WorksheetFragmentBase& rFragment ); protected: - 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 onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual void onStartRecord( SequenceInputStream& rStrm ) override; private: SheetScenarios& mrSheetScenarios; diff --git a/sc/source/filter/inc/scflt.hxx b/sc/source/filter/inc/scflt.hxx index 73b26f4b64df..9e0457fd6b58 100644 --- a/sc/source/filter/inc/scflt.hxx +++ b/sc/source/filter/inc/scflt.hxx @@ -595,7 +595,7 @@ public: FaceName[sizeof(FaceName)-1] = 0; } Sc10FontData( SvStream& rStream ); - virtual ScDataObject* Clone() const SAL_OVERRIDE { return new Sc10FontData(*this); } + virtual ScDataObject* Clone() const override { return new Sc10FontData(*this); } }; // Font-Collection @@ -629,7 +629,7 @@ public: memcpy(Reserved, rData.Reserved, sizeof(Reserved)); } Sc10NameData(SvStream& rStream); - virtual ScDataObject* Clone() const SAL_OVERRIDE { return new Sc10NameData(*this); } + virtual ScDataObject* Clone() const override { return new Sc10NameData(*this); } }; // Range-Collection @@ -680,7 +680,7 @@ public: memcpy(Reserved, rData.Reserved, sizeof(Reserved)); } Sc10PatternData(SvStream& rStream); -virtual ScDataObject* Clone() const SAL_OVERRIDE { return new Sc10PatternData(*this); } +virtual ScDataObject* Clone() const override { return new Sc10PatternData(*this); } }; // Template-Collection @@ -708,7 +708,7 @@ public: memcpy(&DataBaseRec, &rData.DataBaseRec, sizeof(DataBaseRec)); } Sc10DataBaseData(SvStream& rStream); -virtual ScDataObject* Clone() const SAL_OVERRIDE { return new Sc10DataBaseData(*this); } +virtual ScDataObject* Clone() const override { return new Sc10DataBaseData(*this); } }; // DataBank-Collection @@ -732,7 +732,7 @@ public: Sc10PageData( const Sc10PageFormat& rFormat ) : aPageFormat(rFormat) {} bool operator==( const Sc10PageData& rData ) const { return aPageFormat == rData.aPageFormat; } - virtual ScDataObject* Clone() const SAL_OVERRIDE; + virtual ScDataObject* Clone() const override; }; // PageFormat-Collection diff --git a/sc/source/filter/inc/sharedstringsfragment.hxx b/sc/source/filter/inc/sharedstringsfragment.hxx index f7c321ef784a..f0cf30ae5ac1 100644 --- a/sc/source/filter/inc/sharedstringsfragment.hxx +++ b/sc/source/filter/inc/sharedstringsfragment.hxx @@ -33,11 +33,11 @@ public: const OUString& rFragmentPath ); protected: - 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 ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; - virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; - virtual void finalizeImport() SAL_OVERRIDE; + virtual const ::oox::core::RecordInfo* getRecordInfos() const override; + virtual void finalizeImport() override; }; } // namespace xls diff --git a/sc/source/filter/inc/sheetdatacontext.hxx b/sc/source/filter/inc/sheetdatacontext.hxx index 206d36500f65..98d251e4bf85 100644 --- a/sc/source/filter/inc/sheetdatacontext.hxx +++ b/sc/source/filter/inc/sheetdatacontext.hxx @@ -65,11 +65,11 @@ public: virtual ~SheetDataContext(); protected: - 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 onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; + virtual void onEndElement() override; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; private: /** Different types of cell records. */ diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx index a71cecd01f82..93e5b0c870a9 100644 --- a/sc/source/filter/inc/stylesbuffer.hxx +++ b/sc/source/filter/inc/stylesbuffer.hxx @@ -82,9 +82,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 SAL_OVERRIDE; + virtual sal_Int32 getSchemeColor( sal_Int32 nToken ) const override; /** Derived classes may implement to resolve a palette index to an RGB color. */ - virtual sal_Int32 getPaletteColor( sal_Int32 nPaletteIdx ) const SAL_OVERRIDE; + virtual sal_Int32 getPaletteColor( sal_Int32 nPaletteIdx ) const override; }; class Color : public ::oox::drawingml::Color diff --git a/sc/source/filter/inc/stylesfragment.hxx b/sc/source/filter/inc/stylesfragment.hxx index 9c1836d976db..878c91943879 100644 --- a/sc/source/filter/inc/stylesfragment.hxx +++ b/sc/source/filter/inc/stylesfragment.hxx @@ -32,8 +32,8 @@ public: explicit IndexedColorsContext( WorkbookFragmentBase& rFragment ); protected: - 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 ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; }; class FontContext : public WorkbookContextBase @@ -44,7 +44,7 @@ public: WorkbookContextBase( rParent ), mxFont( rxFont ) {} protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; private: FontRef mxFont; @@ -58,8 +58,8 @@ public: WorkbookContextBase( rParent ), mxBorder( rxBorder ) {} protected: - virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) override; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; private: BorderRef mxBorder; @@ -73,7 +73,7 @@ public: WorkbookContextBase( rParent ), mxFill( rxFill ), mfGradPos( -1.0 ) {} protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; private: FillRef mxFill; @@ -88,8 +88,8 @@ public: WorkbookContextBase( rParent ), mxXf( rxXf ), mbCellXf( bCellXf ) {} protected: - virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) override; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; private: XfRef mxXf; @@ -104,7 +104,7 @@ public: WorkbookContextBase( rParent ), mxDxf( rxDxf ) {} protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; private: DxfRef mxDxf; @@ -118,11 +118,11 @@ public: const OUString& rFragmentPath ); protected: - 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 ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; - virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; - virtual void finalizeImport() SAL_OVERRIDE; + virtual const ::oox::core::RecordInfo* getRecordInfos() const override; + virtual void finalizeImport() override; }; } // namespace xls diff --git a/sc/source/filter/inc/tablecolumnscontext.hxx b/sc/source/filter/inc/tablecolumnscontext.hxx index 513af5eea461..8d25ce9e28b5 100644 --- a/sc/source/filter/inc/tablecolumnscontext.hxx +++ b/sc/source/filter/inc/tablecolumnscontext.hxx @@ -34,11 +34,11 @@ public: explicit TableColumnContext( WorksheetContextBase& rParent, TableColumn& rTableColumn ); protected: - 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 onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual void onStartRecord( SequenceInputStream& rStrm ) override; private: TableColumn& mrTableColumn; @@ -50,11 +50,11 @@ public: explicit TableColumnsContext( WorksheetFragmentBase& rFragment, TableColumns& rTableColumns ); protected: - 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 onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual void onStartRecord( SequenceInputStream& rStrm ) override; private: TableColumns& mrTableColumns; diff --git a/sc/source/filter/inc/tablefragment.hxx b/sc/source/filter/inc/tablefragment.hxx index 43fe8c5923f0..67760683d56c 100644 --- a/sc/source/filter/inc/tablefragment.hxx +++ b/sc/source/filter/inc/tablefragment.hxx @@ -35,10 +35,10 @@ public: const OUString& rFragmentPath ); protected: - 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 ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; - virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; + virtual const ::oox::core::RecordInfo* getRecordInfos() const override; private: Table& mrTable; diff --git a/sc/source/filter/inc/workbookfragment.hxx b/sc/source/filter/inc/workbookfragment.hxx index b67feaf275cb..4a28034c4b9f 100644 --- a/sc/source/filter/inc/workbookfragment.hxx +++ b/sc/source/filter/inc/workbookfragment.hxx @@ -36,13 +36,13 @@ public: const OUString& rFragmentPath ); protected: - 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 onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; - virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; - virtual void finalizeImport() SAL_OVERRIDE; + virtual const ::oox::core::RecordInfo* getRecordInfos() const override; + virtual void finalizeImport() override; private: void importExternalReference( const AttributeList& rAttribs ); diff --git a/sc/source/filter/inc/worksheetfragment.hxx b/sc/source/filter/inc/worksheetfragment.hxx index 5c68ff55f185..0cd02b3f5d74 100644 --- a/sc/source/filter/inc/worksheetfragment.hxx +++ b/sc/source/filter/inc/worksheetfragment.hxx @@ -31,11 +31,11 @@ public: explicit DataValidationsContext( WorksheetFragmentBase& rFragment ); protected: - 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 onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; + virtual void onEndElement() override; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; private: /** Imports the dataValidation element containing data validation settings. */ @@ -55,14 +55,14 @@ public: const OUString& rFragmentPath ); protected: - 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 onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; - virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; - virtual void initializeImport() SAL_OVERRIDE; - virtual void finalizeImport() SAL_OVERRIDE; + virtual const ::oox::core::RecordInfo* getRecordInfos() const override; + virtual void initializeImport() override; + virtual void finalizeImport() 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 2cc94f53390e..76e09398976a 100644 --- a/sc/source/filter/inc/xcl97esc.hxx +++ b/sc/source/filter/inc/xcl97esc.hxx @@ -38,7 +38,7 @@ public: private: /** Override to create a new temporary file and return its stream. */ - virtual SvStream* ImplQueryPictureStream() SAL_OVERRIDE; + virtual SvStream* ImplQueryPictureStream() override; private: ::std::unique_ptr< ::utl::TempFile > mxPicTempFile; @@ -93,9 +93,9 @@ public: virtual EscherExHostAppData* StartShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>& rxShape, - const Rectangle* pChildAnchor ) SAL_OVERRIDE; - virtual void EndShape( sal_uInt16 nShapeType, sal_uInt32 nShapeID ) SAL_OVERRIDE; - virtual EscherExHostAppData* EnterAdditionalTextGroup() SAL_OVERRIDE; + const Rectangle* pChildAnchor ) override; + virtual void EndShape( sal_uInt16 nShapeType, sal_uInt32 nShapeID ) override; + virtual EscherExHostAppData* EnterAdditionalTextGroup() override; /// Flush and merge PicStream into EscherStream void EndDocument(); @@ -153,7 +153,7 @@ class XclEscherClientData : public EscherExClientRecord_Base { public: XclEscherClientData() {} - virtual void WriteData( EscherEx& rEx ) const SAL_OVERRIDE; + virtual void WriteData( EscherEx& rEx ) const override; }; // --- class XclEscherClientTextbox ---------------------------------- @@ -175,7 +175,7 @@ public: //! ONLY for the AdditionalText mimic inline void SetXclObj( XclObj* p ) { pXclObj = p; } - virtual void WriteData( EscherEx& rEx ) const SAL_OVERRIDE; + virtual void WriteData( EscherEx& rEx ) const override; }; #endif // _XCL97ESC_HXX diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx index d9c4aafe8d68..e227170d5d35 100644 --- a/sc/source/filter/inc/xcl97rec.hxx +++ b/sc/source/filter/inc/xcl97rec.hxx @@ -65,8 +65,8 @@ public: /// close groups and DgContainer opened in ctor void EndSheet(); - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; static void ResetCounters(); @@ -108,7 +108,7 @@ protected: void ImplWriteAnchor( const XclExpRoot& rRoot, const SdrObject* pSdrObj, const Rectangle* pChildAnchor ); // overwritten for writing MSODRAWING record - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; virtual void WriteSubRecs( XclExpStream& rStrm ); void SaveTextRecs( XclExpStream& rStrm ); @@ -149,7 +149,7 @@ public: //! actually writes ESCHER_ClientTextbox void SetText( const XclExpRoot& rRoot, const SdrTextObj& rObj ); - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; }; // --- class XclObjComment ------------------------------------------- @@ -173,8 +173,8 @@ public: void ProcessEscherObj( const XclExpRoot& rRoot, const Rectangle& rRect, SdrObject* pCaption, bool bVisible ); - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; // --- class XclObjDropDown ------------------------------------------ @@ -184,7 +184,7 @@ class XclObjDropDown : public XclObj private: bool bIsFiltered; - virtual void WriteSubRecs( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteSubRecs( XclExpStream& rStrm ) override; protected: public: @@ -206,13 +206,13 @@ public: inline void SetHorAlign( sal_uInt8 nHorAlign ) { mnHorAlign = nHorAlign; } inline void SetVerAlign( sal_uInt8 nVerAlign ) { mnVerAlign = nVerAlign; } - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; private: - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; private: XclExpStringRef mpString; /// Text and formatting data. @@ -230,13 +230,13 @@ private: const SdrObject& rOleObj; SotStorage* pRootStorage; - virtual void WriteSubRecs( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteSubRecs( XclExpStream& rStrm ) override; public: XclObjOle( XclExpObjectManager& rObjMgr, const SdrObject& rObj ); virtual ~XclObjOle(); - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; }; // --- class XclObjAny ----------------------------------------------- @@ -244,7 +244,7 @@ public: class XclObjAny : public XclObj { protected: - virtual void WriteSubRecs( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteSubRecs( XclExpStream& rStrm ) override; public: XclObjAny( XclExpObjectManager& rObjMgr, @@ -255,8 +255,8 @@ public: com::sun::star::uno::Reference< com::sun::star::drawing::XShape > GetShape() const { return mxShape; } - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) 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 ); @@ -274,13 +274,13 @@ protected: sal_uInt32 nFileHistory; // bfh sal_uInt32 nLowestBiffVer; // sfo - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: ExcBof8_Base(); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; // --- class ExcBofW8 ------------------------------------------------ @@ -309,15 +309,15 @@ private: OUString sUnicodeName; XclExpString GetName() const { return XclExpString( sUnicodeName, EXC_STR_8BITLENGTH );} - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: ExcBundlesheet8( RootData& rRootData, SCTAB nTab ); ExcBundlesheet8( const OUString& rString ); - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_Size GetLen() const override; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; // --- class XclObproj ----------------------------------------------- @@ -325,8 +325,8 @@ public: class XclObproj : public ExcRecord { public: - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; // ---- class XclCodename -------------------------------------------- @@ -335,12 +335,12 @@ class XclCodename : public ExcRecord { private: XclExpString aName; - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: XclCodename( const OUString& ); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; // ---- Scenarios ---------------------------------------------------- @@ -381,17 +381,17 @@ private: bool Append( sal_uInt16 nCol, sal_uInt16 nRow, const OUString& rTxt ); - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; protected: public: ExcEScenario( const XclExpRoot& rRoot, SCTAB nTab ); virtual ~ExcEScenario(); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; class ExcEScenarioManager : public ExcRecord @@ -400,18 +400,18 @@ private: sal_uInt16 nActive; std::vector<ExcEScenario*> aScenes; - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; protected: public: ExcEScenarioManager( const XclExpRoot& rRoot, SCTAB nTab ); virtual ~ExcEScenarioManager(); - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; }; /** Represents a FEATHDR (SHEETPROTECTION) record that stores sheet protection @@ -423,7 +423,7 @@ public: explicit XclExpSheetProtectOptions( const XclExpRoot& rRoot, SCTAB nTab ); private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: sal_uInt16 mnOptions; /// Encoded sheet protection options. @@ -437,7 +437,7 @@ public: explicit XclExpSheetEnhancedProtection( const XclExpRoot& rRoot, const ScEnhancedProtection& rProt ); private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: const XclExpRoot& mrRoot; @@ -449,14 +449,14 @@ class XclCalccount : public ExcRecord private: sal_uInt16 nCount; protected: - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: XclCalccount( const ScDocument& ); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; class XclIteration : public ExcRecord @@ -464,14 +464,14 @@ class XclIteration : public ExcRecord private: sal_uInt16 nIter; protected: - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: XclIteration( const ScDocument& ); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; class XclDelta : public ExcRecord @@ -479,14 +479,14 @@ class XclDelta : public ExcRecord private: double fDelta; protected: - virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveCont( XclExpStream& rStrm ) override; public: XclDelta( const ScDocument& ); - virtual sal_uInt16 GetNum() const SAL_OVERRIDE; - virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const override; + virtual sal_Size GetLen() const override; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; class XclRefmode : public XclExpBoolRecord @@ -494,7 +494,7 @@ class XclRefmode : public XclExpBoolRecord public: XclRefmode( const ScDocument& ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; class XclExpFileEncryption : public XclExpRecord @@ -504,7 +504,7 @@ public: virtual ~XclExpFileEncryption(); private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: const XclExpRoot& mrRoot; @@ -517,7 +517,7 @@ public: explicit XclExpInterfaceHdr( sal_uInt16 nCodePage ); private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; }; /** End of User Interface Records */ @@ -528,7 +528,7 @@ public: virtual ~XclExpInterfaceEnd(); private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; }; /** Write Access User Name - This record contains the user name, which is @@ -540,7 +540,7 @@ public: virtual ~XclExpWriteAccess(); private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; }; class XclExpFileSharing : public XclExpRecord @@ -548,10 +548,10 @@ class XclExpFileSharing : public XclExpRecord public: explicit XclExpFileSharing( const XclExpRoot& rRoot, sal_uInt16 nPasswordHash, bool bRecommendReadOnly ); - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclExpString maUserName; @@ -566,7 +566,7 @@ public: virtual ~XclExpProt4Rev(); private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; }; class XclExpProt4RevPass : public XclExpRecord @@ -576,7 +576,7 @@ public: virtual ~XclExpProt4RevPass(); private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; }; class XclExpRecalcId : public XclExpDummyRecord diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx index 4de16588ed5e..35dd574675dc 100644 --- a/sc/source/filter/inc/xechart.hxx +++ b/sc/source/filter/inc/xechart.hxx @@ -167,7 +167,7 @@ public: virtual ~XclExpChGroupBase(); /** Saves the header record. Calls WriteSubRecords() to let derived classes write sub records. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) 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. */ @@ -192,7 +192,7 @@ public: XclFutureRecType eRecType, sal_uInt16 nRecId, sal_Size nRecSize = 0 ); /** Writes missing CHFRBLOCKBEGIN records and this record. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; }; // Frame formatting =========================================================== @@ -206,7 +206,7 @@ public: inline XclChFramePos& GetFramePosData() { return maData; } private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChFramePos maData; /// Position of the frame. @@ -238,7 +238,7 @@ public: bool IsDefault( XclChFrameType eDefFrameType ) const; private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChLineFormat maData; /// Contents of the CHLINEFORMAT record. @@ -269,7 +269,7 @@ public: bool IsDefault( XclChFrameType eDefFrameType ) const; private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChAreaFormat maData; /// Contents of the CHAREAFORMAT record. @@ -291,17 +291,17 @@ public: bool IsValid() const; /** Writes the CHESCHERFORMAT record group to the stream, if complex formatting is extant. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; /** Returns true, if this record group contains a CHPICFORMAT record. */ - virtual bool HasSubRecords() const SAL_OVERRIDE; + virtual bool HasSubRecords() const override; /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteSubRecords( XclExpStream& rStrm ) 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 ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChEscherFormat maData; /// Fill properties for complex areas (CHESCHERFORMAT record). @@ -365,12 +365,12 @@ public: bool IsDeleteable() const; /** Writes the entire record group. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteSubRecords( XclExpStream& rStrm ) override; private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChFrame maData; /// Contents of the CHFRAME record. @@ -401,10 +401,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 ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChSourceLink maData; /// Contents of the CHSOURCELINK record. @@ -432,7 +432,7 @@ public: explicit XclExpChObjectLink( sal_uInt16 nLinkTarget, const XclChDataPointPos& rPointPos ); private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChObjectLink maData; /// Contents of the CHOBJECTLINK record. @@ -453,7 +453,7 @@ public: bool bShowPercent, bool bShowBubble ); private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChFrLabelProps maData; /// Contents of the CHFRLABELPROPS record. @@ -491,9 +491,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 ) SAL_OVERRIDE; + virtual void SetFont( XclExpChFontRef xFont, const Color& rColor, sal_uInt32 nColorId ) override; /** Sets text rotation to internal data structures. */ - virtual void SetRotation( sal_uInt16 nRotation ) SAL_OVERRIDE; + virtual void SetRotation( sal_uInt16 nRotation ) override; /** Converts all text settings of the passed title text object. */ void ConvertTitle( css::uno::Reference< css::chart2::XTitle > xTitle, sal_uInt16 nTarget, const OUString* pSubTitle = NULL ); @@ -511,10 +511,10 @@ public: sal_uInt16 GetAttLabelFlags() const; /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteSubRecords( XclExpStream& rStrm ) override; private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChText maData; /// Contents of the CHTEXT record. @@ -555,7 +555,7 @@ private: /** Registers marker colors in palette and stores color identifiers. */ void RegisterColors( const XclExpChRoot& rRoot ); - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChMarkerFormat maData; /// Contents of the CHMARKERFORMAT record. @@ -587,7 +587,7 @@ public: void Convert( const ScfPropertySet& rPropSet ); private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclCh3dDataFormat maData; /// Contents of the CH3DDATAFORMAT record. @@ -627,10 +627,10 @@ public: inline bool IsSeriesFormat() const { return maData.maPointPos.mnPointIdx == EXC_CHDATAFORMAT_ALLPOINTS; } /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteSubRecords( XclExpStream& rStrm ) override; private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChDataFormat maData; /// Contents of the CHDATAFORMAT record. @@ -659,7 +659,7 @@ public: inline XclExpChTextRef GetDataLabel() const { return mxLabel; } private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChSerTrendLine maData; /// Contents of the CHSERTRENDLINE record. @@ -679,7 +679,7 @@ public: bool Convert( XclExpChSourceLink& rValueLink, sal_uInt16& rnValueCount, const ScfPropertySet& rPropSet ); private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChSerErrorBar maData; /// Contents of the CHSERERRORBAR record. @@ -718,7 +718,7 @@ public: void ConvertCategSequence( css::uno::Reference< css::chart2::data::XLabeledDataSequence > xCategSeq ); /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteSubRecords( XclExpStream& rStrm ) override; private: /** Initializes members of this series to represent a child of the passed series. */ @@ -733,7 +733,7 @@ private: void CreateErrorBar( const ScfPropertySet& rPropSet, const OUString& rShowPropName, sal_uInt8 nBarId ); - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: typedef XclExpRecordList< XclExpChDataFormat > XclExpChDataFormatList; @@ -776,7 +776,7 @@ public: inline const XclChTypeInfo& GetTypeInfo() const { return maTypeInfo; } private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChType maData; /// Contents of the chart type record. @@ -798,7 +798,7 @@ public: inline bool IsClustered() const { return ::get_flag( maData.mnFlags, EXC_CHCHART3D_CLUSTER ); } private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChChart3d maData; /// Contents of the CHCHART3D record. @@ -820,10 +820,10 @@ public: void Convert( const ScfPropertySet& rPropSet ); /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteSubRecords( XclExpStream& rStrm ) override; private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChLegend maData; /// Contents of the CHLEGEND record. @@ -848,10 +848,10 @@ public: void Convert( const ScfPropertySet& rPropSet ); /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteSubRecords( XclExpStream& rStrm ) override; private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChObjectType meObjType; /// Type of the dropbar. @@ -901,7 +901,7 @@ public: inline bool IsCombinable2d() const { return !Is3dChart() && maTypeInfo.mbCombinable2d; } /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteSubRecords( XclExpStream& rStrm ) override; private: /** Returns an unused format index to be used for the next created series. */ @@ -916,7 +916,7 @@ private: bool CreateStockSeries( css::uno::Reference< css::chart2::XDataSeries > xDataSeries, const OUString& rValueRole, bool bCloseSymbol ); - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: typedef XclExpRecordList< XclExpChSeries > XclExpChSeriesList; @@ -952,8 +952,8 @@ public: { ::set_flag( maLabelData.mnFlags, EXC_CHLABELRANGE_BETWEEN, bTicksBetween ); } private: - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChLabelRange maLabelData; /// Contents of the CHLABELRANGE record. @@ -973,7 +973,7 @@ public: void ConvertAxisPosition( const ScfPropertySet& rPropSet ); private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChValueRange maData; /// Contents of the CHVALUERANGE record. @@ -994,7 +994,7 @@ public: void SetRotation( sal_uInt16 nRotation ); private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChTick maData; /// Contents of the CHTICK record. @@ -1015,9 +1015,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 ) SAL_OVERRIDE; + virtual void SetFont( XclExpChFontRef xFont, const Color& rColor, sal_uInt32 nColorId ) override; /** Sets text rotation to internal data structures. */ - virtual void SetRotation( sal_uInt16 nRotation ) SAL_OVERRIDE; + virtual void SetRotation( sal_uInt16 nRotation ) override; /** Converts formatting and scaling settings from the passed axis. */ void Convert( css::uno::Reference< css::chart2::XAxis > xAxis, @@ -1033,10 +1033,10 @@ public: inline sal_Int32 GetApiAxisDimension() const { return maData.GetApiAxisDimension(); } /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteSubRecords( XclExpStream& rStrm ) override; private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclChAxis maData; /// Contents of the CHAXIS record. @@ -1079,7 +1079,7 @@ public: bool Is3dChart() const; /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteSubRecords( XclExpStream& rStrm ) override; private: /** Returns first inserted chart type group. */ @@ -1094,7 +1094,7 @@ private: const XclChExtTypeInfo& rTypeInfo, sal_Int32 nCrossingAxisDim ); - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: typedef XclExpRecordList< XclExpChTypeGroup > XclExpChTypeGroupList; @@ -1138,10 +1138,10 @@ public: void SetManualPlotArea(); /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteSubRecords( XclExpStream& rStrm ) override; private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: typedef XclExpRecordList< XclExpChSeries > XclExpChSeriesList; @@ -1169,7 +1169,7 @@ public: const Size& rChartSize ); virtual ~XclExpChartDrawing(); - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; private: std::shared_ptr< XclExpObjectManager > mxObjMgr; diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx index 5567dc1119ff..e735b0fe6d80 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 ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: typedef std::unique_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 ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) 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 ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; void WriteEmbeddedData( XclExpStream& rStrm ); @@ -120,7 +120,7 @@ public: private: /** Writes the body of the HLINK record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: typedef std::unique_ptr< SvStream > SvStreamPtr; @@ -146,7 +146,7 @@ public: explicit XclExpLabelranges( const XclExpRoot& rRoot ); /** Writes the LABELRANGES record if it contains at least one range. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; private: /** Fills the specified range list with all label headers of the current sheet. @@ -173,11 +173,11 @@ public: explicit XclExpCF( const XclExpRoot& rRoot, const ScCondFormatEntry& rFormatEntry, sal_Int32 nPriority ); virtual ~XclExpCF(); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Writes the body of the CF record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: typedef std::unique_ptr< XclExpCFImpl > XclExpCFImplPtr; @@ -190,7 +190,7 @@ public: explicit XclExpDateFormat( const XclExpRoot& rRoot, const ScCondDateFormatEntry& rFormatEntry, sal_Int32 nPriority ); virtual ~XclExpDateFormat(); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: const ScCondDateFormatEntry& mrFormatEntry; @@ -203,7 +203,7 @@ public: explicit XclExpCfvo( const XclExpRoot& rRoot, const ScColorScaleEntry& rFormatEntry, const ScAddress& rPos, bool bFirst = true); virtual ~XclExpCfvo() {} - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: const ScColorScaleEntry& mrEntry; ScAddress maSrcPos; @@ -216,7 +216,7 @@ public: explicit XclExpColScaleCol( const XclExpRoot& rRoot, const Color& rColor); virtual ~XclExpColScaleCol(); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: const Color& mrColor; }; @@ -235,12 +235,12 @@ public: bool IsValid() const; /** Writes the CONDFMT record with following CF records, if there is valid data. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Writes the body of the CONDFMT record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: typedef XclExpRecordList< XclExpRecord > XclExpCFList; @@ -255,7 +255,7 @@ class XclExpColorScale: public XclExpRecord, protected XclExpRoot public: explicit XclExpColorScale( const XclExpRoot& rRoot, const ScColorScaleFormat& rFormat, sal_Int32 nPriority ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: typedef XclExpRecordList< XclExpCfvo > XclExpCfvoList; typedef XclExpRecordList< XclExpColScaleCol > XclExpColScaleColList; @@ -270,7 +270,7 @@ class XclExpDataBar : public XclExpRecord, protected XclExpRoot public: explicit XclExpDataBar( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, sal_Int32 nPriority, const OString& rGUID); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: std::unique_ptr<XclExpCfvo> mpCfvoLowerLimit; std::unique_ptr<XclExpCfvo> mpCfvoUpperLimit; @@ -286,7 +286,7 @@ class XclExpIconSet : public XclExpRecord, protected XclExpRoot public: explicit XclExpIconSet( const XclExpRoot& rRoot, const ScIconSetFormat& rFormat, sal_Int32 nPriority ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: typedef XclExpRecordList< XclExpCfvo > XclExpCfvoList; @@ -303,8 +303,8 @@ public: explicit XclExpCondFormatBuffer( const XclExpRoot& rRoot, XclExtLstRef xExtLst ); /** Writes all contained CONDFMT records with their CF records. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: typedef XclExpRecordList< XclExpCondfmt > XclExpCondfmtList; @@ -332,11 +332,11 @@ public: @return false = Resulting range list empty - do not write this record. */ bool Finalize(); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Writes the body of the DV record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: ScRangeList maScRanges; /// Calc range list with all affected cells. @@ -365,15 +365,15 @@ public: void InsertCellRange( const ScRange& rRange, sal_uLong nScHandle ); /** Writes the DVAL record and the DV record list. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) 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 ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: typedef XclExpRecordList< XclExpDV > XclExpDVList; @@ -401,7 +401,7 @@ public: virtual ~XclExpWebQuery(); /** Writes all needed records for this web query. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; private: XclExpString maDestRange; /// Destination range. diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx index a20bdd962947..33b992d10e02 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 ) SAL_OVERRIDE; + virtual void WriteData( EscherEx& rEscherEx, const Rectangle& rRect ) override; private: virtual void ImplSetFlags( const SdrObject& rSdrObj ); @@ -72,8 +72,8 @@ public: explicit XclExpDffSheetAnchor( const XclExpRoot& rRoot ); private: - virtual void ImplSetFlags( const SdrObject& rSdrObj ) SAL_OVERRIDE; - virtual void ImplCalcAnchorRect( const Rectangle& rRect, MapUnit eMapUnit ) SAL_OVERRIDE; + virtual void ImplSetFlags( const SdrObject& rSdrObj ) override; + virtual void ImplCalcAnchorRect( const Rectangle& rRect, MapUnit eMapUnit ) override; private: SCTAB mnScTab; /// Calc sheet index. @@ -87,8 +87,8 @@ public: const Size& rPageSize, sal_Int32 nScaleX, sal_Int32 nScaleY ); private: - virtual void ImplSetFlags( const SdrObject& rSdrObj ) SAL_OVERRIDE; - virtual void ImplCalcAnchorRect( const Rectangle& rRect, MapUnit eMapUnit ) SAL_OVERRIDE; + virtual void ImplSetFlags( const SdrObject& rSdrObj ) override; + virtual void ImplCalcAnchorRect( const Rectangle& rRect, MapUnit eMapUnit ) override; private: Size maPageSize; @@ -119,7 +119,7 @@ public: explicit XclExpMsoDrawingBase( XclEscherEx& rEscherEx, sal_uInt16 nRecId ); private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; protected: XclEscherEx& mrEscherEx; /// Reference to the DFF converter containing the DFF stream. @@ -151,8 +151,8 @@ public: explicit XclExpImgData( const Graphic& rGraphic, sal_uInt16 nRecId ); /** Writes the BITMAP record. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: Graphic maGraphic; /// The VCL graphic. @@ -214,7 +214,7 @@ public: explicit XclExpShapeObj( XclExpObjectManager& rRoot, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, ScDocument* pDoc ); virtual ~XclExpShapeObj(); private: - virtual void WriteSubRecs( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteSubRecs( XclExpStream& rStrm ) override; }; //delete for exporting OCX @@ -232,7 +232,7 @@ public: sal_uInt32 nStrmStart, sal_uInt32 nStrmSize ); private: - virtual void WriteSubRecs( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteSubRecs( XclExpStream& rStrm ) override; private: OUString maClassName; /// Class name of the control. @@ -256,7 +256,7 @@ public: bool SetMacroLink( const ::com::sun::star::script::ScriptEventDescriptor& rEvent ); private: - virtual void WriteSubRecs( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteSubRecs( XclExpStream& rStrm ) override; /** Writes a subrecord containing a cell link, or nothing, if no link present. */ void WriteCellLinkSubRec( XclExpStream& rStrm, sal_uInt16 nSubRecId ); @@ -296,8 +296,8 @@ public: virtual ~XclExpChartObj(); /** Writes the OBJ record and the entire chart substream. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; const css::uno::Reference<css::chart::XChartDocument>& GetChartDoc() const; @@ -333,14 +333,14 @@ public: const OUString& rAddText ); /** Writes the NOTE record, if the respective Escher object is present. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) 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 ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclExpString maAuthor; /// Name of the author. @@ -370,7 +370,7 @@ public: XclExpComments( SCTAB nTab, XclExpNoteList& rNotes ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: SCTAB mnTab; @@ -435,7 +435,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 SAL_OVERRIDE; + virtual XclExpDffAnchorBase* CreateDffAnchor() const override; private: Size maPageSize; diff --git a/sc/source/filter/inc/xeextlst.hxx b/sc/source/filter/inc/xeextlst.hxx index fcb9a1d8a7ba..3a5270027424 100644 --- a/sc/source/filter/inc/xeextlst.hxx +++ b/sc/source/filter/inc/xeextlst.hxx @@ -49,7 +49,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 ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: ScColorScaleEntryType meType; @@ -81,7 +81,7 @@ class XclExpExtIcon : public XclExpRecordBase, protected XclExpRoot { public: explicit XclExpExtIcon( const XclExpRoot& rRoot, const std::pair<ScIconSetType, sal_Int32>& rCustomEntry); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: const char* pIconSetName; @@ -92,7 +92,7 @@ class XclExpExtDataBar : public XclExpRecordBase, protected XclExpRoot { public: explicit XclExpExtDataBar( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, const ScAddress& rPos ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: databar::ScAxisPosition meAxisPosition; @@ -111,7 +111,7 @@ class XclExpExtIconSet : public XclExpRecordBase, protected XclExpRoot { public: explicit XclExpExtIconSet(const XclExpRoot& rRoot, const ScIconSetFormat& rFormat, const ScAddress& rPos); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: XclExpRecordList<XclExpExtCfvo> maCfvos; @@ -128,7 +128,7 @@ class XclExpExtCfRule : public XclExpRecordBase, protected XclExpRoot { public: XclExpExtCfRule( const XclExpRoot& rRoot, const ScFormatEntry& rFormat, const ScAddress& rPos, const OString& rId, sal_Int32 nPriority ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: XclExpRecordRef mxEntry; @@ -144,7 +144,7 @@ class XclExpExtConditionalFormatting : public XclExpRecordBase, protected XclExp { public: explicit XclExpExtConditionalFormatting( const XclExpRoot& rRoot, std::vector<XclExpExtCondFormatData>& rData, const ScRangeList& rRange); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: XclExpRecordList<XclExpExtCfRule> maCfRules; @@ -157,9 +157,9 @@ class XclExpExtCondFormat : public XclExpExt { public: XclExpExtCondFormat( const XclExpRoot& rRoot ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; - virtual XclExpExtType GetType() SAL_OVERRIDE { return XclExpExtDataBarType; } + virtual XclExpExtType GetType() override { return XclExpExtDataBarType; } void AddRecord( XclExpExtConditionalFormattingRef aFormat ); @@ -171,9 +171,9 @@ class XclExpExtCalcPr : public XclExpExt { public: XclExpExtCalcPr( const XclExpRoot& rRoot, formula::FormulaGrammar::AddressConvention eConv ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; - virtual XclExpExtType GetType() SAL_OVERRIDE { return XclExpExtDataFooType; } + virtual XclExpExtType GetType() override { return XclExpExtDataFooType; } private: formula::FormulaGrammar::AddressConvention meConv; @@ -184,7 +184,7 @@ class XclExtLst : public XclExpRecordBase, public XclExpRoot { public: explicit XclExtLst( const XclExpRoot& rRoot); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; void AddRecord( XclExpExtRef aEntry ); diff --git a/sc/source/filter/inc/xelink.hxx b/sc/source/filter/inc/xelink.hxx index fd3a8374d2d7..9112a9c7192a 100644 --- a/sc/source/filter/inc/xelink.hxx +++ b/sc/source/filter/inc/xelink.hxx @@ -198,10 +198,10 @@ public: const OUString& rName, const ScExternalRefCache::TokenArrayRef& rArray ); /** Writes the entire Link table. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; /** Writes the entire Link table to OOXML. */ - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: typedef std::shared_ptr< XclExpLinkManagerImpl > XclExpLinkMgrImplPtr; diff --git a/sc/source/filter/inc/xename.hxx b/sc/source/filter/inc/xename.hxx index 48188dbfc6e7..f779affc7a34 100644 --- a/sc/source/filter/inc/xename.hxx +++ b/sc/source/filter/inc/xename.hxx @@ -64,8 +64,8 @@ public: bool IsVolatile( sal_uInt16 nNameIdx ) const; /** Writes the entire list of NAME records. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: typedef std::shared_ptr< XclExpNameManagerImpl > XclExpNameMgrImplRef; diff --git a/sc/source/filter/inc/xepage.hxx b/sc/source/filter/inc/xepage.hxx index 3f1d161edcdb..fe05987c39be 100644 --- a/sc/source/filter/inc/xepage.hxx +++ b/sc/source/filter/inc/xepage.hxx @@ -36,10 +36,10 @@ class XclExpHeaderFooter : public XclExpRecord public: explicit XclExpHeaderFooter( sal_uInt16 nRecId, const OUString& rHdrString ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Writes the header or footer string. Writes an empty record, if no header/footer present. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: OUString maHdrString; /// Header or footer contents. @@ -53,10 +53,10 @@ class XclExpSetup : public XclExpRecord public: explicit XclExpSetup( const XclPageData& rPageData ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Writes the contents of the SETUP record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: const XclPageData& mrData; /// Page settings data of current sheet. @@ -74,12 +74,12 @@ public: sal_uInt16 nMaxPos ); /** Writes the record, if the list is not empty. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Writes the page break list. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: const ScfUInt16Vec& mrPageBreaks; /// Page settings data of current sheet. @@ -99,8 +99,8 @@ public: inline const XclPageData& GetPageData() const { return maData; } /** Writes all page settings records to the stream. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; XclExpImgData* getGraphicExport(); @@ -116,7 +116,7 @@ public: explicit XclExpChartPageSettings( const XclExpRoot& rRoot ); /** Writes all page settings records to the stream. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; private: XclPageData maData; /// Page settings data. diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx index 450c3a411c1a..1683f3f7ee15 100644 --- a/sc/source/filter/inc/xepivot.hxx +++ b/sc/source/filter/inc/xepivot.hxx @@ -53,7 +53,7 @@ public: bool EqualsBool( bool bValue ) const; private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: sal_uInt16 mnTypeFlag; /// Data type flag. @@ -94,7 +94,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 ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; private: typedef XclExpRecordList< XclExpPCItem > XclExpPCItemList; @@ -147,7 +147,7 @@ private: void WriteSxgroupinfo( XclExpStream& rStrm ); /** Writes the contents of the SXFIELD record for this field. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclExpPCItemList maOrigItemList; /// List with original items. @@ -247,7 +247,7 @@ public: private: /** Writes the SXVI record body describing the pivot table item. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: const XclExpPCItem* mpCacheItem; /// The referred pivot cache item. @@ -293,7 +293,7 @@ public: void WriteSxdi( XclExpStream& rStrm, sal_uInt16 nDataInfoIdx ) const; /** Writes the entire pivot table field. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; private: /** Returns an item by its name. */ @@ -342,7 +342,7 @@ public: sal_uInt16 GetDataFieldIndex( const OUString& rName, sal_uInt16 nDefaultIdx ) const; /** Writes the entire pivot table. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; private: /** Returns a pivot table field by its name. */ diff --git a/sc/source/filter/inc/xepivotxml.hxx b/sc/source/filter/inc/xepivotxml.hxx index 0b34f2528241..d04f5b79b24e 100644 --- a/sc/source/filter/inc/xepivotxml.hxx +++ b/sc/source/filter/inc/xepivotxml.hxx @@ -33,7 +33,7 @@ public: }; XclExpXmlPivotCaches( const XclExpRoot& rRoot ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; void SetCaches( const std::vector<Entry>& rCaches ); bool HasCaches() const; @@ -64,7 +64,7 @@ class XclExpXmlPivotTables : public XclExpRecordBase, protected XclExpRoot public: XclExpXmlPivotTables( const XclExpRoot& rRoot, const XclExpXmlPivotCaches& rCaches ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; void AppendTable( const ScDPObject* pTable, sal_Int32 nCacheId, sal_Int32 nPivotId ); diff --git a/sc/source/filter/inc/xerecord.hxx b/sc/source/filter/inc/xerecord.hxx index 7bbdd3655cdc..cca2c0aeaeac 100644 --- a/sc/source/filter/inc/xerecord.hxx +++ b/sc/source/filter/inc/xerecord.hxx @@ -49,7 +49,7 @@ public: XclExpDelegatingRecord( XclExpRecordBase* pRecord ); virtual ~XclExpDelegatingRecord(); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: XclExpRecordBase* mpRecord; }; @@ -71,7 +71,7 @@ public: virtual ~XclExpXmlStartElementRecord(); /** Starts the element nElement */ - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; class XclExpXmlEndElementRecord : public XclExpXmlElementRecord @@ -81,7 +81,7 @@ public: virtual ~XclExpXmlEndElementRecord(); /** Ends the element nElement */ - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; class XclExpXmlStartSingleElementRecord : public XclExpXmlElementRecord @@ -91,7 +91,7 @@ public: virtual ~XclExpXmlStartSingleElementRecord(); /** Starts the single element nElement */ - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; class XclExpXmlEndSingleElementRecord : public XclExpRecordBase @@ -101,7 +101,7 @@ public: virtual ~XclExpXmlEndSingleElementRecord(); /** Ends the single element nElement */ - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; /** Base class for single records with any content. @@ -139,7 +139,7 @@ public: void SetRecHeader( sal_uInt16 nRecId, sal_Size nRecSize ); /** Writes the record header and calls WriteBody(). */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; protected: /** Writes the body of the record (without record header). @@ -185,11 +185,11 @@ public: XclExpValueRecord* SetAttribute( sal_Int32 nId ); /** Write the OOXML attribute and its value */ - void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Writes the body of the record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE { rStrm << maValue; } + virtual void WriteBody( XclExpStream& rStrm ) override { rStrm << maValue; } // inlining prevents warning in wntmsci10 private: @@ -239,11 +239,11 @@ public: /** Returns the Boolean value of the record. */ inline bool GetBool() const { return mbValue; } - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Writes the body of the record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: bool mbValue; /// The record data. @@ -265,7 +265,7 @@ public: private: /** Writes the body of the record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: const void* mpData; /// The record data. @@ -280,7 +280,7 @@ public: sal_uInt16 nRecId, sal_Size nRecSize = 0 ); /** Writes the extended record header and calls WriteBody(). */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; private: XclFutureRecType meRecType; @@ -340,14 +340,14 @@ public: inline void RemoveAllRecords() { maRecs.clear(); } /** Writes the complete record list. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE + virtual void Save( XclExpStream& rStrm ) override { // inlining prevents warning in wntmsci10 for( typename RecordVec::iterator aIt = maRecs.begin(), aEnd = maRecs.end(); aIt != aEnd; ++aIt ) (*aIt)->Save( rStrm ); } - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE + virtual void SaveXml( XclExpXmlStream& rStrm ) override { // inlining prevents warning in wntmsci10 for( typename RecordVec::iterator aIt = maRecs.begin(), aEnd = maRecs.end(); aIt != aEnd; ++aIt ) @@ -366,7 +366,7 @@ public: explicit XclExpSubStream( sal_uInt16 nSubStrmType ); /** Writes the complete substream, including leading BOF and trailing EOF. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) 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 57838a58cd9a..5b95a74bcd0e 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -323,14 +323,14 @@ public: virtual bool exportDocument() throw (css::uno::RuntimeException, css::ucb::ContentCreationException, - std::exception) SAL_OVERRIDE; + std::exception) override; // only needed for import; ignore - 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; + virtual bool importDocument() throw() override; + virtual oox::vml::Drawing* getVmlDrawing() override; + virtual const oox::drawingml::Theme* getCurrentTheme() const override; + virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() override; + virtual oox::drawingml::chart::ChartConverter* getChartConverter() override; /* Now create all the overloads in a typesafe way (i.e. without varargs) by creating a number of overloads @@ -362,8 +362,8 @@ public: #undef SAX_ARGS_FUNC private: - virtual ::oox::ole::VbaProject* implCreateVbaProject() const SAL_OVERRIDE; - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::oox::ole::VbaProject* implCreateVbaProject() const override; + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) 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 f08b71c61e61..1a8ca7114464 100644 --- a/sc/source/filter/inc/xestyle.hxx +++ b/sc/source/filter/inc/xestyle.hxx @@ -110,12 +110,12 @@ public: { return Color( GetColorData( nXclIndex ) ); } /** Saves the PALETTE record, if it differs from the default palette. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Writes the contents of the PALETTE record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: typedef std::shared_ptr< XclExpPaletteImpl > XclExpPaletteImplRef; @@ -174,11 +174,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 ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Writes the contents of the FONT record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclFontData maData; /// All font attributes. @@ -191,7 +191,7 @@ class XclExpDxfFont : public XclExpRecordBase, protected XclExpRoot public: XclExpDxfFont(const XclExpRoot& rRoot, const SfxItemSet& rItemSet); - virtual void SaveXml(XclExpXmlStream& rStrm) SAL_OVERRIDE; + virtual void SaveXml(XclExpXmlStream& rStrm) override; private: ScDxfFont maDxfData; @@ -204,10 +204,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 SAL_OVERRIDE; + virtual bool Equals( const XclFontData& rFontData, sal_uInt32 nHash ) const override; /** Skips writing this record. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; }; class ScPatternAttr; @@ -246,8 +246,8 @@ public: XclExpColorType eColorType, bool bAppFont = false ); /** Writes all FONT records contained in this buffer. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Initializes the default fonts for the current BIFF version. */ @@ -297,8 +297,8 @@ public: sal_uInt16 Insert( sal_uLong nScNumFmt ); /** Writes all FORMAT records contained in this buffer. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Writes the FORMAT record with index nXclIx and format string rFormatStr. */ @@ -482,7 +482,7 @@ public: void SetXmlIds( sal_uInt32 nBorderId, sal_uInt32 nFillId ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; protected: explicit XclExpXF( const XclExpRoot& rRoot, bool bCellXF ); @@ -526,7 +526,7 @@ private: void WriteBody8( XclExpStream& rStrm ); /** Writes the contents of the XF record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; }; /** Represents a default XF record. Supports methods to set attributes directly. */ @@ -552,11 +552,11 @@ public: /** Returns true, if this record represents an Excel built-in style. */ inline bool IsBuiltIn() const { return mnStyleId != EXC_STYLE_USERDEF; } - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Writes the contents of the STYLE record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: OUString maName; /// Name of the cell style. @@ -633,8 +633,8 @@ public: sal_Int32 GetXmlCellIndex( sal_uInt32 nXFId ) const; /** Writes all XF records contained in this buffer. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: typedef XclExpRecordList< XclExpXF > XclExpXFList; @@ -714,7 +714,7 @@ public: XclExpDxfFont* pFont, XclExpNumFmt* pNumberFmt, XclExpCellProt* pProt, XclExpColor* pColor); virtual ~XclExpDxf(); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: std::unique_ptr<XclExpCellAlign> mpAlign; @@ -733,7 +733,7 @@ public: sal_Int32 GetDxfId(const OUString& rName); - virtual void SaveXml( XclExpXmlStream& rStrm) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm) override; private: typedef boost::ptr_vector<XclExpDxf> DxfContainer; std::map<OUString, sal_Int32> maStyleNameToDxfId; @@ -747,7 +747,7 @@ class XclExpXmlStyleSheet : public XclExpRecordBase, protected XclExpRoot public: explicit XclExpXmlStyleSheet( const XclExpRoot& rRoot ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; #endif diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx index 31e879dffc86..3a29f3582f4d 100644 --- a/sc/source/filter/inc/xetable.hxx +++ b/sc/source/filter/inc/xetable.hxx @@ -53,7 +53,7 @@ public: explicit XclExpStringRec( const XclExpRoot& rRoot, const OUString& rResult ); private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclExpStringRef mxResult; @@ -111,12 +111,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 SAL_OVERRIDE; + virtual XclTokenArrayRef CreateCellTokenArray( const XclExpRoot& rRoot ) const override; /** Returns true, if the array formula contains volatile functions. */ - virtual bool IsVolatile() const SAL_OVERRIDE; + virtual bool IsVolatile() const override; private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclTokenArrayRef mxTokArr; /// The token array of a matrix formula. @@ -159,12 +159,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 SAL_OVERRIDE; + virtual XclTokenArrayRef CreateCellTokenArray( const XclExpRoot& rRoot ) const override; /** Returns true, if the shared formula contains volatile functions. */ - virtual bool IsVolatile() const SAL_OVERRIDE; + virtual bool IsVolatile() const override; private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclTokenArrayRef mxTokArr; /// The token array of a shared formula. @@ -221,18 +221,18 @@ public: void Finalize(); /** Creates and returns the token array for a corresponding FORMULA cell record. */ - virtual XclTokenArrayRef CreateCellTokenArray( const XclExpRoot& rRoot ) const SAL_OVERRIDE; + virtual XclTokenArrayRef CreateCellTokenArray( const XclExpRoot& rRoot ) const override; /** Returns true, if the multiple operations range is volatile. */ - virtual bool IsVolatile() const SAL_OVERRIDE; + virtual bool IsVolatile() const override; /** Writes the record if it is valid. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) 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 ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: sal_uInt16 mnLastAppXclCol;/// Column index of last appended cell. @@ -323,15 +323,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 SAL_OVERRIDE; + virtual sal_uInt16 GetLastXclCol() const override; /** Return the XF identifier of the cell. */ - virtual sal_uInt32 GetFirstXFId() const SAL_OVERRIDE; + virtual sal_uInt32 GetFirstXFId() const override; /** Returns true, if this record does not contain at least one valid cell. */ - virtual bool IsEmpty() const SAL_OVERRIDE; + virtual bool IsEmpty() const override; /** Converts the XF identifier into the Excel XF index. */ - virtual void ConvertXFIndexes( const XclExpRoot& rRoot ) SAL_OVERRIDE; + virtual void ConvertXFIndexes( const XclExpRoot& rRoot ) override; /** Writes cell address, XF index, and calls WriteContents() for each cell. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; protected: explicit XclExpSingleCellBase( sal_uInt16 nRecId, sal_Size nContSize, @@ -349,7 +349,7 @@ protected: private: /** Writes cell address, XF index, and calls WriteContents() for each cell. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; /** Derived classes write the contents of the specified cell (without XF index). */ virtual void WriteContents( XclExpStream& rStrm ) = 0; @@ -368,9 +368,9 @@ public: const ScPatternAttr* pPattern, sal_uInt32 nForcedXFId, double fValue ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: - virtual void WriteContents( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteContents( XclExpStream& rStrm ) override; private: double mfValue; /// The cell value. @@ -386,9 +386,9 @@ public: const ScPatternAttr* pPattern, sal_uInt32 nForcedXFId, bool bValue ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: - virtual void WriteContents( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteContents( XclExpStream& rStrm ) override; private: bool mbValue; /// The cell value. @@ -419,15 +419,15 @@ public: const EditTextObject* pEditText, XclExpHyperlinkHelper& rHlinkHelper ); /** Returns true if the cell contains multi-line text. */ - virtual bool IsMultiLineText() const SAL_OVERRIDE; + virtual bool IsMultiLineText() const override; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Initializes the record contents. Called from constructors. */ void Init( const XclExpRoot& rRoot, const ScPatternAttr* pPattern, XclExpStringRef xText ); - virtual void WriteContents( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteContents( XclExpStream& rStrm ) override; private: XclExpStringRef mxText; /// The cell text. @@ -451,11 +451,11 @@ public: XclExpTableopBuffer& rTableopBfr ); /** Writes the FORMULA record and additional records related to the formula. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: - virtual void WriteContents( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteContents( XclExpStream& rStrm ) override; private: ScFormulaCell& mrScFmlaCell; /// The Calc formula cell. @@ -479,18 +479,18 @@ class XclExpMultiCellBase : public XclExpCellBase { public: /** Returns the column index of the last cell this record describes. */ - virtual sal_uInt16 GetLastXclCol() const SAL_OVERRIDE; + virtual sal_uInt16 GetLastXclCol() const override; /** Return the XF identifier of the first contained cell. */ - virtual sal_uInt32 GetFirstXFId() const SAL_OVERRIDE; + virtual sal_uInt32 GetFirstXFId() const override; /** Returns true, if this record does not contain at least one valid cell. */ - virtual bool IsEmpty() const SAL_OVERRIDE; + virtual bool IsEmpty() const override; /** Convert all XF identifiers into the Excel XF indexes. */ - virtual void ConvertXFIndexes( const XclExpRoot& rRoot ) SAL_OVERRIDE; + virtual void ConvertXFIndexes( const XclExpRoot& rRoot ) 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 ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; protected: explicit XclExpMultiCellBase( sal_uInt16 nRecId, sal_uInt16 nMulRecId, @@ -542,16 +542,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 ) SAL_OVERRIDE; + virtual bool TryMerge( const XclExpCellBase& rCell ) override; /** Inserts the Excel XF index(es) into the passed vector. */ - virtual void GetBlankXFIndexes( ScfUInt16Vec& rXFIndexes ) const SAL_OVERRIDE; + virtual void GetBlankXFIndexes( ScfUInt16Vec& rXFIndexes ) const override; /** Tries to remove unused Excel XF index(es). */ - virtual void RemoveUnusedBlankCells( const ScfUInt16Vec& rXFIndexes ) SAL_OVERRIDE; + virtual void RemoveUnusedBlankCells( const ScfUInt16Vec& rXFIndexes ) override; private: /** Writes the remaining contents of the specified cell (without XF index). */ - 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; + virtual void WriteContents( XclExpStream& rStrm, sal_uInt16 nRelCol ) override; + virtual void WriteXmlContents( XclExpXmlStream& rStrm, const XclAddress& rAddress, sal_uInt32 nXFId, sal_uInt16 nRelCol ) override; }; /** Represents an RK or MULRK record that describes cells with a compressed double values. */ @@ -565,12 +565,12 @@ public: sal_Int32 nRkValue ); /** Tries to merge the contents of the passed cell to own data. */ - virtual bool TryMerge( const XclExpCellBase& rCell ) SAL_OVERRIDE; + virtual bool TryMerge( const XclExpCellBase& rCell ) override; private: /** Writes the remaining contents of the specified cell (without XF index). */ - 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; + virtual void WriteContents( XclExpStream& rStrm, sal_uInt16 nRelCol ) override; + virtual void WriteXmlContents( XclExpXmlStream& rStrm, const XclAddress& rAddress, sal_uInt32 nXFId, sal_uInt16 nRelCol ) override; private: ScfInt32Vec maRkValues; /// The cell values. @@ -644,7 +644,7 @@ public: explicit XclExpGuts( const XclExpRoot& rRoot ); private: - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: sal_uInt16 mnColLevels; /// Number of visible column outline levels. @@ -664,10 +664,10 @@ public: sal_uInt16 nFirstUsedXclCol, sal_uInt32 nFirstUsedXclRow, sal_uInt16 nFirstFreeXclCol, sal_uInt32 nFirstFreeXclRow ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Writes the contents of the DIMENSIONS record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: sal_uInt32 mnFirstUsedXclRow; /// First used row. @@ -732,11 +732,11 @@ public: /** Returns true, if the column has default format and width. */ bool IsDefault( const XclExpDefcolwidth& rDefColWidth ) const; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Writes the contents of this COLINFO record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclExpXFId maXFId; /// The XF identifier for column default format. @@ -767,8 +767,8 @@ public: void Finalize( ScfUInt16Vec& rXFIndexes ); /** Writes all COLINFO records of this buffer. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: typedef XclExpRecordList< XclExpColinfo > XclExpColinfoList; @@ -807,7 +807,7 @@ public: XclExpDefaultRowData& GetDefaultData() { return maDefData; } private: /** Writes the contents of the record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclExpDefaultRowData maDefData; /// Record data. @@ -874,8 +874,8 @@ public: void WriteCellList( XclExpStream& rStrm ); /** Writes the ROW record if the row is not disabled (see DisableIfDefault() function). */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; inline sal_uInt32 GetXclRowRpt() const { return mnXclRowRpt; } inline void SetXclRowRpt( sal_uInt32 nRpt ){ mnXclRowRpt = nRpt; } @@ -884,7 +884,7 @@ private: void InsertCell( XclExpCellRef xCell, size_t nPos, bool bIsMergedBase ); /** Writes the contents of the ROW record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: typedef XclExpRecordList< XclExpCellBase > XclExpCellList; @@ -924,8 +924,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 ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; XclExpDimensions& GetDimensions() { return maDimensions;} @@ -989,8 +989,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 ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: typedef XclExpRecordList< XclExpNote > XclExpNoteList; diff --git a/sc/source/filter/inc/xeview.hxx b/sc/source/filter/inc/xeview.hxx index 87f7e182b791..0e4176e98083 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 ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Writes the contents of the WINDOW1 record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) 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 ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: Color maGridColor; /// Grid color (<=BIFF5). @@ -75,7 +75,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 ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: sal_uInt16 mnNum; /// Numerator of the zoom factor. @@ -88,11 +88,11 @@ class XclExpPane : public XclExpRecord public: explicit XclExpPane( const XclTabViewData& rData ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Writes the contents of the PANE record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: sal_uInt16 mnSplitX; /// Split X position, or frozen column. @@ -108,10 +108,10 @@ class XclExpSelection : public XclExpRecord public: explicit XclExpSelection( const XclTabViewData& rData, sal_uInt8 nPane ); - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: /** Writes the contents of the SELECTION record. */ - virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: XclSelectionData maSelData; /// Selection data. @@ -126,7 +126,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 ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) override; private: const XclTabViewData& mrTabViewData; /// view settings data of current sheet. @@ -142,8 +142,8 @@ public: explicit XclExpTabViewSettings( const XclExpRoot& rRoot, SCTAB nScTab ); /** Writes all view settings records to the stream. */ - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) override; + virtual void SaveXml( XclExpXmlStream& rStrm ) 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 9d1dfff38453..038db9d51e13 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -280,9 +280,9 @@ public: explicit XclImpChEscherFormat( const XclImpRoot& rRoot ); /** Reads the CHESCHERFORMAT record (complex fill data) (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadHeaderRecord( XclImpStream& rStrm ) override; /** Reads a record from the CHESCHERFORMAT group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadSubRecord( XclImpStream& rStrm ) override; /** Converts and writes the contained data to the passed property set. */ void Convert( const XclImpChRoot& rRoot, ScfPropertySet& rPropSet, @@ -311,7 +311,7 @@ public: explicit XclImpChFrameBase( const XclChFormatInfo& rFmtInfo ); /** Reads a frame formatting record (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadSubRecord( XclImpStream& rStrm ) override; /** Returns true, if the line format is set to automatic. */ inline bool IsAutoLine() const { return !mxLineFmt || mxLineFmt->IsAuto(); } @@ -357,7 +357,7 @@ public: XclChObjectType eObjType ); /** Reads the CHFRAME record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadHeaderRecord( XclImpStream& rStrm ) override; /** Sets formatting from BIFF3-BIFF5 OBJ record, if own formatting is invisible. */ void UpdateObjFrame( const XclObjLineData& rLineData, const XclObjFillData& rFillData ); @@ -469,16 +469,16 @@ public: explicit XclImpChText( const XclImpChRoot& rRoot ); /** Reads the CHTEXT record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadHeaderRecord( XclImpStream& rStrm ) override; /** Reads a record from the CHTEXT group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadSubRecord( XclImpStream& rStrm ) override; /** Returns the leading font index for the text object. */ - virtual sal_uInt16 GetFontIndex() const SAL_OVERRIDE; + virtual sal_uInt16 GetFontIndex() const override; /** Returns the leading font color for the text object. */ - virtual Color GetFontColor() const SAL_OVERRIDE; + virtual Color GetFontColor() const override; /** Returns the rotation value for the text object. */ - virtual sal_uInt16 GetRotation() const SAL_OVERRIDE; + virtual sal_uInt16 GetRotation() const override; /** Sets explicit string data for this text object. */ void SetString( const OUString& rString ); @@ -633,9 +633,9 @@ public: explicit XclImpChDataFormat( const XclImpChRoot& rRoot ); /** Reads the CHDATAFORMAT record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadHeaderRecord( XclImpStream& rStrm ) override; /** Reads a record from the CHDATAFORMAT group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadSubRecord( XclImpStream& rStrm ) override; /** Sets this object to the specified data point position. */ void SetPointPos( const XclChDataPointPos& rPointPos, sal_uInt16 nFormatIdx ); @@ -757,9 +757,9 @@ public: explicit XclImpChSeries( const XclImpChRoot& rRoot, sal_uInt16 nSeriesIdx ); /** Reads the CHSERIES record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadHeaderRecord( XclImpStream& rStrm ) override; /** Reads a record from the CHSERIES group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadSubRecord( XclImpStream& rStrm ) override; /** Sets a data point or series format (CHDATAFORMAT group) for this series. */ void SetDataFormat( const XclImpChDataFormatRef& xDataFmt ); @@ -904,9 +904,9 @@ public: explicit XclImpChLegend( const XclImpChRoot& rRoot ); /** Reads the CHLEGEND record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadHeaderRecord( XclImpStream& rStrm ) override; /** Reads a record from the CHLEGEND group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadSubRecord( XclImpStream& rStrm ) override; /** Final processing after reading the entire chart. */ void Finalize(); @@ -934,7 +934,7 @@ public: explicit XclImpChDropBar( sal_uInt16 nDropBar ); /** Reads the CHDROPBAR record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadHeaderRecord( XclImpStream& rStrm ) override; /** Converts and writes the contained frame data to the passed property set. */ void Convert( const XclImpChRoot& rRoot, ScfPropertySet& rPropSet ) const; @@ -960,9 +960,9 @@ public: explicit XclImpChTypeGroup( const XclImpChRoot& rRoot ); /** Reads the CHTYPEGROUP record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadHeaderRecord( XclImpStream& rStrm ) override; /** Reads a record from the CHTYPEGROUP group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadSubRecord( XclImpStream& rStrm ) override; /** Final processing after reading the entire chart. */ void Finalize(); @@ -1132,18 +1132,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 ) SAL_OVERRIDE; + virtual void ReadHeaderRecord( XclImpStream& rStrm ) override; /** Reads a record from the CHAXIS group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadSubRecord( XclImpStream& rStrm ) override; /** Final processing after reading the entire chart. */ void Finalize(); /** Returns the font index for the axis labels. */ - virtual sal_uInt16 GetFontIndex() const SAL_OVERRIDE; + virtual sal_uInt16 GetFontIndex() const override; /** Returns the font color for the axis labels. */ - virtual Color GetFontColor() const SAL_OVERRIDE; + virtual Color GetFontColor() const override; /** Returns the rotation value for axis labels. */ - virtual sal_uInt16 GetRotation() const SAL_OVERRIDE; + virtual sal_uInt16 GetRotation() const override; /** Returns the type of this axis. */ inline sal_uInt16 GetAxisType() const { return maData.mnType; } @@ -1199,9 +1199,9 @@ public: explicit XclImpChAxesSet( const XclImpChRoot& rRoot, sal_uInt16 nAxesSetId ); /** Reads the CHAXESSET record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadHeaderRecord( XclImpStream& rStrm ) override; /** Reads a record from the CHAXESSET group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadSubRecord( XclImpStream& rStrm ) override; /** Final processing after reading the entire chart. */ void Finalize(); @@ -1283,9 +1283,9 @@ public: virtual ~XclImpChChart(); /** Reads the CHCHART record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadHeaderRecord( XclImpStream& rStrm ) override; /** Reads a record from the CHCHART group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; + virtual void ReadSubRecord( XclImpStream& rStrm ) 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. */ @@ -1366,9 +1366,9 @@ public: const Rectangle& rChartRect ); /** Calculate the resulting rectangle of the passed anchor. */ - virtual Rectangle CalcAnchorRect( const XclObjAnchor& rAnchor, bool bDffAnchor ) const SAL_OVERRIDE; + virtual Rectangle CalcAnchorRect( const XclObjAnchor& rAnchor, bool bDffAnchor ) const override; /** Called whenever an object has been inserted into the draw page. */ - virtual void OnObjectInserted( const XclImpDrawObjBase& rDrawObj ) SAL_OVERRIDE; + virtual void OnObjectInserted( const XclImpDrawObjBase& rDrawObj ) 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 6e55d35b188e..989afd934d72 100644 --- a/sc/source/filter/inc/xiescher.hxx +++ b/sc/source/filter/inc/xiescher.hxx @@ -245,15 +245,15 @@ public: protected: /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */ - virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) override; /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */ - virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) 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 ) SAL_OVERRIDE; + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) override; /** Returns a progress bar size that takes all group children into account. */ - virtual sal_Size DoGetProgressSize() const SAL_OVERRIDE; + virtual sal_Size DoGetProgressSize() const override; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; + virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const override; protected: XclImpDrawObjVector maChildren; /// Grouped objects. @@ -268,13 +268,13 @@ public: protected: /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */ - virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) override; /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */ - virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) 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 ) SAL_OVERRIDE; + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) override; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; + virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const override; protected: XclObjLineData maLineData; /// BIFF5 line formatting. @@ -296,13 +296,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 ) SAL_OVERRIDE; + virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) override; /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */ - virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) 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 ) SAL_OVERRIDE; + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) override; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; + virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const override; protected: XclObjFillData maFillData; /// BIFF5 fill formatting. @@ -318,7 +318,7 @@ public: protected: /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; + virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const override; }; /** An arc object. */ @@ -329,13 +329,13 @@ public: protected: /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */ - virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) override; /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */ - virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) 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 ) SAL_OVERRIDE; + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) override; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; + virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const override; protected: XclObjFillData maFillData; /// BIFF5 fill formatting. @@ -354,11 +354,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 ) SAL_OVERRIDE; + virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) 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 ) SAL_OVERRIDE; + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) override; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; + virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const override; protected: typedef std::vector< Point > PointVector; @@ -389,15 +389,15 @@ public: protected: /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */ - virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) override; /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */ - virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) 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 ) SAL_OVERRIDE; + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) override; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; + virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const override; /** Inserts the contained text data at the passed object. */ - virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const SAL_OVERRIDE; + virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const override; protected: XclImpObjTextData maTextData; /// Textbox data from BIFF5 OBJ or BIFF8 TXO record. @@ -415,19 +415,19 @@ public: protected: /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */ - virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) override; /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */ - virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) 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 ) SAL_OVERRIDE; + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) 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 ) SAL_OVERRIDE; + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) override; /** Returns the needed size on the progress bar. */ - virtual sal_Size DoGetProgressSize() const SAL_OVERRIDE; + virtual sal_Size DoGetProgressSize() const override; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; + virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const override; /** Converts the chart document. */ - virtual void DoPostProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const SAL_OVERRIDE; + virtual void DoPostProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const override; private: /** Calculates the object anchor of a sheet chart (chart fills one page). */ @@ -451,7 +451,7 @@ public: protected: /** Inserts the note into the document, sets visibility. */ - virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const SAL_OVERRIDE; + virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const override; private: ScAddress maScPos; /// Cell position of the note object. @@ -523,9 +523,9 @@ protected: void ConvertLabel( ScfPropertySet& rPropSet ) const; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; + virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const override; /** Additional processing on the SdrObject, calls new virtual function DoProcessControl(). */ - virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const SAL_OVERRIDE; + virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const override; /** Derived classes return the service name of the control component to be created. */ virtual OUString DoGetServiceName() const = 0; @@ -541,11 +541,11 @@ public: protected: /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const override; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const SAL_OVERRIDE; + virtual OUString DoGetServiceName() const override; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; + virtual XclTbxEventType DoGetEventType() const override; }; /** A checkbox control. */ @@ -556,15 +556,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 ) SAL_OVERRIDE; + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) 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 ) SAL_OVERRIDE; + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) override; /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const override; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const SAL_OVERRIDE; + virtual OUString DoGetServiceName() const override; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; + virtual XclTbxEventType DoGetEventType() const override; protected: sal_uInt16 mnState; @@ -579,15 +579,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 ) SAL_OVERRIDE; + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) 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 ) SAL_OVERRIDE; + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) override; /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const override; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const SAL_OVERRIDE; + virtual OUString DoGetServiceName() const override; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; + virtual XclTbxEventType DoGetEventType() const override; protected: sal_uInt16 mnNextInGroup; /// Next option button in a group. @@ -602,11 +602,11 @@ public: protected: /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const override; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const SAL_OVERRIDE; + virtual OUString DoGetServiceName() const override; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; + virtual XclTbxEventType DoGetEventType() const override; }; /** A groupbox control. */ @@ -617,15 +617,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 ) SAL_OVERRIDE; + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) 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 ) SAL_OVERRIDE; + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) override; /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const override; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const SAL_OVERRIDE; + virtual OUString DoGetServiceName() const override; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; + virtual XclTbxEventType DoGetEventType() const override; protected: sal_uInt16 mnGroupBoxFlags; @@ -639,11 +639,11 @@ public: protected: /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const override; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const SAL_OVERRIDE; + virtual OUString DoGetServiceName() const override; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; + virtual XclTbxEventType DoGetEventType() const override; }; /** An edit control. */ @@ -657,15 +657,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 ) SAL_OVERRIDE; + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) 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 ) SAL_OVERRIDE; + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) override; /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const override; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const SAL_OVERRIDE; + virtual OUString DoGetServiceName() const override; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; + virtual XclTbxEventType DoGetEventType() const override; protected: sal_uInt16 mnContentType; @@ -685,7 +685,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 ) SAL_OVERRIDE; + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) override; protected: sal_uInt16 mnValue; @@ -706,13 +706,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 ) SAL_OVERRIDE; + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) override; /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const override; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const SAL_OVERRIDE; + virtual OUString DoGetServiceName() const override; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; + virtual XclTbxEventType DoGetEventType() const override; }; /** A scrollbar control. */ @@ -723,13 +723,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 ) SAL_OVERRIDE; + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) override; /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const override; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const SAL_OVERRIDE; + virtual OUString DoGetServiceName() const override; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; + virtual XclTbxEventType DoGetEventType() const override; }; /** Base class for list controls (listbox, dropdown). */ @@ -763,15 +763,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 ) SAL_OVERRIDE; + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) 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 ) SAL_OVERRIDE; + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) override; /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const override; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const SAL_OVERRIDE; + virtual OUString DoGetServiceName() const override; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; + virtual XclTbxEventType DoGetEventType() const override; protected: ScfUInt8Vec maSelection; @@ -791,15 +791,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 ) SAL_OVERRIDE; + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) 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 ) SAL_OVERRIDE; + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) override; /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const override; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const SAL_OVERRIDE; + virtual OUString DoGetServiceName() const override; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; + virtual XclTbxEventType DoGetEventType() const override; protected: sal_uInt16 mnLeft; @@ -817,7 +817,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 SAL_OVERRIDE; + virtual OUString GetObjName() const override; /** Returns the graphic imported from the IMGDATA record. */ inline const Graphic& GetGraphic() const { return maGraphic; } @@ -838,17 +838,17 @@ public: protected: /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */ - virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) override; /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */ - virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; + virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) 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 ) SAL_OVERRIDE; + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) 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 ) SAL_OVERRIDE; + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) override; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; + virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const override; /** Override to do additional processing on the SdrObject. */ - virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const SAL_OVERRIDE; + virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const override; private: /** Reads and sets the picture flags from a BIFF3-BIFF5 OBJ picture record. */ @@ -921,7 +921,7 @@ public: protected: /** Returns a color from the Excel color palette. */ - virtual bool GetColorFromPalette( sal_uInt16 nIndex, Color& rColor ) const SAL_OVERRIDE; + virtual bool GetColorFromPalette( sal_uInt16 nIndex, Color& rColor ) const override; }; /** This is the central instance for converting binary DFF data into shape @@ -971,14 +971,14 @@ private: SvStream& rDffStrm, DffRecordHeader& rHeader, void* pClientData, - DffObjData& rObjData ) SAL_OVERRIDE; + DffObjData& rObjData ) override; /** Processes an DFF object, reads properties from DFF stream. */ virtual SdrObject* ProcessObj( SvStream& rDffStrm, DffObjData& rDffObjData, void* pClientData, Rectangle& rTextRect, - SdrObject* pOldSdrObj = 0 ) SAL_OVERRIDE; + SdrObject* pOldSdrObj = 0 ) override; // virtual functions of SvxMSConvertOCXControls @@ -989,7 +989,7 @@ private: const ::com::sun::star::awt::Size& rSize, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >* pxShape, - bool bFloatingCtrl ) SAL_OVERRIDE; + bool bFloatingCtrl ) override; private: /** Data per registered drawing manager, will be stacked for recursive calls. */ @@ -1132,9 +1132,9 @@ public: void ConvertObjects( XclImpDffConverter& rDffConv ); /** Calculate the resulting rectangle of the passed anchor. */ - virtual Rectangle CalcAnchorRect( const XclObjAnchor& rAnchor, bool bDffAnchor ) const SAL_OVERRIDE; + virtual Rectangle CalcAnchorRect( const XclObjAnchor& rAnchor, bool bDffAnchor ) const override; /** On call, updates the used area of the sheet. */ - virtual void OnObjectInserted( const XclImpDrawObjBase& rDrawObj ) SAL_OVERRIDE; + virtual void OnObjectInserted( const XclImpDrawObjBase& rDrawObj ) 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 0843cd187b3b..c575c4ead6ab 100644 --- a/sc/source/filter/inc/xistream.hxx +++ b/sc/source/filter/inc/xistream.hxx @@ -55,8 +55,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 ) SAL_OVERRIDE; - virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) SAL_OVERRIDE; + virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) override; + virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) override; /** Updates the decrypter on start of a new record or after seeking stream. */ void Update( SvStream& rStrm, sal_uInt16 nRecSize ); @@ -99,15 +99,15 @@ private: explicit XclImpBiff5Decrypter( const XclImpBiff5Decrypter& rSrc ); /** Implementation of cloning this object. */ - virtual XclImpBiff5Decrypter* OnClone() const SAL_OVERRIDE; + virtual XclImpBiff5Decrypter* OnClone() const override; /** Implements password verification and initialization of the decoder. */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > - OnVerifyPassword( const OUString& rPassword ) SAL_OVERRIDE; - virtual bool OnVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) SAL_OVERRIDE; + OnVerifyPassword( const OUString& rPassword ) override; + virtual bool OnVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) override; /** Implementation of updating the decrypter. */ - virtual void OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize ) SAL_OVERRIDE; + virtual void OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize ) override; /** Implementation of the decryption. */ - virtual sal_uInt16 OnRead( SvStream& rStrm, sal_uInt8* pnData, sal_uInt16 nBytes ) SAL_OVERRIDE; + virtual sal_uInt16 OnRead( SvStream& rStrm, sal_uInt8* pnData, sal_uInt16 nBytes ) override; private: ::msfilter::MSCodec_XorXLS95 maCodec; /// Crypto algorithm implementation. @@ -128,15 +128,15 @@ private: explicit XclImpBiff8Decrypter( const XclImpBiff8Decrypter& rSrc ); /** Implementation of cloning this object. */ - virtual XclImpBiff8Decrypter* OnClone() const SAL_OVERRIDE; + virtual XclImpBiff8Decrypter* OnClone() const override; /** Implements password verification and initialization of the decoder. */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > - OnVerifyPassword( const OUString& rPassword ) SAL_OVERRIDE; - virtual bool OnVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) SAL_OVERRIDE; + OnVerifyPassword( const OUString& rPassword ) override; + virtual bool OnVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) override; /** Implementation of updating the decrypter. */ - virtual void OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize ) SAL_OVERRIDE; + virtual void OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize ) override; /** Implementation of the decryption. */ - virtual sal_uInt16 OnRead( SvStream& rStrm, sal_uInt8* pnData, sal_uInt16 nBytes ) SAL_OVERRIDE; + virtual sal_uInt16 OnRead( SvStream& rStrm, sal_uInt8* pnData, sal_uInt16 nBytes ) override; /** Returns the block number corresponding to the passed stream position. */ static sal_uInt32 GetBlock( sal_Size nStrmPos ); |