summaryrefslogtreecommitdiff
path: root/idl/source/objects
diff options
context:
space:
mode:
authorOliver Specht <oliver.specht@cib.de>2015-11-07 14:43:19 +0100
committerOliver Specht <oliver.specht@cib.de>2015-11-11 10:49:30 +0000
commitfa91dd31f39a24329d288d4e1cda28db3a16af0d (patch)
tree603d7c206ac0ec1f1a08cc9f3bf8835bd8d2fb2f /idl/source/objects
parentc21ddcdb30b8dd7be56176e00bc2d4780cb342e1 (diff)
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 'idl/source/objects')
-rw-r--r--idl/source/objects/basobj.cxx3
-rw-r--r--idl/source/objects/module.cxx1
-rw-r--r--idl/source/objects/object.cxx2
-rw-r--r--idl/source/objects/slot.cxx1
-rw-r--r--idl/source/objects/types.cxx12
5 files changed, 4 insertions, 15 deletions
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index 332341da3a2e..4af4327f3e8e 100644
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -62,7 +62,6 @@ void SvMetaObject::Back2Delemitter( SvStream & rOutStm )
rOutStm.Seek( nPos );
}
-TYPEINIT1( SvMetaObject, SvRttiBase );
SvMetaObject::SvMetaObject()
{
}
@@ -158,13 +157,11 @@ bool SvMetaObject::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
return bOk;
}
-TYPEINIT1( SvMetaReference, SvMetaObject );
SvMetaReference::SvMetaReference()
{
}
-TYPEINIT1( SvMetaExtern, SvMetaReference );
SvMetaExtern::SvMetaExtern()
: pModule( nullptr )
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index f78390eab8df..0109211adec9 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -27,7 +27,6 @@
#include <tools/debug.hxx>
#include <osl/file.hxx>
-TYPEINIT1( SvMetaModule, SvMetaExtern );
SvMetaModule::SvMetaModule( bool bImp )
: bImported( bImp ), bIsModified( false )
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index 218504f18487..3172e86e5b39 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -28,13 +28,11 @@
#include <globals.hxx>
#include <database.hxx>
-TYPEINIT1( SvClassElement, SvPersistBase );
SvClassElement::SvClassElement()
{
};
-TYPEINIT1( SvMetaClass, SvMetaType );
SvMetaClass::SvMetaClass()
: aAutomation( true, false )
{
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index f0176db98b63..6d8157b2506a 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -27,7 +27,6 @@
#include <globals.hxx>
#include <database.hxx>
-TYPEINIT1( SvMetaSlot, SvMetaAttribute );
SvMetaObject *SvMetaSlot::MakeClone() const
{
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index fd7b0806fd2d..f683458790d9 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -27,7 +27,6 @@
#include <globals.hxx>
#include <database.hxx>
-TYPEINIT1( SvMetaAttribute, SvMetaReference );
SvMetaAttribute::SvMetaAttribute()
: aAutomation( true, false )
, aExport( true, false )
@@ -220,7 +219,6 @@ void SvMetaAttribute::Insert (SvSlotElementList&, const OString&, SvIdlDataBase&
{
}
-TYPEINIT1( SvMetaType, SvMetaExtern );
#define CTOR \
: aCall0( CALL_VALUE, false ) \
, aCall1( CALL_VALUE, false ) \
@@ -592,8 +590,10 @@ void SvMetaType::WriteSfxItem(
rOutStm.WriteCharPtr( aTypeName.getStr() ).WriteCharPtr( aVarName.getStr() )
.WriteCharPtr( " = " ) << endl;
rOutStm.WriteChar( '{' ) << endl;
- rOutStm.WriteCharPtr( "\tTYPE(" ).WriteCharPtr( rItemName.getStr() ).WriteCharPtr( "), " )
- .WriteCharPtr( aAttrCount.getStr() );
+
+ rOutStm.WriteCharPtr( "\tcreateSfxPoolItem<" ).WriteCharPtr( rItemName.getStr() )
+ .WriteCharPtr(">, &typeid(").WriteCharPtr( rItemName.getStr() ).WriteCharPtr( "), " );
+ rOutStm.WriteCharPtr( aAttrCount.getStr() );
if( nAttrCount )
{
rOutStm.WriteCharPtr( ", { " );
@@ -658,13 +658,11 @@ OString SvMetaType::GetParserString() const
return aPStr;
}
-TYPEINIT1( SvMetaTypeString, SvMetaType );
SvMetaTypeString::SvMetaTypeString()
: SvMetaType( "String", "SbxSTRING", "BSTR", 's', "char *", "String", "$" )
{
}
-TYPEINIT1( SvMetaEnumValue, SvMetaObject );
SvMetaEnumValue::SvMetaEnumValue()
{
}
@@ -677,7 +675,6 @@ bool SvMetaEnumValue::ReadSvIdl( SvIdlDataBase & rBase,
return true;
}
-TYPEINIT1( SvMetaTypeEnum, SvMetaType );
SvMetaTypeEnum::SvMetaTypeEnum()
{
SetBasicName("Integer");
@@ -737,7 +734,6 @@ bool SvMetaTypeEnum::ReadSvIdl( SvIdlDataBase & rBase,
return false;
}
-TYPEINIT1( SvMetaTypevoid, SvMetaType );
SvMetaTypevoid::SvMetaTypevoid()
: SvMetaType( "void", "SbxVOID", "void", 'v', "void", "", "" )
{