diff options
| author | Noel Grandin <noel@peralex.com> | 2014-06-05 08:16:59 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-06-05 08:17:52 +0200 |
| commit | 0e507ae031768deceab236a41d1bbe9fb5123cea (patch) | |
| tree | 34cc1626f1e8fa6d50d6edd88045be6252150f19 /odk | |
| parent | db246b491c1639942d9f952658d33974e9b06201 (diff) | |
various: remove SAL_THROW macro
Change-Id: I9464179a736b91f5bc32eb5e5e89b3b4e3da3494
Diffstat (limited to 'odk')
3 files changed, 6 insertions, 9 deletions
diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx index 1c07b9f5396a..20649fc16579 100644 --- a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx +++ b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx @@ -214,14 +214,13 @@ Sequence< OUString > MyService1Impl::getSupportedServiceNames() Reference< XInterface > SAL_CALL create_MyService1Impl( Reference< XComponentContext > const & xContext ) - SAL_THROW(()) { return static_cast< lang::XTypeProvider * >( new MyService1Impl( xContext) ); } // forward decl: implemented in service2_impl.cxx Reference< XInterface > SAL_CALL create_MyService2Impl( - Reference< XComponentContext > const & ) SAL_THROW(()); + Reference< XComponentContext > const & ); } diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx b/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx index fd041358ef48..def49109571e 100644 --- a/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx +++ b/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx @@ -56,8 +56,7 @@ namespace my_sc_impl extern Sequence< OUString > SAL_CALL getSupportedServiceNames_MyService1Impl(); extern OUString SAL_CALL getImplementationName_MyService1Impl(); extern Reference< XInterface > SAL_CALL create_MyService1Impl( - Reference< XComponentContext > const & xContext ) - SAL_THROW(()); + Reference< XComponentContext > const & xContext ); static Sequence< OUString > getSupportedServiceNames_MyService2Impl() { @@ -166,7 +165,6 @@ Sequence< OUString > MyService2Impl::getSupportedServiceNames() Reference< XInterface > SAL_CALL create_MyService2Impl( Reference< XComponentContext > const & xContext ) - SAL_THROW(()) { return static_cast< ::cppu::OWeakObject * >( new MyService2Impl( xContext ) ); } diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx index 24cf6704c399..610bb4062192 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx @@ -79,13 +79,13 @@ namespace connectivity ,nSearchType( ::com::sun::star::sdbc::ColumnSearch::FULL) {} - inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW(()) + inline static void * SAL_CALL operator new( size_t nSize ) { return ::rtl_allocateMemory( nSize ); } - inline static void * SAL_CALL operator new( size_t nSize,void* _pHint ) SAL_THROW(()) + inline static void * SAL_CALL operator new( size_t nSize,void* _pHint ) { return _pHint; } - inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(()) + inline static void SAL_CALL operator delete( void * pMem ) { ::rtl_freeMemory( pMem ); } - inline static void SAL_CALL operator delete( void * pMem,void* _pHint ) SAL_THROW(()) + inline static void SAL_CALL operator delete( void * pMem,void* _pHint ) { } sal_Bool operator == (const OTypeInfo& lh) const { return lh.nType == nType; } |