mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ucb: remove SAL_THROW macro

Browse Source 
Change-Id: I023c342b0f086e57c821136498851999fb0152ec
This commit is contained in:
Noel Grandin
2014-06-05 08:15:39 +02:00
parent 79df6cf588
commit 4c563b3a1d
16 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ucb/source/ucp/expand/ucpexpand.cxx
View File

@@ -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 ) );

2
ucb/source/ucp/ftp/ftpdirp.hxx
View File

@@ -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,

2
ucb/source/ucp/tdoc/tdoc_storage.cxx
View File

@@ -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 );

2
ucb/source/ucp/tdoc/tdoc_storage.hxx
View File

@@ -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,

4
ucb/source/ucp/webdav-neon/DAVSession.hxx
View File

@@ -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 )
{

2
ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx
View File

@@ -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 );

4
ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx
View File

@@ -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;
};

4
ucb/source/ucp/webdav/DAVSession.hxx
View File

@@ -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 )
{

2
ucb/source/ucp/webdav/DAVSessionFactory.cxx
View File

@@ -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 );

4
ucb/source/ucp/webdav/DAVSessionFactory.hxx
View File

@@ -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;
};

6
ucb/workben/cachemap/cachemapobject1.cxx
View File

@@ -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)

10
ucb/workben/cachemap/cachemapobject1.hxx
View File

@@ -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

8
ucb/workben/cachemap/cachemapobject3.cxx
View File

@@ -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)

10
ucb/workben/cachemap/cachemapobject3.hxx
View File

@@ -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

2
ucb/workben/cachemap/cachemapobjectcontainer2.cxx
View File

@@ -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)

2
ucb/workben/cachemap/cachemapobjectcontainer2.hxx
View File

@@ -40,7 +40,7 @@ class ObjectContainer2
public:
ObjectContainer2();
~ObjectContainer2() SAL_THROW(());
~ObjectContainer2();
rtl::Reference< Object2 > get(OUString const & rKey);