From b36963c0a6a09f70ca6d8d607dd3249a3496497d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 12 Oct 2015 16:04:04 +0200 Subject: Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274 --- idl/inc/basobj.hxx | 12 ++++++------ idl/inc/hash.hxx | 6 +++--- idl/inc/module.hxx | 8 ++++---- idl/inc/object.hxx | 8 ++++---- idl/inc/slot.hxx | 14 +++++++------- idl/inc/types.hxx | 20 ++++++++++---------- 6 files changed, 34 insertions(+), 34 deletions(-) (limited to 'idl/inc') diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx index f63e1580f569..bb788d5c6853 100644 --- a/idl/inc/basobj.hxx +++ b/idl/inc/basobj.hxx @@ -100,7 +100,7 @@ public: TYPEINFO_OVERRIDE(); SvMetaReference(); - const SvString & GetName() const SAL_OVERRIDE + const SvString & GetName() const override { return ( !aRef.Is() || !SvMetaObject::GetName().getString().isEmpty() ) @@ -108,7 +108,7 @@ public: : aRef->GetName(); } - const SvString & GetHelpText() const SAL_OVERRIDE + const SvString & GetHelpText() const override { return ( !aRef.Is() || !SvMetaObject::GetHelpText().getString().isEmpty() ) @@ -116,7 +116,7 @@ public: : aRef->GetHelpText(); } - const SvString & GetConfigName() const SAL_OVERRIDE + const SvString & GetConfigName() const override { return ( !aRef.Is() || !SvMetaObject::GetConfigName().getString().isEmpty() ) @@ -124,7 +124,7 @@ public: : aRef->GetConfigName(); } - const SvString & GetDescription() const SAL_OVERRIDE + const SvString & GetDescription() const override { return ( !aRef.Is() || !SvMetaObject::GetDescription().getString().isEmpty() ) @@ -156,10 +156,10 @@ public: const SvGlobalName &GetUUId() const; void SetModule( SvIdlDataBase & rBase ); - virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; + virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override; protected: - virtual void ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; + virtual void ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override; }; class SvMetaExternMemberList : public SvRefMemberList {}; diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx index fc7258bdfb6e..9a3374b20ce6 100644 --- a/idl/inc/hash.hxx +++ b/idl/inc/hash.hxx @@ -98,14 +98,14 @@ class SvStringHashTable : public SvHashTable { SvStringHashEntry* pEntries; protected: - virtual sal_uInt32 HashFunc( const OString& rElement ) const SAL_OVERRIDE; - virtual bool equals( const OString &rElement, sal_uInt32 nIndex ) const SAL_OVERRIDE; + virtual sal_uInt32 HashFunc( const OString& rElement ) const override; + virtual bool equals( const OString &rElement, sal_uInt32 nIndex ) const override; public: SvStringHashTable( sal_uInt32 nMaxEntries ); // max size of hash-tabel virtual ~SvStringHashTable(); OString GetNearString( const OString& rName ) const; - virtual bool IsEntry( sal_uInt32 nIndex ) const SAL_OVERRIDE; + virtual bool IsEntry( sal_uInt32 nIndex ) const override; bool Insert( const OString& rStr, sal_uInt32 * pHash ); // insert string 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 46cacb854a20..fb93209cfdb4 100644 --- a/idl/inc/module.hxx +++ b/idl/inc/module.hxx @@ -49,19 +49,19 @@ class SvMetaModule : public SvMetaExtern SvGlobalName aEndName; SvGlobalName aNextName; protected: - virtual void ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; - virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; + virtual void ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override; + virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override; public: TYPEINFO_OVERRIDE(); - virtual bool SetName( const OString& rName, SvIdlDataBase * = NULL ) SAL_OVERRIDE; + virtual bool SetName( const OString& rName, SvIdlDataBase * = NULL ) override; SvMetaModule( bool bImported ); bool FillNextName( SvGlobalName * ); bool IsImported() const { return bImported; } - virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; + virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override; void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ); }; diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx index 7d3e07b39fc6..1ba006635121 100644 --- a/idl/inc/object.hxx +++ b/idl/inc/object.hxx @@ -94,17 +94,17 @@ class SvMetaClass : public SvMetaType protected: virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase, - SvTokenStream & rInStm ) SAL_OVERRIDE; + SvTokenStream & rInStm ) override; virtual void ReadContextSvIdl( SvIdlDataBase &, - SvTokenStream & rInStm ) SAL_OVERRIDE; + SvTokenStream & rInStm ) override; public: TYPEINFO_OVERRIDE(); SvMetaClass(); void FillClasses( SvMetaClassList & rList ); - virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; - virtual void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ) SAL_OVERRIDE; + virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override; + virtual void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ) override; }; #endif // INCLUDED_IDL_INC_OBJECT_HXX diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx index eee879b817bf..91eff6dfdb1e 100644 --- a/idl/inc/slot.hxx +++ b/idl/inc/slot.hxx @@ -153,9 +153,9 @@ public: SvMetaSlot(); SvMetaSlot( SvMetaType * pType ); - virtual bool IsVariable() const SAL_OVERRIDE; - virtual bool IsMethod() const SAL_OVERRIDE; - virtual OString GetMangleName( bool bVariable ) const SAL_OVERRIDE; + virtual bool IsVariable() const override; + virtual bool IsMethod() const override; + virtual OString GetMangleName( bool bVariable ) const override; SvMetaAttribute * GetMethod() const; SvMetaType * GetSlotType() const; @@ -200,12 +200,12 @@ public: void ResetSlotPointer() { pNextSlot = pLinkedSlot = 0; } - virtual bool Test( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; + virtual bool Test( SvIdlDataBase &, SvTokenStream & rInStm ) override; virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase, - SvTokenStream & rInStm ) SAL_OVERRIDE; - virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; + SvTokenStream & rInStm ) override; + virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override; virtual void Insert( SvSlotElementList&, const OString& rPrefix, - SvIdlDataBase& ) SAL_OVERRIDE; + SvIdlDataBase& ) override; void WriteSlotStubs( const OString& rShellName, ByteStringList & rList, SvStream & rOutStm ); diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index f1cbcde90fed..21d0c05ef456 100644 --- a/idl/inc/types.hxx +++ b/idl/inc/types.hxx @@ -46,7 +46,7 @@ class SvMetaAttribute : public SvMetaReference protected: virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase, - SvTokenStream & rInStm ) SAL_OVERRIDE; + SvTokenStream & rInStm ) override; public: TYPEINFO_OVERRIDE(); SvMetaAttribute(); @@ -70,8 +70,8 @@ public: virtual OString GetMangleName( bool bVariable ) const; - virtual bool Test( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; - virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; + virtual bool Test( SvIdlDataBase &, SvTokenStream & rInStm ) override; + virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override; sal_uLong MakeSfx( OStringBuffer& rAtrrArray ); virtual void Insert( SvSlotElementList&, const OString& rPrefix, SvIdlDataBase& ); @@ -108,8 +108,8 @@ class SvMetaType : public SvMetaExtern protected: bool ReadNamesSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ); - virtual void ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; - virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; + virtual void ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override; + virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override; bool ReadHeaderSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); public: @@ -159,10 +159,10 @@ public: const OString& GetCName() const; char GetParserChar() const { return cParserChar; } - virtual bool SetName( const OString& rName, SvIdlDataBase * = NULL ) SAL_OVERRIDE; + virtual bool SetName( const OString& rName, SvIdlDataBase * = NULL ) override; - virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; + virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override; sal_uLong MakeSfx( OStringBuffer& rAtrrArray ); virtual void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ); @@ -188,7 +188,7 @@ public: TYPEINFO_OVERRIDE(); SvMetaEnumValue(); - virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; + virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override; }; class SvMetaEnumValueMemberList : public SvRefMemberList {}; @@ -198,7 +198,7 @@ class SvMetaTypeEnum : public SvMetaType SvMetaEnumValueMemberList aEnumValueList; OString aPrefix; protected: - virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; + virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override; public: TYPEINFO_OVERRIDE(); SvMetaTypeEnum(); @@ -208,7 +208,7 @@ public: SvMetaEnumValue * GetObject( sal_uLong n ) const { return aEnumValueList[n]; } - virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; + virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override; }; class SvMetaTypeEnumMemberList : public SvRefMemberList {}; -- cgit