summaryrefslogtreecommitdiff
path: root/idl/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-02-09 09:08:35 +0200
committerNoel Grandin <noel@peralex.com>2016-02-09 09:43:53 +0200
commitcfa4ba4b2b7138f7b95fb725866ed37155ccceee (patch)
treea8796f81aa8d7eefeee59e63090f32fd2424d000 /idl/inc
parent8bbcbcec91f723a3839bd80aa1d28e0420dfd1e6 (diff)
simplify SvMetaObjectMemberStack
Change-Id: I7c1ba85fcb21925f5e912fa48207411e4fc1fbb4
Diffstat (limited to 'idl/inc')
-rw-r--r--idl/inc/basobj.hxx18
-rw-r--r--idl/inc/database.hxx4
2 files changed, 2 insertions, 20 deletions
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index dbec6b476b78..af85f472c7d1 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -107,24 +107,6 @@ public:
virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
};
-class SvMetaObjectMemberStack
-{
- SvRefMemberList<SvMetaObject *> aList;
-public:
- SvMetaObjectMemberStack() {;}
-
- void Push( SvMetaObject * pObj )
- { aList.push_back( pObj ); }
- void Pop() { aList.pop_back(); }
- SvMetaObject * Get( std::function<bool ( const SvMetaObject* )> isSvMetaObject )
- {
- for( SvRefMemberList<SvMetaObject *>::reverse_iterator it = aList.rbegin(); it != aList.rend(); ++it )
- if( isSvMetaObject(*it) )
- return *it;
- return nullptr;
- }
-};
-
class SvMetaReference : public SvMetaObject
{
protected:
diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx
index c9259bf22fdf..e0bb7e2ace83 100644
--- a/idl/inc/database.hxx
+++ b/idl/inc/database.hxx
@@ -67,10 +67,10 @@ class SvIdlDataBase
SvRefMemberList<SvMetaModule *> aModuleList;
SvRefMemberList<SvMetaAttribute *> aAttrList;
SvRefMemberList<SvMetaType *> aTmpTypeList; // not persistent
+ SvRefMemberList<SvMetaObject *> aContextStack;
protected:
::std::set< OUString > m_DepFiles;
- SvMetaObjectMemberStack aContextStack;
OUString aPath;
SvIdlError aError;
void WriteReset()
@@ -102,7 +102,7 @@ public:
{ aError = r; }
const OUString & GetPath() const { return aPath; }
- SvMetaObjectMemberStack & GetStack() { return aContextStack; }
+ SvRefMemberList<SvMetaObject *>& GetStack() { return aContextStack; }
void Write(const OString& rText);
static void WriteError(const OString& rErrWrn,