diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2011-12-13 22:16:31 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2011-12-13 22:16:31 +0100 |
commit | db4bc6812d69d960a558b89c18f08b17a2e38d27 (patch) | |
tree | 15d6547e929635baaffd9a4008a872e9d1c246e6 /configmgr/source/node.cxx | |
parent | 39cbce553da1834f78b77f48b2f1be9578d6cc05 (diff) |
Unified configmgr::Node::getMember{s,Map} again.
(With the insight that Data::components is RootNode::members.)
Diffstat (limited to 'configmgr/source/node.cxx')
-rw-r--r-- | configmgr/source/node.cxx | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/configmgr/source/node.cxx b/configmgr/source/node.cxx index b6480820aedc..773b9246d583 100644 --- a/configmgr/source/node.cxx +++ b/configmgr/source/node.cxx @@ -30,7 +30,11 @@ #include <cassert> +#include "com/sun/star/uno/Reference.hxx" +#include "com/sun/star/uno/RuntimeException.hpp" +#include "com/sun/star/uno/XInterface.hpp" #include "rtl/ref.hxx" +#include "rtl/ustring.h" #include "rtl/ustring.hxx" #include "data.hxx" @@ -39,15 +43,17 @@ namespace configmgr { -NodeMap const & Node::getMembers() const { - NodeMap * members = const_cast< Node * >(this)->getMemberMap(); - assert(members != 0); - return *members; +namespace { + +namespace css = com::sun::star; + } -NodeMap * Node::getMemberMap() { +NodeMap & Node::getMembers() { assert(false); - return 0; + throw css::uno::RuntimeException( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("this cannot happen")), + css::uno::Reference< css::uno::XInterface >()); } rtl::OUString Node::getTemplateName() const { |