diff options
author | Noel Grandin <noel@peralex.com> | 2016-02-08 10:49:57 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-02-08 14:00:38 +0200 |
commit | b2c7ea1a22eb2158d3e40351c066ac174f61eb55 (patch) | |
tree | 561ac0f38f9f9f8e00a9bfd7099d813deb3ca215 /idl | |
parent | 37458b730b7f193a1a853b06ae68f19e53e1ad58 (diff) |
cParserChar in SvMetaType is unused
Change-Id: Ie46b381a3d6005e5ce98f33146a6c38f671b8473
Diffstat (limited to 'idl')
-rw-r--r-- | idl/inc/types.hxx | 4 | ||||
-rw-r--r-- | idl/source/objects/types.cxx | 9 | ||||
-rw-r--r-- | idl/source/prj/database.cxx | 23 |
3 files changed, 15 insertions, 21 deletions
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index f2c514fdea59..894707361df4 100644 --- a/idl/inc/types.hxx +++ b/idl/inc/types.hxx @@ -73,7 +73,6 @@ class SvMetaType : public SvMetaReference MetaTypeType nType; bool bIsItem; bool bIsShell; - char cParserChar; void WriteSfxItem( const OString& rItemName, SvIdlDataBase & rBase, SvStream & rOutStm ); @@ -84,8 +83,7 @@ protected: bool ReadHeaderSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); public: SvMetaType(); - SvMetaType( const OString& rTypeName, - char cParserChar ); + SvMetaType( const OString& rTypeName ); virtual ~SvMetaType(); diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index 7a904a530149..baaf5e34b140 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -183,19 +183,16 @@ void SvMetaAttribute::Insert (SvSlotElementList&, const OString&, SvIdlDataBase& , nType( MetaTypeType::Base ) \ , bIsItem( false ) \ , bIsShell( false ) \ - , cParserChar( 'h' ) SvMetaType::SvMetaType() CTOR { } -SvMetaType::SvMetaType( const OString& rName, - char cPc ) +SvMetaType::SvMetaType( const OString& rName ) CTOR { SetName( rName ); - cParserChar = cPc; } SvMetaType::~SvMetaType() { @@ -415,7 +412,7 @@ bool SvMetaType::ReadMethodArgs( SvIdlDataBase & rBase, } SvMetaTypeString::SvMetaTypeString() - : SvMetaType( "String", 's' ) + : SvMetaType( "String" ) { } @@ -488,7 +485,7 @@ bool SvMetaTypeEnum::ReadSvIdl( SvIdlDataBase & rBase, } SvMetaTypevoid::SvMetaTypevoid() - : SvMetaType( "void", 'v' ) + : SvMetaType( "void" ) { } diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx index 3474f5f11a31..a9ff18ba92d2 100644 --- a/idl/source/prj/database.cxx +++ b/idl/source/prj/database.cxx @@ -45,9 +45,8 @@ SvIdlDataBase::~SvIdlDataBase() delete pIdTable; } -#define ADD_TYPE( Name, ParserChar ) \ - aTypeList.push_back( new SvMetaType( SvHash_##Name()->GetName(), \ - ParserChar ) ); +#define ADD_TYPE( Name ) \ + aTypeList.push_back( new SvMetaType( SvHash_##Name()->GetName() ) ); SvRefMemberList<SvMetaType *>& SvIdlDataBase::GetTypeList() { @@ -57,15 +56,15 @@ SvRefMemberList<SvMetaType *>& SvIdlDataBase::GetTypeList() aTypeList.push_back( new SvMetaTypevoid() ); // MI: IDispatch::Invoke can not unsigned - ADD_TYPE( UINT16, 'h' ); - ADD_TYPE( INT16, 'h' ); - ADD_TYPE( UINT32, 'l' ); - ADD_TYPE( INT32, 'l' ); - ADD_TYPE( BOOL, 'b' ); - ADD_TYPE( BYTE, 'c' ); - ADD_TYPE( float, 'f' ); - ADD_TYPE( double, 'F' ); - ADD_TYPE( SbxObject, 'o' ); + ADD_TYPE( UINT16 ); + ADD_TYPE( INT16 ); + ADD_TYPE( UINT32 ); + ADD_TYPE( INT32 ); + ADD_TYPE( BOOL ); + ADD_TYPE( BYTE ); + ADD_TYPE( float ); + ADD_TYPE( double ); + ADD_TYPE( SbxObject ); // Attention! When adding types all binary data bases get incompatible |