diff options
author | Noel Grandin <noel@peralex.com> | 2014-06-05 08:15:21 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-06-05 08:17:50 +0200 |
commit | 79df6cf588afbd0fdf09c1eb8c692466606acba5 (patch) | |
tree | 54676b4d13122bd16fb3075c8e009fd3cd4cad76 /forms | |
parent | 62258d9c8f6b6f8d89ade68af97ccdac63dce2b7 (diff) |
forms: remove SAL_THROW macro
Change-Id: I532f29e240cf29c5e65c919c4bcaccd86c510ce9
Diffstat (limited to 'forms')
-rw-r--r-- | forms/source/component/clickableimage.cxx | 2 | ||||
-rw-r--r-- | forms/source/component/clickableimage.hxx | 2 | ||||
-rw-r--r-- | forms/source/component/entrylisthelper.cxx | 2 | ||||
-rw-r--r-- | forms/source/component/entrylisthelper.hxx | 3 | ||||
-rw-r--r-- | forms/source/helper/controlfeatureinterception.cxx | 6 | ||||
-rw-r--r-- | forms/source/inc/InterfaceContainer.hxx | 2 | ||||
-rw-r--r-- | forms/source/inc/controlfeatureinterception.hxx | 6 | ||||
-rw-r--r-- | forms/source/inc/listenercontainers.hxx | 4 | ||||
-rw-r--r-- | forms/source/misc/InterfaceContainer.cxx | 2 | ||||
-rw-r--r-- | forms/source/misc/listenercontainers.cxx | 2 | ||||
-rw-r--r-- | forms/source/richtext/attributedispatcher.hxx | 4 | ||||
-rw-r--r-- | forms/source/richtext/featuredispatcher.cxx | 2 | ||||
-rw-r--r-- | forms/source/richtext/featuredispatcher.hxx | 2 | ||||
-rw-r--r-- | forms/source/xforms/datatyperepository.cxx | 2 | ||||
-rw-r--r-- | forms/source/xforms/datatyperepository.hxx | 2 |
15 files changed, 21 insertions, 22 deletions
diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx index 55bd6ca278db..cb482d543478 100644 --- a/forms/source/component/clickableimage.cxx +++ b/forms/source/component/clickableimage.cxx @@ -381,7 +381,7 @@ namespace frm } - void OClickableImageBaseControl::implSubmit( const MouseEvent& _rEvent, const Reference< XInteractionHandler >& _rxHandler ) SAL_THROW((VetoException, WrappedTargetException, RuntimeException)) + void OClickableImageBaseControl::implSubmit( const MouseEvent& _rEvent, const Reference< XInteractionHandler >& _rxHandler ) { try { diff --git a/forms/source/component/clickableimage.hxx b/forms/source/component/clickableimage.hxx index cd441d70a9cf..e2c8ec10dee2 100644 --- a/forms/source/component/clickableimage.hxx +++ b/forms/source/component/clickableimage.hxx @@ -242,7 +242,7 @@ namespace frm void implSubmit( const ::com::sun::star::awt::MouseEvent& _rEvent, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& aHandler - ) SAL_THROW((com::sun::star::util::VetoException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)); + ); }; class OImageProducerThread_Impl: public OComponentEventThread diff --git a/forms/source/component/entrylisthelper.cxx b/forms/source/component/entrylisthelper.cxx index 5242982fbf16..2139d708bdb7 100644 --- a/forms/source/component/entrylisthelper.cxx +++ b/forms/source/component/entrylisthelper.cxx @@ -285,7 +285,7 @@ namespace frm bool OEntryListHelper::convertNewListSourceProperty( Any& _rConvertedValue, - Any& _rOldValue, const Any& _rValue ) SAL_THROW( ( IllegalArgumentException ) ) + Any& _rOldValue, const Any& _rValue ) { if ( hasExternalListSource() ) throw IllegalArgumentException( ); diff --git a/forms/source/component/entrylisthelper.hxx b/forms/source/component/entrylisthelper.hxx index e1c31b267e7f..1e3ddf7272c9 100644 --- a/forms/source/component/entrylisthelper.hxx +++ b/forms/source/component/entrylisthelper.hxx @@ -95,8 +95,7 @@ namespace frm ::com::sun::star::uno::Any& _rConvertedValue, ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Any& _rValue - ) - SAL_THROW( ( ::com::sun::star::lang::IllegalArgumentException ) ); + ); /** helper for implementing setFastPropertyValueNoBroadcast diff --git a/forms/source/helper/controlfeatureinterception.cxx b/forms/source/helper/controlfeatureinterception.cxx index 709398bf4997..1d30b97771cb 100644 --- a/forms/source/helper/controlfeatureinterception.cxx +++ b/forms/source/helper/controlfeatureinterception.cxx @@ -126,7 +126,7 @@ namespace frm } } - Reference< XDispatch > ControlFeatureInterception::queryDispatch( const URL& _rURL, const OUString& _rTargetFrameName, ::sal_Int32 _nSearchFlags ) SAL_THROW((RuntimeException)) + Reference< XDispatch > ControlFeatureInterception::queryDispatch( const URL& _rURL, const OUString& _rTargetFrameName, ::sal_Int32 _nSearchFlags ) { Reference< XDispatch > xDispatcher; if ( m_xFirstDispatchInterceptor.is() ) @@ -135,13 +135,13 @@ namespace frm } - Reference< XDispatch > ControlFeatureInterception::queryDispatch( const URL& _rURL ) SAL_THROW((RuntimeException)) + Reference< XDispatch > ControlFeatureInterception::queryDispatch( const URL& _rURL ) { return queryDispatch( _rURL, OUString(), 0 ); } - Reference< XDispatch > ControlFeatureInterception::queryDispatch( const sal_Char* _pAsciiURL ) SAL_THROW((RuntimeException)) + Reference< XDispatch > ControlFeatureInterception::queryDispatch( const sal_Char* _pAsciiURL ) { return queryDispatch( m_pUrlTransformer->getStrictURLFromAscii( _pAsciiURL ) ); } diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx index 9dc224d7acb7..a75f39278637 100644 --- a/forms/source/inc/InterfaceContainer.hxx +++ b/forms/source/inc/InterfaceContainer.hxx @@ -263,7 +263,7 @@ protected: @throws ::com::sun::star::lang::IndexOutOfBoundsException if the given index does not denote a valid position in our children array */ - void implCheckIndex( const sal_Int32 _nIndex ) SAL_THROW( ( ::com::sun::star::lang::IndexOutOfBoundsException ) ); + void implCheckIndex( const sal_Int32 _nIndex ); private: // hack for Vba Events diff --git a/forms/source/inc/controlfeatureinterception.hxx b/forms/source/inc/controlfeatureinterception.hxx index 3881a6ebde2e..381eb32f0341 100644 --- a/forms/source/inc/controlfeatureinterception.hxx +++ b/forms/source/inc/controlfeatureinterception.hxx @@ -71,18 +71,18 @@ namespace frm /** queries the interceptor chain for the given dispatch */ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > - queryDispatch( const ::com::sun::star::util::URL& _rURL, const OUString& _rTargetFrameName, ::sal_Int32 _nSearchFlags ) SAL_THROW((::com::sun::star::uno::RuntimeException)); + queryDispatch( const ::com::sun::star::util::URL& _rURL, const OUString& _rTargetFrameName, ::sal_Int32 _nSearchFlags ); /** queries the interceptor chain for the given dispatch, with a blank target frame and no frame search flags */ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > - queryDispatch( const ::com::sun::star::util::URL& _rURL ) SAL_THROW((::com::sun::star::uno::RuntimeException)); + queryDispatch( const ::com::sun::star::util::URL& _rURL ); /** queries the interceptor chain for the URL given as ASCII string, with a blank target frame and no frame search flags */ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > - queryDispatch( const sal_Char* _pAsciiURL ) SAL_THROW((::com::sun::star::uno::RuntimeException)); + queryDispatch( const sal_Char* _pAsciiURL ); }; diff --git a/forms/source/inc/listenercontainers.hxx b/forms/source/inc/listenercontainers.hxx index 77ca03a9c7b1..d373600aa151 100644 --- a/forms/source/inc/listenercontainers.hxx +++ b/forms/source/inc/listenercontainers.hxx @@ -54,7 +54,7 @@ namespace frm virtual bool implTypedNotify( const ::com::sun::star::uno::Reference< ListenerClass >& _rxListener, const EventClass& _rEvent - ) SAL_THROW( ( ::com::sun::star::uno::Exception ) ) = 0; + ) = 0; public: inline bool notify() @@ -112,7 +112,7 @@ namespace frm virtual bool implTypedNotify( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener >& _rxListener, const ::com::sun::star::lang::EventObject& _rEvent - ) SAL_THROW( ( ::com::sun::star::uno::Exception ) ) SAL_OVERRIDE; + ) SAL_OVERRIDE; }; diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx index 4a1da91b9213..d57087b3b11c 100644 --- a/forms/source/misc/InterfaceContainer.cxx +++ b/forms/source/misc/InterfaceContainer.cxx @@ -1018,7 +1018,7 @@ void OInterfaceContainer::implReplaceByIndex( const sal_Int32 _nIndex, const Any } -void OInterfaceContainer::implCheckIndex( const sal_Int32 _nIndex ) SAL_THROW( ( ::com::sun::star::lang::IndexOutOfBoundsException ) ) +void OInterfaceContainer::implCheckIndex( const sal_Int32 _nIndex ) { if (_nIndex < 0 || _nIndex >= (sal_Int32)m_aItems.size()) throw IndexOutOfBoundsException(); diff --git a/forms/source/misc/listenercontainers.cxx b/forms/source/misc/listenercontainers.cxx index 4cecbe839129..e7fc68deafc5 100644 --- a/forms/source/misc/listenercontainers.cxx +++ b/forms/source/misc/listenercontainers.cxx @@ -33,7 +33,7 @@ namespace frm bool ResetListeners::implTypedNotify( const Reference< XResetListener >& _rxListener, - const EventObject& _rEvent ) SAL_THROW( ( Exception ) ) + const EventObject& _rEvent ) { switch ( m_eCurrentNotificationType ) { diff --git a/forms/source/richtext/attributedispatcher.hxx b/forms/source/richtext/attributedispatcher.hxx index d1010f4f91ed..a1044f0dba80 100644 --- a/forms/source/richtext/attributedispatcher.hxx +++ b/forms/source/richtext/attributedispatcher.hxx @@ -55,7 +55,7 @@ namespace frm ); /// notifies a new attribute state - void notifyAttributeState( const AttributeState& _rState ) SAL_THROW (()); + void notifyAttributeState( const AttributeState& _rState ); protected: virtual ~OAttributeDispatcher( ); @@ -81,7 +81,7 @@ namespace frm void notifyState( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _rxControl, const AttributeState& _rState - ) SAL_THROW (()); + ); }; diff --git a/forms/source/richtext/featuredispatcher.cxx b/forms/source/richtext/featuredispatcher.cxx index 2c096bfc478e..4b6506f753cb 100644 --- a/forms/source/richtext/featuredispatcher.cxx +++ b/forms/source/richtext/featuredispatcher.cxx @@ -119,7 +119,7 @@ namespace frm } - void ORichTextFeatureDispatcher::doNotify( const Reference< XStatusListener >& _rxListener, const FeatureStateEvent& _rEvent ) const SAL_THROW(()) + void ORichTextFeatureDispatcher::doNotify( const Reference< XStatusListener >& _rxListener, const FeatureStateEvent& _rEvent ) const { OSL_PRECOND( _rxListener.is(), "ORichTextFeatureDispatcher::doNotify: invalid listener!" ); if ( _rxListener.is() ) diff --git a/forms/source/richtext/featuredispatcher.hxx b/forms/source/richtext/featuredispatcher.hxx index c92cb8d386c8..598141d94fcd 100644 --- a/forms/source/richtext/featuredispatcher.hxx +++ b/forms/source/richtext/featuredispatcher.hxx @@ -77,7 +77,7 @@ namespace frm void doNotify( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _rxListener, const ::com::sun::star::frame::FeatureStateEvent& _rEvent - ) const SAL_THROW(()); + ) const; protected: // XDispatch diff --git a/forms/source/xforms/datatyperepository.cxx b/forms/source/xforms/datatyperepository.cxx index 02fe3e49a3ed..e25f3e1ee9d8 100644 --- a/forms/source/xforms/datatyperepository.cxx +++ b/forms/source/xforms/datatyperepository.cxx @@ -98,7 +98,7 @@ namespace xforms } - ODataTypeRepository::Repository::iterator ODataTypeRepository::implLocate( const OUString& _rName, bool _bAllowMiss ) SAL_THROW( ( NoSuchElementException ) ) + ODataTypeRepository::Repository::iterator ODataTypeRepository::implLocate( const OUString& _rName, bool _bAllowMiss ) { Repository::iterator aTypePos = m_aRepository.find( _rName ); if ( aTypePos == m_aRepository.end() && !_bAllowMiss ) diff --git a/forms/source/xforms/datatyperepository.hxx b/forms/source/xforms/datatyperepository.hxx index 6ea9387adaa3..33d95dc466e3 100644 --- a/forms/source/xforms/datatyperepository.hxx +++ b/forms/source/xforms/datatyperepository.hxx @@ -74,7 +74,7 @@ namespace xforms private: /** locates the type with the given name in our repository, or throws an exception if there is no such type */ - Repository::iterator implLocate( const OUString& _rName, bool _bAllowMiss = false ) SAL_THROW( ( ::com::sun::star::container::NoSuchElementException ) ); + Repository::iterator implLocate( const OUString& _rName, bool _bAllowMiss = false ); }; |