diff options
author | Oliver Specht <oliver.specht@cib.de> | 2015-11-07 14:43:19 +0100 |
---|---|---|
committer | Oliver Specht <oliver.specht@cib.de> | 2015-11-11 10:49:30 +0000 |
commit | fa91dd31f39a24329d288d4e1cda28db3a16af0d (patch) | |
tree | 603d7c206ac0ec1f1a08cc9f3bf8835bd8d2fb2f /basic | |
parent | tdf#93243 replace boost::bind with c++11 lambdas in vcl/source tree (diff) | |
download | core-fa91dd31f39a24329d288d4e1cda28db3a16af0d.tar.gz core-fa91dd31f39a24329d288d4e1cda28db3a16af0d.zip |
5th step to remove tools/rtti.hxx
tools/rtti.hxx removed
completed the interface of some Sdr.* Items
and removed pseudo items
Change-Id: I0cdcd01494be35b97a27d5985aa908affa96048a
Reviewed-on: https://gerrit.libreoffice.org/19837
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Oliver Specht <oliver.specht@cib.de>
Diffstat (limited to 'basic')
-rw-r--r-- | basic/inc/sbobjmod.hxx | 2 | ||||
-rw-r--r-- | basic/inc/sbprop.hxx | 2 | ||||
-rw-r--r-- | basic/inc/sbstdobj.hxx | 3 | ||||
-rw-r--r-- | basic/source/basmgr/basmgr.cxx | 1 | ||||
-rw-r--r-- | basic/source/classes/sb.cxx | 3 | ||||
-rw-r--r-- | basic/source/classes/sbunoobj.cxx | 10 | ||||
-rw-r--r-- | basic/source/classes/sbxmod.cxx | 9 | ||||
-rw-r--r-- | basic/source/inc/sbjsmeth.hxx | 1 | ||||
-rw-r--r-- | basic/source/inc/sbjsmod.hxx | 1 | ||||
-rw-r--r-- | basic/source/inc/sbunoobj.hxx | 11 | ||||
-rw-r--r-- | basic/source/runtime/stdobj1.cxx | 3 | ||||
-rw-r--r-- | basic/source/sbx/sbxarray.cxx | 2 | ||||
-rw-r--r-- | basic/source/sbx/sbxbase.cxx | 1 | ||||
-rw-r--r-- | basic/source/sbx/sbxcoll.cxx | 2 | ||||
-rw-r--r-- | basic/source/sbx/sbxobj.cxx | 3 | ||||
-rw-r--r-- | basic/source/sbx/sbxvalue.cxx | 1 | ||||
-rw-r--r-- | basic/source/sbx/sbxvar.cxx | 1 |
17 files changed, 0 insertions, 56 deletions
diff --git a/basic/inc/sbobjmod.hxx b/basic/inc/sbobjmod.hxx index 6a16f3c8e7ec..8d79bddcd842 100644 --- a/basic/inc/sbobjmod.hxx +++ b/basic/inc/sbobjmod.hxx @@ -37,7 +37,6 @@ protected: virtual ~SbObjModule(); public: - TYPEINFO_OVERRIDE(); SbObjModule( const OUString& rName, const css::script::ModuleInfo& mInfo, bool bIsVbaCompatible ); virtual SbxVariable* Find( const OUString& rName, SbxClassType t ) override; @@ -61,7 +60,6 @@ class BASIC_DLLPUBLIC SbUserFormModule : public SbObjModule //protected: void InitObject(); public: - TYPEINFO_OVERRIDE(); SbUserFormModule( const OUString& rName, const css::script::ModuleInfo& mInfo, bool bIsVBACompat ); virtual ~SbUserFormModule(); virtual SbxVariable* Find( const OUString& rName, SbxClassType t ) override; diff --git a/basic/inc/sbprop.hxx b/basic/inc/sbprop.hxx index 83347e5622aa..09138ae84163 100644 --- a/basic/inc/sbprop.hxx +++ b/basic/inc/sbprop.hxx @@ -37,7 +37,6 @@ class BASIC_DLLPUBLIC SbProperty : public SbxProperty virtual ~SbProperty(); public: SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASICPROP,1); - TYPEINFO_OVERRIDE(); SbModule* GetModule() { return pMod; } }; @@ -54,7 +53,6 @@ public: : SbxProperty( r, t ) // , pMod( p ) , mbSet( false ) {} - TYPEINFO_OVERRIDE(); bool isSet() { return mbSet; } diff --git a/basic/inc/sbstdobj.hxx b/basic/inc/sbstdobj.hxx index 5013434940c4..100657ccf8eb 100644 --- a/basic/inc/sbstdobj.hxx +++ b/basic/inc/sbstdobj.hxx @@ -48,7 +48,6 @@ protected: void PropHeight( SbxVariable* pVar, SbxArray* pPar, bool bWrite ); public: - TYPEINFO_OVERRIDE(); SbStdPicture(); virtual SbxVariable* Find( const OUString&, SbxClassType ) override; @@ -79,7 +78,6 @@ protected: void PropName( SbxVariable* pVar, SbxArray* pPar, bool bWrite ); public: - TYPEINFO_OVERRIDE(); SbStdFont(); virtual SbxVariable* Find( const OUString&, SbxClassType ) override; @@ -114,7 +112,6 @@ protected: static void MethSetText( SbxVariable* pVar, SbxArray* pPar_, bool bWrite ); public: - TYPEINFO_OVERRIDE(); SbStdClipboard(); virtual SbxVariable* Find( const OUString&, SbxClassType ) override; diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 34e052cd91b3..2742a2476e02 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -95,7 +95,6 @@ static const char szManagerStream[] = "BasicManager2"; static const char szImbedded[] = "LIBIMBEDDED"; static const char szCryptingKey[] = "CryptedBasic"; -TYPEINIT1( BasicManager, SfxBroadcaster ); const StreamMode eStreamReadMode = StreamMode::READ | StreamMode::NOCREATE | StreamMode::SHARE_DENYALL; const StreamMode eStorageReadMode = StreamMode::READ | StreamMode::SHARE_DENYWRITE; diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index e84bc3a76c06..bfdfcef8c1e4 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -52,7 +52,6 @@ #include <svtools/miscopt.hxx> using namespace ::com::sun::star::script; -TYPEINIT1(StarBASIC,SbxObject) #define RTLNAME "@SBRTL" // i#i68894# @@ -628,7 +627,6 @@ SbxObject* createUserTypeImpl( const OUString& rClassName ) } -TYPEINIT1(SbClassModuleObject,SbModule) SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule ) : SbModule( pClassModule->GetName() ) @@ -2047,7 +2045,6 @@ void StarBASIC::DetachAllDocBasicItems() // #118116 Implementation Collection object -TYPEINIT1(BasicCollection,SbxObject) static const char pCountStr[] = "Count"; static const char pAddStr[] = "Add"; diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 0a05bbfee05d..316234e0ceee 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -96,14 +96,6 @@ using namespace com::sun::star::container; using namespace com::sun::star::bridge; using namespace cppu; -TYPEINIT1(SbUnoMethod,SbxMethod) -TYPEINIT1(SbUnoProperty,SbxProperty) -TYPEINIT1(SbUnoObject,SbxObject) -TYPEINIT1(SbUnoStructRefObject,SbxObject) -TYPEINIT1(SbUnoClass,SbxObject) -TYPEINIT1(SbUnoService,SbxObject) -TYPEINIT1(SbUnoServiceCtor,SbxMethod) -TYPEINIT1(SbUnoSingleton,SbxObject) // Identifiers for creating the strings for dbg_Properties static char const ID_DBG_SUPPORTEDINTERFACES[] = "Dbg_SupportedInterfaces"; @@ -355,7 +347,6 @@ Any convertAny( const Any& rVal, const Type& aDestType ) // #105565 Special Object to wrap a strongly typed Uno Any -TYPEINIT1(SbUnoAnyObject,SbxObject) // TODO: source out later @@ -2013,7 +2004,6 @@ OUString Impl_DumpMethods(SbUnoObject& rUnoObj) return aRet.makeStringAndClear(); } -TYPEINIT1(AutomationNamedArgsSbxArray,SbxArray) // Implementation SbUnoObject void SbUnoObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 084db8cd82d7..3809d107114a 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -413,14 +413,6 @@ SbPropertyRef DocObjectWrapper::getProperty( const OUString& aName ) throw (Runt return pProperty; } -TYPEINIT1(SbModule,SbxObject) -TYPEINIT1(SbMethod,SbxMethod) -TYPEINIT1(SbProperty,SbxProperty) -TYPEINIT1(SbProcedureProperty,SbxProperty) -TYPEINIT1(SbJScriptModule,SbModule) -TYPEINIT1(SbJScriptMethod,SbMethod) -TYPEINIT1(SbObjModule,SbModule) -TYPEINIT1(SbUserFormModule,SbObjModule) uno::Reference< frame::XModel > getDocumentModel( StarBASIC* pb ) { @@ -649,7 +641,6 @@ SbIfaceMapperMethod::~SbIfaceMapperMethod() { } -TYPEINIT1(SbIfaceMapperMethod,SbMethod) // From the code generator: remove invalid entries diff --git a/basic/source/inc/sbjsmeth.hxx b/basic/source/inc/sbjsmeth.hxx index 59cbabd18812..ffd6c1eff241 100644 --- a/basic/source/inc/sbjsmeth.hxx +++ b/basic/source/inc/sbjsmeth.hxx @@ -34,7 +34,6 @@ public: virtual ~SbJScriptMethod(); SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_JSCRIPTMETH,2); - TYPEINFO_OVERRIDE(); }; diff --git a/basic/source/inc/sbjsmod.hxx b/basic/source/inc/sbjsmod.hxx index 9ba492efcacd..14cfc096b602 100644 --- a/basic/source/inc/sbjsmod.hxx +++ b/basic/source/inc/sbjsmod.hxx @@ -32,7 +32,6 @@ class SbJScriptModule : public SbModule virtual bool StoreData( SvStream& ) const override; public: SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_JSCRIPTMOD,1); - TYPEINFO_OVERRIDE(); SbJScriptModule( const OUString& ); // hand through }; diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx index f601f8ebe08e..4c01fb14a0b4 100644 --- a/basic/source/inc/sbunoobj.hxx +++ b/basic/source/inc/sbunoobj.hxx @@ -81,7 +81,6 @@ class SbUnoStructRefObject: public SbxObject OUString Impl_DumpProperties(); OUString getDbgObjectName(); public: - TYPEINFO_OVERRIDE(); StructRefInfo getStructMember( const OUString& rMember ); StructRefInfo getStructInfo() { return maMemberInfo; } SbUnoStructRefObject( const OUString& aName_, const StructRefInfo& rMemberInfo ); @@ -119,7 +118,6 @@ class SbUnoObject: public SbxObject public: static bool getDefaultPropName( SbUnoObject* pUnoObj, OUString& sDfltProp ); - TYPEINFO_OVERRIDE(); SbUnoObject( const OUString& aName_, const css::uno::Any& aUnoObj_ ); virtual ~SbUnoObject(); @@ -165,7 +163,6 @@ class SbUnoMethod : public SbxMethod bool mbInvocation; // Method is based on invocation public: - TYPEINFO_OVERRIDE(); SbUnoMethod( const OUString& aName_, SbxDataType eSbxType, css::uno::Reference< css::reflection::XIdlMethod > xUnoMethod_, bool bInvocation ); @@ -196,7 +193,6 @@ class SbUnoProperty : public SbxProperty SbUnoProperty& operator = ( const SbUnoProperty&) = delete; public: - TYPEINFO_OVERRIDE(); SbUnoProperty( const OUString& aName_, SbxDataType eSbxType, SbxDataType eRealSbxType, const css::beans::Property& aUnoProp_, sal_Int32 nId_, bool bInvocation, bool bUnoStruct ); @@ -220,7 +216,6 @@ class SbUnoClass : public SbxObject const css::uno::Reference< css::reflection::XIdlClass > m_xClass; public: - TYPEINFO_OVERRIDE(); SbUnoClass( const OUString& aName_ ) : SbxObject( aName_ ) {} @@ -250,7 +245,6 @@ class SbUnoService : public SbxObject bool m_bNeedsInit; public: - TYPEINFO_OVERRIDE(); SbUnoService( const OUString& aName_, const css::uno::Reference< css::reflection::XServiceTypeDescription2 >& xServiceTypeDesc ) : SbxObject( aName_ ) @@ -278,7 +272,6 @@ class SbUnoServiceCtor : public SbxMethod SbUnoServiceCtor* pNext; public: - TYPEINFO_OVERRIDE(); SbUnoServiceCtor( const OUString& aName_, css::uno::Reference< css::reflection::XServiceConstructorDescription > xServiceCtorDesc ); virtual ~SbUnoServiceCtor(); @@ -295,7 +288,6 @@ class SbUnoSingleton : public SbxObject const css::uno::Reference< css::reflection::XSingletonTypeDescription > m_xSingletonTypeDesc; public: - TYPEINFO_OVERRIDE(); SbUnoSingleton( const OUString& aName_, const css::uno::Reference< css::reflection::XSingletonTypeDescription >& xSingletonTypeDesc ); @@ -319,7 +311,6 @@ public: const css::uno::Any& getValue() { return mVal; } - TYPEINFO_OVERRIDE(); }; @@ -330,7 +321,6 @@ class AutomationNamedArgsSbxArray : public SbxArray { css::uno::Sequence< OUString > maNameSeq; public: - TYPEINFO_OVERRIDE(); AutomationNamedArgsSbxArray( sal_Int32 nSeqSize ) : maNameSeq( nSeqSize ) {} @@ -377,7 +367,6 @@ class BasicCollection : public SbxObject void CollRemove( SbxArray* pPar_ ); public: - TYPEINFO_OVERRIDE(); BasicCollection( const OUString& rClassname ); virtual SbxVariable* Find( const OUString&, SbxClassType ) override; virtual void Clear() override; diff --git a/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx index 17c508ef98a2..0ca186716cfe 100644 --- a/basic/source/runtime/stdobj1.cxx +++ b/basic/source/runtime/stdobj1.cxx @@ -110,7 +110,6 @@ void SbStdPicture::PropHeight( SbxVariable* pVar, SbxArray*, bool bWrite ) } -TYPEINIT1( SbStdPicture, SbxObject ); SbStdPicture::SbStdPicture() : SbxObject( OUString("Picture")) @@ -224,7 +223,6 @@ void SbStdFont::PropName( SbxVariable* pVar, SbxArray*, bool bWrite ) } } -TYPEINIT1( SbStdFont, SbxObject ); SbStdFont::SbStdFont() : SbxObject( OUString("Font") ) @@ -392,7 +390,6 @@ void SbStdClipboard::MethSetText( SbxVariable* pVar, SbxArray* pPar_, bool ) } -TYPEINIT1( SbStdClipboard, SbxObject ); SbStdClipboard::SbStdClipboard() : SbxObject( OUString("Clipboard") ) diff --git a/basic/source/sbx/sbxarray.cxx b/basic/source/sbx/sbxarray.cxx index e4c815a0b5d6..9484d9e550dd 100644 --- a/basic/source/sbx/sbxarray.cxx +++ b/basic/source/sbx/sbxarray.cxx @@ -34,8 +34,6 @@ struct SbxVarEntry boost::optional<OUString> maAlias; }; -TYPEINIT1(SbxArray,SbxBase) -TYPEINIT1(SbxDimArray,SbxArray) // SbxArray diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx index 8689b5b379ff..b868238342c0 100644 --- a/basic/source/sbx/sbxbase.cxx +++ b/basic/source/sbx/sbxbase.cxx @@ -30,7 +30,6 @@ // AppData-Structure for SBX: -TYPEINIT0(SbxBase) SbxAppData::SbxAppData() : eSbxError(ERRCODE_SBX_OK) diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx index 8918123e0e58..9a91d354a436 100644 --- a/basic/source/sbx/sbxcoll.cxx +++ b/basic/source/sbx/sbxcoll.cxx @@ -22,8 +22,6 @@ #include <basic/sbx.hxx> #include "sbxres.hxx" -TYPEINIT1(SbxCollection,SbxObject) -TYPEINIT1(SbxStdCollection,SbxCollection) static OUString pCount; static OUString pAdd; diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index c198c7a19b4a..dc20af6e7eb7 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -27,9 +27,6 @@ #include <svl/SfxBroadcaster.hxx> #include "sbxres.hxx" -TYPEINIT1(SbxMethod,SbxVariable) -TYPEINIT1(SbxProperty,SbxVariable) -TYPEINIT2(SbxObject,SbxVariable,SfxListener) static OUString pNameProp; // Name-Property static OUString pParentProp; // Parent-Property diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx index f5ef66712e95..dc1a1447781d 100644 --- a/basic/source/sbx/sbxvalue.cxx +++ b/basic/source/sbx/sbxvalue.cxx @@ -28,7 +28,6 @@ #include "sbxconv.hxx" #include "runtime.hxx" -TYPEINIT1(SbxValue,SbxBase) ///////////////////////////// constructors diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx index 0758a37fca96..548ce03642ac 100644 --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -36,7 +36,6 @@ using namespace com::sun::star::uno; // SbxVariable -TYPEINIT1(SbxVariable,SbxValue) // SbxVariableImpl |