diff options
-rw-r--r-- | configmgr/source/treemgr/configdefaultprovider.cxx | 8 | ||||
-rw-r--r-- | configmgr/source/treemgr/defaultproviderproxy.cxx | 8 | ||||
-rw-r--r-- | configmgr/source/treemgr/defaultproviderproxy.hxx | 11 |
3 files changed, 15 insertions, 12 deletions
diff --git a/configmgr/source/treemgr/configdefaultprovider.cxx b/configmgr/source/treemgr/configdefaultprovider.cxx index 794d794d68..d66ddb96a8 100644 --- a/configmgr/source/treemgr/configdefaultprovider.cxx +++ b/configmgr/source/treemgr/configdefaultprovider.cxx @@ -2,9 +2,9 @@ * * $RCSfile: configdefaultprovider.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: jb $ $Date: 2001-11-05 16:50:20 $ + * last change: $Author: jb $ $Date: 2001-11-09 12:01:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -136,7 +136,7 @@ DefaultProvider::DefaultProvider(rtl::Reference< DefaultProviderProxy > const& _ //----------------------------------------------------------------------------- /// tries to load default data into the specified tree -bool DefaultProvider::fetchDefaultData(Tree const& _aTree) const SAL_THROW((uno::Exception)) +bool DefaultProvider::fetchDefaultData(Tree const& _aTree) const CFG_UNO_THROW_ALL() { node::Attributes aAttributes = _aTree.getAttributes(_aTree.getRootNode()); @@ -152,7 +152,7 @@ bool DefaultProvider::fetchDefaultData(Tree const& _aTree) const SAL_THROW((uno: //----------------------------------------------------------------------------- /// tries to load a default instance of the specified node -std::auto_ptr<ISubtree> DefaultProvider::getDefaultTree(Tree const& _aTree, NodeRef const& _aNode) const SAL_THROW((uno::Exception)) +std::auto_ptr<ISubtree> DefaultProvider::getDefaultTree(Tree const& _aTree, NodeRef const& _aNode) const CFG_UNO_THROW_ALL() { std::auto_ptr<ISubtree> aRet; diff --git a/configmgr/source/treemgr/defaultproviderproxy.cxx b/configmgr/source/treemgr/defaultproviderproxy.cxx index a730749046..0665acab86 100644 --- a/configmgr/source/treemgr/defaultproviderproxy.cxx +++ b/configmgr/source/treemgr/defaultproviderproxy.cxx @@ -2,9 +2,9 @@ * * $RCSfile: defaultproviderproxy.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: jb $ $Date: 2001-09-28 12:44:39 $ + * last change: $Author: jb $ $Date: 2001-11-09 12:01:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -126,7 +126,7 @@ sal_Int16 DefaultProviderProxy::implGetRemainingDepth(AbsolutePath const& _aLoca //----------------------------------------------------------------------------- /// tries to load default data into the specified location (which must be within the request range owned) -bool DefaultProviderProxy::fetchDefaultData(AbsolutePath const& _aLocation) const SAL_THROW((uno::Exception)) +bool DefaultProviderProxy::fetchDefaultData(AbsolutePath const& _aLocation) const CFG_UNO_THROW_ALL() { sal_Int16 nDepth = implGetRemainingDepth(_aLocation); @@ -136,7 +136,7 @@ bool DefaultProviderProxy::fetchDefaultData(AbsolutePath const& _aLocation) cons //----------------------------------------------------------------------------- /// tries to load a default instance of the specified node (which must be within the request range owned) -std::auto_ptr<ISubtree> DefaultProviderProxy::getDefaultTree(AbsolutePath const& _aLocation) const SAL_THROW((uno::Exception)) +std::auto_ptr<ISubtree> DefaultProviderProxy::getDefaultTree(AbsolutePath const& _aLocation) const CFG_UNO_THROW_ALL() { sal_Int16 nDepth = implGetRemainingDepth(_aLocation); diff --git a/configmgr/source/treemgr/defaultproviderproxy.hxx b/configmgr/source/treemgr/defaultproviderproxy.hxx index 3b70749a68..222c27569f 100644 --- a/configmgr/source/treemgr/defaultproviderproxy.hxx +++ b/configmgr/source/treemgr/defaultproviderproxy.hxx @@ -2,9 +2,9 @@ * * $RCSfile: defaultproviderproxy.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: vg $ $Date: 2001-10-02 13:16:36 $ + * last change: $Author: jb $ $Date: 2001-11-09 12:01:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,6 +65,9 @@ #ifndef CONFIGMGR_CONFIGPATH_HXX_ #include "configpath.hxx" #endif +#ifndef CONFIGMGR_UTILITY_HXX_ +#include "utility.hxx" +#endif #ifndef _SALHELPER_SIMPLEREFERENCEOBJECT_HXX_ #include <salhelper/simplereferenceobject.hxx> @@ -116,10 +119,10 @@ namespace configmgr ~DefaultProviderProxy(); /// tries to load default data into the specified location (which must be within the request range owned) - bool fetchDefaultData(AbsolutePath const& _aLocation) const SAL_THROW((uno::Exception)); + bool fetchDefaultData(AbsolutePath const& _aLocation) const CFG_UNO_THROW_ALL(); /// tries to load a default instance of the specified node (which must be within the request range owned) - std::auto_ptr<ISubtree> getDefaultTree(AbsolutePath const& _aLocation) const SAL_THROW((uno::Exception)); + std::auto_ptr<ISubtree> getDefaultTree(AbsolutePath const& _aLocation) const CFG_UNO_THROW_ALL(); private: sal_Int16 implGetRemainingDepth(AbsolutePath const& _aLocation) const; |