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 /include/oox/dump | |
parent | HAVE_CXX11_OVERRIDE is required on all supported toolchains (diff) | |
download | core-b36963c0a6a09f70ca6d8d607dd3249a3496497d.tar.gz core-b36963c0a6a09f70ca6d8d607dd3249a3496497d.zip |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'include/oox/dump')
-rw-r--r-- | include/oox/dump/dffdumper.hxx | 6 | ||||
-rw-r--r-- | include/oox/dump/dumperbase.hxx | 80 | ||||
-rw-r--r-- | include/oox/dump/oledumper.hxx | 114 | ||||
-rw-r--r-- | include/oox/dump/pptxdumper.hxx | 4 | ||||
-rw-r--r-- | include/oox/dump/xlsbdumper.hxx | 6 |
5 files changed, 105 insertions, 105 deletions
diff --git a/include/oox/dump/dffdumper.hxx b/include/oox/dump/dffdumper.hxx index 6ab41a59ea66..46dd050f62a1 100644 --- a/include/oox/dump/dffdumper.hxx +++ b/include/oox/dump/dffdumper.hxx @@ -41,9 +41,9 @@ protected: using SequenceRecordObjectBase::construct; - virtual bool implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ) SAL_OVERRIDE; - virtual void implWriteExtHeader() SAL_OVERRIDE; - virtual void implDumpRecordBody() SAL_OVERRIDE; + virtual bool implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ) override; + virtual void implWriteExtHeader() override; + virtual void implDumpRecordBody() override; private: sal_uInt32 dumpDffSimpleColor( const String& rName ); diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx index 8e5355e2069d..d3ec9236f4d7 100644 --- a/include/oox/dump/dumperbase.hxx +++ b/include/oox/dump/dumperbase.hxx @@ -602,17 +602,17 @@ public: protected: explicit NameListBase( const SharedConfigData& rCfgData ) : mrCfgData( rCfgData ) {} - virtual bool implIsValid() const SAL_OVERRIDE; + virtual bool implIsValid() const override; virtual void implProcessConfigItemStr( TextInputStream& rStrm, const OUString& rKey, - const OUString& rData ) SAL_OVERRIDE; + const OUString& rData ) override; virtual void implProcessConfigItemInt( TextInputStream& rStrm, sal_Int64 nKey, - const OUString& rData ) SAL_OVERRIDE; + const OUString& rData ) override; /** Derived classes set the name for the passed key. */ virtual void implSetName( sal_Int64 nKey, const OUString& rName ) = 0; @@ -655,16 +655,16 @@ protected: virtual void implProcessConfigItemStr( TextInputStream& rStrm, const OUString& rKey, - const OUString& rData ) SAL_OVERRIDE; + const OUString& rData ) override; /** Sets the name for the passed key. */ - virtual void implSetName( sal_Int64 nKey, const OUString& rName ) SAL_OVERRIDE; + virtual void implSetName( sal_Int64 nKey, const OUString& rName ) override; /** Returns the name for the passed key, or the default name, if key is not contained. */ - virtual OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const SAL_OVERRIDE; + virtual OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const override; /** Returns the name for the passed double value. */ - virtual OUString implGetNameDbl( const Config& rCfg, double fValue ) const SAL_OVERRIDE; + virtual OUString implGetNameDbl( const Config& rCfg, double fValue ) const override; /** Inserts all names from the passed list. */ - virtual void implIncludeList( const NameListBase& rList ) SAL_OVERRIDE; + virtual void implIncludeList( const NameListBase& rList ) override; private: OUString maDefName; @@ -684,9 +684,9 @@ protected: virtual void implProcessConfigItemStr( TextInputStream& rStrm, const OUString& rKey, - const OUString& rData ) SAL_OVERRIDE; + const OUString& rData ) override; - virtual void implSetName( sal_Int64 nKey, const OUString& rName ) SAL_OVERRIDE; + virtual void implSetName( sal_Int64 nKey, const OUString& rName ) override; private: bool mbIgnoreEmpty; @@ -708,16 +708,16 @@ protected: virtual void implProcessConfigItemStr( TextInputStream& rStrm, const OUString& rKey, - const OUString& rData ) SAL_OVERRIDE; + const OUString& rData ) override; /** Sets the name for the passed key. */ - virtual void implSetName( sal_Int64 nKey, const OUString& rName ) SAL_OVERRIDE; + virtual void implSetName( sal_Int64 nKey, const OUString& rName ) override; /** Returns the name for the passed key. */ - virtual OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const SAL_OVERRIDE; + virtual OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const override; /** Returns the name for the passed double value. */ - virtual OUString implGetNameDbl( const Config& rCfg, double fValue ) const SAL_OVERRIDE; + virtual OUString implGetNameDbl( const Config& rCfg, double fValue ) const override; /** Inserts all flags from the passed list. */ - virtual void implIncludeList( const NameListBase& rList ) SAL_OVERRIDE; + virtual void implIncludeList( const NameListBase& rList ) override; private: sal_Int64 mnIgnore; @@ -732,11 +732,11 @@ public: protected: /** Sets the name for the passed key. */ - virtual void implSetName( sal_Int64 nKey, const OUString& rName ) SAL_OVERRIDE; + virtual void implSetName( sal_Int64 nKey, const OUString& rName ) override; /** Returns the name for the passed key. */ - virtual OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const SAL_OVERRIDE; + virtual OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const override; /** Inserts all flags from the passed list. */ - virtual void implIncludeList( const NameListBase& rList ) SAL_OVERRIDE; + virtual void implIncludeList( const NameListBase& rList ) override; private: struct ExtItemFormatKey @@ -768,13 +768,13 @@ public: protected: /** Sets the name for the passed key. */ - virtual void implSetName( sal_Int64 nKey, const OUString& rName ) SAL_OVERRIDE; + virtual void implSetName( sal_Int64 nKey, const OUString& rName ) override; /** Returns the converted value with appended unit name. */ - virtual OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const SAL_OVERRIDE; + virtual OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const override; /** Returns the converted value with appended unit name. */ - virtual OUString implGetNameDbl( const Config& rCfg, double fValue ) const SAL_OVERRIDE; + virtual OUString implGetNameDbl( const Config& rCfg, double fValue ) const override; /** Empty implementation. */ - virtual void implIncludeList( const NameListBase& rList ) SAL_OVERRIDE; + virtual void implIncludeList( const NameListBase& rList ) override; private: OUString maUnitName; @@ -851,11 +851,11 @@ public: bool isPasswordCancelled() const { return mbPwCancelled; } protected: - virtual bool implIsValid() const SAL_OVERRIDE; + virtual bool implIsValid() const override; virtual void implProcessConfigItemStr( TextInputStream& rStrm, const OUString& rKey, - const OUString& rData ) SAL_OVERRIDE; + const OUString& rData ) override; private: bool readConfigFile( const OUString& rFileUrl ); @@ -957,7 +957,7 @@ protected: const StorageRef& rxRootStrg, const OUString& rSysFileName ); - virtual bool implIsValid() const SAL_OVERRIDE; + virtual bool implIsValid() const override; const OUString* implGetOption( const OUString& rKey ) const; NameListRef implGetNameList( const OUString& rListName ) const; @@ -1064,7 +1064,7 @@ public: protected: - virtual bool implIsValid() const SAL_OVERRIDE; + virtual bool implIsValid() const override; private: void writeItemName( const String& rItemName ); @@ -1168,7 +1168,7 @@ public: bool isStorage() const; private: - virtual bool implIsValid() const SAL_OVERRIDE; + virtual bool implIsValid() const override; private: StorageRef mxStrg; @@ -1196,7 +1196,7 @@ protected: void construct( const ConfigRef& rxConfig ); void construct( const ObjectBase& rParent ); - virtual bool implIsValid() const SAL_OVERRIDE; + virtual bool implIsValid() const override; virtual void implDump(); @@ -1222,8 +1222,8 @@ protected: void construct( const ObjectBase& rParent, const StorageRef& rxStrg, const OUString& rSysPath ); void construct( const ObjectBase& rParent ); - virtual bool implIsValid() const SAL_OVERRIDE; - virtual void implDump() SAL_OVERRIDE; + virtual bool implIsValid() const override; + virtual void implDump() override; virtual void implDumpStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm, @@ -1298,7 +1298,7 @@ protected: void construct( const ObjectBase& rParent, const OUString& rSysFileName ); void construct( const OutputObjectBase& rParent ); - virtual bool implIsValid() const SAL_OVERRIDE; + virtual bool implIsValid() const override; @@ -1468,7 +1468,7 @@ protected: void construct( const OutputObjectBase& rParent, const BinaryInputStreamRef& rxStrm ); void construct( const InputObjectBase& rParent ); - virtual bool implIsValid() const SAL_OVERRIDE; + virtual bool implIsValid() const override; void skipBlock( sal_Int64 nBytes, bool bShowSize = true ); void dumpRawBinary( sal_Int64 nBytes, bool bShowOffset = true, bool bStream = false ); @@ -1662,7 +1662,7 @@ public: protected: void dumpBinaryStream( bool bShowOffset = true ); - virtual void implDump() SAL_OVERRIDE; + virtual void implDump() override; }; @@ -1684,8 +1684,8 @@ protected: const BinaryInputStreamRef& rxStrm, rtl_TextEncoding eTextEnc ); - virtual bool implIsValid() const SAL_OVERRIDE; - virtual void implDump() SAL_OVERRIDE; + virtual bool implIsValid() const override; + virtual void implDump() override; virtual void implDumpText( TextInputStream& rTextStrm ) = 0; @@ -1713,7 +1713,7 @@ public: rtl_TextEncoding eTextEnc ); protected: - virtual void implDumpText( TextInputStream& rTextStrm ) SAL_OVERRIDE; + virtual void implDumpText( TextInputStream& rTextStrm ) override; void implDumpLine( const OUString& rLine, sal_uInt32 nLine ); }; @@ -1728,7 +1728,7 @@ public: const OUString& rSysFileName ); protected: - virtual void implDumpText( TextInputStream& rTextStrm ) SAL_OVERRIDE; + virtual void implDumpText( TextInputStream& rTextStrm ) override; }; @@ -1752,8 +1752,8 @@ protected: sal_Int64 getRecSize() const { return mnRecSize; } NameListRef getRecNames() const { return maRecNames.getNameList( cfg() ); } - virtual bool implIsValid() const SAL_OVERRIDE; - virtual void implDump() SAL_OVERRIDE; + virtual bool implIsValid() const override; + virtual void implDump() override; virtual bool implStartRecord( BinaryInputStream& rBaseStrm, sal_Int64& ornRecPos, sal_Int64& ornRecId, sal_Int64& ornRecSize ) = 0; virtual void implWriteExtHeader(); @@ -1793,7 +1793,7 @@ protected: const String& rRecNames, const String& rSimpleRecs = EMPTY_STRING ); - virtual bool implStartRecord( BinaryInputStream& rBaseStrm, sal_Int64& ornRecPos, sal_Int64& ornRecId, sal_Int64& ornRecSize ) SAL_OVERRIDE; + virtual bool implStartRecord( BinaryInputStream& rBaseStrm, sal_Int64& ornRecPos, sal_Int64& ornRecId, sal_Int64& ornRecSize ) override; virtual bool implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ) = 0; private: diff --git a/include/oox/dump/oledumper.hxx b/include/oox/dump/oledumper.hxx index ea0c8fd9458d..629de0f40858 100644 --- a/include/oox/dump/oledumper.hxx +++ b/include/oox/dump/oledumper.hxx @@ -60,7 +60,7 @@ public: explicit StdFontObject( const InputObjectBase& rParent ); protected: - virtual void implDump() SAL_OVERRIDE; + virtual void implDump() override; }; @@ -71,7 +71,7 @@ public: explicit StdPicObject( const InputObjectBase& rParent ); protected: - virtual void implDump() SAL_OVERRIDE; + virtual void implDump() override; }; @@ -91,7 +91,7 @@ public: explicit OleCompObjObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName ); protected: - virtual void implDump() SAL_OVERRIDE; + virtual void implDump() override; }; @@ -103,7 +103,7 @@ public: explicit OlePropertyStreamObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName ); protected: - virtual void implDump() SAL_OVERRIDE; + virtual void implDump() override; private: void dumpSection( const OUString& rGuid, sal_uInt32 nStartPos ); @@ -152,7 +152,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, - const OUString& rSysFileName ) SAL_OVERRIDE; + const OUString& rSysFileName ) override; }; @@ -166,7 +166,7 @@ protected: sal_uInt32 nDataId5, sal_uInt32 nDataId6, sal_uInt16 nVersion, bool bCommonPart, bool bComplexPart ); - virtual void implDump() SAL_OVERRIDE; + virtual void implDump() override; virtual void implDumpProperties() = 0; virtual void implDumpCommonExtra( sal_Int64 nEndPos ); virtual void implDumpCommonTrailing(); @@ -194,7 +194,7 @@ public: explicit ComCtlScrollBarObject( const InputObjectBase& rParent, sal_uInt16 nVersion ); protected: - virtual void implDumpProperties() SAL_OVERRIDE; + virtual void implDumpProperties() override; }; @@ -205,7 +205,7 @@ public: explicit ComCtlProgressBarObject( const InputObjectBase& rParent, sal_uInt16 nVersion ); protected: - virtual void implDumpProperties() SAL_OVERRIDE; + virtual void implDumpProperties() override; }; @@ -216,7 +216,7 @@ public: explicit ComCtlSliderObject( const InputObjectBase& rParent, sal_uInt16 nVersion ); protected: - virtual void implDumpProperties() SAL_OVERRIDE; + virtual void implDumpProperties() override; }; @@ -227,7 +227,7 @@ public: explicit ComCtlUpDownObject( const InputObjectBase& rParent, sal_uInt16 nVersion ); protected: - virtual void implDumpProperties() SAL_OVERRIDE; + virtual void implDumpProperties() override; }; @@ -238,9 +238,9 @@ public: explicit ComCtlImageListObject( const InputObjectBase& rParent, sal_uInt16 nVersion ); protected: - virtual void implDumpProperties() SAL_OVERRIDE; - virtual void implDumpCommonExtra( sal_Int64 nEndPos ) SAL_OVERRIDE; - virtual void implDumpCommonTrailing() SAL_OVERRIDE; + virtual void implDumpProperties() override; + virtual void implDumpCommonExtra( sal_Int64 nEndPos ) override; + virtual void implDumpCommonTrailing() override; }; @@ -251,8 +251,8 @@ public: explicit ComCtlTabStripObject( const InputObjectBase& rParent, sal_uInt16 nVersion ); protected: - virtual void implDumpProperties() SAL_OVERRIDE; - virtual void implDumpCommonExtra( sal_Int64 nEndPos ) SAL_OVERRIDE; + virtual void implDumpProperties() override; + virtual void implDumpCommonExtra( sal_Int64 nEndPos ) override; }; @@ -263,8 +263,8 @@ public: explicit ComCtlTreeViewObject( const InputObjectBase& rParent, sal_uInt16 nVersion ); protected: - virtual void implDumpProperties() SAL_OVERRIDE; - virtual void implDumpCommonExtra( sal_Int64 nEndPos ) SAL_OVERRIDE; + virtual void implDumpProperties() override; + virtual void implDumpCommonExtra( sal_Int64 nEndPos ) override; private: sal_uInt32 mnStringFlags; @@ -278,9 +278,9 @@ public: explicit ComCtlStatusBarObject( const InputObjectBase& rParent, sal_uInt16 nVersion ); protected: - virtual void implDumpProperties() SAL_OVERRIDE; - virtual void implDumpCommonExtra( sal_Int64 nEndPos ) SAL_OVERRIDE; - virtual void implDumpCommonTrailing() SAL_OVERRIDE; + virtual void implDumpProperties() override; + virtual void implDumpCommonExtra( sal_Int64 nEndPos ) override; + virtual void implDumpCommonTrailing() override; }; @@ -303,8 +303,8 @@ protected: const String& rPropNameList, bool b64BitPropFlags = false ); - virtual bool implIsValid() const SAL_OVERRIDE; - virtual void implDump() SAL_OVERRIDE; + virtual bool implIsValid() const override; + virtual void implDump() override; virtual void implDumpShortProperties(); virtual void implDumpExtended(); @@ -432,7 +432,7 @@ public: explicit AxCFontNewObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties() SAL_OVERRIDE; + virtual void implDumpShortProperties() override; }; @@ -443,7 +443,7 @@ public: explicit AxColumnInfoObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties() SAL_OVERRIDE; + virtual void implDumpShortProperties() override; }; @@ -454,8 +454,8 @@ public: explicit AxCommandButtonObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties() SAL_OVERRIDE; - virtual void implDumpExtended() SAL_OVERRIDE; + virtual void implDumpShortProperties() override; + virtual void implDumpExtended() override; }; @@ -466,8 +466,8 @@ public: explicit AxMorphControlObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties() SAL_OVERRIDE; - virtual void implDumpExtended() SAL_OVERRIDE; + virtual void implDumpShortProperties() override; + virtual void implDumpExtended() override; private: void dumpColumnInfos(); @@ -485,8 +485,8 @@ public: explicit AxLabelObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties() SAL_OVERRIDE; - virtual void implDumpExtended() SAL_OVERRIDE; + virtual void implDumpShortProperties() override; + virtual void implDumpExtended() override; }; @@ -497,7 +497,7 @@ public: explicit AxImageObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties() SAL_OVERRIDE; + virtual void implDumpShortProperties() override; }; @@ -508,7 +508,7 @@ public: explicit AxScrollBarObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties() SAL_OVERRIDE; + virtual void implDumpShortProperties() override; }; @@ -519,7 +519,7 @@ public: explicit AxSpinButtonObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties() SAL_OVERRIDE; + virtual void implDumpShortProperties() override; }; @@ -530,8 +530,8 @@ public: explicit AxTabStripObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties() SAL_OVERRIDE; - virtual void implDumpExtended() SAL_OVERRIDE; + virtual void implDumpShortProperties() override; + virtual void implDumpExtended() override; private: sal_Int32 mnTabFlagCount; @@ -554,7 +554,7 @@ public: const OUString* pProgId = 0 ); protected: - virtual void implDump() SAL_OVERRIDE; + virtual void implDump() override; private: void constructFormCtrlStrmObj( const OUString* pProgId ); @@ -595,7 +595,7 @@ public: explicit VbaFormClassInfoObject( const InputObjectBase& rParent, VbaFormSharedData& rFormData ); protected: - virtual void implDumpShortProperties() SAL_OVERRIDE; + virtual void implDumpShortProperties() override; private: VbaFormSharedData& mrFormData; @@ -609,7 +609,7 @@ public: explicit VbaFormSiteObject( const InputObjectBase& rParent, VbaFormSharedData& rFormData ); protected: - virtual void implDumpShortProperties() SAL_OVERRIDE; + virtual void implDumpShortProperties() override; private: VbaFormSharedData& mrFormData; @@ -623,7 +623,7 @@ public: explicit VbaFormDesignExtObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties() SAL_OVERRIDE; + virtual void implDumpShortProperties() override; }; @@ -638,8 +638,8 @@ public: VbaFormSharedData& rFormData ); protected: - virtual void implDumpShortProperties() SAL_OVERRIDE; - virtual void implDumpExtended() SAL_OVERRIDE; + virtual void implDumpShortProperties() override; + virtual void implDumpExtended() override; private: void dumpClassInfos(); @@ -664,7 +664,7 @@ public: VbaFormSharedData& rFormData ); protected: - virtual void implDump() SAL_OVERRIDE; + virtual void implDump() override; private: VbaFormSharedData& mrFormData; @@ -678,7 +678,7 @@ public: explicit VbaPageObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties() SAL_OVERRIDE; + virtual void implDumpShortProperties() override; }; @@ -689,8 +689,8 @@ public: explicit VbaMultiPageObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties() SAL_OVERRIDE; - virtual void implDumpExtended() SAL_OVERRIDE; + virtual void implDumpShortProperties() override; + virtual void implDumpExtended() override; private: sal_Int32 mnPageCount; @@ -708,7 +708,7 @@ public: VbaFormSharedData& rFormData ); protected: - virtual void implDump() SAL_OVERRIDE; + virtual void implDump() override; private: VbaFormSharedData& mrFormData; @@ -729,12 +729,12 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, - const OUString& rSysFileName ) SAL_OVERRIDE; + const OUString& rSysFileName ) override; virtual void implDumpStorage( const StorageRef& rxStrg, const OUString& rStrgPath, - const OUString& rSysPath ) SAL_OVERRIDE; + const OUString& rSysPath ) override; private: bool isFormStorage( const OUString& rStrgPath ) const; @@ -771,9 +771,9 @@ public: VbaSharedData& rVbaData ); protected: - virtual bool implIsValid() const SAL_OVERRIDE; - virtual bool implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ) SAL_OVERRIDE; - virtual void implDumpRecordBody() SAL_OVERRIDE; + virtual bool implIsValid() const override; + virtual bool implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ) override; + virtual void implDumpRecordBody() override; private: OUString dumpByteString( const String& rName = EMPTY_STRING ); @@ -801,7 +801,7 @@ public: sal_Int32 nStrmOffset ); protected: - virtual void implDump() SAL_OVERRIDE; + virtual void implDump() override; private: VbaSharedData& mrVbaData; @@ -824,7 +824,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, - const OUString& rSysFileName ) SAL_OVERRIDE; + const OUString& rSysFileName ) override; private: VbaSharedData& mrVbaData; @@ -846,7 +846,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, - const OUString& rSysFileName ) SAL_OVERRIDE; + const OUString& rSysFileName ) override; private: VbaSharedData& mrVbaData; @@ -864,12 +864,12 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, - const OUString& rSysFileName ) SAL_OVERRIDE; + const OUString& rSysFileName ) override; virtual void implDumpStorage( const StorageRef& rxStrg, const OUString& rStrgPath, - const OUString& rSysPath ) SAL_OVERRIDE; + const OUString& rSysPath ) override; private: VbaSharedData maVbaData; @@ -889,7 +889,7 @@ public: protected: virtual void implDumpBaseStream( const BinaryInputStreamRef& rxStrm, - const OUString& rSysFileName ) SAL_OVERRIDE; + const OUString& rSysFileName ) override; }; diff --git a/include/oox/dump/pptxdumper.hxx b/include/oox/dump/pptxdumper.hxx index 09aef138ad83..82f6a022872d 100644 --- a/include/oox/dump/pptxdumper.hxx +++ b/include/oox/dump/pptxdumper.hxx @@ -40,7 +40,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, - const OUString& rSysFileName ) SAL_OVERRIDE; + const OUString& rSysFileName ) override; }; @@ -56,7 +56,7 @@ public: const OUString& rSysFileName ); protected: - virtual void implDump() SAL_OVERRIDE; + virtual void implDump() override; }; diff --git a/include/oox/dump/xlsbdumper.hxx b/include/oox/dump/xlsbdumper.hxx index 8d01018b0c53..d7c1ef6eea5e 100644 --- a/include/oox/dump/xlsbdumper.hxx +++ b/include/oox/dump/xlsbdumper.hxx @@ -45,7 +45,7 @@ protected: using SequenceRecordObjectBase::construct; - virtual bool implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ) SAL_OVERRIDE; + virtual bool implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ) override; private: typedef std::shared_ptr< SequenceInputStream > SequenceInputStreamRef; @@ -66,7 +66,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, - const OUString& rSysFileName ) SAL_OVERRIDE; + const OUString& rSysFileName ) override; }; @@ -82,7 +82,7 @@ public: const OUString& rSysFileName ); protected: - virtual void implDump() SAL_OVERRIDE; + virtual void implDump() override; }; |