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 /sc | |
parent | db246b491c1639942d9f952658d33974e9b06201 (diff) |
various: remove SAL_THROW macro
Change-Id: I9464179a736b91f5bc32eb5e5e89b3b4e3da3494
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/ui/unoobj/celllistsource.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/unoobj/celllistsource.hxx | 6 | ||||
-rw-r--r-- | sc/source/ui/unoobj/cellvaluebinding.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/unoobj/cellvaluebinding.hxx | 9 |
4 files changed, 10 insertions, 15 deletions
diff --git a/sc/source/ui/unoobj/celllistsource.cxx b/sc/source/ui/unoobj/celllistsource.cxx index 917167e67157..409cb0bc1b54 100644 --- a/sc/source/ui/unoobj/celllistsource.cxx +++ b/sc/source/ui/unoobj/celllistsource.cxx @@ -147,14 +147,14 @@ namespace calc } - void OCellListSource::checkDisposed( ) const SAL_THROW( ( DisposedException ) ) + void OCellListSource::checkDisposed( ) const { if ( OCellListSource_Base::rBHelper.bInDispose || OCellListSource_Base::rBHelper.bDisposed ) throw DisposedException(); // TODO: is it worth having an error message here? } - void OCellListSource::checkInitialized() SAL_THROW( ( RuntimeException ) ) + void OCellListSource::checkInitialized() { if ( !m_bInitialized ) throw RuntimeException(); diff --git a/sc/source/ui/unoobj/celllistsource.hxx b/sc/source/ui/unoobj/celllistsource.hxx index f2ac472e48bd..558a5b7c4b15 100644 --- a/sc/source/ui/unoobj/celllistsource.hxx +++ b/sc/source/ui/unoobj/celllistsource.hxx @@ -116,10 +116,8 @@ namespace calc virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - void checkDisposed( ) const - SAL_THROW( ( ::com::sun::star::lang::DisposedException ) ); - void checkInitialized() - SAL_THROW( ( ::com::sun::star::uno::RuntimeException ) ); + void checkDisposed( ) const; + void checkInitialized(); /** retrieves the actual address of our cell range @precond diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx index 8eeb87d8a7c5..3b808f922354 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.cxx +++ b/sc/source/ui/unoobj/cellvaluebinding.cxx @@ -419,7 +419,7 @@ namespace calc } - void OCellValueBinding::checkDisposed( ) const SAL_THROW( ( DisposedException ) ) + void OCellValueBinding::checkDisposed( ) const { if ( OCellValueBinding_Base::rBHelper.bInDispose || OCellValueBinding_Base::rBHelper.bDisposed ) throw DisposedException(); @@ -427,7 +427,7 @@ namespace calc } - void OCellValueBinding::checkInitialized() SAL_THROW( ( RuntimeException ) ) + void OCellValueBinding::checkInitialized() { if ( !m_bInitialized ) throw RuntimeException(); @@ -435,7 +435,7 @@ namespace calc } - void OCellValueBinding::checkValueType( const Type& _rType ) const SAL_THROW( ( IncompatibleTypesException ) ) + void OCellValueBinding::checkValueType( const Type& _rType ) const { OCellValueBinding* pNonConstThis = const_cast< OCellValueBinding* >( this ); if ( !pNonConstThis->supportsType( _rType ) ) diff --git a/sc/source/ui/unoobj/cellvaluebinding.hxx b/sc/source/ui/unoobj/cellvaluebinding.hxx index 4dffbbb11597..9a3c34b4a8c6 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.hxx +++ b/sc/source/ui/unoobj/cellvaluebinding.hxx @@ -125,12 +125,9 @@ namespace calc virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - void checkDisposed( ) const - SAL_THROW( ( ::com::sun::star::lang::DisposedException ) ); - void checkValueType( const ::com::sun::star::uno::Type& _rType ) const - SAL_THROW( ( ::com::sun::star::form::binding::IncompatibleTypesException ) ); - void checkInitialized() - SAL_THROW( ( ::com::sun::star::uno::RuntimeException ) ); + void checkDisposed( ) const; + void checkValueType( const ::com::sun::star::uno::Type& _rType ) const; + void checkInitialized(); /** notifies our modify listeners @precond |