diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 11:54:10 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 11:54:55 +0100 |
| commit | 5fb78604c1c3e91beb867c352928af9e1ef57a26 (patch) | |
| tree | 7d6a0f7c1bfe2f2803f5f2ffb5741dd3c05c5818 /basic/inc | |
| parent | bc5060b32f08b0408fb929faea1f8140a58d3cc5 (diff) | |
Split TYPEINFO into plain and TYPEINFO_OVERRIDE
...where the latter contains SAL_OVERRIDE annotations
Change-Id: Id64794b388d83dfe7026440e8b20a5b5efd412d1
Diffstat (limited to 'basic/inc')
| -rw-r--r-- | basic/inc/sbobjmod.hxx | 4 | ||||
| -rw-r--r-- | basic/inc/sbprop.hxx | 4 | ||||
| -rw-r--r-- | basic/inc/sbstdobj.hxx | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/basic/inc/sbobjmod.hxx b/basic/inc/sbobjmod.hxx index e7416cca279d..a47763c19295 100644 --- a/basic/inc/sbobjmod.hxx +++ b/basic/inc/sbobjmod.hxx @@ -37,7 +37,7 @@ protected: virtual ~SbObjModule(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SbObjModule( const OUString& rName, const com::sun::star::script::ModuleInfo& mInfo, bool bIsVbaCompatible ); virtual SbxVariable* Find( const OUString& rName, SbxClassType t ); @@ -63,7 +63,7 @@ class BASIC_DLLPUBLIC SbUserFormModule : public SbObjModule //protected: virtual void InitObject(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SbUserFormModule( const OUString& rName, const com::sun::star::script::ModuleInfo& mInfo, bool bIsVBACompat ); virtual ~SbUserFormModule(); virtual SbxVariable* Find( const OUString& rName, SbxClassType t ); diff --git a/basic/inc/sbprop.hxx b/basic/inc/sbprop.hxx index c65fe261725b..678de56f472b 100644 --- a/basic/inc/sbprop.hxx +++ b/basic/inc/sbprop.hxx @@ -37,7 +37,7 @@ class BASIC_DLLPUBLIC SbProperty : public SbxProperty virtual ~SbProperty(); public: SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASICPROP,1); - TYPEINFO(); + TYPEINFO_OVERRIDE(); SbModule* GetModule() { return pMod; } }; @@ -54,7 +54,7 @@ public: : SbxProperty( r, t ) // , pMod( p ) , mbSet( false ) {} - TYPEINFO(); + TYPEINFO_OVERRIDE(); bool isSet( void ) { return mbSet; } diff --git a/basic/inc/sbstdobj.hxx b/basic/inc/sbstdobj.hxx index ad45eaa76eab..62a40560ec69 100644 --- a/basic/inc/sbstdobj.hxx +++ b/basic/inc/sbstdobj.hxx @@ -49,7 +49,7 @@ protected: void PropHeight( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SbStdPicture(); virtual SbxVariable* Find( const OUString&, SbxClassType ); @@ -81,7 +81,7 @@ protected: void PropName( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SbStdFont(); virtual SbxVariable* Find( const OUString&, SbxClassType ); @@ -117,7 +117,7 @@ protected: void MethSetText( SbxVariable* pVar, SbxArray* pPar_, sal_Bool bWrite ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SbStdClipboard(); virtual SbxVariable* Find( const OUString&, SbxClassType ); |