Split TYPEINFO into plain and TYPEINFO_OVERRIDE

...where the latter contains SAL_OVERRIDE annotations

Change-Id: Id64794b388d83dfe7026440e8b20a5b5efd412d1

6 files changed, 20 insertions, 20 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 );
diff --git a/basic/source/inc/sbjsmeth.hxx b/basic/source/inc/sbjsmeth.hxx
index 7031e6a1cd0d..8f790fa37b2e 100644
--- a/basic/source/inc/sbjsmeth.hxx
+++ b/basic/source/inc/sbjsmeth.hxx
@@ -34,7 +34,7 @@ public:
     virtual ~SbJScriptMethod();
 
     SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_JSCRIPTMETH,2);
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 };
 
 SV_DECL_IMPL_REF(SbJScriptMethod)
diff --git a/basic/source/inc/sbjsmod.hxx b/basic/source/inc/sbjsmod.hxx
index 9af385fa301b..fa6a9c7b4b50 100644
--- a/basic/source/inc/sbjsmod.hxx
+++ b/basic/source/inc/sbjsmod.hxx
@@ -32,7 +32,7 @@ class SbJScriptModule : public SbModule
     virtual sal_Bool StoreData( SvStream& ) const;
 public:
     SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_JSCRIPTMOD,1);
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SbJScriptModule( const OUString& );       // hand through
 };
 
diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index e7c20b8b452b..0566e3964f68 100644
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@@ -80,7 +80,7 @@ class SbUnoStructRefObject: public SbxObject
     OUString Impl_DumpProperties();
     OUString getDbgObjectName();
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     StructRefInfo getStructMember( const OUString& rMember );
     StructRefInfo getStructInfo() { return maMemberInfo; }
     SbUnoStructRefObject( const OUString& aName_, const StructRefInfo& rMemberInfo );
@@ -119,7 +119,7 @@ class SbUnoObject: public SbxObject
 
 public:
     static bool getDefaultPropName( SbUnoObject* pUnoObj, OUString& sDfltProp );
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SbUnoObject( const OUString& aName_, const ::com::sun::star::uno::Any& aUnoObj_ );
     ~SbUnoObject();
 
@@ -166,7 +166,7 @@ class SbUnoMethod : public SbxMethod
     bool mbDirectInvocation; // Method should be used with XDirectInvocation interface
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     SbUnoMethod( const OUString& aName_, SbxDataType eSbxType, ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlMethod > xUnoMethod_,
         bool bInvocation,
@@ -200,7 +200,7 @@ class SbUnoProperty : public SbxProperty
     SbUnoProperty& operator = ( const SbUnoProperty&);
 public:
 
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SbUnoProperty( const OUString& aName_, SbxDataType eSbxType, SbxDataType eRealSbxType,
         const ::com::sun::star::beans::Property& aUnoProp_, sal_Int32 nId_, bool bInvocation, bool bUnoStruct );
 
@@ -224,7 +224,7 @@ class SbUnoClass : public SbxObject
     const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass >   m_xClass;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SbUnoClass( const OUString& aName_ )
         : SbxObject( aName_ )
     {}
@@ -255,7 +255,7 @@ class SbUnoService : public SbxObject
     bool m_bNeedsInit;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SbUnoService( const OUString& aName_,
         const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XServiceTypeDescription2 >& xServiceTypeDesc )
             : SbxObject( aName_ )
@@ -284,7 +284,7 @@ class SbUnoServiceCtor : public SbxMethod
     SbUnoServiceCtor* pNext;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 
     SbUnoServiceCtor( const OUString& aName_, ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XServiceConstructorDescription > xServiceCtorDesc );
     virtual ~SbUnoServiceCtor();
@@ -301,7 +301,7 @@ class SbUnoSingleton : public SbxObject
     const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XSingletonTypeDescription >   m_xSingletonTypeDesc;
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     SbUnoSingleton( const OUString& aName_,
         const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XSingletonTypeDescription >& xSingletonTypeDesc );
 
@@ -326,7 +326,7 @@ public:
     const ::com::sun::star::uno::Any& getValue( void )
         { return mVal; }
 
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
 };
 
 
@@ -337,7 +337,7 @@ class AutomationNamedArgsSbxArray : public SbxArray
 {
     ::com::sun::star::uno::Sequence< OUString >      maNameSeq;
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     AutomationNamedArgsSbxArray( sal_Int32 nSeqSize )
         : maNameSeq( nSeqSize )
     {}
@@ -385,7 +385,7 @@ class BasicCollection : public SbxObject
     void CollRemove( SbxArray* pPar_ );
 
 public:
-    TYPEINFO();
+    TYPEINFO_OVERRIDE();
     BasicCollection( const OUString& rClassname );
     virtual SbxVariable* Find( const OUString&, SbxClassType );
     virtual void Clear();