From 0f8f733eaf54c00f79d086c2b2867c7a8b1bcc6c Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 16 Feb 2016 13:15:43 +0200 Subject: move parsing of method ags into SvIdlParser Change-Id: I2fb969529c0670ae93c3cba69bf207d2c87887dc --- idl/inc/lex.hxx | 8 +------- idl/inc/types.hxx | 3 ++- 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'idl/inc') diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx index 7780a36a49ec..f513e9ec68fb 100644 --- a/idl/inc/lex.hxx +++ b/idl/inc/lex.hxx @@ -166,7 +166,7 @@ public: return *(*pRetToken).get(); } - SvToken& GetToken_NextAll() + SvToken& GetToken_Next() { std::vector >::iterator pRetToken = pCurToken++; @@ -178,12 +178,6 @@ public: return *(*pRetToken).get(); } - SvToken& GetToken_Next() - { - // comments get removed initially - return GetToken_NextAll(); - } - SvToken& GetToken() const { return *(*pCurToken).get(); } bool ReadIf( char cChar ) diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index ec7a0de281ee..167e902947de 100644 --- a/idl/inc/types.hxx +++ b/idl/inc/types.hxx @@ -62,7 +62,6 @@ class SvMetaType : public SvMetaReference SvStream & rOutStm ); protected: bool ReadNamesSvIdl( SvTokenStream & rInStm ); - virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override; bool ReadHeaderSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); public: @@ -71,6 +70,8 @@ public: virtual ~SvMetaType(); + virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override; + SvRefMemberList& GetAttrList() { return aAttrList; } sal_uLong GetAttrCount() const { return aAttrList.size(); } -- cgit