diff options
| author | Noel Grandin <noel@peralex.com> | 2014-06-05 08:08:06 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-06-05 08:17:46 +0200 |
| commit | da906ab93781928adc51c605825f91b16fe8dd19 (patch) | |
| tree | d66505e7ca1c9894dd4fb10503f78a4edbd1be74 /cppuhelper/test | |
| parent | 41066fef1ca94723615838fd521d08c5d37aac5b (diff) | |
cppuhelper: remove SAL_THROW macro
Change-Id: I54141071396d04e7bead56da14a665b8556ba6d2
Diffstat (limited to 'cppuhelper/test')
| -rw-r--r-- | cppuhelper/test/cfg_test.cxx | 8 | ||||
| -rw-r--r-- | cppuhelper/test/testcmp/TestComponent.cxx | 7 |
2 files changed, 5 insertions, 10 deletions
diff --git a/cppuhelper/test/cfg_test.cxx b/cppuhelper/test/cfg_test.cxx index aaa5bed2661f..7bd62c75dccb 100644 --- a/cppuhelper/test/cfg_test.cxx +++ b/cppuhelper/test/cfg_test.cxx @@ -80,7 +80,7 @@ class ServiceImpl0 Reference< XComponentContext > m_xContext; public: - ServiceImpl0( Reference< XComponentContext > const & xContext ) SAL_THROW(()); + ServiceImpl0( Reference< XComponentContext > const & xContext ); // XInitialization virtual void SAL_CALL initialize( const Sequence< Any >& rArgs ) throw (Exception, RuntimeException); @@ -91,7 +91,7 @@ public: virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) throw (RuntimeException); }; -ServiceImpl0::ServiceImpl0( Reference< XComponentContext > const & xContext ) SAL_THROW(()) +ServiceImpl0::ServiceImpl0( Reference< XComponentContext > const & xContext ) : m_xContext( xContext ) { sal_Int32 n; @@ -151,7 +151,7 @@ sal_Bool ServiceImpl0::supportsService( const OUString & rServiceName ) class ServiceImpl1 : public ServiceImpl0 { public: - inline ServiceImpl1( Reference< XComponentContext > const & xContext ) SAL_THROW(()) + inline ServiceImpl1( Reference< XComponentContext > const & xContext ) : ServiceImpl0( xContext ) {} @@ -175,14 +175,12 @@ Sequence< OUString > ServiceImpl1::getSupportedServiceNames() static Reference< XInterface > SAL_CALL ServiceImpl0_create( Reference< XComponentContext > const & xContext ) - SAL_THROW( (Exception) ) { return (OWeakObject *)new ServiceImpl0( xContext ); } static Reference< XInterface > SAL_CALL ServiceImpl1_create( Reference< XComponentContext > const & xContext ) - SAL_THROW( (Exception) ) { return (OWeakObject *)new ServiceImpl1( xContext ); } diff --git a/cppuhelper/test/testcmp/TestComponent.cxx b/cppuhelper/test/testcmp/TestComponent.cxx index 5ccd4a14050b..64d2b9ff36af 100644 --- a/cppuhelper/test/testcmp/TestComponent.cxx +++ b/cppuhelper/test/testcmp/TestComponent.cxx @@ -63,8 +63,7 @@ class TestComponent: public cppu::WeakImplHelper1<lang::XServiceInfo> public: static uno::Reference<uno::XInterface> create( uno::Reference<uno::XComponentContext> const & xCtx - ) - SAL_THROW((uno::Exception)); + ); static uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames_Static(); @@ -89,9 +88,7 @@ protected: uno::Reference<uno::XInterface> SAL_CALL TestComponent::create( - uno::Reference<uno::XComponentContext> const & xCtx -) - SAL_THROW((uno::Exception)) + uno::Reference<uno::XComponentContext> const & xCtx) { try { |