#86080# Cleanup of exception specifications for loading/updating; correct exception translation

3 files changed, 15 insertions, 15 deletions

diff --git a/configmgr/source/treecache/cachewritescheduler.cxx b/configmgr/source/treecache/cachewritescheduler.cxx
index c6761a1a25c8..c83a832cfe07 100644
--- a/configmgr/source/treecache/cachewritescheduler.cxx
+++ b/configmgr/source/treecache/cachewritescheduler.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cachewritescheduler.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: lla $ $Date: 2001-04-11 11:40:47 $
+ *  last change: $Author: jb $ $Date: 2001-11-09 12:07:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -139,9 +139,9 @@ void OCacheWriteScheduler::runWriter()
             {
                 writeOneTreeFoundByOption(xTaskOption);
             }
-            catch (uno::Exception&)
+            catch (uno::Exception& e)
             {
-                CFG_TRACE_ERROR("TreeCacheWriteScheduler: Attempt to write data failed - error is (currently ignored)");
+                CFG_TRACE_ERROR("TreeCacheWriteScheduler: Attempt to write data failed - error is '%s' (currently ignored)",OUSTRING2ASCII(e.Message));
             }
         }
         else
@@ -156,7 +156,7 @@ void OCacheWriteScheduler::runWriter()
 }
 
 // -----------------------------------------------------------------------------
-void OCacheWriteScheduler::writeOneTreeFoundByOption(vos::ORef< OOptions > const& _xOptions) throw (lang::WrappedTargetException, uno::RuntimeException)
+void OCacheWriteScheduler::writeOneTreeFoundByOption(vos::ORef< OOptions > const& _xOptions) CFG_UNO_THROW_ALL(  )
 {
     // PRE: m_aUpdateMutex of TreeMgr must be acuired
     if (TreeInfo* pInfo = m_rTreeManager.requestTreeInfo(_xOptions,false))
@@ -210,7 +210,7 @@ void OCacheWriteScheduler::implStartBefore(TimeStamp const& _aTime)
 }
 
 // -----------------------------------------------------------------------------
-void OCacheWriteScheduler::scheduleWrite(vos::ORef< OOptions > const& _xOptions, bool _bAsync)  throw (lang::WrappedTargetException, uno::RuntimeException)
+void OCacheWriteScheduler::scheduleWrite(vos::ORef< OOptions > const& _xOptions, bool _bAsync)  CFG_UNO_THROW_ALL(  )
 {
     // PRE: m_aUpdateMutex of TreeMgr must be acuired
     OSL_ASSERT(_xOptions.isValid());
diff --git a/configmgr/source/treecache/cachewritescheduler.hxx b/configmgr/source/treecache/cachewritescheduler.hxx
index 1608e7cc623b..cffe39badf9b 100644
--- a/configmgr/source/treecache/cachewritescheduler.hxx
+++ b/configmgr/source/treecache/cachewritescheduler.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cachewritescheduler.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: lla $ $Date: 2001-04-11 11:40:47 $
+ *  last change: $Author: jb $ $Date: 2001-11-09 12:07:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -148,7 +148,7 @@ namespace configmgr
             return aBaseTime + aDelay;
         }
     //-------- Control of execution  ------------------------------------------
-        void scheduleWrite(vos::ORef< OOptions > const& _xOptions, bool _bASync = false) throw ( lang::WrappedTargetException, uno::RuntimeException);
+        void scheduleWrite(vos::ORef< OOptions > const& _xOptions, bool _bASync = false) CFG_UNO_THROW_ALL(  );
 
         /// stop pending activities for one set of options (do not discard them)
         bool clearTasks(vos::ORef< OOptions > const& _xOptions);
@@ -165,7 +165,7 @@ namespace configmgr
 
         void runWriter();
         void implStartBefore(TimeStamp const& _aTime);
-        void writeOneTreeFoundByOption(vos::ORef< OOptions > const& _xOption) throw (lang::WrappedTargetException, uno::RuntimeException);
+        void writeOneTreeFoundByOption(vos::ORef< OOptions > const& _xOption) CFG_UNO_THROW_ALL(  );
     };
 } // namespace configmgr
 
diff --git a/configmgr/source/treecache/invalidatetree.cxx b/configmgr/source/treecache/invalidatetree.cxx
index 091e3c758f05..748096edab8e 100644
--- a/configmgr/source/treecache/invalidatetree.cxx
+++ b/configmgr/source/treecache/invalidatetree.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: invalidatetree.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: jb $ $Date: 2001-09-28 12:44:34 $
+ *  last change: $Author: jb $ $Date: 2001-11-09 12:07:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -264,7 +264,7 @@ void concatSubtreeWithChanges(ISubtree* _pSubtree, TreeChangeList &_aChangeList)
 
 auto_ptr<ISubtree> TreeManager::loadNodeFromSession( IConfigSession *_pSession, AbsolutePath const& _aAbsoluteSubtreePath,
                                                      const vos::ORef < OOptions >& _xOptions,
-                                                     sal_Int16 _nMinLevels)  throw (uno::Exception)
+                                                     sal_Int16 _nMinLevels)  CFG_UNO_THROW_ALL()
 {
     TreeInfo* pInfo = this->requestTreeInfo(_xOptions,true /*create TreeInfo*/);
 
@@ -321,7 +321,7 @@ public:
 };
 
 // -----------------------------------------------------------------------------
-void TreeManager::invalidateTreeAsync(const AbsolutePath &_aAbsoluteSubtreePath, const vos::ORef<OOptions>& _rOptions) throw (uno::Exception)
+void TreeManager::invalidateTreeAsync(const AbsolutePath &_aAbsoluteSubtreePath, const vos::ORef<OOptions>& _rOptions) CFG_UNO_THROW_ALL()
 {
     if (m_bDisposeMode == false)
     {
@@ -339,7 +339,7 @@ void TreeManager::invalidateTreeAsync(const AbsolutePath &_aAbsoluteSubtreePath,
 
 // -----------------------------------------------------------------------------
 
-void TreeManager::refreshSubtree(const AbsolutePath &_aAbsoluteSubtreePath, const vos::ORef<OOptions>& _aOptions) throw (uno::Exception)
+void TreeManager::refreshSubtree(const AbsolutePath &_aAbsoluteSubtreePath, const vos::ORef<OOptions>& _aOptions) CFG_UNO_THROW_ALL()
 {
     // load the Node direct from the session, without using the cache
     auto_ptr<ISubtree> aLoadedSubtree( this->loadNodeFromSession(m_pSession, _aAbsoluteSubtreePath, _aOptions, -1) );