diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-26 11:56:01 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-26 11:56:21 +0200 |
| commit | 88ec5de1c950d5b9c32fb98054557436d2aa426d (patch) | |
| tree | 562e44f5daeebe0945e7e86cd2d969ca7e773d80 /idl | |
| parent | 406798f8aae3c0e305d6994fc82561a5002af0aa (diff) | |
expand SvMetaType::ReadNamesSvIdl
it just forwards to ReadNameSvIdl
Change-Id: I803edb7a5977cf309e2cedaa3b4764bcbd933597
Diffstat (limited to 'idl')
| -rw-r--r-- | idl/inc/types.hxx | 4 | ||||
| -rw-r--r-- | idl/source/objects/types.cxx | 9 |
2 files changed, 3 insertions, 10 deletions
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index 9768f8f284e8..bcffc371ef99 100644 --- a/idl/inc/types.hxx +++ b/idl/inc/types.hxx @@ -34,7 +34,7 @@ public: tools::SvRef<SvMetaType> aType; SvIdentifier aSlotId; SvMetaAttribute(); - SvMetaAttribute( SvMetaType * ); + SvMetaAttribute( SvMetaType * ); void SetSlotId( const SvIdentifier & rId ) { aSlotId = rId; } @@ -59,8 +59,6 @@ class SvMetaType : public SvMetaReference void WriteSfxItem( const OString& rItemName, SvIdlDataBase & rBase, SvStream & rOutStm ); protected: - bool ReadNamesSvIdl( SvTokenStream & rInStm ); - bool ReadHeaderSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); public: SvMetaType(); diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index 6a38caa8b032..a7b913d49d4f 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -167,12 +167,12 @@ bool SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & , if( rTok.Is( SvHash_interface() ) ) { SetType( MetaTypeType::Interface ); - bOk = ReadNamesSvIdl( rInStm ); + bOk = ReadNameSvIdl( rInStm ); } else if( rTok.Is( SvHash_shell() ) ) { SetType( MetaTypeType::Shell ); - bOk = ReadNamesSvIdl( rInStm ); + bOk = ReadNameSvIdl( rInStm ); } if( !bOk ) rInStm.Seek( nTokPos ); @@ -190,11 +190,6 @@ bool SvMetaType::ReadSvIdl( SvIdlDataBase & rBase, return false; } -bool SvMetaType::ReadNamesSvIdl( SvTokenStream & rInStm ) -{ - return ReadNameSvIdl( rInStm ); -} - void SvMetaType::ReadContextSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { |