diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-08 14:41:57 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-02-09 08:16:26 +0200 |
| commit | 7a6c044e97d02f6168d13cd7528d89e3b3a1dd3f (patch) | |
| tree | 065287c4faa49126a0f07c6832ebf457d3becd49 /idl/source/objects/types.cxx | |
| parent | 153bf01280f32c7216bd872665ca81a90fb301fe (diff) | |
split MetaTypeType::Class into Interface and Shell
Change-Id: Id405be797d516e3e608044a375c40b2138c89aa3
Diffstat (limited to 'idl/source/objects/types.cxx')
| -rw-r--r-- | idl/source/objects/types.cxx | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index 392b0b0325f9..19726d1d0c99 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -134,7 +134,6 @@ void SvMetaAttribute::Insert (SvSlotElementList&, const OString&, SvIdlDataBase& #define CTOR \ : nType( MetaTypeType::Base ) \ , bIsItem( false ) \ - , bIsShell( false ) \ SvMetaType::SvMetaType() CTOR @@ -153,11 +152,6 @@ SvMetaType::~SvMetaType() void SvMetaType::SetType( MetaTypeType nT ) { nType = nT; - if( nType == MetaTypeType::Class ) - { - OStringBuffer aTmp("C_"); - aTmp.append("Object *"); - } } SvMetaType * SvMetaType::GetBaseType() const @@ -181,14 +175,15 @@ bool SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase, sal_uInt32 nTokPos = rInStm.Tell(); SvToken * pTok = rInStm.GetToken_Next(); - if( pTok->Is( SvHash_interface() ) - || pTok->Is( SvHash_shell() ) ) + if( pTok->Is( SvHash_interface() ) ) { - if( pTok->Is( SvHash_shell() ) ) - bIsShell = true; - SetType( MetaTypeType::Class ); + SetType( MetaTypeType::Interface ); + bOk = ReadNamesSvIdl( rInStm ); + } + else if( pTok->Is( SvHash_shell() ) ) + { + SetType( MetaTypeType::Shell ); bOk = ReadNamesSvIdl( rInStm ); - } else if( pTok->Is( SvHash_struct() ) ) { |