diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:37:00 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:39:26 +0100 |
commit | 70cc2b191b95fbc210bc1f0f6a7159f341894f0f (patch) | |
tree | a70f4957c454b443520cbf91250c41d9eea80017 /idl | |
parent | 8757bea2e88c6e349e1fe98d8e9695d7b9c6179e (diff) |
First batch of adding SAL_OVERRRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.
Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a
Diffstat (limited to 'idl')
-rw-r--r-- | idl/inc/basobj.hxx | 26 | ||||
-rw-r--r-- | idl/inc/hash.hxx | 6 | ||||
-rw-r--r-- | idl/inc/module.hxx | 18 | ||||
-rw-r--r-- | idl/inc/object.hxx | 16 | ||||
-rw-r--r-- | idl/inc/slot.hxx | 24 | ||||
-rw-r--r-- | idl/inc/types.hxx | 52 |
6 files changed, 71 insertions, 71 deletions
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx index 0bb8a79d93a4..623dedb72ca7 100644 --- a/idl/inc/basobj.hxx +++ b/idl/inc/basobj.hxx @@ -135,10 +135,10 @@ public: virtual const SvString& GetDescription() const{ return aDescription; } virtual sal_Bool Test( SvIdlDataBase &, SvTokenStream & rInStm ); - virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); - virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); + virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; + virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE; virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, - WriteType, WriteAttribute = 0); + WriteType, WriteAttribute = 0) SAL_OVERRIDE; void WriteDescription( SvStream& rOutStm ); }; SV_DECL_IMPL_REF(SvMetaName) @@ -155,7 +155,7 @@ public: SV_DECL_META_FACTORY1( SvMetaReference, SvMetaName, 17 ) SvMetaReference(); - const SvString & GetName() const + const SvString & GetName() const SAL_OVERRIDE { return ( !aRef.Is() || !SvMetaName::GetName().getString().isEmpty() ) @@ -163,7 +163,7 @@ public: : aRef->GetName(); } - const SvString & GetHelpText() const + const SvString & GetHelpText() const SAL_OVERRIDE { return ( !aRef.Is() || !SvMetaName::GetHelpText().getString().isEmpty() ) @@ -171,7 +171,7 @@ public: : aRef->GetHelpText(); } - const SvString & GetConfigName() const + const SvString & GetConfigName() const SAL_OVERRIDE { return ( !aRef.Is() || !SvMetaName::GetConfigName().getString().isEmpty() ) @@ -179,7 +179,7 @@ public: : aRef->GetConfigName(); } - const SvString & GetDescription() const + const SvString & GetDescription() const SAL_OVERRIDE { return ( !aRef.Is() || !SvMetaName::GetDescription().getString().isEmpty() ) @@ -213,17 +213,17 @@ public: const SvGlobalName &GetUUId() const; const SvVersion & GetVersion() const { return aVersion; } void SetModule( SvIdlDataBase & rBase ); - virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); - virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); + virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; + virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE; virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, - WriteType, WriteAttribute = 0); + WriteType, WriteAttribute = 0) SAL_OVERRIDE; protected: - virtual void ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); + virtual void ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase, - SvStream & rOutStm, sal_uInt16 nTab ); + SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE; virtual void WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, - WriteType, WriteAttribute = 0); + WriteType, WriteAttribute = 0) SAL_OVERRIDE; }; SV_DECL_IMPL_REF(SvMetaExtern) diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx index 6a29ef5f3ba9..d08a545ce75f 100644 --- a/idl/inc/hash.hxx +++ b/idl/inc/hash.hxx @@ -100,14 +100,14 @@ class SvStringHashTable : public SvHashTable { SvStringHashEntry* pEntries; protected: - virtual sal_uInt32 HashFunc( const OString& rElement ) const; - virtual bool equals( const OString &rElement, sal_uInt32 nIndex ) const; + virtual sal_uInt32 HashFunc( const OString& rElement ) const SAL_OVERRIDE; + virtual bool equals( const OString &rElement, sal_uInt32 nIndex ) const SAL_OVERRIDE; public: SvStringHashTable( sal_uInt32 nMaxEntries ); // max size of hash-tabel virtual ~SvStringHashTable(); OString GetNearString( const OString& rName ) const; - virtual sal_Bool IsEntry( sal_uInt32 nIndex ) const; + virtual sal_Bool IsEntry( sal_uInt32 nIndex ) const SAL_OVERRIDE; sal_Bool Insert( const OString& rStr, sal_uInt32 * pHash ); // insert string sal_Bool Test( const OString& rStr, sal_uInt32 * pHash ) const; // test of insert string diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx index d11d2caf420a..5200a27aa983 100644 --- a/idl/inc/module.hxx +++ b/idl/inc/module.hxx @@ -50,10 +50,10 @@ class SvMetaModule : public SvMetaExtern SvGlobalName aEndName; SvGlobalName aNextName; protected: - virtual void ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); - virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); - virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); - virtual void WriteContextSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); + virtual void ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; + virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE; + virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; + virtual void WriteContextSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE; public: SV_DECL_META_FACTORY1( SvMetaModule, SvMetaExtern, 13 ) SvMetaModule(); @@ -61,7 +61,7 @@ public: const OUString & GetIdlFileName() const { return aIdlFileName; } const OString& GetModulePrefix() const { return aModulePrefix.getString(); } - virtual sal_Bool SetName( const OString& rName, SvIdlDataBase * = NULL ); + virtual sal_Bool SetName( const OString& rName, SvIdlDataBase * = NULL ) SAL_OVERRIDE; const OString& GetHelpFileName() const { return aHelpFileName.getString(); } const OString& GetTypeLibFileName() const { return aTypeLibFile.getString(); } @@ -77,14 +77,14 @@ public: sal_Bool IsImported() const { return bImported; } sal_Bool IsModified() const { return bIsModified; } - virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); - virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); + virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; + virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE; virtual void WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, - WriteType, WriteAttribute = 0 ); + WriteType, WriteAttribute = 0 ) SAL_OVERRIDE; virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, - WriteType, WriteAttribute = 0 ); + WriteType, WriteAttribute = 0 ) SAL_OVERRIDE; virtual void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ); virtual void WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm, HelpIdTable& rTable ); diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx index 69c1eb1a6da8..55f839dcd9c4 100644 --- a/idl/inc/object.hxx +++ b/idl/inc/object.hxx @@ -99,13 +99,13 @@ class SvMetaClass : public SvMetaType protected: virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase, - SvTokenStream & rInStm ); + SvTokenStream & rInStm ) SAL_OVERRIDE; virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase, - SvStream & rOutStm, sal_uInt16 nTab ); + SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE; virtual void ReadContextSvIdl( SvIdlDataBase &, - SvTokenStream & rInStm ); + SvTokenStream & rInStm ) SAL_OVERRIDE; virtual void WriteContextSvIdl( SvIdlDataBase & rBase, - SvStream & rOutStm, sal_uInt16 nTab ); + SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE; void WriteOdlMembers( ByteStringList & rSuperList, sal_Bool bVariable, sal_Bool bWriteTab, SvIdlDataBase & rBase, @@ -125,12 +125,12 @@ public: GetClassList() const { return aClassList; } - virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); - virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); + virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; + virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE; virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, - WriteType, WriteAttribute = 0 ); - virtual void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ); + WriteType, WriteAttribute = 0 ) SAL_OVERRIDE; + virtual void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ) SAL_OVERRIDE; virtual void WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm, HelpIdTable& rTable ); }; diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx index 456d51d64b87..c0041ef29de5 100644 --- a/idl/inc/slot.hxx +++ b/idl/inc/slot.hxx @@ -76,7 +76,7 @@ class SvMetaSlot : public SvMetaAttribute SvIdlDataBase & rBase, SvStream & rOutStm ); virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, - WriteType, WriteAttribute = 0 ); + WriteType, WriteAttribute = 0 ) SAL_OVERRIDE; void SetEnumValue(SvMetaEnumValue *p) { pEnumValue = p; } @@ -175,9 +175,9 @@ public: SvMetaSlot(); SvMetaSlot( SvMetaType * pType ); - virtual sal_Bool IsVariable() const; - virtual sal_Bool IsMethod() const; - virtual OString GetMangleName( sal_Bool bVariable ) const; + virtual sal_Bool IsVariable() const SAL_OVERRIDE; + virtual sal_Bool IsMethod() const SAL_OVERRIDE; + virtual OString GetMangleName( sal_Bool bVariable ) const SAL_OVERRIDE; SvMetaAttribute * GetMethod() const; SvMetaType * GetSlotType() const; @@ -227,16 +227,16 @@ public: SvMetaEnumValue* GetEnumValue() const { return pEnumValue; } - virtual sal_Bool Test( SvIdlDataBase &, SvTokenStream & rInStm ); + virtual sal_Bool Test( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase, - SvTokenStream & rInStm ); + SvTokenStream & rInStm ) SAL_OVERRIDE; virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase, - SvStream & rOutStm, sal_uInt16 nTab ); - virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); + SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE; + virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; virtual void WriteSvIdl( SvIdlDataBase & rBase, - SvStream & rOutStm, sal_uInt16 nTab ); + SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE; virtual void Insert( SvSlotElementList&, const OString& rPrefix, - SvIdlDataBase& ); + SvIdlDataBase& ) SAL_OVERRIDE; void WriteSlotStubs( const OString& rShellName, ByteStringList & rList, SvStream & rOutStm ); @@ -250,8 +250,8 @@ public: sal_uInt16 WriteSlotParamArray( SvIdlDataBase & rBase, SvStream & rOutStm ); virtual void WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm, - HelpIdTable& rIdTable ); - virtual void WriteCSV( SvIdlDataBase&, SvStream& ); + HelpIdTable& rIdTable ) SAL_OVERRIDE; + virtual void WriteCSV( SvIdlDataBase&, SvStream& ) SAL_OVERRIDE; }; SV_DECL_IMPL_REF(SvMetaSlot) diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index 0efc9082e135..b127d70e13bb 100644 --- a/idl/inc/types.hxx +++ b/idl/inc/types.hxx @@ -54,11 +54,11 @@ protected: sal_uLong MakeSlotValue( SvIdlDataBase & rBase, sal_Bool bVariable ) const; virtual void WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, - WriteType, WriteAttribute = 0 ); + WriteType, WriteAttribute = 0 ) SAL_OVERRIDE; virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase, - SvTokenStream & rInStm ); + SvTokenStream & rInStm ) SAL_OVERRIDE; virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase, - SvStream & rOutStm, sal_uInt16 nTab ); + SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE; public: SV_DECL_META_FACTORY1( SvMetaAttribute, SvMetaReference, 2 ) SvMetaAttribute(); @@ -101,16 +101,16 @@ public: virtual OString GetMangleName( sal_Bool bVariable ) const; - virtual sal_Bool Test( SvIdlDataBase &, SvTokenStream & rInStm ); - virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); - virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); + virtual sal_Bool Test( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; + virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; + virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE; virtual void WriteParam( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType ); void WriteRecursiv_Impl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType, WriteAttribute ); virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, - WriteType, WriteAttribute = 0 ); + WriteType, WriteAttribute = 0 ) SAL_OVERRIDE; sal_uLong MakeSfx( OStringBuffer& rAtrrArray ); virtual void Insert( SvSlotElementList&, const OString& rPrefix, SvIdlDataBase& ); @@ -149,17 +149,17 @@ class SvMetaType : public SvMetaExtern protected: sal_Bool ReadNamesSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ); - virtual void ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); - virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); - virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); + virtual void ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; + virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE; + virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; virtual void WriteContextSvIdl( SvIdlDataBase &, SvStream & rOutStm, - sal_uInt16 nTab ); + sal_uInt16 nTab ) SAL_OVERRIDE; virtual void WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, - WriteType, WriteAttribute = 0 ); + WriteType, WriteAttribute = 0 ) SAL_OVERRIDE; virtual void WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, - WriteType, WriteAttribute = 0 ); + WriteType, WriteAttribute = 0 ) SAL_OVERRIDE; sal_Bool ReadHeaderSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); void WriteHeaderSvIdl( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16 nTab ); @@ -213,14 +213,14 @@ public: const OString& GetCName() const; char GetParserChar() const { return cParserChar; } - virtual sal_Bool SetName( const OString& rName, SvIdlDataBase * = NULL ); + virtual sal_Bool SetName( const OString& rName, SvIdlDataBase * = NULL ) SAL_OVERRIDE; - virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); + virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; virtual void WriteSvIdl( SvIdlDataBase & rBase, - SvStream & rOutStm, sal_uInt16 nTab ); + SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE; virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, - WriteType, WriteAttribute = 0 ); + WriteType, WriteAttribute = 0 ) SAL_OVERRIDE; OString GetCString() const; void WriteSvIdlType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); void WriteOdlType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); @@ -257,10 +257,10 @@ public: SV_DECL_META_FACTORY1( SvMetaEnumValue, SvMetaName, 20 ) SvMetaEnumValue(); - virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); - virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); + virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; + virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE; virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, - WriteType, WriteAttribute = 0 ); + WriteType, WriteAttribute = 0 ) SAL_OVERRIDE; }; SV_DECL_IMPL_REF(SvMetaEnumValue) @@ -271,11 +271,11 @@ class SvMetaTypeEnum : public SvMetaType SvMetaEnumValueMemberList aEnumValueList; OString aPrefix; protected: - virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); + virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; virtual void WriteContextSvIdl( SvIdlDataBase &, SvStream & rOutStm, - sal_uInt16 nTab ); + sal_uInt16 nTab ) SAL_OVERRIDE; virtual void WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, - WriteType, WriteAttribute = 0 ); + WriteType, WriteAttribute = 0 ) SAL_OVERRIDE; public: SV_DECL_META_FACTORY1( SvMetaTypeEnum, SvMetaType, 21 ) SvMetaTypeEnum(); @@ -286,12 +286,12 @@ public: SvMetaEnumValue * GetObject( sal_uLong n ) const { return aEnumValueList[n]; } - virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); - virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); + virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; + virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE; virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, - WriteType, WriteAttribute = 0 ); + WriteType, WriteAttribute = 0 ) SAL_OVERRIDE; }; SV_DECL_IMPL_REF(SvMetaTypeEnum) |