diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-15 14:22:36 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-02-15 15:47:30 +0200 |
| commit | f7520bbc80b571a15adca5279cc7fc5e8965e53c (patch) | |
| tree | ab18692f88820aa9d69b2543c9f9656dcc32c236 /idl/inc | |
| parent | ac432839329866659e339b582d31a1980c035c2e (diff) | |
move interface/shell parsing to SvIdlParser
Change-Id: I95cce21c6c9beb5637dd4f4a769f455eaacbec2b
Diffstat (limited to 'idl/inc')
| -rw-r--r-- | idl/inc/object.hxx | 10 | ||||
| -rw-r--r-- | idl/inc/parser.hxx | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx index 3967fa9e2883..12f5af2b06ac 100644 --- a/idl/inc/object.hxx +++ b/idl/inc/object.hxx @@ -48,9 +48,11 @@ public: class SvMetaClass : public SvMetaType { +public: + tools::SvRef<SvMetaClass> aSuperClass; +private: SvRefMemberList<SvMetaAttribute *> aAttrList; std::vector<SvClassElement> aClassElementList; - tools::SvRef<SvMetaClass> aSuperClass; bool TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm, SvMetaAttribute & rAttr ) const; @@ -70,15 +72,13 @@ class SvMetaClass : public SvMetaType SvMetaClassList & rClassList, const OString& rPrefix, SvIdlDataBase& rBase ); -protected: - virtual void ReadContextSvIdl( SvIdlDataBase &, - SvTokenStream & rInStm ) override; public: SvMetaClass(); + virtual void ReadContextSvIdl( SvIdlDataBase &, + SvTokenStream & rInStm ) override; void FillClasses( SvMetaClassList & rList ); - virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override; virtual void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ) override; }; diff --git a/idl/inc/parser.hxx b/idl/inc/parser.hxx index 8418d0be77da..ccd2f64ae06d 100644 --- a/idl/inc/parser.hxx +++ b/idl/inc/parser.hxx @@ -21,6 +21,7 @@ #define INCLUDED_IDL_INC_PARSER_HXX #include <rtl/ustring.hxx> +#include <types.hxx> class SvTokenStream; class SvIdlDataBase; @@ -40,6 +41,7 @@ public: bool ReadModuleBody(SvMetaModule& rModule); void ReadModuleElement( SvMetaModule& rModule ); void ReadInclude( SvMetaModule& rModule ); + void ReadInterfaceOrShell( SvMetaModule& rModule, MetaTypeType aMetaTypeType ); void ReadItem(); void ReadStruct(); void ReadEnum(); |