summaryrefslogtreecommitdiff
path: root/testtools/source/bridgetest/bridgetest.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-02-25 21:31:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-02-26 18:22:20 +0100
commit5e21a413c788f839a66d9e4c14e745ed18058db8 (patch)
treed4451246461346a425ad6f796e08bf1514cdd942 /testtools/source/bridgetest/bridgetest.cxx
parent6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff)
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'testtools/source/bridgetest/bridgetest.cxx')
-rw-r--r--testtools/source/bridgetest/bridgetest.cxx18
1 files changed, 9 insertions, 9 deletions
diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx
index 7509afb1f826..3bc84e2f1e75 100644
--- a/testtools/source/bridgetest/bridgetest.cxx
+++ b/testtools/source/bridgetest/bridgetest.cxx
@@ -115,12 +115,12 @@ public:
}
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw (RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) throw (RuntimeException);
- virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException);
+ virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception);
+ virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) throw (RuntimeException, std::exception);
+ virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException, std::exception);
// XMain
- virtual sal_Int32 SAL_CALL run( const Sequence< OUString > & rArgs ) throw (RuntimeException);
+ virtual sal_Int32 SAL_CALL run( const Sequence< OUString > & rArgs ) throw (RuntimeException, std::exception);
};
//==================================================================================================
@@ -314,7 +314,7 @@ public:
void SAL_CALL callRecursivly(
const ::com::sun::star::uno::Reference< XRecursiveCall >& xCall,
sal_Int32 nToCall )
- throw(::com::sun::star::uno::RuntimeException)
+ throw(::com::sun::star::uno::RuntimeException, std::exception)
{
MutexGuard guard( m_mutex );
if( nToCall )
@@ -1140,7 +1140,7 @@ inline bool makeSurrogate(
//==================================================================================================
sal_Int32 TestBridgeImpl::run( const Sequence< OUString > & rArgs )
- throw (RuntimeException)
+ throw (RuntimeException, std::exception)
{
bool bRet = false;
try
@@ -1236,19 +1236,19 @@ sal_Int32 TestBridgeImpl::run( const Sequence< OUString > & rArgs )
// XServiceInfo
OUString TestBridgeImpl::getImplementationName()
- throw (RuntimeException)
+ throw (RuntimeException, std::exception)
{
return OUString( IMPLNAME );
}
sal_Bool TestBridgeImpl::supportsService( const OUString & rServiceName )
- throw (RuntimeException)
+ throw (RuntimeException, std::exception)
{
return cppu::supportsService(this, rServiceName);
}
Sequence< OUString > TestBridgeImpl::getSupportedServiceNames()
- throw (RuntimeException)
+ throw (RuntimeException, std::exception)
{
return bridge_test::getSupportedServiceNames();
}