summaryrefslogtreecommitdiff
path: root/ucb/source/ucp
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-06-05 08:15:39 +0200
committerNoel Grandin <noel@peralex.com>2014-06-05 08:17:50 +0200
commit4c563b3a1daf169ed50f6a187121e7e0a1f7c1fc (patch)
tree06a9980d45406c424f388e4ac1be1f658d37488d /ucb/source/ucp
parent79df6cf588afbd0fdf09c1eb8c692466606acba5 (diff)
ucb: remove SAL_THROW macro
Change-Id: I023c342b0f086e57c821136498851999fb0152ec
Diffstat (limited to 'ucb/source/ucp')
-rw-r--r--ucb/source/ucp/expand/ucpexpand.cxx1
-rw-r--r--ucb/source/ucp/ftp/ftpdirp.hxx2
-rw-r--r--ucb/source/ucp/tdoc/tdoc_storage.cxx2
-rw-r--r--ucb/source/ucp/tdoc/tdoc_storage.hxx2
-rw-r--r--ucb/source/ucp/webdav-neon/DAVSession.hxx4
-rw-r--r--ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx2
-rw-r--r--ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx4
-rw-r--r--ucb/source/ucp/webdav/DAVSession.hxx4
-rw-r--r--ucb/source/ucp/webdav/DAVSessionFactory.cxx2
-rw-r--r--ucb/source/ucp/webdav/DAVSessionFactory.hxx4
10 files changed, 13 insertions, 14 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;
};