diff options
| -rw-r--r-- | configmgr/source/api2/apinodeaccess.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/configmgr/source/api2/apinodeaccess.cxx b/configmgr/source/api2/apinodeaccess.cxx index 4cab303f58..8fdf50c0d5 100644 --- a/configmgr/source/api2/apinodeaccess.cxx +++ b/configmgr/source/api2/apinodeaccess.cxx @@ -2,9 +2,9 @@ * * $RCSfile: apinodeaccess.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: jb $ $Date: 2002-02-11 13:47:53 $ + * last change: $Author: vg $ $Date: 2003-10-06 16:09:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,7 +66,10 @@ #include "apitreeaccess.hxx" +#ifndef CONFIGMGR_CONFIGNODE_HXX_ #include "noderef.hxx" +#endif + #include "anynoderef.hxx" #include "valueref.hxx" @@ -76,7 +79,7 @@ namespace configmgr { - namespace configapi + namespace configapi { //----------------------------------------------------------------------------- @@ -155,13 +158,13 @@ UnoAny makeElement(configapi::Factory& rFactory, configuration::Tree const& aTre if (configuration::isStructuralNode(aTree,aInnerNode)) return uno::makeAny( rFactory.makeUnoElement(aTree,aInnerNode) ); - + else return configuration::getSimpleElementValue(aTree,aInnerNode); } else { - return configuration::getSimpleValue(aTree,aNode.toValue()); + return configuration::getSimpleValue(aTree,aNode.toValue()); } } @@ -174,7 +177,7 @@ UnoAny makeInnerElement(configapi::Factory& rFactory, configuration::Tree const& if (!aTree.isEmpty() && aNode.isValid()) { OSL_ENSURE(configuration::isStructuralNode(aTree,aNode), "Trying to makeInnerElement for a simple value"); - + return uno::makeAny( rFactory.makeUnoElement(aTree,aNode) ); } |