ucb: remove SAL_THROW macro

Change-Id: I023c342b0f086e57c821136498851999fb0152ec

16 files changed, 32 insertions, 33 deletions

diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx
index e88d3ccad7b8..5792f58146f0 100644
--- a/ucb/source/ucp/expand/ucpexpand.cxx
+++ b/ucb/source/ucp/expand/ucpexpand.cxx
@@ -117,7 +117,6 @@ void ExpandContentProviderImpl::disposing()
 
 static uno::Reference< uno::XInterface > SAL_CALL create(
     uno::Reference< uno::XComponentContext > const & xComponentContext )
-    SAL_THROW( (uno::Exception) )
 {
     return static_cast< ::cppu::OWeakObject * >(
         new ExpandContentProviderImpl( xComponentContext ) );
diff --git a/ucb/source/ucp/ftp/ftpdirp.hxx b/ucb/source/ucp/ftp/ftpdirp.hxx
index 58666324da1a..d7a1c4c7904b 100644
--- a/ucb/source/ucp/ftp/ftpdirp.hxx
+++ b/ucb/source/ucp/ftp/ftpdirp.hxx
@@ -47,7 +47,7 @@ namespace ftp {
                  const sal_uInt16& hours,
                  const sal_uInt16& day,
                  const sal_uInt16& month,
-                 const sal_uInt16& year) SAL_THROW(())
+                 const sal_uInt16& year)
                      : com::sun::star::util::DateTime(nanoSeconds,
                                                       seconds,
                                                       minutes,
diff --git a/ucb/source/ucp/tdoc/tdoc_storage.cxx b/ucb/source/ucp/tdoc/tdoc_storage.cxx
index a0356bf1a6a0..d22600065327 100644
--- a/ucb/source/ucp/tdoc/tdoc_storage.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_storage.cxx
@@ -351,7 +351,7 @@ StorageElementFactory::createStream( const OUString & rUri,
 }
 
 
-void StorageElementFactory::releaseElement( Storage * pElement ) SAL_THROW(())
+void StorageElementFactory::releaseElement( Storage * pElement )
 {
     OSL_ASSERT( pElement );
     osl::MutexGuard aGuard( m_aMutex );
diff --git a/ucb/source/ucp/tdoc/tdoc_storage.hxx b/ucb/source/ucp/tdoc/tdoc_storage.hxx
index f9bdd5e5d00a..9c2fcd7cbbeb 100644
--- a/ucb/source/ucp/tdoc/tdoc_storage.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_storage.hxx
@@ -97,7 +97,7 @@ namespace tdoc_ucp {
     private:
         friend class Storage;
 
-        void releaseElement( Storage * pElement ) SAL_THROW(());
+        void releaseElement( Storage * pElement );
 
         com::sun::star::uno::Reference< com::sun::star::embed::XStorage >
         queryParentStorage( const OUString & rUri,
diff --git a/ucb/source/ucp/webdav-neon/DAVSession.hxx b/ucb/source/ucp/webdav-neon/DAVSession.hxx
index 1c8864ad019e..081dbacdf50a 100644
--- a/ucb/source/ucp/webdav-neon/DAVSession.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVSession.hxx
@@ -54,12 +54,12 @@ namespace webdav_ucp
 class DAVSession
 {
 public:
-    inline void acquire() SAL_THROW(())
+    inline void acquire()
     {
         osl_atomic_increment( &m_nRefCount );
     }
 
-    void release() SAL_THROW(())
+    void release()
     {
         if ( osl_atomic_decrement( &m_nRefCount ) == 0 )
         {
diff --git a/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx b/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx
index 2f595557bdd0..5132a4fe29d6 100644
--- a/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx
+++ b/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx
@@ -96,7 +96,7 @@ rtl::Reference< DAVSession > DAVSessionFactory::createDAVSession(
     }
 }
 
-void DAVSessionFactory::releaseElement( DAVSession * pElement ) SAL_THROW(())
+void DAVSessionFactory::releaseElement( DAVSession * pElement )
 {
     OSL_ASSERT( pElement );
     osl::MutexGuard aGuard( m_aMutex );
diff --git a/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx b/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx
index b9e561379ffb..8dde5675fa81 100644
--- a/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx
@@ -59,7 +59,7 @@ class DAVSession;
 class DAVSessionFactory : public salhelper::SimpleReferenceObject
 {
 public:
-    virtual ~DAVSessionFactory() SAL_THROW(());
+    virtual ~DAVSessionFactory();
 
     rtl::Reference< DAVSession >
         createDAVSession( const OUString & inUri,
@@ -77,7 +77,7 @@ private:
 
     ::uno::Reference< ::uno::XComponentContext > m_xContext;
 
-    void releaseElement( DAVSession * pElement ) SAL_THROW(());
+    void releaseElement( DAVSession * pElement );
 
     friend class DAVSession;
 };
diff --git a/ucb/source/ucp/webdav/DAVSession.hxx b/ucb/source/ucp/webdav/DAVSession.hxx
index 313a01f81f7d..47df3a902b50 100644
--- a/ucb/source/ucp/webdav/DAVSession.hxx
+++ b/ucb/source/ucp/webdav/DAVSession.hxx
@@ -45,12 +45,12 @@ class DAVAuthListener;
 class DAVSession
 {
 public:
-    inline void acquire() SAL_THROW(())
+    inline void acquire()
     {
         osl_incrementInterlockedCount( &m_nRefCount );
     }
 
-    void release() SAL_THROW(())
+    void release()
     {
         if ( osl_decrementInterlockedCount( &m_nRefCount ) == 0 )
         {
diff --git a/ucb/source/ucp/webdav/DAVSessionFactory.cxx b/ucb/source/ucp/webdav/DAVSessionFactory.cxx
index 43a2a850f02f..cab6d863180b 100644
--- a/ucb/source/ucp/webdav/DAVSessionFactory.cxx
+++ b/ucb/source/ucp/webdav/DAVSessionFactory.cxx
@@ -84,7 +84,7 @@ rtl::Reference< DAVSession > DAVSessionFactory::createDAVSession(
     }
 }
 
-void DAVSessionFactory::releaseElement( DAVSession * pElement ) SAL_THROW(())
+void DAVSessionFactory::releaseElement( DAVSession * pElement )
 {
     assert( pElement );
     osl::MutexGuard aGuard( m_aMutex );
diff --git a/ucb/source/ucp/webdav/DAVSessionFactory.hxx b/ucb/source/ucp/webdav/DAVSessionFactory.hxx
index 3b0d81203ed5..18d21192567d 100644
--- a/ucb/source/ucp/webdav/DAVSessionFactory.hxx
+++ b/ucb/source/ucp/webdav/DAVSessionFactory.hxx
@@ -47,7 +47,7 @@ class DAVSession;
 class DAVSessionFactory : public salhelper::SimpleReferenceObject
 {
 public:
-    virtual ~DAVSessionFactory() SAL_THROW(());
+    virtual ~DAVSessionFactory();
 
     rtl::Reference< DAVSession >
         createDAVSession( const OUString & inUri,
@@ -63,7 +63,7 @@ private:
     osl::Mutex m_aMutex;
     std::auto_ptr< ucbhelper::InternetProxyDecider > m_xProxyDecider;
 
-    void releaseElement( DAVSession * pElement ) SAL_THROW(());
+    void releaseElement( DAVSession * pElement );
 
     friend class DAVSession;
 };
diff --git a/ucb/workben/cachemap/cachemapobject1.cxx b/ucb/workben/cachemap/cachemapobject1.cxx
index 5d51267605b4..cddc7c920714 100644
--- a/ucb/workben/cachemap/cachemapobject1.cxx
+++ b/ucb/workben/cachemap/cachemapobject1.cxx
@@ -37,10 +37,10 @@ Object1::Object1(rtl::Reference< ObjectContainer1 > const & rContainer):
     OSL_ASSERT(m_xContainer.is());
 }
 
-inline Object1::~Object1() SAL_THROW(())
+inline Object1::~Object1()
 {}
 
-void ObjectContainer1::releaseElement(Object1 * pElement) SAL_THROW(())
+void ObjectContainer1::releaseElement(Object1 * pElement)
 {
     OSL_ASSERT(pElement);
     bool bDelete = false;
@@ -59,7 +59,7 @@ void ObjectContainer1::releaseElement(Object1 * pElement) SAL_THROW(())
 ObjectContainer1::ObjectContainer1()
 {}
 
-ObjectContainer1::~ObjectContainer1() SAL_THROW(())
+ObjectContainer1::~ObjectContainer1()
 {}
 
 rtl::Reference< Object1 > ObjectContainer1::get(OUString const & rKey)
diff --git a/ucb/workben/cachemap/cachemapobject1.hxx b/ucb/workben/cachemap/cachemapobject1.hxx
index 32b95ecbe261..65ca92e2fbcf 100644
--- a/ucb/workben/cachemap/cachemapobject1.hxx
+++ b/ucb/workben/cachemap/cachemapobject1.hxx
@@ -39,7 +39,7 @@ class ObjectContainer1: public salhelper::SimpleReferenceObject
 public:
     ObjectContainer1();
 
-    virtual ~ObjectContainer1() SAL_THROW(());
+    virtual ~ObjectContainer1();
 
     rtl::Reference< Object1 > get(OUString const & rKey);
 
@@ -49,7 +49,7 @@ private:
     Map m_aMap;
     osl::Mutex m_aMutex;
 
-    void releaseElement(Object1 * pElement) SAL_THROW(());
+    void releaseElement(Object1 * pElement);
 
     friend class Object1; // to access Map, releaseElement()
 };
@@ -57,10 +57,10 @@ private:
 class Object1
 {
 public:
-    inline void acquire() SAL_THROW(())
+    inline void acquire()
     { osl_atomic_increment(&m_nRefCount); }
 
-    inline void release() SAL_THROW(())
+    inline void release()
     { m_xContainer->releaseElement(this); }
 
 private:
@@ -70,7 +70,7 @@ private:
 
     inline Object1(rtl::Reference< ObjectContainer1 > const & rContainer);
 
-    inline ~Object1() SAL_THROW(());
+    inline ~Object1();
 
     Object1(Object1 &); // not implemented
     void operator =(Object1); // not implemented
diff --git a/ucb/workben/cachemap/cachemapobject3.cxx b/ucb/workben/cachemap/cachemapobject3.cxx
index da360809749e..3b2f9e08f430 100644
--- a/ucb/workben/cachemap/cachemapobject3.cxx
+++ b/ucb/workben/cachemap/cachemapobject3.cxx
@@ -37,10 +37,10 @@ Object3::Object3(rtl::Reference< ObjectContainer3 > const & rContainer):
     OSL_ASSERT(m_xContainer.is());
 }
 
-inline Object3::~Object3() SAL_THROW(())
+inline Object3::~Object3()
 {}
 
-void Object3::release() SAL_THROW(())
+void Object3::release()
 {
     if (osl_atomic_decrement(&m_nRefCount) == 0)
     {
@@ -49,7 +49,7 @@ void Object3::release() SAL_THROW(())
     }
 }
 
-void ObjectContainer3::releaseElement(Object3 * pElement) SAL_THROW(())
+void ObjectContainer3::releaseElement(Object3 * pElement)
 {
     OSL_ASSERT(pElement);
     osl::MutexGuard aGuard(m_aMutex);
@@ -60,7 +60,7 @@ void ObjectContainer3::releaseElement(Object3 * pElement) SAL_THROW(())
 ObjectContainer3::ObjectContainer3()
 {}
 
-ObjectContainer3::~ObjectContainer3() SAL_THROW(())
+ObjectContainer3::~ObjectContainer3()
 {}
 
 rtl::Reference< Object3 > ObjectContainer3::get(OUString const & rKey)
diff --git a/ucb/workben/cachemap/cachemapobject3.hxx b/ucb/workben/cachemap/cachemapobject3.hxx
index e7a88c486a21..7fe5d6911c3b 100644
--- a/ucb/workben/cachemap/cachemapobject3.hxx
+++ b/ucb/workben/cachemap/cachemapobject3.hxx
@@ -39,7 +39,7 @@ class ObjectContainer3: public salhelper::SimpleReferenceObject
 public:
     ObjectContainer3();
 
-    virtual ~ObjectContainer3() SAL_THROW(());
+    virtual ~ObjectContainer3();
 
     rtl::Reference< Object3 > get(OUString const & rKey);
 
@@ -49,7 +49,7 @@ private:
     Map m_aMap;
     osl::Mutex m_aMutex;
 
-    void releaseElement(Object3 * pElement) SAL_THROW(());
+    void releaseElement(Object3 * pElement);
 
     friend class Object3; // to access Map, releaseElement()
 };
@@ -57,10 +57,10 @@ private:
 class Object3
 {
 public:
-    inline void acquire() SAL_THROW(())
+    inline void acquire()
     { osl_atomic_increment(&m_nRefCount); }
 
-    void release() SAL_THROW(());
+    void release();
 
 private:
     rtl::Reference< ObjectContainer3 > m_xContainer;
@@ -69,7 +69,7 @@ private:
 
     inline Object3(rtl::Reference< ObjectContainer3 > const & rContainer);
 
-    inline ~Object3() SAL_THROW(());
+    inline ~Object3();
 
     Object3(Object3 &); // not implemented
     void operator =(Object3); // not implemented
diff --git a/ucb/workben/cachemap/cachemapobjectcontainer2.cxx b/ucb/workben/cachemap/cachemapobjectcontainer2.cxx
index 6578133c258c..79e628c170ee 100644
--- a/ucb/workben/cachemap/cachemapobjectcontainer2.cxx
+++ b/ucb/workben/cachemap/cachemapobjectcontainer2.cxx
@@ -33,7 +33,7 @@ using namespace com::sun::star;
 ObjectContainer2::ObjectContainer2()
 {}
 
-ObjectContainer2::~ObjectContainer2() SAL_THROW(())
+ObjectContainer2::~ObjectContainer2()
 {}
 
 rtl::Reference< Object2 > ObjectContainer2::get(OUString const & rKey)
diff --git a/ucb/workben/cachemap/cachemapobjectcontainer2.hxx b/ucb/workben/cachemap/cachemapobjectcontainer2.hxx
index f57705497ba4..59e2d3e59bec 100644
--- a/ucb/workben/cachemap/cachemapobjectcontainer2.hxx
+++ b/ucb/workben/cachemap/cachemapobjectcontainer2.hxx
@@ -40,7 +40,7 @@ class ObjectContainer2
 public:
     ObjectContainer2();
 
-    ~ObjectContainer2() SAL_THROW(());
+    ~ObjectContainer2();
 
     rtl::Reference< Object2 > get(OUString const & rKey);