diff options
Diffstat (limited to 'forms/source')
123 files changed, 1583 insertions, 1978 deletions
diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx index 15944189adb2..99d076c3096a 100644 --- a/forms/source/component/Button.cxx +++ b/forms/source/component/Button.cxx @@ -63,7 +63,7 @@ OButtonModel::OButtonModel(const Reference<XComponentContext>& _rxFactory) } -Any SAL_CALL OButtonModel::queryAggregation( const Type& _type ) throw(RuntimeException, std::exception) +Any SAL_CALL OButtonModel::queryAggregation( const Type& _type ) { Any aReturn = OClickableImageBaseModel::queryAggregation( _type ); if ( !aReturn.hasValue() ) @@ -114,7 +114,7 @@ IMPLEMENT_DEFAULT_CLONING( OButtonModel ) // XServiceInfo -css::uno::Sequence<OUString> OButtonModel::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> OButtonModel::getSupportedServiceNames() { css::uno::Sequence<OUString> aSupported = OClickableImageBaseModel::getSupportedServiceNames(); aSupported.realloc( aSupported.getLength() + 2 ); @@ -127,13 +127,13 @@ css::uno::Sequence<OUString> OButtonModel::getSupportedServiceNames() throw(std } -OUString OButtonModel::getServiceName() throw ( css::uno::RuntimeException, std::exception) +OUString OButtonModel::getServiceName() { return OUString(FRM_COMPONENT_COMMANDBUTTON); // old (non-sun) name for compatibility ! } -void OButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw (css::io::IOException, css::uno::RuntimeException, std::exception) +void OButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream) { OClickableImageBaseModel::write(_rxOutStream); @@ -154,7 +154,7 @@ void OButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream) thr } -void OButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) throw (css::io::IOException, css::uno::RuntimeException, std::exception) +void OButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) { OClickableImageBaseModel::read(_rxInStream); @@ -221,7 +221,7 @@ void SAL_CALL OButtonModel::disposing() } -void SAL_CALL OButtonModel::reset() throw (RuntimeException, std::exception) +void SAL_CALL OButtonModel::reset() { if ( !m_aResetHelper.approveReset() ) return; @@ -232,13 +232,13 @@ void SAL_CALL OButtonModel::reset() throw (RuntimeException, std::exception) } -void SAL_CALL OButtonModel::addResetListener( const Reference< XResetListener >& _listener ) throw (RuntimeException, std::exception) +void SAL_CALL OButtonModel::addResetListener( const Reference< XResetListener >& _listener ) { m_aResetHelper.addResetListener( _listener ); } -void SAL_CALL OButtonModel::removeResetListener( const Reference< XResetListener >& _listener ) throw (RuntimeException, std::exception) +void SAL_CALL OButtonModel::removeResetListener( const Reference< XResetListener >& _listener ) { m_aResetHelper.removeResetListener( _listener ); } @@ -259,7 +259,7 @@ void SAL_CALL OButtonModel::getFastPropertyValue( Any& _rValue, sal_Int32 _nHand } -void SAL_CALL OButtonModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw (Exception, std::exception) +void SAL_CALL OButtonModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) { switch ( _nHandle ) { @@ -279,7 +279,7 @@ void SAL_CALL OButtonModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle } -sal_Bool SAL_CALL OButtonModel::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw (IllegalArgumentException, RuntimeException, std::exception) +sal_Bool SAL_CALL OButtonModel::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) { bool bModified = false; switch ( _nHandle ) @@ -339,7 +339,7 @@ Sequence<Type> OButtonControl::_getTypes() } -css::uno::Sequence<OUString> OButtonControl::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> OButtonControl::getSupportedServiceNames() { css::uno::Sequence<OUString> aSupported = OClickableImageBaseControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); @@ -379,7 +379,7 @@ OButtonControl::~OButtonControl() // UNO binding -Any SAL_CALL OButtonControl::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception) +Any SAL_CALL OButtonControl::queryAggregation(const Type& _rType) { // if asked for the XTypeProvider, don't let OButtonControl_BASE do this Any aReturn; @@ -405,7 +405,7 @@ void SAL_CALL OButtonControl::disposing() } -void SAL_CALL OButtonControl::disposing( const EventObject& _rSource ) throw( RuntimeException, std::exception ) +void SAL_CALL OButtonControl::disposing( const EventObject& _rSource ) { OControl::disposing( _rSource ); OFormNavigationHelper::disposing( _rSource ); @@ -413,7 +413,7 @@ void SAL_CALL OButtonControl::disposing( const EventObject& _rSource ) throw( Ru // ActionListener -void OButtonControl::actionPerformed(const ActionEvent& /*rEvent*/) throw ( css::uno::RuntimeException, std::exception) +void OButtonControl::actionPerformed(const ActionEvent& /*rEvent*/) { // Asynchronous for css::util::URL-Button ImplSVEvent * n = Application::PostUserEvent( LINK(this, OButtonControl, OnClick) ); @@ -503,7 +503,7 @@ void OButtonControl::actionPerformed_Impl( bool _bNotifyListener, const css::awt // XButton -void OButtonControl::setLabel(const OUString& Label) throw( RuntimeException, std::exception ) +void OButtonControl::setLabel(const OUString& Label) { Reference<XButton> xButton; query_aggregation( m_xAggregate, xButton ); @@ -512,7 +512,7 @@ void OButtonControl::setLabel(const OUString& Label) throw( RuntimeException, st } -void SAL_CALL OButtonControl::setActionCommand(const OUString& _rCommand) throw( RuntimeException, std::exception ) +void SAL_CALL OButtonControl::setActionCommand(const OUString& _rCommand) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -526,13 +526,13 @@ void SAL_CALL OButtonControl::setActionCommand(const OUString& _rCommand) throw( } -void SAL_CALL OButtonControl::addActionListener(const Reference<XActionListener>& _rxListener) throw( RuntimeException, std::exception ) +void SAL_CALL OButtonControl::addActionListener(const Reference<XActionListener>& _rxListener) { m_aActionListeners.addInterface(_rxListener); } -void SAL_CALL OButtonControl::removeActionListener(const Reference<XActionListener>& _rxListener) throw( RuntimeException, std::exception ) +void SAL_CALL OButtonControl::removeActionListener(const Reference<XActionListener>& _rxListener) { m_aActionListeners.removeInterface(_rxListener); } @@ -589,7 +589,7 @@ void OButtonControl::startOrStopModelPropertyListening( bool _bStart ) } -sal_Bool SAL_CALL OButtonControl::setModel( const Reference< XControlModel >& _rxModel ) throw ( RuntimeException, std::exception ) +sal_Bool SAL_CALL OButtonControl::setModel( const Reference< XControlModel >& _rxModel ) { startOrStopModelPropertyListening( false ); bool bResult = OClickableImageBaseControl::setModel( _rxModel ); @@ -621,7 +621,7 @@ void OButtonControl::modelFeatureUrlPotentiallyChanged( ) } -void SAL_CALL OButtonControl::propertyChange( const PropertyChangeEvent& _rEvent ) throw ( RuntimeException, std::exception ) +void SAL_CALL OButtonControl::propertyChange( const PropertyChangeEvent& _rEvent ) { if ( _rEvent.PropertyName == PROPERTY_TARGET_URL || _rEvent.PropertyName == PROPERTY_BUTTONTYPE @@ -675,7 +675,7 @@ sal_Int16 OButtonControl::getModelUrlFeatureId( ) const } -void SAL_CALL OButtonControl::setDesignMode( sal_Bool _bOn ) throw( RuntimeException, std::exception ) +void SAL_CALL OButtonControl::setDesignMode( sal_Bool _bOn ) { OClickableImageBaseControl::setDesignMode( _bOn ); @@ -734,14 +734,14 @@ bool OButtonControl::isEnabled( sal_Int16 _nFeatureId ) const } -void SAL_CALL OButtonControl::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException, std::exception) +void SAL_CALL OButtonControl::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) { OClickableImageBaseControl::registerDispatchProviderInterceptor( _rxInterceptor ); OFormNavigationHelper::registerDispatchProviderInterceptor( _rxInterceptor ); } -void SAL_CALL OButtonControl::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException, std::exception) +void SAL_CALL OButtonControl::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) { OClickableImageBaseControl::releaseDispatchProviderInterceptor( _rxInterceptor ); OFormNavigationHelper::releaseDispatchProviderInterceptor( _rxInterceptor ); diff --git a/forms/source/component/Button.hxx b/forms/source/component/Button.hxx index d315c0f24043..eabc05286e13 100644 --- a/forms/source/component/Button.hxx +++ b/forms/source/component/Button.hxx @@ -50,26 +50,25 @@ public: // UNO DECLARE_UNO3_AGG_DEFAULTS( OButtonModel, OClickableImageBaseModel ) - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override; css::uno::Sequence< css::uno::Type> _getTypes() override; // css::lang::XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.form.OButtonModel"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // css::io::XPersistObject - virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; + virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override; + virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override; // XReset - virtual void SAL_CALL reset( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addResetListener( const css::uno::Reference< css::form::XResetListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeResetListener( const css::uno::Reference< css::form::XResetListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL reset( ) override; + virtual void SAL_CALL addResetListener( const css::uno::Reference< css::form::XResetListener >& aListener ) override; + virtual void SAL_CALL removeResetListener( const css::uno::Reference< css::form::XResetListener >& aListener ) override; // OControlModel's property handling virtual void describeFixedProperties( @@ -78,18 +77,16 @@ public: // XPropertySet and friends virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) - throw (css::uno::Exception, std::exception) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override; virtual sal_Bool SAL_CALL convertFastPropertyValue( - css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) override; virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const override; // OComponentHelper virtual void SAL_CALL disposing() override; protected: - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) override; private: void impl_resetNoBroadcast_nothrow(); @@ -134,37 +131,36 @@ public: virtual ~OButtonControl() override; // XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.form.OButtonControl"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // UNO binding DECLARE_UNO3_AGG_DEFAULTS(OButtonControl, OClickableImageBaseControl) - virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) override; // XActionListener - virtual void SAL_CALL actionPerformed(const css::awt::ActionEvent& rEvent) throw ( css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL actionPerformed(const css::awt::ActionEvent& rEvent) override; // XButton - virtual void SAL_CALL addActionListener(const css::uno::Reference< css::awt::XActionListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeActionListener(const css::uno::Reference< css::awt::XActionListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLabel(const OUString& Label) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setActionCommand(const OUString& _rCommand) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addActionListener(const css::uno::Reference< css::awt::XActionListener>& _rxListener) override; + virtual void SAL_CALL removeActionListener(const css::uno::Reference< css::awt::XActionListener>& _rxListener) override; + virtual void SAL_CALL setLabel(const OUString& Label) override; + virtual void SAL_CALL setActionCommand(const OUString& _rCommand) override; // OComponentHelper virtual void SAL_CALL disposing() override; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) override; // XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) override; // XControl - virtual sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& _rxModel ) throw ( css::uno::RuntimeException, std::exception ) override; - void SAL_CALL setDesignMode(sal_Bool bOn) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& _rxModel ) override; + void SAL_CALL setDesignMode(sal_Bool bOn) override; protected: // OFormNavigationHelper overriables @@ -174,8 +170,8 @@ protected: virtual bool isEnabled( sal_Int16 _nFeatureId ) const override; // XDispatchProviderInterception disambiguation - virtual void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) override; + virtual void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) override; // OImageControl overridables virtual void actionPerformed_Impl( bool bNotifyListener, const css::awt::MouseEvent& _rEvt ) override; diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx index 432899a67a8c..65178f68ddc4 100644 --- a/forms/source/component/CheckBox.cxx +++ b/forms/source/component/CheckBox.cxx @@ -45,7 +45,7 @@ OCheckBoxControl::OCheckBoxControl(const Reference<XComponentContext>& _rxFactor } -css::uno::Sequence<OUString> SAL_CALL OCheckBoxControl::getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OCheckBoxControl::getSupportedServiceNames() { css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); @@ -84,7 +84,7 @@ IMPLEMENT_DEFAULT_CLONING( OCheckBoxModel ) // XServiceInfo -css::uno::Sequence<OUString> SAL_CALL OCheckBoxModel::getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OCheckBoxModel::getSupportedServiceNames() { css::uno::Sequence<OUString> aSupported = OReferenceValueComponent::getSupportedServiceNames(); @@ -117,14 +117,13 @@ void OCheckBoxModel::describeFixedProperties( Sequence< Property >& _rProps ) co } -OUString SAL_CALL OCheckBoxModel::getServiceName() throw(RuntimeException, std::exception) +OUString SAL_CALL OCheckBoxModel::getServiceName() { return OUString(FRM_COMPONENT_CHECKBOX); // old (non-sun) name for compatibility ! } void SAL_CALL OCheckBoxModel::write(const Reference<css::io::XObjectOutputStream>& _rxOutStream) - throw(css::io::IOException, RuntimeException, std::exception) { OReferenceValueComponent::write(_rxOutStream); @@ -139,7 +138,7 @@ void SAL_CALL OCheckBoxModel::write(const Reference<css::io::XObjectOutputStream } -void SAL_CALL OCheckBoxModel::read(const Reference<css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, RuntimeException, std::exception) +void SAL_CALL OCheckBoxModel::read(const Reference<css::io::XObjectInputStream>& _rxInStream) { OReferenceValueComponent::read(_rxInStream); osl::MutexGuard aGuard(m_aMutex); diff --git a/forms/source/component/CheckBox.hxx b/forms/source/component/CheckBox.hxx index cfa6c0c8a3a2..98421e1599e9 100644 --- a/forms/source/component/CheckBox.hxx +++ b/forms/source/component/CheckBox.hxx @@ -35,18 +35,17 @@ public: DECLARE_DEFAULT_LEAF_XTOR( OCheckBoxModel ); // XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.form.OCheckBoxModel"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XPersistObject - virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; virtual void SAL_CALL - write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; + write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override; virtual void SAL_CALL - read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; + read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override; // OControlModel's property handling virtual void describeFixedProperties( @@ -54,7 +53,7 @@ public: ) const override; protected: - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) override; // OBoundControlModel overridables virtual css::uno::Any translateDbColumnToControlValue( ) override; @@ -67,11 +66,10 @@ public: explicit OCheckBoxControl(const css::uno::Reference< css::uno::XComponentContext>& _rxContext); // XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.form.OCheckBoxControl"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; }; diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx index e87ea44684ab..c221024dd533 100644 --- a/forms/source/component/Columns.cxx +++ b/forms/source/component/Columns.cxx @@ -121,7 +121,7 @@ const Sequence<sal_Int8>& OGridColumn::getUnoTunnelImplementationId() } -sal_Int64 SAL_CALL OGridColumn::getSomething( const Sequence<sal_Int8>& _rIdentifier) throw(RuntimeException, std::exception) +sal_Int64 SAL_CALL OGridColumn::getSomething( const Sequence<sal_Int8>& _rIdentifier) { sal_Int64 nReturn(0); @@ -141,13 +141,13 @@ sal_Int64 SAL_CALL OGridColumn::getSomething( const Sequence<sal_Int8>& _rIdenti } -Sequence<sal_Int8> SAL_CALL OGridColumn::getImplementationId() throw(RuntimeException, std::exception) +Sequence<sal_Int8> SAL_CALL OGridColumn::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } -Sequence<Type> SAL_CALL OGridColumn::getTypes() throw(RuntimeException, std::exception) +Sequence<Type> SAL_CALL OGridColumn::getTypes() { TypeBag aTypes( OGridColumn_BASE::getTypes() ); // erase the types which we do not support @@ -171,7 +171,7 @@ Sequence<Type> SAL_CALL OGridColumn::getTypes() throw(RuntimeException, std::exc } -Any SAL_CALL OGridColumn::queryAggregation( const Type& _rType ) throw (RuntimeException, std::exception) +Any SAL_CALL OGridColumn::queryAggregation( const Type& _rType ) { Any aReturn; // some functionality at our aggregate cannot be reasonably fulfilled here. @@ -269,7 +269,7 @@ OGridColumn::~OGridColumn() // XEventListener -void SAL_CALL OGridColumn::disposing(const EventObject& _rSource) throw(RuntimeException, std::exception) +void SAL_CALL OGridColumn::disposing(const EventObject& _rSource) { OPropertySetAggregationHelper::disposing(_rSource); @@ -391,7 +391,6 @@ void OGridColumn::getFastPropertyValue(Any& rValue, sal_Int32 nHandle ) const sal_Bool OGridColumn::convertFastPropertyValue( Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw( IllegalArgumentException, RuntimeException, std::exception ) { bool bModified(false); switch (nHandle) @@ -421,7 +420,7 @@ sal_Bool OGridColumn::convertFastPropertyValue( Any& rConvertedValue, Any& rOldV } -void OGridColumn::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (css::uno::Exception, std::exception) +void OGridColumn::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) { switch (nHandle) { @@ -460,7 +459,7 @@ Any OGridColumn::getPropertyDefaultByHandle( sal_Int32 nHandle ) const // XCloneable -Reference< XCloneable > SAL_CALL OGridColumn::createClone( ) throw (RuntimeException, std::exception) +Reference< XCloneable > SAL_CALL OGridColumn::createClone( ) { OGridColumn* pNewColumn = createCloneColumn(); return pNewColumn; diff --git a/forms/source/component/Columns.hxx b/forms/source/component/Columns.hxx index ec52109711cd..0ea0b1bbc49f 100644 --- a/forms/source/component/Columns.hxx +++ b/forms/source/component/Columns.hxx @@ -68,21 +68,21 @@ public: // UNO binding DECLARE_UNO3_AGG_DEFAULTS(OGridControlModel, OGridColumn_BASE) - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override; static const css::uno::Sequence<sal_Int8>& getUnoTunnelImplementationId(); // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence<sal_Int8>& _rIdentifier) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence<sal_Int8>& _rIdentifier) override; // XTypeProvider - virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Type> SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type> SAL_CALL getTypes() override; // OComponentHelper virtual void SAL_CALL disposing() override; // XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) override; // XPersistObject void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream); @@ -92,9 +92,8 @@ public: virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override = 0; virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const override; virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, - sal_Int32 nHandle, const css::uno::Any& rValue ) - throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw (css::uno::Exception, std::exception) override; + sal_Int32 nHandle, const css::uno::Any& rValue ) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) override; using OPropertySetAggregationHelper::getFastPropertyValue; @@ -102,7 +101,7 @@ public: virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const override; // XCloneable - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) override; const OUString& getModelName() const { return m_aModelName; } @@ -122,7 +121,7 @@ public: explicit ClassName(const css::uno::Reference<css::uno::XComponentContext>& _rContext ); \ explicit ClassName(const ClassName* _pCloneFrom); \ \ - virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; \ + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override; \ virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; \ \ virtual void fillProperties( \ @@ -143,7 +142,7 @@ ClassName::ClassName( const ClassName* _pCloneFrom ) \ :OGridColumn( _pCloneFrom ) \ { \ } \ -css::uno::Reference< css::beans::XPropertySetInfo> ClassName::getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) \ +css::uno::Reference< css::beans::XPropertySetInfo> ClassName::getPropertySetInfo() \ { \ css::uno::Reference< css::beans::XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); \ return xInfo; \ diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx index 0173e8a0ce03..57ff1e6b2122 100644 --- a/forms/source/component/ComboBox.cxx +++ b/forms/source/component/ComboBox.cxx @@ -82,7 +82,7 @@ Sequence<Type> OComboBoxModel::_getTypes() // XServiceInfo -css::uno::Sequence<OUString> SAL_CALL OComboBoxModel::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OComboBoxModel::getSupportedServiceNames() { css::uno::Sequence<OUString> aSupported = OBoundControlModel::getSupportedServiceNames(); @@ -107,7 +107,7 @@ css::uno::Sequence<OUString> SAL_CALL OComboBoxModel::getSupportedServiceNames() } -Any SAL_CALL OComboBoxModel::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception) +Any SAL_CALL OComboBoxModel::queryAggregation(const Type& _rType) { Any aReturn = OBoundControlModel::queryAggregation( _rType ); if ( !aReturn.hasValue() ) @@ -200,7 +200,6 @@ void OComboBoxModel::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) cons void OComboBoxModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) - throw (Exception, std::exception) { switch (_nHandle) { @@ -255,7 +254,6 @@ void OComboBoxModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const sal_Bool OComboBoxModel::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue) - throw (IllegalArgumentException, RuntimeException, std::exception) { bool bModified(false); switch (_nHandle) @@ -309,14 +307,13 @@ void OComboBoxModel::describeAggregateProperties( Sequence< Property >& _rAggreg } -OUString SAL_CALL OComboBoxModel::getServiceName() throw(RuntimeException, std::exception) +OUString SAL_CALL OComboBoxModel::getServiceName() { return OUString(FRM_COMPONENT_COMBOBOX); // old (non-sun) name for compatibility ! } void SAL_CALL OComboBoxModel::write(const Reference<css::io::XObjectOutputStream>& _rxOutStream) - throw(css::io::IOException, RuntimeException, std::exception) { OBoundControlModel::write(_rxOutStream); @@ -353,7 +350,7 @@ void SAL_CALL OComboBoxModel::write(const Reference<css::io::XObjectOutputStream } -void SAL_CALL OComboBoxModel::read(const Reference<css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, RuntimeException, std::exception) +void SAL_CALL OComboBoxModel::read(const Reference<css::io::XObjectInputStream>& _rxInStream) { OBoundControlModel::read(_rxInStream); ControlModelLock aLock( *this ); @@ -686,7 +683,7 @@ void OComboBoxModel::onDisconnectedDbColumn() } -void SAL_CALL OComboBoxModel::reloaded( const EventObject& aEvent ) throw(RuntimeException, std::exception) +void SAL_CALL OComboBoxModel::reloaded( const EventObject& aEvent ) { OBoundControlModel::reloaded(aEvent); @@ -843,7 +840,7 @@ void OComboBoxModel::refreshInternalEntryList() } -void SAL_CALL OComboBoxModel::disposing( const EventObject& _rSource ) throw ( RuntimeException, std::exception ) +void SAL_CALL OComboBoxModel::disposing( const EventObject& _rSource ) { if ( !OEntryListHelper::handleDisposing( _rSource ) ) OBoundControlModel::disposing( _rSource ); @@ -858,7 +855,7 @@ OComboBoxControl::OComboBoxControl(const Reference<XComponentContext>& _rxContex } -css::uno::Sequence<OUString> SAL_CALL OComboBoxControl::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OComboBoxControl::getSupportedServiceNames() { css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); diff --git a/forms/source/component/ComboBox.hxx b/forms/source/component/ComboBox.hxx index ecc65a21bd57..776d5e9d4641 100644 --- a/forms/source/component/ComboBox.hxx +++ b/forms/source/component/ComboBox.hxx @@ -73,32 +73,29 @@ public: // OPropertySetHelper virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) - throw (css::uno::Exception, std::exception) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override; virtual sal_Bool SAL_CALL convertFastPropertyValue( - css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) override; // XLoadListener - virtual void SAL_CALL reloaded( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL reloaded( const css::lang::EventObject& aEvent ) override; // XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.form.OComboBoxModel"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // UNO DECLARE_UNO3_AGG_DEFAULTS(OComboBoxModel, OBoundControlModel) - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override; // XPersistObject - virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; virtual void SAL_CALL - write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; + write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override; virtual void SAL_CALL - read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; + read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override; // OControlModel's property handling virtual void describeFixedProperties( @@ -109,7 +106,7 @@ public: ) const override; // XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) override; // prevent method hiding using OBoundControlModel::getFastPropertyValue; @@ -135,7 +132,7 @@ protected: protected: void loadData( bool _bForce ); - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) override; }; class OComboBoxControl : public OBoundControl @@ -144,11 +141,10 @@ public: explicit OComboBoxControl(const css::uno::Reference< css::uno::XComponentContext>& _rxContext); // XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.form.OComboBoxControl"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; }; diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx index 552b94ef735b..c658edc98ada 100644 --- a/forms/source/component/Currency.cxx +++ b/forms/source/component/Currency.cxx @@ -45,7 +45,7 @@ OCurrencyControl::OCurrencyControl(const Reference<XComponentContext>& _rxFactor { } -css::uno::Sequence<OUString> SAL_CALL OCurrencyControl::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> SAL_CALL OCurrencyControl::getSupportedServiceNames() { css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); @@ -133,7 +133,7 @@ IMPLEMENT_DEFAULT_CLONING( OCurrencyModel ) // XServiceInfo -css::uno::Sequence<OUString> SAL_CALL OCurrencyModel::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> SAL_CALL OCurrencyModel::getSupportedServiceNames() { css::uno::Sequence<OUString> aSupported = OBoundControlModel::getSupportedServiceNames(); @@ -165,7 +165,7 @@ void OCurrencyModel::describeFixedProperties( Sequence< Property >& _rProps ) co } -OUString SAL_CALL OCurrencyModel::getServiceName() throw ( css::uno::RuntimeException, std::exception) +OUString SAL_CALL OCurrencyModel::getServiceName() { return OUString(FRM_COMPONENT_CURRENCYFIELD); // old (non-sun) name for compatibility ! } diff --git a/forms/source/component/Currency.hxx b/forms/source/component/Currency.hxx index e09c3f2cb78a..61e60ac00e2b 100644 --- a/forms/source/component/Currency.hxx +++ b/forms/source/component/Currency.hxx @@ -35,14 +35,13 @@ public: DECLARE_DEFAULT_LEAF_XTOR( OCurrencyModel ); // css::lang::XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.form.OCurrencyModel"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // css::io::XPersistObject - virtual OUString SAL_CALL getServiceName() throw ( ::com::sun ::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; // OControlModel's property handling virtual void describeFixedProperties( @@ -59,7 +58,7 @@ protected: virtual void resetNoBroadcast() override; protected: - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) override; void implConstruct(); }; @@ -69,11 +68,10 @@ class OCurrencyControl: public OBoundControl public: explicit OCurrencyControl(const css::uno::Reference< css::uno::XComponentContext>& _rxContext); // css::lang::XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.form.OCurrencyControl"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; }; diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 2cad1f8431fa..32bda101a149 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -191,13 +191,13 @@ void OFormSubmitResetThread::processEvent( //= ODatabaseForm -Sequence<sal_Int8> SAL_CALL ODatabaseForm::getImplementationId() throw(RuntimeException, std::exception) +Sequence<sal_Int8> SAL_CALL ODatabaseForm::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } -Sequence<Type> SAL_CALL ODatabaseForm::getTypes() throw(RuntimeException, std::exception) +Sequence<Type> SAL_CALL ODatabaseForm::getTypes() { // ask the aggregate Sequence<Type> aAggregateTypes; @@ -213,7 +213,7 @@ Sequence<Type> SAL_CALL ODatabaseForm::getTypes() throw(RuntimeException, std::e } -Any SAL_CALL ODatabaseForm::queryAggregation(const Type& _rType) throw(RuntimeException, std::exception) +Any SAL_CALL ODatabaseForm::queryAggregation(const Type& _rType) { Any aReturn = ODatabaseForm_BASE1::queryInterface(_rType); // our own interfaces @@ -1370,49 +1370,49 @@ Reference< XMultiPropertySet > ODatabaseForm::getPropertiesInterface() } -Reference< XPropertySetInfo > ODatabaseForm::getPropertySetInfo() throw( RuntimeException, std::exception ) +Reference< XPropertySetInfo > ODatabaseForm::getPropertySetInfo() { return createPropertySetInfo( getInfoHelper() ); } -void SAL_CALL ODatabaseForm::addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) +void SAL_CALL ODatabaseForm::addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) { m_aPropertyBagHelper.addProperty( _rName, _nAttributes, _rInitialValue ); } -void SAL_CALL ODatabaseForm::removeProperty( const OUString& _rName ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException, std::exception) +void SAL_CALL ODatabaseForm::removeProperty( const OUString& _rName ) { m_aPropertyBagHelper.removeProperty( _rName ); } -Sequence< PropertyValue > SAL_CALL ODatabaseForm::getPropertyValues() throw (RuntimeException, std::exception) +Sequence< PropertyValue > SAL_CALL ODatabaseForm::getPropertyValues() { return m_aPropertyBagHelper.getPropertyValues(); } -void SAL_CALL ODatabaseForm::setPropertyValues( const Sequence< PropertyValue >& _rProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL ODatabaseForm::setPropertyValues( const Sequence< PropertyValue >& _rProps ) { m_aPropertyBagHelper.setPropertyValues( _rProps ); } -Any SAL_CALL ODatabaseForm::getWarnings( ) throw (SQLException, RuntimeException, std::exception) +Any SAL_CALL ODatabaseForm::getWarnings( ) { return m_aWarnings.getWarnings(); } -void SAL_CALL ODatabaseForm::clearWarnings( ) throw (SQLException, RuntimeException, std::exception) +void SAL_CALL ODatabaseForm::clearWarnings( ) { m_aWarnings.clearWarnings(); } -Reference< XCloneable > SAL_CALL ODatabaseForm::createClone( ) throw (RuntimeException, std::exception) +Reference< XCloneable > SAL_CALL ODatabaseForm::createClone( ) { ODatabaseForm* pClone = new ODatabaseForm( *this ); osl_atomic_increment( &pClone->m_refCount ); @@ -1461,7 +1461,6 @@ void ODatabaseForm::fire( sal_Int32* pnHandles, const Any* pNewValues, const Any Any SAL_CALL ODatabaseForm::getFastPropertyValue( sal_Int32 nHandle ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { if ((nHandle == PROPERTY_ID_ISMODIFIED) && (m_nResetsPending > 0)) return css::uno::Any(false); @@ -1553,7 +1552,6 @@ void ODatabaseForm::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const sal_Bool ODatabaseForm::convertFastPropertyValue( Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw (IllegalArgumentException, RuntimeException, std::exception) { bool bModified(false); switch (nHandle) @@ -1635,7 +1633,7 @@ sal_Bool ODatabaseForm::convertFastPropertyValue( Any& rConvertedValue, Any& rOl return bModified; } -void ODatabaseForm::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw( Exception, std::exception ) +void ODatabaseForm::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) { switch (nHandle) { @@ -1890,7 +1888,7 @@ Any ODatabaseForm::getPropertyDefaultByHandle( sal_Int32 nHandle ) const // css::form::XReset -void SAL_CALL ODatabaseForm::reset() throw( RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::reset() { ::osl::ResettableMutexGuard aGuard(m_aMutex); @@ -2049,13 +2047,13 @@ void ODatabaseForm::reset_impl(bool _bAproveByListeners) } -void SAL_CALL ODatabaseForm::addResetListener(const Reference<XResetListener>& _rListener) throw( RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::addResetListener(const Reference<XResetListener>& _rListener) { m_aResetListeners.addTypedListener( _rListener ); } -void SAL_CALL ODatabaseForm::removeResetListener(const Reference<XResetListener>& _rListener) throw( RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::removeResetListener(const Reference<XResetListener>& _rListener) { m_aResetListeners.removeTypedListener( _rListener ); } @@ -2064,7 +2062,7 @@ void SAL_CALL ODatabaseForm::removeResetListener(const Reference<XResetListener> // css::form::XSubmit void SAL_CALL ODatabaseForm::submit( const Reference<XControl>& Control, - const css::awt::MouseEvent& MouseEvt ) throw( RuntimeException, std::exception ) + const css::awt::MouseEvent& MouseEvt ) { { ::osl::MutexGuard aGuard(m_aMutex); @@ -2263,13 +2261,13 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const css::a // XSubmit -void SAL_CALL ODatabaseForm::addSubmitListener(const Reference<XSubmitListener>& _rListener) throw( RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::addSubmitListener(const Reference<XSubmitListener>& _rListener) { m_aSubmitListeners.addInterface(_rListener); } -void SAL_CALL ODatabaseForm::removeSubmitListener(const Reference<XSubmitListener>& _rListener) throw( RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::removeSubmitListener(const Reference<XSubmitListener>& _rListener) { m_aSubmitListeners.removeInterface(_rListener); } @@ -2277,13 +2275,13 @@ void SAL_CALL ODatabaseForm::removeSubmitListener(const Reference<XSubmitListene // css::sdbc::XSQLErrorBroadcaster -void SAL_CALL ODatabaseForm::addSQLErrorListener(const Reference<XSQLErrorListener>& _rListener) throw( RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::addSQLErrorListener(const Reference<XSQLErrorListener>& _rListener) { m_aErrorListeners.addInterface(_rListener); } -void SAL_CALL ODatabaseForm::removeSQLErrorListener(const Reference<XSQLErrorListener>& _rListener) throw( RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::removeSQLErrorListener(const Reference<XSQLErrorListener>& _rListener) { m_aErrorListeners.removeInterface(_rListener); } @@ -2298,7 +2296,7 @@ void ODatabaseForm::invlidateParameters() // OChangeListener -void ODatabaseForm::_propertyChanged(const PropertyChangeEvent& evt) throw( RuntimeException ) +void ODatabaseForm::_propertyChanged(const PropertyChangeEvent& evt) { if (evt.PropertyName == PROPERTY_ACTIVE_CONNECTION && !m_bForwardingConnection) { @@ -2317,7 +2315,7 @@ void ODatabaseForm::_propertyChanged(const PropertyChangeEvent& evt) throw( Runt // smartXChild -void SAL_CALL ODatabaseForm::setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw ( css::lang::NoSupportException, css::uno::RuntimeException, std::exception) +void SAL_CALL ODatabaseForm::setParent(const css::uno::Reference<css::uno::XInterface>& Parent) { // SYNCHRONIZED -----> ::osl::ResettableMutexGuard aGuard(m_aMutex); @@ -2378,7 +2376,7 @@ void SAL_CALL ODatabaseForm::setParent(const css::uno::Reference<css::uno::XInte // smartXTabControllerModel -sal_Bool SAL_CALL ODatabaseForm::getGroupControl() throw(css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseForm::getGroupControl() { ::osl::ResettableMutexGuard aGuard(m_aMutex); @@ -2397,7 +2395,7 @@ sal_Bool SAL_CALL ODatabaseForm::getGroupControl() throw(css::uno::RuntimeExcept } -void SAL_CALL ODatabaseForm::setControlModels(const Sequence<Reference<XControlModel> >& rControls) throw( RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::setControlModels(const Sequence<Reference<XControlModel> >& rControls) { ::osl::ResettableMutexGuard aGuard(m_aMutex); @@ -2434,14 +2432,14 @@ void SAL_CALL ODatabaseForm::setControlModels(const Sequence<Reference<XControlM } -Sequence<Reference<XControlModel> > SAL_CALL ODatabaseForm::getControlModels() throw( RuntimeException, std::exception ) +Sequence<Reference<XControlModel> > SAL_CALL ODatabaseForm::getControlModels() { ::osl::MutexGuard aGuard(m_aMutex); return m_pGroupManager->getControlModels(); } -void SAL_CALL ODatabaseForm::setGroup( const Sequence<Reference<XControlModel> >& _rGroup, const OUString& Name ) throw( RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::setGroup( const Sequence<Reference<XControlModel> >& _rGroup, const OUString& Name ) { ::osl::MutexGuard aGuard(m_aMutex); @@ -2470,14 +2468,14 @@ void SAL_CALL ODatabaseForm::setGroup( const Sequence<Reference<XControlModel> > } -sal_Int32 SAL_CALL ODatabaseForm::getGroupCount() throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL ODatabaseForm::getGroupCount() { ::osl::MutexGuard aGuard(m_aMutex); return m_pGroupManager->getGroupCount(); } -void SAL_CALL ODatabaseForm::getGroup( sal_Int32 nGroup, Sequence<Reference<XControlModel> >& _rGroup, OUString& _rName ) throw( RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::getGroup( sal_Int32 nGroup, Sequence<Reference<XControlModel> >& _rGroup, OUString& _rName ) { ::osl::MutexGuard aGuard(m_aMutex); _rGroup.realloc(0); @@ -2489,7 +2487,7 @@ void SAL_CALL ODatabaseForm::getGroup( sal_Int32 nGroup, Sequence<Reference<XCon } -void SAL_CALL ODatabaseForm::getGroupByName(const OUString& Name, Sequence< Reference<XControlModel> >& _rGroup) throw( RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::getGroupByName(const OUString& Name, Sequence< Reference<XControlModel> >& _rGroup) { ::osl::MutexGuard aGuard(m_aMutex); _rGroup.realloc(0); @@ -2499,7 +2497,7 @@ void SAL_CALL ODatabaseForm::getGroupByName(const OUString& Name, Sequence< Refe // css::lang::XEventListener -void SAL_CALL ODatabaseForm::disposing(const EventObject& Source) throw( RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::disposing(const EventObject& Source) { // does the call come from the connection which we are sharing with our parent? if ( isSharingConnection() ) @@ -2540,7 +2538,7 @@ void ODatabaseForm::impl_createLoadTimer() // css::form::XLoadListener -void SAL_CALL ODatabaseForm::loaded(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::loaded(const EventObject& /*aEvent*/) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -2554,7 +2552,7 @@ void SAL_CALL ODatabaseForm::loaded(const EventObject& /*aEvent*/) throw( Runtim } -void SAL_CALL ODatabaseForm::unloading(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::unloading(const EventObject& /*aEvent*/) { { // now stop the rowset listening if we are a subform @@ -2572,13 +2570,13 @@ void SAL_CALL ODatabaseForm::unloading(const EventObject& /*aEvent*/) throw( Run } -void SAL_CALL ODatabaseForm::unloaded(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::unloaded(const EventObject& /*aEvent*/) { // nothing to do } -void SAL_CALL ODatabaseForm::reloading(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::reloading(const EventObject& /*aEvent*/) { // now stop the rowset listening if we are a subform ::osl::MutexGuard aGuard(m_aMutex); @@ -2591,7 +2589,7 @@ void SAL_CALL ODatabaseForm::reloading(const EventObject& /*aEvent*/) throw( Run } -void SAL_CALL ODatabaseForm::reloaded(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::reloaded(const EventObject& /*aEvent*/) { reload_impl(true); { @@ -2611,7 +2609,7 @@ IMPL_LINK_NOARG(ODatabaseForm, OnTimeout, Timer *, void) // css::form::XLoadable -void SAL_CALL ODatabaseForm::load() throw( RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::load() { load_impl(false); } @@ -2799,7 +2797,7 @@ bool ODatabaseForm::implEnsureConnection() } -void ODatabaseForm::load_impl(bool bCausedByParentForm, bool bMoveToFirst, const Reference< XInteractionHandler >& _rxCompletionHandler ) throw( RuntimeException, std::exception ) +void ODatabaseForm::load_impl(bool bCausedByParentForm, bool bMoveToFirst, const Reference< XInteractionHandler >& _rxCompletionHandler ) { ::osl::ResettableMutexGuard aGuard(m_aMutex); @@ -2848,7 +2846,7 @@ void ODatabaseForm::load_impl(bool bCausedByParentForm, bool bMoveToFirst, const } -void SAL_CALL ODatabaseForm::unload() throw( RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::unload() { ::osl::ResettableMutexGuard aGuard(m_aMutex); if (!isLoaded()) @@ -2895,13 +2893,13 @@ void SAL_CALL ODatabaseForm::unload() throw( RuntimeException, std::exception ) } -void SAL_CALL ODatabaseForm::reload() throw( RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::reload() { reload_impl(true); } -void ODatabaseForm::reload_impl(bool bMoveToFirst, const Reference< XInteractionHandler >& _rxCompletionHandler ) throw( RuntimeException, std::exception ) +void ODatabaseForm::reload_impl(bool bMoveToFirst, const Reference< XInteractionHandler >& _rxCompletionHandler ) { ::osl::ResettableMutexGuard aGuard(m_aMutex); if (!isLoaded()) @@ -2956,26 +2954,26 @@ void ODatabaseForm::reload_impl(bool bMoveToFirst, const Reference< XInteraction } -sal_Bool SAL_CALL ODatabaseForm::isLoaded() throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL ODatabaseForm::isLoaded() { return m_bLoaded; } -void SAL_CALL ODatabaseForm::addLoadListener(const Reference<XLoadListener>& aListener) throw( RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::addLoadListener(const Reference<XLoadListener>& aListener) { m_aLoadListeners.addInterface(aListener); } -void SAL_CALL ODatabaseForm::removeLoadListener(const Reference<XLoadListener>& aListener) throw( RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::removeLoadListener(const Reference<XLoadListener>& aListener) { m_aLoadListeners.removeInterface(aListener); } // css::sdbc::XCloseable -void SAL_CALL ODatabaseForm::close() throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::close() { // unload will close the aggregate unload(); @@ -2984,7 +2982,7 @@ void SAL_CALL ODatabaseForm::close() throw( SQLException, RuntimeException, std: // css::sdbc::XRowSetListener -void SAL_CALL ODatabaseForm::cursorMoved(const EventObject& /*event*/) throw( RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::cursorMoved(const EventObject& /*event*/) { // reload the subform with the new parameters of the parent // do this handling delayed to provide of execute too many SQL Statements @@ -3002,13 +3000,13 @@ void SAL_CALL ODatabaseForm::cursorMoved(const EventObject& /*event*/) throw( Ru } -void SAL_CALL ODatabaseForm::rowChanged(const EventObject& /*event*/) throw( RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::rowChanged(const EventObject& /*event*/) { // ignore it } -void SAL_CALL ODatabaseForm::rowSetChanged(const EventObject& /*event*/) throw( RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::rowSetChanged(const EventObject& /*event*/) { // not interested in : // if our parent is an ODatabaseForm, too, then after this rowSetChanged we'll get a "reloaded" @@ -3058,7 +3056,7 @@ bool ODatabaseForm::impl_approveRowChange_throw( const EventObject& _rEvent, con } -sal_Bool SAL_CALL ODatabaseForm::approveCursorMove(const EventObject& event) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL ODatabaseForm::approveCursorMove(const EventObject& event) { // is our aggregate calling? if (event.Source == css::uno::Reference<css::uno::XInterface>(static_cast<XWeak*>(this))) @@ -3107,7 +3105,7 @@ sal_Bool SAL_CALL ODatabaseForm::approveCursorMove(const EventObject& event) thr } -sal_Bool SAL_CALL ODatabaseForm::approveRowChange(const RowChangeEvent& event) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL ODatabaseForm::approveRowChange(const RowChangeEvent& event) { // is our aggregate calling? if (event.Source == css::uno::Reference<css::uno::XInterface>(static_cast<XWeak*>(this))) @@ -3147,7 +3145,7 @@ sal_Bool SAL_CALL ODatabaseForm::approveRowChange(const RowChangeEvent& event) t } -sal_Bool SAL_CALL ODatabaseForm::approveRowSetChange(const EventObject& event) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL ODatabaseForm::approveRowSetChange(const EventObject& event) { if (event.Source == css::uno::Reference<css::uno::XInterface>(static_cast<XWeak*>(this))) // ignore our aggregate as we handle this approve ourself { @@ -3176,7 +3174,7 @@ sal_Bool SAL_CALL ODatabaseForm::approveRowSetChange(const EventObject& event) t // css::sdb::XRowSetApproveBroadcaster -void SAL_CALL ODatabaseForm::addRowSetApproveListener(const Reference<XRowSetApproveListener>& _rListener) throw( RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::addRowSetApproveListener(const Reference<XRowSetApproveListener>& _rListener) { ::osl::ResettableMutexGuard aGuard(m_aMutex); m_aRowSetApproveListeners.addInterface(_rListener); @@ -3194,7 +3192,7 @@ void SAL_CALL ODatabaseForm::addRowSetApproveListener(const Reference<XRowSetApp } -void SAL_CALL ODatabaseForm::removeRowSetApproveListener(const Reference<XRowSetApproveListener>& _rListener) throw( RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::removeRowSetApproveListener(const Reference<XRowSetApproveListener>& _rListener) { ::osl::ResettableMutexGuard aGuard(m_aMutex); // do we have to remove the multiplex ? @@ -3213,24 +3211,24 @@ void SAL_CALL ODatabaseForm::removeRowSetApproveListener(const Reference<XRowSet // com::sun:star::form::XDatabaseParameterBroadcaster -void SAL_CALL ODatabaseForm::addDatabaseParameterListener(const Reference<XDatabaseParameterListener>& _rListener) throw( RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::addDatabaseParameterListener(const Reference<XDatabaseParameterListener>& _rListener) { m_aParameterManager.addParameterListener( _rListener ); } -void SAL_CALL ODatabaseForm::removeDatabaseParameterListener(const Reference<XDatabaseParameterListener>& _rListener) throw( RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::removeDatabaseParameterListener(const Reference<XDatabaseParameterListener>& _rListener) { m_aParameterManager.removeParameterListener( _rListener ); } -void SAL_CALL ODatabaseForm::addParameterListener(const Reference<XDatabaseParameterListener>& _rListener) throw( RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::addParameterListener(const Reference<XDatabaseParameterListener>& _rListener) { ODatabaseForm::addDatabaseParameterListener( _rListener ); } -void SAL_CALL ODatabaseForm::removeParameterListener(const Reference<XDatabaseParameterListener>& _rListener) throw( RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::removeParameterListener(const Reference<XDatabaseParameterListener>& _rListener) { ODatabaseForm::removeDatabaseParameterListener( _rListener ); } @@ -3238,7 +3236,7 @@ void SAL_CALL ODatabaseForm::removeParameterListener(const Reference<XDatabasePa // css::sdb::XCompletedExecution -void SAL_CALL ODatabaseForm::executeWithCompletion( const Reference< XInteractionHandler >& _rxHandler ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ODatabaseForm::executeWithCompletion( const Reference< XInteractionHandler >& _rxHandler ) { ::osl::ClearableMutexGuard aGuard(m_aMutex); // the difference between execute and load is, that we position on the first row in case of load @@ -3262,7 +3260,7 @@ void SAL_CALL ODatabaseForm::executeWithCompletion( const Reference< XInteractio // css::sdbc::XRowSet -void SAL_CALL ODatabaseForm::execute() throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::execute() { ::osl::ResettableMutexGuard aGuard(m_aMutex); // if somebody calls an execute and we're not loaded we reroute this call to our load method. @@ -3286,14 +3284,14 @@ void SAL_CALL ODatabaseForm::execute() throw( SQLException, RuntimeException, st } -void SAL_CALL ODatabaseForm::addRowSetListener(const Reference<XRowSetListener>& _rListener) throw( RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::addRowSetListener(const Reference<XRowSetListener>& _rListener) { if (m_xAggregateAsRowSet.is()) m_xAggregateAsRowSet->addRowSetListener(_rListener); } -void SAL_CALL ODatabaseForm::removeRowSetListener(const Reference<XRowSetListener>& _rListener) throw( RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::removeRowSetListener(const Reference<XRowSetListener>& _rListener) { if (m_xAggregateAsRowSet.is()) m_xAggregateAsRowSet->removeRowSetListener(_rListener); @@ -3302,109 +3300,109 @@ void SAL_CALL ODatabaseForm::removeRowSetListener(const Reference<XRowSetListene // css::sdbc::XResultSet -sal_Bool SAL_CALL ODatabaseForm::next() throw( SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL ODatabaseForm::next() { return m_xAggregateAsRowSet->next(); } -sal_Bool SAL_CALL ODatabaseForm::isBeforeFirst() throw( SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL ODatabaseForm::isBeforeFirst() { return m_xAggregateAsRowSet->isBeforeFirst(); } -sal_Bool SAL_CALL ODatabaseForm::isAfterLast() throw( SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL ODatabaseForm::isAfterLast() { return m_xAggregateAsRowSet->isAfterLast(); } -sal_Bool SAL_CALL ODatabaseForm::isFirst() throw( SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL ODatabaseForm::isFirst() { return m_xAggregateAsRowSet->isFirst(); } -sal_Bool SAL_CALL ODatabaseForm::isLast() throw( SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL ODatabaseForm::isLast() { return m_xAggregateAsRowSet->isLast(); } -void SAL_CALL ODatabaseForm::beforeFirst() throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::beforeFirst() { m_xAggregateAsRowSet->beforeFirst(); } -void SAL_CALL ODatabaseForm::afterLast() throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::afterLast() { m_xAggregateAsRowSet->afterLast(); } -sal_Bool SAL_CALL ODatabaseForm::first() throw( SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL ODatabaseForm::first() { return m_xAggregateAsRowSet->first(); } -sal_Bool SAL_CALL ODatabaseForm::last() throw( SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL ODatabaseForm::last() { return m_xAggregateAsRowSet->last(); } -sal_Int32 SAL_CALL ODatabaseForm::getRow() throw( SQLException, RuntimeException, std::exception ) +sal_Int32 SAL_CALL ODatabaseForm::getRow() { return m_xAggregateAsRowSet->getRow(); } -sal_Bool SAL_CALL ODatabaseForm::absolute(sal_Int32 row) throw( SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL ODatabaseForm::absolute(sal_Int32 row) { return m_xAggregateAsRowSet->absolute(row); } -sal_Bool SAL_CALL ODatabaseForm::relative(sal_Int32 rows) throw( SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL ODatabaseForm::relative(sal_Int32 rows) { return m_xAggregateAsRowSet->relative(rows); } -sal_Bool SAL_CALL ODatabaseForm::previous() throw( SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL ODatabaseForm::previous() { return m_xAggregateAsRowSet->previous(); } -void SAL_CALL ODatabaseForm::refreshRow() throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::refreshRow() { m_xAggregateAsRowSet->refreshRow(); } -sal_Bool SAL_CALL ODatabaseForm::rowUpdated() throw( SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL ODatabaseForm::rowUpdated() { return m_xAggregateAsRowSet->rowUpdated(); } -sal_Bool SAL_CALL ODatabaseForm::rowInserted() throw( SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL ODatabaseForm::rowInserted() { return m_xAggregateAsRowSet->rowInserted(); } -sal_Bool SAL_CALL ODatabaseForm::rowDeleted() throw( SQLException, RuntimeException, std::exception ) +sal_Bool SAL_CALL ODatabaseForm::rowDeleted() { return m_xAggregateAsRowSet->rowDeleted(); } -css::uno::Reference<css::uno::XInterface> SAL_CALL ODatabaseForm::getStatement() throw( SQLException, RuntimeException, std::exception ) +css::uno::Reference<css::uno::XInterface> SAL_CALL ODatabaseForm::getStatement() { return m_xAggregateAsRowSet->getStatement(); } @@ -3412,7 +3410,7 @@ css::uno::Reference<css::uno::XInterface> SAL_CALL ODatabaseForm::getStatement() // css::sdbc::XResultSetUpdate // exceptions during insert update and delete will be forwarded to the errorlistener -void SAL_CALL ODatabaseForm::insertRow() throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::insertRow() { try { @@ -3432,7 +3430,7 @@ void SAL_CALL ODatabaseForm::insertRow() throw( SQLException, RuntimeException, } -void SAL_CALL ODatabaseForm::updateRow() throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::updateRow() { try { @@ -3452,7 +3450,7 @@ void SAL_CALL ODatabaseForm::updateRow() throw( SQLException, RuntimeException, } -void SAL_CALL ODatabaseForm::deleteRow() throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::deleteRow() { try { @@ -3472,7 +3470,7 @@ void SAL_CALL ODatabaseForm::deleteRow() throw( SQLException, RuntimeException, } -void SAL_CALL ODatabaseForm::cancelRowUpdates() throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::cancelRowUpdates() { try { @@ -3492,7 +3490,7 @@ void SAL_CALL ODatabaseForm::cancelRowUpdates() throw( SQLException, RuntimeExce } -void SAL_CALL ODatabaseForm::moveToInsertRow() throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::moveToInsertRow() { Reference<XResultSetUpdate> xUpdate; if (query_aggregation( m_xAggregate, xUpdate)) @@ -3527,7 +3525,7 @@ void SAL_CALL ODatabaseForm::moveToInsertRow() throw( SQLException, RuntimeExcep } -void SAL_CALL ODatabaseForm::moveToCurrentRow() throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::moveToCurrentRow() { Reference<XResultSetUpdate> xUpdate; if (query_aggregation( m_xAggregate, xUpdate)) @@ -3536,7 +3534,7 @@ void SAL_CALL ODatabaseForm::moveToCurrentRow() throw( SQLException, RuntimeExce // css::sdbcx::XDeleteRows -Sequence<sal_Int32> SAL_CALL ODatabaseForm::deleteRows(const Sequence<Any>& rows) throw( SQLException, RuntimeException, std::exception ) +Sequence<sal_Int32> SAL_CALL ODatabaseForm::deleteRows(const Sequence<Any>& rows) { try { @@ -3559,145 +3557,145 @@ Sequence<sal_Int32> SAL_CALL ODatabaseForm::deleteRows(const Sequence<Any>& rows // css::sdbc::XParameters -void SAL_CALL ODatabaseForm::setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) { m_aParameterManager.setNull(parameterIndex, sqlType); } -void SAL_CALL ODatabaseForm::setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) { m_aParameterManager.setObjectNull(parameterIndex, sqlType, typeName); } -void SAL_CALL ODatabaseForm::setBoolean(sal_Int32 parameterIndex, sal_Bool x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::setBoolean(sal_Int32 parameterIndex, sal_Bool x) { m_aParameterManager.setBoolean(parameterIndex, x); } -void SAL_CALL ODatabaseForm::setByte(sal_Int32 parameterIndex, sal_Int8 x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::setByte(sal_Int32 parameterIndex, sal_Int8 x) { m_aParameterManager.setByte(parameterIndex, x); } -void SAL_CALL ODatabaseForm::setShort(sal_Int32 parameterIndex, sal_Int16 x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::setShort(sal_Int32 parameterIndex, sal_Int16 x) { m_aParameterManager.setShort(parameterIndex, x); } -void SAL_CALL ODatabaseForm::setInt(sal_Int32 parameterIndex, sal_Int32 x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::setInt(sal_Int32 parameterIndex, sal_Int32 x) { m_aParameterManager.setInt(parameterIndex, x); } -void SAL_CALL ODatabaseForm::setLong(sal_Int32 parameterIndex, sal_Int64 x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::setLong(sal_Int32 parameterIndex, sal_Int64 x) { m_aParameterManager.setLong(parameterIndex, x); } -void SAL_CALL ODatabaseForm::setFloat(sal_Int32 parameterIndex, float x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::setFloat(sal_Int32 parameterIndex, float x) { m_aParameterManager.setFloat(parameterIndex, x); } -void SAL_CALL ODatabaseForm::setDouble(sal_Int32 parameterIndex, double x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::setDouble(sal_Int32 parameterIndex, double x) { m_aParameterManager.setDouble(parameterIndex, x); } -void SAL_CALL ODatabaseForm::setString(sal_Int32 parameterIndex, const OUString& x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::setString(sal_Int32 parameterIndex, const OUString& x) { m_aParameterManager.setString(parameterIndex, x); } -void SAL_CALL ODatabaseForm::setBytes(sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::setBytes(sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x) { m_aParameterManager.setBytes(parameterIndex, x); } -void SAL_CALL ODatabaseForm::setDate(sal_Int32 parameterIndex, const css::util::Date& x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::setDate(sal_Int32 parameterIndex, const css::util::Date& x) { m_aParameterManager.setDate(parameterIndex, x); } -void SAL_CALL ODatabaseForm::setTime(sal_Int32 parameterIndex, const css::util::Time& x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::setTime(sal_Int32 parameterIndex, const css::util::Time& x) { m_aParameterManager.setTime(parameterIndex, x); } -void SAL_CALL ODatabaseForm::setTimestamp(sal_Int32 parameterIndex, const css::util::DateTime& x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::setTimestamp(sal_Int32 parameterIndex, const css::util::DateTime& x) { m_aParameterManager.setTimestamp(parameterIndex, x); } -void SAL_CALL ODatabaseForm::setBinaryStream(sal_Int32 parameterIndex, const Reference<XInputStream>& x, sal_Int32 length) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::setBinaryStream(sal_Int32 parameterIndex, const Reference<XInputStream>& x, sal_Int32 length) { m_aParameterManager.setBinaryStream(parameterIndex, x, length); } -void SAL_CALL ODatabaseForm::setCharacterStream(sal_Int32 parameterIndex, const Reference<XInputStream>& x, sal_Int32 length) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::setCharacterStream(sal_Int32 parameterIndex, const Reference<XInputStream>& x, sal_Int32 length) { m_aParameterManager.setCharacterStream(parameterIndex, x, length); } -void SAL_CALL ODatabaseForm::setObjectWithInfo(sal_Int32 parameterIndex, const Any& x, sal_Int32 targetSqlType, sal_Int32 scale) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::setObjectWithInfo(sal_Int32 parameterIndex, const Any& x, sal_Int32 targetSqlType, sal_Int32 scale) { m_aParameterManager.setObjectWithInfo(parameterIndex, x, targetSqlType, scale); } -void SAL_CALL ODatabaseForm::setObject(sal_Int32 parameterIndex, const Any& x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::setObject(sal_Int32 parameterIndex, const Any& x) { m_aParameterManager.setObject(parameterIndex, x); } -void SAL_CALL ODatabaseForm::setRef(sal_Int32 parameterIndex, const Reference<XRef>& x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::setRef(sal_Int32 parameterIndex, const Reference<XRef>& x) { m_aParameterManager.setRef(parameterIndex, x); } -void SAL_CALL ODatabaseForm::setBlob(sal_Int32 parameterIndex, const Reference<XBlob>& x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::setBlob(sal_Int32 parameterIndex, const Reference<XBlob>& x) { m_aParameterManager.setBlob(parameterIndex, x); } -void SAL_CALL ODatabaseForm::setClob(sal_Int32 parameterIndex, const Reference<XClob>& x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::setClob(sal_Int32 parameterIndex, const Reference<XClob>& x) { m_aParameterManager.setClob(parameterIndex, x); } -void SAL_CALL ODatabaseForm::setArray(sal_Int32 parameterIndex, const Reference<XArray>& x) throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::setArray(sal_Int32 parameterIndex, const Reference<XArray>& x) { m_aParameterManager.setArray(parameterIndex, x); } -void SAL_CALL ODatabaseForm::clearParameters() throw( SQLException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::clearParameters() { m_aParameterManager.clearParameters(); } -void SAL_CALL ODatabaseForm::propertyChange( const PropertyChangeEvent& evt ) throw (RuntimeException, std::exception) +void SAL_CALL ODatabaseForm::propertyChange( const PropertyChangeEvent& evt ) { if ( evt.Source == m_xParent ) { @@ -3715,13 +3713,13 @@ void SAL_CALL ODatabaseForm::propertyChange( const PropertyChangeEvent& evt ) th // css::lang::XServiceInfo -OUString SAL_CALL ODatabaseForm::getImplementationName() throw( RuntimeException, std::exception ) +OUString SAL_CALL ODatabaseForm::getImplementationName() { return OUString( "com.sun.star.comp.forms.ODatabaseForm" ); } -Sequence< OUString > SAL_CALL ODatabaseForm::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL ODatabaseForm::getSupportedServiceNames() { // the services of our aggregate Sequence< OUString > aServices; @@ -3739,7 +3737,7 @@ Sequence< OUString > SAL_CALL ODatabaseForm::getSupportedServiceNames() throw( R ); } -sal_Bool SAL_CALL ODatabaseForm::supportsService(const OUString& ServiceName) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL ODatabaseForm::supportsService(const OUString& ServiceName) { return cppu::supportsService(this, ServiceName); } @@ -3748,12 +3746,12 @@ sal_Bool SAL_CALL ODatabaseForm::supportsService(const OUString& ServiceName) th const sal_uInt16 CYCLE = 0x0001; const sal_uInt16 DONTAPPLYFILTER = 0x0002; -OUString ODatabaseForm::getServiceName() throw( RuntimeException, std::exception ) +OUString ODatabaseForm::getServiceName() { return OUString(FRM_COMPONENT_FORM); // old (non-sun) name for compatibility ! } -void SAL_CALL ODatabaseForm::write(const Reference<XObjectOutputStream>& _rxOutStream) throw( IOException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::write(const Reference<XObjectOutputStream>& _rxOutStream) { DBG_ASSERT(m_xAggregateSet.is(), "ODatabaseForm::write : only to be called if the aggregate exists !"); @@ -3868,7 +3866,7 @@ void SAL_CALL ODatabaseForm::write(const Reference<XObjectOutputStream>& _rxOutS } -void SAL_CALL ODatabaseForm::read(const Reference<XObjectInputStream>& _rxInStream) throw( IOException, RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::read(const Reference<XObjectInputStream>& _rxInStream) { DBG_ASSERT(m_xAggregateSet.is(), "ODatabaseForm::read : only to be called if the aggregate exists !"); @@ -3991,7 +3989,7 @@ void ODatabaseForm::implRemoved(const css::uno::Reference<css::uno::XInterface>& } } -void SAL_CALL ODatabaseForm::errorOccured(const SQLErrorEvent& _rEvent) throw( RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::errorOccured(const SQLErrorEvent& _rEvent) { // give it to my own error listener onError(_rEvent); @@ -4000,7 +3998,7 @@ void SAL_CALL ODatabaseForm::errorOccured(const SQLErrorEvent& _rEvent) throw( R } // css::container::XNamed -OUString SAL_CALL ODatabaseForm::getName() throw( RuntimeException, std::exception ) +OUString SAL_CALL ODatabaseForm::getName() { OUString sReturn; try @@ -4018,7 +4016,7 @@ OUString SAL_CALL ODatabaseForm::getName() throw( RuntimeException, std::excepti return sReturn; } -void SAL_CALL ODatabaseForm::setName(const OUString& aName) throw( RuntimeException, std::exception ) +void SAL_CALL ODatabaseForm::setName(const OUString& aName) { setFastPropertyValue(PROPERTY_ID_NAME, makeAny(aName)); } diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx index f041f5139b7e..4f46a2dd3ce7 100644 --- a/forms/source/component/DatabaseForm.hxx +++ b/forms/source/component/DatabaseForm.hxx @@ -219,24 +219,23 @@ public: // UNO binding DECLARE_UNO3_AGG_DEFAULTS(ODatabaseForm, OFormComponents) - virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) override; // XTypeProvider - virtual css::uno::Sequence< css::uno::Type> SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type> SAL_CALL getTypes( ) override; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) override; // css::lang::XComponent virtual void SAL_CALL disposing() override; // property handling - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const override; - virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw ( css::uno::Exception, std::exception ) override; + virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) override; - css::uno::Any SAL_CALL getFastPropertyValue( sal_Int32 nHandle ) - throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL getFastPropertyValue( sal_Int32 nHandle ) override; void fire( sal_Int32 * pnHandles, const css::uno::Any * pNewValues, const css::uno::Any * pOldValues, sal_Int32 nCount ); // IPropertyBagHelperContext @@ -254,178 +253,178 @@ public: virtual css::uno::Any getPropertyDefaultByHandle(sal_Int32 nHandle) const override; // css::sdbc::XSQLErrorBroadcaster - virtual void SAL_CALL addSQLErrorListener(const css::uno::Reference< css::sdb::XSQLErrorListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeSQLErrorListener(const css::uno::Reference< css::sdb::XSQLErrorListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addSQLErrorListener(const css::uno::Reference< css::sdb::XSQLErrorListener>& _rxListener) override; + virtual void SAL_CALL removeSQLErrorListener(const css::uno::Reference< css::sdb::XSQLErrorListener>& _rxListener) override; // css::form::XForm // nothing to implement // css::form::XReset - virtual void SAL_CALL reset() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addResetListener(const css::uno::Reference< css::form::XResetListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeResetListener(const css::uno::Reference< css::form::XResetListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL reset() override; + virtual void SAL_CALL addResetListener(const css::uno::Reference< css::form::XResetListener>& _rxListener) override; + virtual void SAL_CALL removeResetListener(const css::uno::Reference< css::form::XResetListener>& _rxListener) override; // css::form::XSubmit - virtual void SAL_CALL submit(const css::uno::Reference< css::awt::XControl>& aControl, const css::awt::MouseEvent& aMouseEvt) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addSubmitListener(const css::uno::Reference< css::form::XSubmitListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeSubmitListener(const css::uno::Reference< css::form::XSubmitListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL submit(const css::uno::Reference< css::awt::XControl>& aControl, const css::awt::MouseEvent& aMouseEvt) override; + virtual void SAL_CALL addSubmitListener(const css::uno::Reference< css::form::XSubmitListener>& _rxListener) override; + virtual void SAL_CALL removeSubmitListener(const css::uno::Reference< css::form::XSubmitListener>& _rxListener) override; // css::container::XChild - virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getParent() throw ( css::uno::RuntimeException, std::exception) override { return OFormComponents::getParent(); } - virtual void SAL_CALL setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw (::css::lang::NoSupportException , css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getParent() override { return OFormComponents::getParent(); } + virtual void SAL_CALL setParent(const css::uno::Reference<css::uno::XInterface>& Parent) override; // css::container::XNamed - virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName(const OUString& aName) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName(const OUString& aName) override; // css::awt::XTabControllerModel - virtual sal_Bool SAL_CALL getGroupControl() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setGroupControl(sal_Bool /*_bGroupControl*/) throw(css::uno::RuntimeException, std::exception) override { } - virtual void SAL_CALL setControlModels(const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& _rControls) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > > SAL_CALL getControlModels() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setGroup(const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& _rGroup, const OUString& _rGroupName) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getGroupCount() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL getGroup(sal_Int32 _nGroup, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& _rxGroup, OUString& _rName) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL getGroupByName(const OUString& _rName, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& _rxGroup) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getGroupControl() override; + virtual void SAL_CALL setGroupControl(sal_Bool /*_bGroupControl*/) override { } + virtual void SAL_CALL setControlModels(const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& _rControls) override; + virtual css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > > SAL_CALL getControlModels() override; + virtual void SAL_CALL setGroup(const css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& _rGroup, const OUString& _rGroupName) override; + virtual sal_Int32 SAL_CALL getGroupCount() override; + virtual void SAL_CALL getGroup(sal_Int32 _nGroup, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& _rxGroup, OUString& _rName) override; + virtual void SAL_CALL getGroupByName(const OUString& _rName, css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > >& _rxGroup) override; // css::lang::XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) override; // css::form::XLoadListener - virtual void SAL_CALL loaded(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL unloading(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL unloaded(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL reloading(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL reloaded(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL loaded(const css::lang::EventObject& aEvent) override; + virtual void SAL_CALL unloading(const css::lang::EventObject& aEvent) override; + virtual void SAL_CALL unloaded(const css::lang::EventObject& aEvent) override; + virtual void SAL_CALL reloading(const css::lang::EventObject& aEvent) override; + virtual void SAL_CALL reloaded(const css::lang::EventObject& aEvent) override; // css::form::XLoadable - virtual void SAL_CALL load() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL unload() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL reload() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isLoaded() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addLoadListener(const css::uno::Reference< css::form::XLoadListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeLoadListener(const css::uno::Reference< css::form::XLoadListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL load() override; + virtual void SAL_CALL unload() override; + virtual void SAL_CALL reload() override; + virtual sal_Bool SAL_CALL isLoaded() override; + virtual void SAL_CALL addLoadListener(const css::uno::Reference< css::form::XLoadListener>& _rxListener) override; + virtual void SAL_CALL removeLoadListener(const css::uno::Reference< css::form::XLoadListener>& _rxListener) override; // css::sdbc::XCloseable - virtual void SAL_CALL close() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close() override; // css::sdbc::XRowSetListener - virtual void SAL_CALL cursorMoved(const css::lang::EventObject& event) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rowChanged(const css::lang::EventObject& event) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rowSetChanged(const css::lang::EventObject& event) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cursorMoved(const css::lang::EventObject& event) override; + virtual void SAL_CALL rowChanged(const css::lang::EventObject& event) override; + virtual void SAL_CALL rowSetChanged(const css::lang::EventObject& event) override; // css::sdb::XRowSetApproveListener - virtual sal_Bool SAL_CALL approveCursorMove(const css::lang::EventObject& event) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL approveRowChange(const css::sdb::RowChangeEvent& event) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL approveRowSetChange(const css::lang::EventObject& event) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL approveCursorMove(const css::lang::EventObject& event) override; + virtual sal_Bool SAL_CALL approveRowChange(const css::sdb::RowChangeEvent& event) override; + virtual sal_Bool SAL_CALL approveRowSetChange(const css::lang::EventObject& event) override; // css::sdb::XRowSetApproveBroadcaster - virtual void SAL_CALL addRowSetApproveListener(const css::uno::Reference< css::sdb::XRowSetApproveListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeRowSetApproveListener(const css::uno::Reference< css::sdb::XRowSetApproveListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addRowSetApproveListener(const css::uno::Reference< css::sdb::XRowSetApproveListener>& _rxListener) override; + virtual void SAL_CALL removeRowSetApproveListener(const css::uno::Reference< css::sdb::XRowSetApproveListener>& _rxListener) override; // com::sun:star::form::XDatabaseParameterBroadcaster2 - virtual void SAL_CALL addDatabaseParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeDatabaseParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addDatabaseParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& _rxListener) override; + virtual void SAL_CALL removeDatabaseParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& _rxListener) override; // com::sun:star::form::XDatabaseParameterBroadcaster - virtual void SAL_CALL addParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& _rxListener) override; + virtual void SAL_CALL removeParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& _rxListener) override; // css::sdbc::XRowSet - virtual void SAL_CALL execute() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addRowSetListener(const css::uno::Reference< css::sdbc::XRowSetListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeRowSetListener(const css::uno::Reference< css::sdbc::XRowSetListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL execute() override; + virtual void SAL_CALL addRowSetListener(const css::uno::Reference< css::sdbc::XRowSetListener>& _rxListener) override; + virtual void SAL_CALL removeRowSetListener(const css::uno::Reference< css::sdbc::XRowSetListener>& _rxListener) override; // css::sdb::XCompletedExecution - virtual void SAL_CALL executeWithCompletion( const css::uno::Reference< css::task::XInteractionHandler >& handler ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL executeWithCompletion( const css::uno::Reference< css::task::XInteractionHandler >& handler ) override; // css::sdbc::XResultSet - virtual sal_Bool SAL_CALL next() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isBeforeFirst() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAfterLast() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isFirst() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isLast() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL beforeFirst() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL afterLast() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL first() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL last() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL absolute(sal_Int32 row) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL relative(sal_Int32 rows) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL previous() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL refreshRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowUpdated() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowInserted() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowDeleted() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getStatement() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL next() override; + virtual sal_Bool SAL_CALL isBeforeFirst() override; + virtual sal_Bool SAL_CALL isAfterLast() override; + virtual sal_Bool SAL_CALL isFirst() override; + virtual sal_Bool SAL_CALL isLast() override; + virtual void SAL_CALL beforeFirst() override; + virtual void SAL_CALL afterLast() override; + virtual sal_Bool SAL_CALL first() override; + virtual sal_Bool SAL_CALL last() override; + virtual sal_Int32 SAL_CALL getRow() override; + virtual sal_Bool SAL_CALL absolute(sal_Int32 row) override; + virtual sal_Bool SAL_CALL relative(sal_Int32 rows) override; + virtual sal_Bool SAL_CALL previous() override; + virtual void SAL_CALL refreshRow() override; + virtual sal_Bool SAL_CALL rowUpdated() override; + virtual sal_Bool SAL_CALL rowInserted() override; + virtual sal_Bool SAL_CALL rowDeleted() override; + virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getStatement() override; // css::sdbc::XResultSetUpdate - virtual void SAL_CALL insertRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deleteRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL cancelRowUpdates() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL moveToInsertRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL moveToCurrentRow() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertRow() override; + virtual void SAL_CALL updateRow() override; + virtual void SAL_CALL deleteRow() override; + virtual void SAL_CALL cancelRowUpdates() override; + virtual void SAL_CALL moveToInsertRow() override; + virtual void SAL_CALL moveToCurrentRow() override; // css::sdbcx::XDeleteRows - virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows(const css::uno::Sequence< css::uno::Any>& rows) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows(const css::uno::Sequence< css::uno::Any>& rows) override; // css::lang::XServiceInfo - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // css::io::XPersistObject - virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; + virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override; + virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override; // css::sdbc::XSQLErrorListener - virtual void SAL_CALL errorOccured(const css::sdb::SQLErrorEvent& aEvent) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL errorOccured(const css::sdb::SQLErrorEvent& aEvent) override; // css::sdbc::XParameters - virtual void SAL_CALL setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBoolean(sal_Int32 parameterIndex, sal_Bool x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setByte(sal_Int32 parameterIndex, sal_Int8 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setShort(sal_Int32 parameterIndex, sal_Int16 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setInt(sal_Int32 parameterIndex, sal_Int32 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLong(sal_Int32 parameterIndex, sal_Int64 x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFloat(sal_Int32 parameterIndex, float x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDouble(sal_Int32 parameterIndex, double x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setString(sal_Int32 parameterIndex, const OUString& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBytes(sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDate(sal_Int32 parameterIndex, const css::util::Date& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTime(sal_Int32 parameterIndex, const css::util::Time& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTimestamp(sal_Int32 parameterIndex, const css::util::DateTime& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBinaryStream(sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream>& x, sal_Int32 length) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCharacterStream(sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream>& x, sal_Int32 length) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObject(sal_Int32 parameterIndex, const css::uno::Any& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObjectWithInfo(sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRef(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef>& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBlob(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob>& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setClob(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob>& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setArray(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray>& x) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearParameters() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) override; + virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) override; + virtual void SAL_CALL setBoolean(sal_Int32 parameterIndex, sal_Bool x) override; + virtual void SAL_CALL setByte(sal_Int32 parameterIndex, sal_Int8 x) override; + virtual void SAL_CALL setShort(sal_Int32 parameterIndex, sal_Int16 x) override; + virtual void SAL_CALL setInt(sal_Int32 parameterIndex, sal_Int32 x) override; + virtual void SAL_CALL setLong(sal_Int32 parameterIndex, sal_Int64 x) override; + virtual void SAL_CALL setFloat(sal_Int32 parameterIndex, float x) override; + virtual void SAL_CALL setDouble(sal_Int32 parameterIndex, double x) override; + virtual void SAL_CALL setString(sal_Int32 parameterIndex, const OUString& x) override; + virtual void SAL_CALL setBytes(sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x) override; + virtual void SAL_CALL setDate(sal_Int32 parameterIndex, const css::util::Date& x) override; + virtual void SAL_CALL setTime(sal_Int32 parameterIndex, const css::util::Time& x) override; + virtual void SAL_CALL setTimestamp(sal_Int32 parameterIndex, const css::util::DateTime& x) override; + virtual void SAL_CALL setBinaryStream(sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream>& x, sal_Int32 length) override; + virtual void SAL_CALL setCharacterStream(sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream>& x, sal_Int32 length) override; + virtual void SAL_CALL setObject(sal_Int32 parameterIndex, const css::uno::Any& x) override; + virtual void SAL_CALL setObjectWithInfo(sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale) override; + virtual void SAL_CALL setRef(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef>& x) override; + virtual void SAL_CALL setBlob(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob>& x) override; + virtual void SAL_CALL setClob(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob>& x) override; + virtual void SAL_CALL setArray(sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray>& x) override; + virtual void SAL_CALL clearParameters() override; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) override; // XPropertyContainer - virtual void SAL_CALL addProperty( const OUString& Name, ::sal_Int16 Attributes, const css::uno::Any& DefaultValue ) throw (css::beans::PropertyExistException, css::beans::IllegalTypeException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeProperty( const OUString& Name ) throw (css::beans::UnknownPropertyException, css::beans::NotRemoveableException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addProperty( const OUString& Name, ::sal_Int16 Attributes, const css::uno::Any& DefaultValue ) override; + virtual void SAL_CALL removeProperty( const OUString& Name ) override; // XPropertyAccess - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues( ) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) override; using OPropertySetAggregationHelper::setPropertyValues; // XWarningsSupplier - virtual css::uno::Any SAL_CALL getWarnings( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearWarnings( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getWarnings( ) override; + virtual void SAL_CALL clearWarnings( ) override; // XCloneable - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) override; protected: // OPropertySetAggregationHelper overridables @@ -437,7 +436,7 @@ protected: virtual void implRemoved(const css::uno::Reference<css::uno::XInterface>& _rxObject) override; // OPropertyChangeListener - virtual void _propertyChanged( const css::beans::PropertyChangeEvent& ) throw(css::uno::RuntimeException) override; + virtual void _propertyChanged( const css::beans::PropertyChangeEvent& ) override; private: bool executeRowSet(::osl::ResettableMutexGuard& _rClearForNotifies, bool bMoveToFirst, @@ -450,12 +449,10 @@ private: // impl methods /// @throws css::uno::RuntimeException void load_impl(bool bCausedByParentForm, bool bMoveToFirst = true, - const css::uno::Reference< css::task::XInteractionHandler >& _rxCompletionHandler = css::uno::Reference< css::task::XInteractionHandler >()) - throw(css::uno::RuntimeException, std::exception); + const css::uno::Reference< css::task::XInteractionHandler >& _rxCompletionHandler = css::uno::Reference< css::task::XInteractionHandler >()); /// @throws css::uno::RuntimeException void reload_impl(bool bMoveToFirst, - const css::uno::Reference< css::task::XInteractionHandler >& _rxCompletionHandler = css::uno::Reference< css::task::XInteractionHandler >()) - throw(css::uno::RuntimeException, std::exception); + const css::uno::Reference< css::task::XInteractionHandler >& _rxCompletionHandler = css::uno::Reference< css::task::XInteractionHandler >()); void submit_impl(const css::uno::Reference< css::awt::XControl>& Control, const css::awt::MouseEvent& MouseEvt); void reset_impl(bool _bAproveByListeners); diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx index e4f9874604be..5ef5a02284b4 100644 --- a/forms/source/component/Date.cxx +++ b/forms/source/component/Date.cxx @@ -56,7 +56,7 @@ Sequence<Type> ODateControl::_getTypes() } -css::uno::Sequence<OUString> SAL_CALL ODateControl::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> SAL_CALL ODateControl::getSupportedServiceNames() { css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); @@ -120,7 +120,7 @@ IMPLEMENT_DEFAULT_CLONING( ODateModel ) // XServiceInfo -css::uno::Sequence<OUString> SAL_CALL ODateModel::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> SAL_CALL ODateModel::getSupportedServiceNames() { css::uno::Sequence<OUString> aSupported = OBoundControlModel::getSupportedServiceNames(); @@ -145,7 +145,7 @@ css::uno::Sequence<OUString> SAL_CALL ODateModel::getSupportedServiceNames() thr } -OUString SAL_CALL ODateModel::getServiceName() throw ( css::uno::RuntimeException, std::exception) +OUString SAL_CALL ODateModel::getServiceName() { return OUString(FRM_COMPONENT_DATEFIELD); // old (non-sun) name for compatibility ! } @@ -181,7 +181,7 @@ void SAL_CALL ODateModel::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle sal_Bool SAL_CALL ODateModel::convertFastPropertyValue(Any& _rConvertedValue, Any& _rOldValue, - sal_Int32 _nHandle, const Any& _rValue ) throw(IllegalArgumentException, RuntimeException, std::exception) + sal_Int32 _nHandle, const Any& _rValue ) { if (PROPERTY_ID_FORMATKEY == _nHandle) return convertFormatKeyPropertyValue(_rConvertedValue, _rOldValue, _rValue); @@ -190,7 +190,7 @@ sal_Bool SAL_CALL ODateModel::convertFastPropertyValue(Any& _rConvertedValue, An } -void SAL_CALL ODateModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw ( css::uno::Exception, std::exception) +void SAL_CALL ODateModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) { if (PROPERTY_ID_FORMATKEY == _nHandle) setFormatKeyPropertyValue(_rValue); diff --git a/forms/source/component/Date.hxx b/forms/source/component/Date.hxx index b819016a7396..59a4a94b8543 100644 --- a/forms/source/component/Date.hxx +++ b/forms/source/component/Date.hxx @@ -41,21 +41,19 @@ public: DECLARE_DEFAULT_LEAF_XTOR( ODateModel ); // XPersistObject - virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getServiceName() override; // css::beans::XPropertySet virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const override; virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, - sal_Int32 nHandle, const css::uno::Any& rValue ) - throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw ( css::uno::Exception, std::exception) override; + sal_Int32 nHandle, const css::uno::Any& rValue ) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) override; // XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.form.ODateModel"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XPropertySet using OEditBaseModel::getFastPropertyValue; @@ -86,7 +84,7 @@ protected: virtual void onConnectedDbColumn( const css::uno::Reference< css::uno::XInterface >& _rxForm ) override; protected: - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) override; }; class ODateControl: public OBoundControl @@ -99,11 +97,10 @@ public: DECLARE_UNO3_AGG_DEFAULTS(ODateControl, OBoundControl) // css::lang::XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.form.ODateControl"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; }; diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx index 76a2ceaee79b..fa4de8afddf3 100644 --- a/forms/source/component/Edit.cxx +++ b/forms/source/component/Edit.cxx @@ -72,7 +72,7 @@ Sequence<Type> OEditControl::_getTypes() } -Any SAL_CALL OEditControl::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception) +Any SAL_CALL OEditControl::queryAggregation(const Type& _rType) { Any aReturn = OBoundControl::queryAggregation(_rType); if (!aReturn.hasValue()) @@ -116,13 +116,13 @@ OEditControl::~OEditControl() // XChangeBroadcaster -void OEditControl::addChangeListener(const Reference<XChangeListener>& l) throw ( css::uno::RuntimeException, std::exception) +void OEditControl::addChangeListener(const Reference<XChangeListener>& l) { m_aChangeListeners.addInterface( l ); } -void OEditControl::removeChangeListener(const Reference<XChangeListener>& l) throw ( css::uno::RuntimeException, std::exception) +void OEditControl::removeChangeListener(const Reference<XChangeListener>& l) { m_aChangeListeners.removeInterface( l ); } @@ -139,7 +139,7 @@ void OEditControl::disposing() // XServiceInfo -css::uno::Sequence<OUString> OEditControl::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> OEditControl::getSupportedServiceNames() { css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 3); @@ -153,14 +153,14 @@ css::uno::Sequence<OUString> OEditControl::getSupportedServiceNames() throw(std // XEventListener -void OEditControl::disposing(const EventObject& Source) throw( RuntimeException, std::exception ) +void OEditControl::disposing(const EventObject& Source) { OBoundControl::disposing(Source); } // XFocusListener -void OEditControl::focusGained( const FocusEvent& /*e*/ ) throw ( css::uno::RuntimeException, std::exception) +void OEditControl::focusGained( const FocusEvent& /*e*/ ) { Reference<XPropertySet> xSet(getModel(), UNO_QUERY); if (xSet.is()) @@ -168,7 +168,7 @@ void OEditControl::focusGained( const FocusEvent& /*e*/ ) throw ( css::uno::Runt } -void OEditControl::focusLost( const FocusEvent& /*e*/ ) throw ( css::uno::RuntimeException, std::exception) +void OEditControl::focusLost( const FocusEvent& /*e*/ ) { Reference<XPropertySet> xSet(getModel(), UNO_QUERY); if (xSet.is()) @@ -185,7 +185,7 @@ void OEditControl::focusLost( const FocusEvent& /*e*/ ) throw ( css::uno::Runtim // XKeyListener -void OEditControl::keyPressed(const css::awt::KeyEvent& e) throw ( css::uno::RuntimeException, std::exception) +void OEditControl::keyPressed(const css::awt::KeyEvent& e) { if( e.KeyCode != KEY_RETURN || e.Modifiers != 0 ) return; @@ -242,7 +242,7 @@ void OEditControl::keyPressed(const css::awt::KeyEvent& e) throw ( css::uno::Run } -void OEditControl::keyReleased(const css::awt::KeyEvent& /*e*/) throw ( css::uno::RuntimeException, std::exception) +void OEditControl::keyReleased(const css::awt::KeyEvent& /*e*/) { } @@ -307,14 +307,14 @@ void OEditModel::disposing() // XPersistObject -OUString SAL_CALL OEditModel::getServiceName() throw ( css::uno::RuntimeException, std::exception) +OUString SAL_CALL OEditModel::getServiceName() { return OUString(FRM_COMPONENT_EDIT); // old (non-sun) name for compatibility ! } // XServiceInfo -css::uno::Sequence<OUString> SAL_CALL OEditModel::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> SAL_CALL OEditModel::getSupportedServiceNames() { css::uno::Sequence<OUString> aSupported = OBoundControlModel::getSupportedServiceNames(); @@ -393,7 +393,7 @@ bool OEditModel::implActsAsRichText( ) const } -void SAL_CALL OEditModel::reset( ) throw(RuntimeException, std::exception) +void SAL_CALL OEditModel::reset( ) { // no reset if we currently act as rich text control if ( implActsAsRichText() ) @@ -514,7 +514,7 @@ void OEditModel::readAggregate( const Reference< XObjectInputStream >& _rxInStre } -void OEditModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) +void OEditModel::write(const Reference<XObjectOutputStream>& _rxOutStream) { Any aCurrentText; sal_Int16 nOldTextLen = 0; @@ -544,7 +544,7 @@ void OEditModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw } -void OEditModel::read(const Reference<XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) +void OEditModel::read(const Reference<XObjectInputStream>& _rxInStream) { OEditBaseModel::read(_rxInStream); diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx index 5430920ce335..97d7a4f1b755 100644 --- a/forms/source/component/Edit.hxx +++ b/forms/source/component/Edit.hxx @@ -57,22 +57,21 @@ public: virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const override; // XPersistObject - virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override; + virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override; + virtual OUString SAL_CALL getServiceName() override; // XPropertySet using OBoundControlModel::getFastPropertyValue; // XReset - virtual void SAL_CALL reset( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL reset( ) override; // XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.form.OEditModel"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // OControlModel's property handling virtual void describeFixedProperties( @@ -104,7 +103,7 @@ protected: protected: virtual sal_uInt16 getPersistenceFlags() const override; - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) override; private: bool implActsAsRichText( ) const; @@ -131,7 +130,7 @@ public: virtual ~OEditControl() override; DECLARE_UNO3_AGG_DEFAULTS(OEditControl, OBoundControl) - virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) override; virtual css::uno::Sequence< css::uno::Type> _getTypes() override; @@ -139,26 +138,25 @@ public: virtual void SAL_CALL disposing() override; // css::lang::XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) override; // css::lang::XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.form.OEditControl"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // css::form::XChangeBroadcaster - virtual void SAL_CALL addChangeListener(const css::uno::Reference< css::form::XChangeListener>& _rxListener) throw ( css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeChangeListener(const css::uno::Reference< css::form::XChangeListener>& _rxListener) throw ( css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addChangeListener(const css::uno::Reference< css::form::XChangeListener>& _rxListener) override; + virtual void SAL_CALL removeChangeListener(const css::uno::Reference< css::form::XChangeListener>& _rxListener) override; // css::awt::XFocusListener - virtual void SAL_CALL focusGained( const css::awt::FocusEvent& e ) throw ( css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL focusLost( const css::awt::FocusEvent& e ) throw ( css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL focusGained( const css::awt::FocusEvent& e ) override; + virtual void SAL_CALL focusLost( const css::awt::FocusEvent& e ) override; // css::awt::XKeyListener - virtual void SAL_CALL keyPressed(const css::awt::KeyEvent& e) throw ( css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL keyReleased(const css::awt::KeyEvent& e) throw ( css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL keyPressed(const css::awt::KeyEvent& e) override; + virtual void SAL_CALL keyReleased(const css::awt::KeyEvent& e) override; // XControl using OBoundControl::createPeer; diff --git a/forms/source/component/EditBase.cxx b/forms/source/component/EditBase.cxx index 3cde33ea2b20..aedecc889582 100644 --- a/forms/source/component/EditBase.cxx +++ b/forms/source/component/EditBase.cxx @@ -85,7 +85,7 @@ OEditBaseModel::~OEditBaseModel( ) // XPersist -void OEditBaseModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) +void OEditBaseModel::write(const Reference<XObjectOutputStream>& _rxOutStream) { OBoundControlModel::write(_rxOutStream); @@ -159,7 +159,7 @@ sal_uInt16 OEditBaseModel::getPersistenceFlags() const } -void OEditBaseModel::read(const Reference<XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) +void OEditBaseModel::read(const Reference<XObjectInputStream>& _rxInStream) { OBoundControlModel::read(_rxInStream); ::osl::MutexGuard aGuard(m_aMutex); @@ -293,7 +293,6 @@ void OEditBaseModel::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons sal_Bool OEditBaseModel::convertFastPropertyValue( Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw( IllegalArgumentException, RuntimeException, std::exception ) { bool bModified(false); switch (nHandle) @@ -326,7 +325,7 @@ sal_Bool OEditBaseModel::convertFastPropertyValue( Any& rConvertedValue, Any& rO return bModified; } -void OEditBaseModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw ( css::uno::Exception, std::exception) +void OEditBaseModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) { switch (nHandle) { diff --git a/forms/source/component/EditBase.hxx b/forms/source/component/EditBase.hxx index 07605ac0e4ee..96e5560a7ee3 100644 --- a/forms/source/component/EditBase.hxx +++ b/forms/source/component/EditBase.hxx @@ -69,15 +69,14 @@ public: virtual ~OEditBaseModel() override; // XPersistObject - virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override; + virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override; // XPropertySet virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const override; virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, - sal_Int32 nHandle, const css::uno::Any& rValue ) - throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw ( css::uno::Exception, std::exception) override; + sal_Int32 nHandle, const css::uno::Any& rValue ) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) override; using ::cppu::OPropertySetHelper::getFastPropertyValue; // XPropertyState diff --git a/forms/source/component/EventThread.cxx b/forms/source/component/EventThread.cxx index f255dbb3868e..dd3e16c951bd 100644 --- a/forms/source/component/EventThread.cxx +++ b/forms/source/component/EventThread.cxx @@ -55,7 +55,7 @@ OComponentEventThread::~OComponentEventThread() impl_clearEventQueue(); } -Any SAL_CALL OComponentEventThread::queryInterface(const Type& _rType) throw (RuntimeException, std::exception) +Any SAL_CALL OComponentEventThread::queryInterface(const Type& _rType) { Any aReturn; @@ -80,7 +80,7 @@ void OComponentEventThread::impl_clearEventQueue() m_aFlags.erase( m_aFlags.begin(), m_aFlags.end() ); } -void OComponentEventThread::disposing( const EventObject& evt ) throw ( css::uno::RuntimeException, std::exception) +void OComponentEventThread::disposing( const EventObject& evt ) { if( evt.Source == static_cast<XWeak*>(m_xComp.get()) ) { diff --git a/forms/source/component/EventThread.hxx b/forms/source/component/EventThread.hxx index e83b3bbb9592..f6aa8d8799d7 100644 --- a/forms/source/component/EventThread.hxx +++ b/forms/source/component/EventThread.hxx @@ -84,7 +84,7 @@ public: // UNO Anbindung DECLARE_UNO3_DEFAULTS(OComponentEventThread, OWeakObject) - virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) override; explicit OComponentEventThread(::cppu::OComponentHelper* pCompImpl); virtual ~OComponentEventThread() override; @@ -94,7 +94,7 @@ public: bool bFlag = false ); // css::lang::XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource ) override; // Resolve ambiguity: both OWeakObject and OObject have these memory operators void * SAL_CALL operator new( size_t size ) throw() { return osl::Thread::operator new(size); } diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx index 2a112313b8d0..4006e6cdea44 100644 --- a/forms/source/component/File.cxx +++ b/forms/source/component/File.cxx @@ -67,7 +67,7 @@ Sequence<Type> OFileControlModel::_getTypes() // XServiceInfo -css::uno::Sequence<OUString> OFileControlModel::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> OFileControlModel::getSupportedServiceNames() { css::uno::Sequence<OUString> aSupported = OControlModel::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); @@ -109,7 +109,7 @@ OFileControlModel::~OFileControlModel() IMPLEMENT_DEFAULT_CLONING( OFileControlModel ) -Any SAL_CALL OFileControlModel::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception) +Any SAL_CALL OFileControlModel::queryAggregation(const Type& _rType) { Any aReturn = OControlModel::queryAggregation(_rType); if (!aReturn.hasValue()) @@ -153,7 +153,7 @@ void OFileControlModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle) con } -void OFileControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) throw ( css::uno::Exception, std::exception) +void OFileControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) { switch (nHandle) { @@ -168,7 +168,6 @@ void OFileControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, cons sal_Bool OFileControlModel::convertFastPropertyValue(Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue) - throw( IllegalArgumentException, RuntimeException, std::exception ) { switch (nHandle) { @@ -189,13 +188,13 @@ void OFileControlModel::describeFixedProperties( Sequence< Property >& _rProps ) } -OUString SAL_CALL OFileControlModel::getServiceName() throw ( css::uno::RuntimeException, std::exception) +OUString SAL_CALL OFileControlModel::getServiceName() { return OUString(FRM_COMPONENT_FILECONTROL); // old (non-sun) name for compatibility ! } -void OFileControlModel::write(const Reference<css::io::XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) +void OFileControlModel::write(const Reference<css::io::XObjectOutputStream>& _rxOutStream) { OControlModel::write(_rxOutStream); @@ -209,7 +208,7 @@ void OFileControlModel::write(const Reference<css::io::XObjectOutputStream>& _rx } -void OFileControlModel::read(const Reference<css::io::XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) +void OFileControlModel::read(const Reference<css::io::XObjectInputStream>& _rxInStream) { OControlModel::read(_rxInStream); ::osl::MutexGuard aGuard(m_aMutex); @@ -235,7 +234,7 @@ void OFileControlModel::read(const Reference<css::io::XObjectInputStream>& _rxIn } -void SAL_CALL OFileControlModel::reset() throw ( css::uno::RuntimeException, std::exception) +void SAL_CALL OFileControlModel::reset() { ::comphelper::OInterfaceIteratorHelper2 aIter(m_aResetListeners); EventObject aEvt(static_cast<XWeak*>(this)); @@ -254,13 +253,13 @@ void SAL_CALL OFileControlModel::reset() throw ( css::uno::RuntimeException, std } -void OFileControlModel::addResetListener(const Reference<XResetListener>& _rxListener) throw ( css::uno::RuntimeException, std::exception) +void OFileControlModel::addResetListener(const Reference<XResetListener>& _rxListener) { m_aResetListeners.addInterface(_rxListener); } -void OFileControlModel::removeResetListener(const Reference<XResetListener>& _rxListener) throw ( css::uno::RuntimeException, std::exception) +void OFileControlModel::removeResetListener(const Reference<XResetListener>& _rxListener) { m_aResetListeners.removeInterface(_rxListener); } diff --git a/forms/source/component/File.hxx b/forms/source/component/File.hxx index 2ac053d0ea1b..e0ba9d2f3381 100644 --- a/forms/source/component/File.hxx +++ b/forms/source/component/File.hxx @@ -40,36 +40,34 @@ public: DECLARE_DEFAULT_LEAF_XTOR( OFileControlModel ); DECLARE_UNO3_AGG_DEFAULTS(OFileControlModel, OControlModel) - virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) override; // XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.form.OFileControlModel"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // OComponentHelper virtual void SAL_CALL disposing() override; // XPropertySet and friends virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw ( css::uno::Exception, std::exception) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) override; - virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) - throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) override; virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 _nHandle ) const override; // XPersistObject - virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw ( ::com ::sun::star::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw ( ::com ::sun::star::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; + virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override; + virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override; // XReset - virtual void SAL_CALL reset() throw ( css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addResetListener(const css::uno::Reference< css::form::XResetListener>& _rxListener) throw ( css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeResetListener(const css::uno::Reference< css::form::XResetListener>& _rxListener) throw ( css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL reset() override; + virtual void SAL_CALL addResetListener(const css::uno::Reference< css::form::XResetListener>& _rxListener) override; + virtual void SAL_CALL removeResetListener(const css::uno::Reference< css::form::XResetListener>& _rxListener) override; // OControlModel's property handling virtual void describeFixedProperties( @@ -81,7 +79,7 @@ public: using OControlModel::getFastPropertyValue; protected: - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) override; }; diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx index fd1ee7452bd8..96225e6cba06 100644 --- a/forms/source/component/Filter.cxx +++ b/forms/source/component/Filter.cxx @@ -131,7 +131,7 @@ namespace frm } - Any SAL_CALL OFilterControl::queryAggregation( const Type & rType ) throw(RuntimeException, std::exception) + Any SAL_CALL OFilterControl::queryAggregation( const Type & rType ) { Any aRet = UnoControl::queryAggregation( rType); if(!aRet.hasValue()) @@ -169,7 +169,7 @@ namespace frm // XComponent - void OFilterControl::dispose() throw( RuntimeException, std::exception ) + void OFilterControl::dispose() { EventObject aEvt(*this); m_aTextListeners.disposeAndClear( aEvt ); @@ -177,7 +177,7 @@ namespace frm } - void OFilterControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw(RuntimeException, std::exception) + void OFilterControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) { UnoControl::createPeer( rxToolkit, rParentPeer ); @@ -267,14 +267,14 @@ namespace frm // XEventListener - void SAL_CALL OFilterControl::disposing(const EventObject& Source) throw( RuntimeException, std::exception ) + void SAL_CALL OFilterControl::disposing(const EventObject& Source) { UnoControl::disposing(Source); } // XItemListener - void SAL_CALL OFilterControl::itemStateChanged( const ItemEvent& rEvent ) throw(RuntimeException, std::exception) + void SAL_CALL OFilterControl::itemStateChanged( const ItemEvent& rEvent ) { #if !HAVE_FEATURE_DBCONNECTIVITY (void) rEvent; @@ -481,7 +481,7 @@ namespace frm // XFocusListener - void SAL_CALL OFilterControl::focusGained(const FocusEvent& /*e*/) throw( RuntimeException, std::exception ) + void SAL_CALL OFilterControl::focusGained(const FocusEvent& /*e*/) { // should we fill the combobox? if (m_bFilterList && !m_bFilterListFilled) @@ -489,12 +489,12 @@ namespace frm } - void SAL_CALL OFilterControl::focusLost(const FocusEvent& /*e*/) throw( RuntimeException, std::exception ) + void SAL_CALL OFilterControl::focusLost(const FocusEvent& /*e*/) { } - sal_Bool SAL_CALL OFilterControl::commit() throw(RuntimeException, std::exception) + sal_Bool SAL_CALL OFilterControl::commit() { #if HAVE_FEATURE_DBCONNECTIVITY if ( !ensureInitialized( ) ) @@ -547,19 +547,19 @@ namespace frm // XTextComponent - void SAL_CALL OFilterControl::addTextListener(const Reference< XTextListener > & l) throw(RuntimeException, std::exception) + void SAL_CALL OFilterControl::addTextListener(const Reference< XTextListener > & l) { m_aTextListeners.addInterface( l ); } - void SAL_CALL OFilterControl::removeTextListener(const Reference< XTextListener > & l) throw(RuntimeException, std::exception) + void SAL_CALL OFilterControl::removeTextListener(const Reference< XTextListener > & l) { m_aTextListeners.removeInterface( l ); } - void SAL_CALL OFilterControl::setText( const OUString& aText ) throw(RuntimeException, std::exception) + void SAL_CALL OFilterControl::setText( const OUString& aText ) { if ( !ensureInitialized( ) ) // already asserted in ensureInitialized @@ -658,7 +658,7 @@ namespace frm } - void SAL_CALL OFilterControl::insertText( const css::awt::Selection& rSel, const OUString& aText ) throw(css::uno::RuntimeException, std::exception) + void SAL_CALL OFilterControl::insertText( const css::awt::Selection& rSel, const OUString& aText ) { Reference< XTextComponent > xText( getPeer(), UNO_QUERY ); if (xText.is()) @@ -669,13 +669,13 @@ namespace frm } - OUString SAL_CALL OFilterControl::getText() throw(RuntimeException, std::exception) + OUString SAL_CALL OFilterControl::getText() { return m_aText; } - OUString SAL_CALL OFilterControl::getSelectedText() throw(RuntimeException, std::exception) + OUString SAL_CALL OFilterControl::getSelectedText() { OUString aSelected; Reference< XTextComponent > xText( getPeer(), UNO_QUERY ); @@ -686,7 +686,7 @@ namespace frm } - void SAL_CALL OFilterControl::setSelection( const css::awt::Selection& aSelection ) throw(css::uno::RuntimeException, std::exception) + void SAL_CALL OFilterControl::setSelection( const css::awt::Selection& aSelection ) { Reference< XTextComponent > xText( getPeer(), UNO_QUERY ); if (xText.is()) @@ -694,7 +694,7 @@ namespace frm } - css::awt::Selection SAL_CALL OFilterControl::getSelection() throw(css::uno::RuntimeException, std::exception) + css::awt::Selection SAL_CALL OFilterControl::getSelection() { css::awt::Selection aSel; Reference< XTextComponent > xText( getPeer(), UNO_QUERY ); @@ -704,14 +704,14 @@ namespace frm } - sal_Bool SAL_CALL OFilterControl::isEditable() throw(RuntimeException, std::exception) + sal_Bool SAL_CALL OFilterControl::isEditable() { Reference< XTextComponent > xText( getPeer(), UNO_QUERY ); return xText.is() && xText->isEditable(); } - void SAL_CALL OFilterControl::setEditable( sal_Bool bEditable ) throw(RuntimeException, std::exception) + void SAL_CALL OFilterControl::setEditable( sal_Bool bEditable ) { Reference< XTextComponent > xText( getPeer(), UNO_QUERY ); if (xText.is()) @@ -719,14 +719,14 @@ namespace frm } - sal_Int16 SAL_CALL OFilterControl::getMaxTextLen() throw(RuntimeException, std::exception) + sal_Int16 SAL_CALL OFilterControl::getMaxTextLen() { Reference< XTextComponent > xText( getPeer(), UNO_QUERY ); return xText.is() ? xText->getMaxTextLen() : 0; } - void SAL_CALL OFilterControl::setMaxTextLen( sal_Int16 nLength ) throw(RuntimeException, std::exception) + void SAL_CALL OFilterControl::setMaxTextLen( sal_Int16 nLength ) { Reference< XTextComponent > xText( getPeer(), UNO_QUERY ); if (xText.is()) @@ -748,7 +748,7 @@ namespace frm } - void SAL_CALL OFilterControl::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) + void SAL_CALL OFilterControl::initialize( const Sequence< Any >& aArguments ) { const Any* pArguments = aArguments.getConstArray(); const Any* pArgumentsEnd = pArguments + aArguments.getLength(); @@ -871,17 +871,17 @@ namespace frm #endif } - OUString SAL_CALL OFilterControl::getImplementationName( ) throw (RuntimeException, std::exception) + OUString SAL_CALL OFilterControl::getImplementationName( ) { return OUString( "com.sun.star.comp.forms.OFilterControl" ); } - sal_Bool SAL_CALL OFilterControl::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL OFilterControl::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } - Sequence< OUString > SAL_CALL OFilterControl::getSupportedServiceNames( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL OFilterControl::getSupportedServiceNames( ) { return { "com.sun.star.form.control.FilterControl", "com.sun.star.awt.UnoControl" }; diff --git a/forms/source/component/Filter.hxx b/forms/source/component/Filter.hxx index 1267e1f55c91..a28ed7f1b199 100644 --- a/forms/source/component/Filter.hxx +++ b/forms/source/component/Filter.hxx @@ -82,50 +82,50 @@ namespace frm explicit OFilterControl( const css::uno::Reference< css::uno::XComponentContext >& _rxORB ); DECLARE_UNO3_AGG_DEFAULTS(OFilterControl,OWeakAggObject) - css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) override; virtual OUString GetComponentServiceName() override; - virtual void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit > & rxToolkit, const css::uno::Reference< css::awt::XWindowPeer > & rParentPeer ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit > & rxToolkit, const css::uno::Reference< css::awt::XWindowPeer > & rParentPeer ) override; // css::lang::XComponent - virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() override; // css::awt::XTextComponent - virtual void SAL_CALL addTextListener( const css::uno::Reference< css::awt::XTextListener > & l ) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeTextListener( const css::uno::Reference< css::awt::XTextListener > & l ) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setText( const OUString& aText ) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL insertText( const css::awt::Selection& rSel, const OUString& aText ) throw( css::uno::RuntimeException, std::exception ) override; - virtual OUString SAL_CALL getText() throw( css::uno::RuntimeException, std::exception ) override; - virtual OUString SAL_CALL getSelectedText() throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setSelection( const css::awt::Selection& aSelection ) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::awt::Selection SAL_CALL getSelection() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL isEditable() throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setEditable( sal_Bool bEditable ) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setMaxTextLen( sal_Int16 nLength ) throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Int16 SAL_CALL getMaxTextLen() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addTextListener( const css::uno::Reference< css::awt::XTextListener > & l ) override; + virtual void SAL_CALL removeTextListener( const css::uno::Reference< css::awt::XTextListener > & l ) override; + virtual void SAL_CALL setText( const OUString& aText ) override; + virtual void SAL_CALL insertText( const css::awt::Selection& rSel, const OUString& aText ) override; + virtual OUString SAL_CALL getText() override; + virtual OUString SAL_CALL getSelectedText() override; + virtual void SAL_CALL setSelection( const css::awt::Selection& aSelection ) override; + virtual css::awt::Selection SAL_CALL getSelection() override; + virtual sal_Bool SAL_CALL isEditable() override; + virtual void SAL_CALL setEditable( sal_Bool bEditable ) override; + virtual void SAL_CALL setMaxTextLen( sal_Int16 nLength ) override; + virtual sal_Int16 SAL_CALL getMaxTextLen() override; // css::form::XBoundComponent - virtual void SAL_CALL addUpdateListener(const css::uno::Reference< css::form::XUpdateListener > & /*l*/) throw( css::uno::RuntimeException, std::exception ) override {} - virtual void SAL_CALL removeUpdateListener(const css::uno::Reference< css::form::XUpdateListener > & /*l*/) throw( css::uno::RuntimeException, std::exception ) override {} - virtual sal_Bool SAL_CALL commit() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addUpdateListener(const css::uno::Reference< css::form::XUpdateListener > & /*l*/) override {} + virtual void SAL_CALL removeUpdateListener(const css::uno::Reference< css::form::XUpdateListener > & /*l*/) override {} + virtual sal_Bool SAL_CALL commit() override; // css::lang::XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) override; // css::awt::XFocusListener - virtual void SAL_CALL focusGained(const css::awt::FocusEvent& e) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL focusLost(const css::awt::FocusEvent& e) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL focusGained(const css::awt::FocusEvent& e) override; + virtual void SAL_CALL focusLost(const css::awt::FocusEvent& e) override; // css::awt::XItemListener - virtual void SAL_CALL itemStateChanged(const css::awt::ItemEvent& rEvent) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL itemStateChanged(const css::awt::ItemEvent& rEvent) override; // css::util::XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; protected: virtual void PrepareWindowDescriptor( css::awt::WindowDescriptor& rDesc ) override; diff --git a/forms/source/component/FixedText.cxx b/forms/source/component/FixedText.cxx index 01315f980a09..3509a9d42c58 100644 --- a/forms/source/component/FixedText.cxx +++ b/forms/source/component/FixedText.cxx @@ -62,7 +62,7 @@ OFixedTextModel::~OFixedTextModel( ) IMPLEMENT_DEFAULT_CLONING( OFixedTextModel ) -css::uno::Sequence<OUString> SAL_CALL OFixedTextModel::getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OFixedTextModel::getSupportedServiceNames() { css::uno::Sequence<OUString> aSupported = OControlModel::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); @@ -81,14 +81,13 @@ void OFixedTextModel::describeAggregateProperties( Sequence< Property >& _rAggre } -OUString SAL_CALL OFixedTextModel::getServiceName() throw(RuntimeException, std::exception) +OUString SAL_CALL OFixedTextModel::getServiceName() { return OUString(FRM_COMPONENT_FIXEDTEXT); // old (non-sun) name for compatibility ! } void SAL_CALL OFixedTextModel::write(const Reference<XObjectOutputStream>& _rxOutStream) - throw(IOException, RuntimeException, std::exception) { OControlModel::write(_rxOutStream); @@ -98,7 +97,7 @@ void SAL_CALL OFixedTextModel::write(const Reference<XObjectOutputStream>& _rxOu } -void SAL_CALL OFixedTextModel::read(const Reference<XObjectInputStream>& _rxInStream) throw(IOException, RuntimeException, std::exception) +void SAL_CALL OFixedTextModel::read(const Reference<XObjectInputStream>& _rxInStream) { OControlModel::read(_rxInStream); diff --git a/forms/source/component/FixedText.hxx b/forms/source/component/FixedText.hxx index f3a6dd7ac5b1..eba1f531e9ca 100644 --- a/forms/source/component/FixedText.hxx +++ b/forms/source/component/FixedText.hxx @@ -33,18 +33,17 @@ public: DECLARE_DEFAULT_LEAF_XTOR( OFixedTextModel ); // XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.form.OFixedTextModel"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XPersistObject - virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; virtual void SAL_CALL - write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; + write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override; virtual void SAL_CALL - read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; + read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override; // OControlModel's property handling virtual void describeAggregateProperties( @@ -52,7 +51,7 @@ public: ) const override; protected: - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) override; }; diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index 80e85758801c..caf486676148 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -150,7 +150,7 @@ void OControl::doSetDelegator() } // UNO Binding -Any SAL_CALL OControl::queryAggregation( const Type& _rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OControl::queryAggregation( const Type& _rType ) { // ask the base class Any aReturn( OComponentHelper::queryAggregation(_rType) ); @@ -166,12 +166,12 @@ Any SAL_CALL OControl::queryAggregation( const Type& _rType ) throw(RuntimeExcep return aReturn; } -Sequence<sal_Int8> SAL_CALL OControl::getImplementationId() throw(RuntimeException, std::exception) +Sequence<sal_Int8> SAL_CALL OControl::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } -Sequence<Type> SAL_CALL OControl::getTypes() throw(RuntimeException, std::exception) +Sequence<Type> SAL_CALL OControl::getTypes() { TypeBag aTypes( _getTypes() ); @@ -200,7 +200,7 @@ void OControl::disposing() } // XServiceInfo -sal_Bool SAL_CALL OControl::supportsService(const OUString& _rsServiceName) throw ( RuntimeException, std::exception) +sal_Bool SAL_CALL OControl::supportsService(const OUString& _rsServiceName) { return cppu::supportsService(this, _rsServiceName); } @@ -215,14 +215,14 @@ Sequence< OUString > OControl::getAggregateServiceNames() return aAggServices; } -Sequence<OUString> SAL_CALL OControl::getSupportedServiceNames() throw(RuntimeException, std::exception) +Sequence<OUString> SAL_CALL OControl::getSupportedServiceNames() { // no own supported service names return getAggregateServiceNames(); } // XEventListener -void SAL_CALL OControl::disposing(const css::lang::EventObject& _rEvent) throw (RuntimeException, std::exception) +void SAL_CALL OControl::disposing(const css::lang::EventObject& _rEvent) { Reference< XInterface > xAggAsIface; query_aggregation(m_xAggregate, xAggAsIface); @@ -237,13 +237,13 @@ void SAL_CALL OControl::disposing(const css::lang::EventObject& _rEvent) throw ( } // XControl -void SAL_CALL OControl::setContext(const Reference< XInterface >& Context) throw (RuntimeException, std::exception) +void SAL_CALL OControl::setContext(const Reference< XInterface >& Context) { if (m_xControl.is()) m_xControl->setContext(Context); } -Reference< XInterface > SAL_CALL OControl::getContext() throw (RuntimeException, std::exception) +Reference< XInterface > SAL_CALL OControl::getContext() { return m_xControl.is() ? m_xControl->getContext() : Reference< XInterface >(); } @@ -264,7 +264,7 @@ void OControl::impl_resetStateGuard_nothrow() m_aWindowStateGuard.attach( xWindow, xModel ); } -void SAL_CALL OControl::createPeer(const Reference<XToolkit>& _rxToolkit, const Reference<XWindowPeer>& _rxParent) throw (RuntimeException, std::exception) +void SAL_CALL OControl::createPeer(const Reference<XToolkit>& _rxToolkit, const Reference<XWindowPeer>& _rxParent) { if ( m_xControl.is() ) { @@ -273,12 +273,12 @@ void SAL_CALL OControl::createPeer(const Reference<XToolkit>& _rxToolkit, const } } -Reference<XWindowPeer> SAL_CALL OControl::getPeer() throw ( RuntimeException, std::exception) +Reference<XWindowPeer> SAL_CALL OControl::getPeer() { return m_xControl.is() ? m_xControl->getPeer() : Reference<XWindowPeer>(); } -sal_Bool SAL_CALL OControl::setModel(const Reference<XControlModel>& Model) throw ( RuntimeException, std::exception) +sal_Bool SAL_CALL OControl::setModel(const Reference<XControlModel>& Model) { if ( !m_xControl.is() ) return false; @@ -288,28 +288,28 @@ sal_Bool SAL_CALL OControl::setModel(const Reference<XControlModel>& Model) thro return bSuccess; } -Reference<XControlModel> SAL_CALL OControl::getModel() throw ( RuntimeException, std::exception) +Reference<XControlModel> SAL_CALL OControl::getModel() { return m_xControl.is() ? m_xControl->getModel() : Reference<XControlModel>(); } -Reference<XView> SAL_CALL OControl::getView() throw ( RuntimeException, std::exception) +Reference<XView> SAL_CALL OControl::getView() { return m_xControl.is() ? m_xControl->getView() : Reference<XView>(); } -void SAL_CALL OControl::setDesignMode(sal_Bool bOn) throw ( RuntimeException, std::exception) +void SAL_CALL OControl::setDesignMode(sal_Bool bOn) { if (m_xControl.is()) m_xControl->setDesignMode(bOn); } -sal_Bool SAL_CALL OControl::isDesignMode() throw ( RuntimeException, std::exception) +sal_Bool SAL_CALL OControl::isDesignMode() { return !m_xControl.is() || m_xControl->isDesignMode(); } -sal_Bool SAL_CALL OControl::isTransparent() throw ( RuntimeException, std::exception) +sal_Bool SAL_CALL OControl::isTransparent() { return !m_xControl.is() || m_xControl->isTransparent(); } @@ -330,7 +330,7 @@ Sequence< Type> OBoundControl::_getTypes() return TypeBag( OControl::_getTypes(), OBoundControl_BASE::getTypes() ).getTypes(); } -Any SAL_CALL OBoundControl::queryAggregation(const Type& _rType) throw(RuntimeException, std::exception) +Any SAL_CALL OBoundControl::queryAggregation(const Type& _rType) { Any aReturn; @@ -350,12 +350,12 @@ Any SAL_CALL OBoundControl::queryAggregation(const Type& _rType) throw(RuntimeEx return aReturn; } -sal_Bool SAL_CALL OBoundControl::getLock() throw(RuntimeException, std::exception) +sal_Bool SAL_CALL OBoundControl::getLock() { return m_bLocked; } -void SAL_CALL OBoundControl::setLock(sal_Bool _bLock) throw(RuntimeException, std::exception) +void SAL_CALL OBoundControl::setLock(sal_Bool _bLock) { if (m_bLocked == bool(_bLock)) return; @@ -382,12 +382,12 @@ void OBoundControl::_setLock(bool _bLock) } } -sal_Bool SAL_CALL OBoundControl::setModel( const Reference< XControlModel >& _rxModel ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL OBoundControl::setModel( const Reference< XControlModel >& _rxModel ) { return OControl::setModel( _rxModel ); } -void SAL_CALL OBoundControl::disposing(const EventObject& Source) throw (RuntimeException, std::exception) +void SAL_CALL OBoundControl::disposing(const EventObject& Source) { // just disambiguate OControl::disposing(Source); @@ -399,12 +399,12 @@ void OBoundControl::disposing() } // OControlModel -Sequence<sal_Int8> SAL_CALL OControlModel::getImplementationId() throw(RuntimeException, std::exception) +Sequence<sal_Int8> SAL_CALL OControlModel::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } -Sequence<Type> SAL_CALL OControlModel::getTypes() throw(RuntimeException, std::exception) +Sequence<Type> SAL_CALL OControlModel::getTypes() { TypeBag aTypes( _getTypes() ); @@ -424,7 +424,7 @@ Sequence<Type> OControlModel::_getTypes() ).getTypes(); } -Any SAL_CALL OControlModel::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception) +Any SAL_CALL OControlModel::queryAggregation(const Type& _rType) { // base class 1 Any aReturn(OComponentHelper::queryAggregation(_rType)); @@ -596,12 +596,12 @@ void OControlModel::doSetDelegator() } // XChild -Reference< XInterface > SAL_CALL OControlModel::getParent() throw(RuntimeException, std::exception) +Reference< XInterface > SAL_CALL OControlModel::getParent() { return m_xParent; } -void SAL_CALL OControlModel::setParent(const Reference< XInterface >& _rxParent) throw(css::lang::NoSupportException, RuntimeException, std::exception) +void SAL_CALL OControlModel::setParent(const Reference< XInterface >& _rxParent) { osl::MutexGuard aGuard(m_aMutex); @@ -617,7 +617,7 @@ void SAL_CALL OControlModel::setParent(const Reference< XInterface >& _rxParent) } // XNamed -OUString SAL_CALL OControlModel::getName() throw(RuntimeException, std::exception) +OUString SAL_CALL OControlModel::getName() { OUString aReturn; try @@ -636,7 +636,7 @@ OUString SAL_CALL OControlModel::getName() throw(RuntimeException, std::exceptio return aReturn; } -void SAL_CALL OControlModel::setName(const OUString& _rName) throw(RuntimeException, std::exception) +void SAL_CALL OControlModel::setName(const OUString& _rName) { try { @@ -654,7 +654,7 @@ void SAL_CALL OControlModel::setName(const OUString& _rName) throw(RuntimeExcept } // XServiceInfo -sal_Bool SAL_CALL OControlModel::supportsService(const OUString& _rServiceName) throw ( RuntimeException, std::exception) +sal_Bool SAL_CALL OControlModel::supportsService(const OUString& _rServiceName) { return cppu::supportsService(this, _rServiceName); } @@ -668,7 +668,7 @@ Sequence< OUString > OControlModel::getAggregateServiceNames() return aAggServices; } -Sequence<OUString> SAL_CALL OControlModel::getSupportedServiceNames() throw(RuntimeException, std::exception) +Sequence<OUString> SAL_CALL OControlModel::getSupportedServiceNames() { return ::comphelper::concatSequences( getAggregateServiceNames(), @@ -676,7 +676,7 @@ Sequence<OUString> SAL_CALL OControlModel::getSupportedServiceNames() throw(Runt ); } -Sequence< OUString > SAL_CALL OControlModel::getSupportedServiceNames_Static() throw( RuntimeException ) +Sequence< OUString > SAL_CALL OControlModel::getSupportedServiceNames_Static() { Sequence< OUString > aServiceNames( 2 ); aServiceNames[ 0 ] = FRM_SUN_FORMCOMPONENT; @@ -685,7 +685,7 @@ Sequence< OUString > SAL_CALL OControlModel::getSupportedServiceNames_Static() t } // XEventListener -void SAL_CALL OControlModel::disposing(const css::lang::EventObject& _rSource) throw (RuntimeException, std::exception) +void SAL_CALL OControlModel::disposing(const css::lang::EventObject& _rSource) { // release the parent if (_rSource.Source == m_xParent) @@ -733,7 +733,6 @@ void OControlModel::readAggregate( const Reference< XObjectInputStream >& _rxInS } void SAL_CALL OControlModel::write(const Reference<css::io::XObjectOutputStream>& _rxOutStream) - throw(css::io::IOException, RuntimeException, std::exception) { osl::MutexGuard aGuard(m_aMutex); @@ -777,7 +776,7 @@ void SAL_CALL OControlModel::write(const Reference<css::io::XObjectOutputStream> // EOIN! } -void OControlModel::read(const Reference<css::io::XObjectInputStream>& InStream) throw (css::io::IOException, RuntimeException, std::exception) +void OControlModel::read(const Reference<css::io::XObjectInputStream>& InStream) { osl::MutexGuard aGuard(m_aMutex); @@ -929,7 +928,6 @@ void OControlModel::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) con sal_Bool OControlModel::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { bool bModified(false); switch (_nHandle) @@ -967,7 +965,6 @@ sal_Bool OControlModel::convertFastPropertyValue( } void OControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) - throw (Exception, std::exception) { switch (_nHandle) { @@ -1047,7 +1044,7 @@ Reference< XMultiPropertySet > OControlModel::getPropertiesInterface() return Reference< XMultiPropertySet >( *this, UNO_QUERY ); } -Reference< XPropertySetInfo> SAL_CALL OControlModel::getPropertySetInfo() throw( RuntimeException, std::exception) +Reference< XPropertySetInfo> SAL_CALL OControlModel::getPropertySetInfo() { return createPropertySetInfo( getInfoHelper() ); } @@ -1057,22 +1054,22 @@ Reference< XPropertySetInfo> SAL_CALL OControlModel::getPropertySetInfo() throw( return m_aPropertyBagHelper.getInfoHelper(); } -void SAL_CALL OControlModel::addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) +void SAL_CALL OControlModel::addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) { m_aPropertyBagHelper.addProperty( _rName, _nAttributes, _rInitialValue ); } -void SAL_CALL OControlModel::removeProperty( const OUString& _rName ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException, std::exception) +void SAL_CALL OControlModel::removeProperty( const OUString& _rName ) { m_aPropertyBagHelper.removeProperty( _rName ); } -Sequence< PropertyValue > SAL_CALL OControlModel::getPropertyValues() throw (RuntimeException, std::exception) +Sequence< PropertyValue > SAL_CALL OControlModel::getPropertyValues() { return m_aPropertyBagHelper.getPropertyValues(); } -void SAL_CALL OControlModel::setPropertyValues( const Sequence< PropertyValue >& _rProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL OControlModel::setPropertyValues( const Sequence< PropertyValue >& _rProps ) { m_aPropertyBagHelper.setPropertyValues( _rProps ); } @@ -1104,7 +1101,7 @@ void OControlModel::firePropertyChanges( const std::vector< sal_Int32 >& _rHandl } // OBoundControlModel -Any SAL_CALL OBoundControlModel::queryAggregation( const Type& _rType ) throw (RuntimeException, std::exception) +Any SAL_CALL OBoundControlModel::queryAggregation( const Type& _rType ) { Any aReturn( OControlModel::queryAggregation(_rType) ); if (!aReturn.hasValue()) @@ -1400,7 +1397,7 @@ void OBoundControlModel::onValuePropertyChange( ControlModelLock& i_rControLock recheckValidity( true ); } -void OBoundControlModel::_propertyChanged( const PropertyChangeEvent& _rEvt ) throw ( RuntimeException, std::exception ) +void OBoundControlModel::_propertyChanged( const PropertyChangeEvent& _rEvt ) { ControlModelLock aLock( *this ); OSL_ENSURE( _rEvt.PropertyName == m_sValuePropertyName, @@ -1445,7 +1442,7 @@ void OBoundControlModel::doFormListening( const bool _bStart ) } // XChild -void SAL_CALL OBoundControlModel::setParent(const Reference<XInterface>& _rxParent) throw(css::lang::NoSupportException, RuntimeException, std::exception) +void SAL_CALL OBoundControlModel::setParent(const Reference<XInterface>& _rxParent) { ControlModelLock aLock( *this ); FieldChangeNotifier aBoundFieldNotifier( aLock ); @@ -1472,7 +1469,7 @@ void SAL_CALL OBoundControlModel::setParent(const Reference<XInterface>& _rxPare } // XEventListener -void SAL_CALL OBoundControlModel::disposing(const css::lang::EventObject& _rEvent) throw (RuntimeException, std::exception) +void SAL_CALL OBoundControlModel::disposing(const css::lang::EventObject& _rEvent) { ControlModelLock aLock( *this ); if ( _rEvent.Source == getField() ) @@ -1504,7 +1501,7 @@ void SAL_CALL OBoundControlModel::disposing(const css::lang::EventObject& _rEven } // XServiceInfo -css::uno::Sequence<OUString> SAL_CALL OBoundControlModel::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OBoundControlModel::getSupportedServiceNames() { return ::comphelper::combineSequences( getAggregateServiceNames(), @@ -1512,7 +1509,7 @@ css::uno::Sequence<OUString> SAL_CALL OBoundControlModel::getSupportedServiceNam ); } -Sequence< OUString > SAL_CALL OBoundControlModel::getSupportedServiceNames_Static() throw( RuntimeException ) +Sequence< OUString > SAL_CALL OBoundControlModel::getSupportedServiceNames_Static() { Sequence<OUString> aOwnServiceNames { "com.sun.star.form.DataAwareControlModel" }; return ::comphelper::concatSequences( @@ -1522,7 +1519,7 @@ Sequence< OUString > SAL_CALL OBoundControlModel::getSupportedServiceNames_Stati } // XPersist -void SAL_CALL OBoundControlModel::write( const Reference<css::io::XObjectOutputStream>& _rxOutStream ) throw(css::io::IOException, RuntimeException, std::exception) +void SAL_CALL OBoundControlModel::write( const Reference<css::io::XObjectOutputStream>& _rxOutStream ) { OControlModel::write(_rxOutStream); osl::MutexGuard aGuard(m_aMutex); @@ -1595,7 +1592,7 @@ void OBoundControlModel::writeCommonProperties(const Reference<css::io::XObjectO xMark->deleteMark(nMark); } -void SAL_CALL OBoundControlModel::read( const Reference< css::io::XObjectInputStream >& _rxInStream ) throw(css::io::IOException, RuntimeException, std::exception) +void SAL_CALL OBoundControlModel::read( const Reference< css::io::XObjectInputStream >& _rxInStream ) { OControlModel::read(_rxInStream); osl::MutexGuard aGuard(m_aMutex); @@ -1634,7 +1631,6 @@ sal_Bool OBoundControlModel::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { bool bModified(false); switch (_nHandle) @@ -1689,7 +1685,7 @@ Any OBoundControlModel::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const return aDefault; } -void OBoundControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception, std::exception) +void OBoundControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) { switch (nHandle) { @@ -1768,7 +1764,7 @@ void OBoundControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, co } // XPropertyChangeListener -void SAL_CALL OBoundControlModel::propertyChange( const PropertyChangeEvent& evt ) throw(RuntimeException, std::exception) +void SAL_CALL OBoundControlModel::propertyChange( const PropertyChangeEvent& evt ) { // if the DBColumn value changed, transfer it to the control if ( evt.PropertyName == PROPERTY_VALUE ) @@ -1814,7 +1810,7 @@ void SAL_CALL OBoundControlModel::propertyChange( const PropertyChangeEvent& evt } } -void SAL_CALL OBoundControlModel::onRowSetChanged( const EventObject& /*i_Event*/ ) throw (RuntimeException, std::exception) +void SAL_CALL OBoundControlModel::onRowSetChanged( const EventObject& /*i_Event*/ ) { ControlModelLock aLock( *this ); FieldChangeNotifier aBoundFieldNotifier( aLock ); @@ -1834,17 +1830,17 @@ void SAL_CALL OBoundControlModel::onRowSetChanged( const EventObject& /*i_Event* } // XBoundComponent -void SAL_CALL OBoundControlModel::addUpdateListener(const Reference<XUpdateListener>& _rxListener) throw(RuntimeException, std::exception) +void SAL_CALL OBoundControlModel::addUpdateListener(const Reference<XUpdateListener>& _rxListener) { m_aUpdateListeners.addInterface(_rxListener); } -void SAL_CALL OBoundControlModel::removeUpdateListener(const Reference< XUpdateListener>& _rxListener) throw(RuntimeException, std::exception) +void SAL_CALL OBoundControlModel::removeUpdateListener(const Reference< XUpdateListener>& _rxListener) { m_aUpdateListeners.removeInterface(_rxListener); } -sal_Bool SAL_CALL OBoundControlModel::commit() throw(RuntimeException, std::exception) +sal_Bool SAL_CALL OBoundControlModel::commit() { ControlModelLock aLock( *this ); OSL_PRECOND( m_bCommitable, "OBoundControlModel::commit: invalid call (I'm not commitable !) " ); @@ -2059,7 +2055,7 @@ void OBoundControlModel::impl_disconnectDatabaseColumn_noNotify() } // XLoadListener -void SAL_CALL OBoundControlModel::loaded( const EventObject& _rEvent ) throw(RuntimeException, std::exception) +void SAL_CALL OBoundControlModel::loaded( const EventObject& _rEvent ) { ControlModelLock aLock( *this ); FieldChangeNotifier aBoundFieldNotifier( aLock ); @@ -2071,12 +2067,12 @@ void SAL_CALL OBoundControlModel::loaded( const EventObject& _rEvent ) throw(Run impl_connectDatabaseColumn_noNotify( false ); } -void SAL_CALL OBoundControlModel::unloaded( const css::lang::EventObject& /*aEvent*/ ) throw(RuntimeException, std::exception) +void SAL_CALL OBoundControlModel::unloaded( const css::lang::EventObject& /*aEvent*/ ) { OSL_PRECOND( !hasExternalValueBinding(), "OBoundControlModel::unloaded: we should never reach this with an external value binding!" ); } -void SAL_CALL OBoundControlModel::reloading( const css::lang::EventObject& /*aEvent*/ ) throw(RuntimeException, std::exception) +void SAL_CALL OBoundControlModel::reloading( const css::lang::EventObject& /*aEvent*/ ) { OSL_PRECOND( !hasExternalValueBinding(), "OBoundControlModel::reloading: we should never reach this with an external value binding!" ); if ( hasExternalValueBinding() ) @@ -2085,7 +2081,7 @@ void SAL_CALL OBoundControlModel::reloading( const css::lang::EventObject& /*aEv m_bForwardValueChanges = false; } -void SAL_CALL OBoundControlModel::unloading(const css::lang::EventObject& /*aEvent*/) throw(RuntimeException, std::exception) +void SAL_CALL OBoundControlModel::unloading(const css::lang::EventObject& /*aEvent*/) { ControlModelLock aLock( *this ); FieldChangeNotifier aBoundFieldNotifier( aLock ); @@ -2095,7 +2091,7 @@ void SAL_CALL OBoundControlModel::unloading(const css::lang::EventObject& /*aEve impl_disconnectDatabaseColumn_noNotify(); } -void SAL_CALL OBoundControlModel::reloaded( const EventObject& _rEvent ) throw(RuntimeException, std::exception) +void SAL_CALL OBoundControlModel::reloaded( const EventObject& _rEvent ) { ControlModelLock aLock( *this ); FieldChangeNotifier aBoundFieldNotifier( aLock ); @@ -2214,17 +2210,17 @@ void OBoundControlModel::resetNoBroadcast() setControlValue( getDefaultForReset(), eOther ); } -void OBoundControlModel::addResetListener(const Reference<XResetListener>& l) throw (RuntimeException, std::exception) +void OBoundControlModel::addResetListener(const Reference<XResetListener>& l) { m_aResetHelper.addResetListener( l ); } -void OBoundControlModel::removeResetListener(const Reference<XResetListener>& l) throw (RuntimeException, std::exception) +void OBoundControlModel::removeResetListener(const Reference<XResetListener>& l) { m_aResetHelper.removeResetListener( l ); } -void OBoundControlModel::reset() throw (RuntimeException, std::exception) +void OBoundControlModel::reset() { if ( !m_aResetHelper.approveReset() ) return; @@ -2475,7 +2471,7 @@ void OBoundControlModel::disconnectExternalValueBinding( ) impl_connectDatabaseColumn_noNotify( false ); } -void SAL_CALL OBoundControlModel::setValueBinding( const Reference< XValueBinding >& _rxBinding ) throw (IncompatibleTypesException, RuntimeException, std::exception) +void SAL_CALL OBoundControlModel::setValueBinding( const Reference< XValueBinding >& _rxBinding ) { OSL_PRECOND( m_bSupportsExternalBinding, "OBoundControlModel::setValueBinding: How did you reach this method?" ); // the interface for this method should not have been exposed if we do not @@ -2501,7 +2497,7 @@ void SAL_CALL OBoundControlModel::setValueBinding( const Reference< XValueBindin connectExternalValueBinding( _rxBinding, aLock ); } -Reference< XValueBinding > SAL_CALL OBoundControlModel::getValueBinding( ) throw (RuntimeException, std::exception) +Reference< XValueBinding > SAL_CALL OBoundControlModel::getValueBinding( ) { ::osl::MutexGuard aGuard( m_aMutex ); OSL_PRECOND( m_bSupportsExternalBinding, "OBoundControlModel::getValueBinding: How did you reach this method?" ); @@ -2510,7 +2506,7 @@ Reference< XValueBinding > SAL_CALL OBoundControlModel::getValueBinding( ) thro return m_xExternalBinding; } -void SAL_CALL OBoundControlModel::modified( const EventObject& _rEvent ) throw ( RuntimeException, std::exception ) +void SAL_CALL OBoundControlModel::modified( const EventObject& _rEvent ) { ControlModelLock aLock( *this ); OSL_PRECOND( hasExternalValueBinding(), "OBoundControlModel::modified: Where did this come from?" ); @@ -2693,7 +2689,7 @@ void OBoundControlModel::disconnectValidator( ) onDisconnectedValidator( ); } -void SAL_CALL OBoundControlModel::setValidator( const Reference< XValidator >& _rxValidator ) throw (VetoException,RuntimeException, std::exception) +void SAL_CALL OBoundControlModel::setValidator( const Reference< XValidator >& _rxValidator ) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); OSL_PRECOND( m_bSupportsValidation, "OBoundControlModel::setValidator: How did you reach this method?" ); @@ -2719,7 +2715,7 @@ void SAL_CALL OBoundControlModel::setValidator( const Reference< XValidator >& _ connectValidator( _rxValidator ); } -Reference< XValidator > SAL_CALL OBoundControlModel::getValidator( ) throw (RuntimeException, std::exception) +Reference< XValidator > SAL_CALL OBoundControlModel::getValidator( ) { ::osl::MutexGuard aGuard( m_aMutex ); OSL_PRECOND( m_bSupportsValidation, "OBoundControlModel::getValidator: How did you reach this method?" ); @@ -2729,7 +2725,7 @@ Reference< XValidator > SAL_CALL OBoundControlModel::getValidator( ) throw (Run return m_xValidator; } -void SAL_CALL OBoundControlModel::validityConstraintChanged( const EventObject& /*Source*/ ) throw (RuntimeException, std::exception) +void SAL_CALL OBoundControlModel::validityConstraintChanged( const EventObject& /*Source*/ ) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); OSL_PRECOND( m_bSupportsValidation, "OBoundControlModel::validityConstraintChanged: How did you reach this method?" ); @@ -2739,7 +2735,7 @@ void SAL_CALL OBoundControlModel::validityConstraintChanged( const EventObject& recheckValidity( false ); } -sal_Bool SAL_CALL OBoundControlModel::isValid( ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL OBoundControlModel::isValid( ) { return m_bIsCurrentValueValid; } @@ -2751,19 +2747,19 @@ css::uno::Any OBoundControlModel::getCurrentFormComponentValue() const return getControlValue(); } -Any SAL_CALL OBoundControlModel::getCurrentValue( ) throw (RuntimeException, std::exception) +Any SAL_CALL OBoundControlModel::getCurrentValue( ) { ::osl::MutexGuard aGuard( m_aMutex ); return getCurrentFormComponentValue(); } -void SAL_CALL OBoundControlModel::addFormComponentValidityListener( const Reference< validation::XFormComponentValidityListener >& Listener ) throw (NullPointerException, RuntimeException, std::exception) +void SAL_CALL OBoundControlModel::addFormComponentValidityListener( const Reference< validation::XFormComponentValidityListener >& Listener ) { if ( Listener.is() ) m_aFormComponentListeners.addInterface( Listener ); } -void SAL_CALL OBoundControlModel::removeFormComponentValidityListener( const Reference< validation::XFormComponentValidityListener >& Listener ) throw (NullPointerException, RuntimeException, std::exception) +void SAL_CALL OBoundControlModel::removeFormComponentValidityListener( const Reference< validation::XFormComponentValidityListener >& Listener ) { if ( Listener.is() ) m_aFormComponentListeners.removeInterface( Listener ); diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index ad6bfb4900e1..df531277fe5b 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -149,7 +149,7 @@ Sequence<Type> OFormattedControl::_getTypes() OBoundControl::_getTypes() ); } -Any SAL_CALL OFormattedControl::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception) +Any SAL_CALL OFormattedControl::queryAggregation(const Type& _rType) { Any aReturn = OBoundControl::queryAggregation(_rType); if (!aReturn.hasValue()) @@ -182,11 +182,11 @@ OFormattedControl::~OFormattedControl() } // XKeyListener -void OFormattedControl::disposing(const EventObject& _rSource) throw(RuntimeException, std::exception) +void OFormattedControl::disposing(const EventObject& _rSource) { OBoundControl::disposing(_rSource); } -void OFormattedControl::keyPressed(const css::awt::KeyEvent& e) throw ( css::uno::RuntimeException, std::exception) +void OFormattedControl::keyPressed(const css::awt::KeyEvent& e) { if( e.KeyCode != KEY_RETURN || e.Modifiers != 0 ) return; @@ -230,7 +230,7 @@ void OFormattedControl::keyPressed(const css::awt::KeyEvent& e) throw ( css::uno OnKeyPressed) ); } -void OFormattedControl::keyReleased(const css::awt::KeyEvent& /*e*/) throw ( css::uno::RuntimeException, std::exception) +void OFormattedControl::keyReleased(const css::awt::KeyEvent& /*e*/) { } @@ -244,7 +244,7 @@ IMPL_LINK_NOARG(OFormattedControl, OnKeyPressed, void*, void) xSubmit->submit( Reference<XControl> (), css::awt::MouseEvent() ); } -css::uno::Sequence<OUString> OFormattedControl::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> OFormattedControl::getSupportedServiceNames() { css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); @@ -300,7 +300,7 @@ void SAL_CALL OFormattedModel::disposing() } // XServiceInfo -css::uno::Sequence<OUString> OFormattedModel::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> OFormattedModel::getSupportedServiceNames() { css::uno::Sequence<OUString> aSupported = OEditBaseModel::getSupportedServiceNames(); sal_Int32 nOldLen = aSupported.getLength(); @@ -319,7 +319,7 @@ css::uno::Sequence<OUString> OFormattedModel::getSupportedServiceNames() throw(s } // XAggregation -Any SAL_CALL OFormattedModel::queryAggregation(const Type& _rType) throw(RuntimeException, std::exception) +Any SAL_CALL OFormattedModel::queryAggregation(const Type& _rType) { Any aReturn = OEditBaseModel::queryAggregation( _rType ); return aReturn.hasValue() ? aReturn : OErrorBroadcaster::queryInterface( _rType ); @@ -335,7 +335,7 @@ Sequence< Type > OFormattedModel::_getTypes() } // XPersistObject -OUString SAL_CALL OFormattedModel::getServiceName() throw ( css::uno::RuntimeException, std::exception) +OUString SAL_CALL OFormattedModel::getServiceName() { return OUString(FRM_COMPONENT_EDIT); } @@ -379,7 +379,7 @@ void OFormattedModel::setPropertyToDefaultByHandle(sal_Int32 nHandle) OEditBaseModel::setPropertyToDefaultByHandle(nHandle); } -void OFormattedModel::setPropertyToDefault(const OUString& aPropertyName) throw( css::beans::UnknownPropertyException, RuntimeException, std::exception ) +void OFormattedModel::setPropertyToDefault(const OUString& aPropertyName) { OPropertyArrayAggregationHelper& rPH = m_aPropertyBagHelper.getInfoHelper(); sal_Int32 nHandle = rPH.getHandleByName( aPropertyName ); @@ -400,7 +400,7 @@ Any OFormattedModel::getPropertyDefaultByHandle( sal_Int32 nHandle ) const return OEditBaseModel::getPropertyDefaultByHandle(nHandle); } -Any SAL_CALL OFormattedModel::getPropertyDefault( const OUString& aPropertyName ) throw( css::beans::UnknownPropertyException, RuntimeException, std::exception ) +Any SAL_CALL OFormattedModel::getPropertyDefault( const OUString& aPropertyName ) { OPropertyArrayAggregationHelper& rPH = m_aPropertyBagHelper.getInfoHelper(); sal_Int32 nHandle = rPH.getHandleByName( aPropertyName ); @@ -410,7 +410,7 @@ Any SAL_CALL OFormattedModel::getPropertyDefault( const OUString& aPropertyName return OEditBaseModel::getPropertyDefault(aPropertyName); } -void OFormattedModel::_propertyChanged( const css::beans::PropertyChangeEvent& evt ) throw(RuntimeException, std::exception) +void OFormattedModel::_propertyChanged( const css::beans::PropertyChangeEvent& evt ) { // TODO: check how this works with external bindings OSL_ENSURE( evt.Source == m_xAggregateSet, "OFormattedModel::_propertyChanged: where did this come from?" ); @@ -513,7 +513,7 @@ Reference< XNumberFormatsSupplier > OFormattedModel::calcDefaultFormatsSupplier( } // XBoundComponent -void OFormattedModel::loaded(const EventObject& rEvent) throw ( css::uno::RuntimeException, std::exception) +void OFormattedModel::loaded(const EventObject& rEvent) { // HACK: our onConnectedDbColumn accesses our NumberFormatter which locks the solar mutex (as it doesn't have // an own one). To prevent deadlocks with other threads which may request a property from us in an @@ -626,7 +626,7 @@ void OFormattedModel::onDisconnectedDbColumn() m_aNullDate = DBTypeConversion::getStandardDate(); } -void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) +void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream) { OEditBaseModel::write(_rxOutStream); _rxOutStream->writeShort(0x0003); @@ -712,7 +712,7 @@ void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream) } } -void OFormattedModel::read(const Reference<XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) +void OFormattedModel::read(const Reference<XObjectInputStream>& _rxInStream) { OEditBaseModel::read(_rxInStream); sal_uInt16 nVersion = _rxInStream->readShort(); diff --git a/forms/source/component/FormattedField.hxx b/forms/source/component/FormattedField.hxx index 53fc2ffde260..b5bf605eaa1f 100644 --- a/forms/source/component/FormattedField.hxx +++ b/forms/source/component/FormattedField.hxx @@ -64,32 +64,31 @@ class OFormattedModel virtual css::uno::Sequence< css::uno::Type> _getTypes() override; // XAggregation - virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) override; // OComponentHelper virtual void SAL_CALL disposing() override; // XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.form.OFormattedModel"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XPersistObject - virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override; + virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override; + virtual OUString SAL_CALL getServiceName() override; // XLoadListener - virtual void SAL_CALL loaded(const css::lang::EventObject& rEvent) throw ( css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL loaded(const css::lang::EventObject& rEvent) override; // XPropertyState void setPropertyToDefaultByHandle(sal_Int32 nHandle) override; css::uno::Any getPropertyDefaultByHandle(sal_Int32 nHandle) const override; - void SAL_CALL setPropertyToDefault(const OUString& aPropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + void SAL_CALL setPropertyToDefault(const OUString& aPropertyName) override; + css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override; // OControlModel's property handling virtual void describeFixedProperties( @@ -100,7 +99,7 @@ class OFormattedModel ) const override; // XPropertyChangeListener - virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) override; + virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) override; // prevent method hiding using OEditBaseModel::disposing; @@ -131,7 +130,7 @@ class OFormattedModel virtual void onDisconnectedDbColumn() override; private: - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) override; void implConstruct(); @@ -149,23 +148,22 @@ class OFormattedModel virtual ~OFormattedControl() override; DECLARE_UNO3_AGG_DEFAULTS(OFormattedControl, OBoundControl) - virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) override; virtual css::uno::Sequence< css::uno::Type> _getTypes() override; // css::lang::XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.form.OFormattedControl"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // css::lang::XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) override; // css::awt::XKeyListener - virtual void SAL_CALL keyPressed(const css::awt::KeyEvent& e) throw ( css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL keyReleased(const css::awt::KeyEvent& e) throw ( css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL keyPressed(const css::awt::KeyEvent& e) override; + virtual void SAL_CALL keyReleased(const css::awt::KeyEvent& e) override; // css::awt::XControl using OBoundControl::setDesignMode; diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx index be4a3ae8d57d..812b58595586 100644 --- a/forms/source/component/FormattedFieldWrapper.cxx +++ b/forms/source/component/FormattedFieldWrapper.cxx @@ -82,7 +82,7 @@ css::uno::Reference<css::uno::XInterface> OFormattedFieldWrapper::createFormatte return xRef; } -Reference< XCloneable > SAL_CALL OFormattedFieldWrapper::createClone() throw (RuntimeException, std::exception) +Reference< XCloneable > SAL_CALL OFormattedFieldWrapper::createClone() { ensureAggregate(); @@ -126,7 +126,7 @@ OFormattedFieldWrapper::~OFormattedFieldWrapper() } -Any SAL_CALL OFormattedFieldWrapper::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception) +Any SAL_CALL OFormattedFieldWrapper::queryAggregation(const Type& _rType) { Any aReturn; @@ -170,23 +170,23 @@ Any SAL_CALL OFormattedFieldWrapper::queryAggregation(const Type& _rType) throw return aReturn; } -OUString SAL_CALL OFormattedFieldWrapper::getServiceName() throw(RuntimeException, std::exception) +OUString SAL_CALL OFormattedFieldWrapper::getServiceName() { // return the old compatibility name for an EditModel return OUString(FRM_COMPONENT_EDIT); } -OUString SAL_CALL OFormattedFieldWrapper::getImplementationName( ) throw (RuntimeException, std::exception) +OUString SAL_CALL OFormattedFieldWrapper::getImplementationName( ) { return OUString("com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted"); } -sal_Bool SAL_CALL OFormattedFieldWrapper::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL OFormattedFieldWrapper::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > SAL_CALL OFormattedFieldWrapper::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > SAL_CALL OFormattedFieldWrapper::getSupportedServiceNames( ) { DBG_ASSERT(m_xAggregate.is(), "OFormattedFieldWrapper::getSupportedServiceNames: should never have made it 'til here without an aggregate!"); Reference< XServiceInfo > xSI; @@ -194,7 +194,7 @@ Sequence< OUString > SAL_CALL OFormattedFieldWrapper::getSupportedServiceNames( return xSI->getSupportedServiceNames(); } -void SAL_CALL OFormattedFieldWrapper::write(const Reference<XObjectOutputStream>& _rxOutStream) throw( IOException, RuntimeException, std::exception ) +void SAL_CALL OFormattedFieldWrapper::write(const Reference<XObjectOutputStream>& _rxOutStream) { // can't write myself ensureAggregate(); @@ -233,7 +233,7 @@ void SAL_CALL OFormattedFieldWrapper::write(const Reference<XObjectOutputStream> m_xFormattedPart->write(_rxOutStream); } -void SAL_CALL OFormattedFieldWrapper::read(const Reference<XObjectInputStream>& _rxInStream) throw( IOException, RuntimeException, std::exception ) +void SAL_CALL OFormattedFieldWrapper::read(const Reference<XObjectInputStream>& _rxInStream) { SolarMutexGuard g; if (m_xAggregate.is()) diff --git a/forms/source/component/FormattedFieldWrapper.hxx b/forms/source/component/FormattedFieldWrapper.hxx index e780b0ed6d0a..d44ea9eee471 100644 --- a/forms/source/component/FormattedFieldWrapper.hxx +++ b/forms/source/component/FormattedFieldWrapper.hxx @@ -63,20 +63,20 @@ public: // UNO DECLARE_UNO3_AGG_DEFAULTS(OFormattedFieldWrapper, OWeakAggObject) - virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XPersistObject - virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; + virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override; + virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override; // XCloneable - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) override; protected: /// ensure we're in a defined state, which means a FormattedModel _OR_ an EditModel diff --git a/forms/source/component/FormsCollection.cxx b/forms/source/component/FormsCollection.cxx index 7e5bd1b4bf1b..b5302709667d 100644 --- a/forms/source/component/FormsCollection.cxx +++ b/forms/source/component/FormsCollection.cxx @@ -31,17 +31,17 @@ using namespace ::com::sun::star::form; using namespace ::com::sun::star::container; using namespace ::com::sun::star::util; -OUString SAL_CALL OFormsCollection::getServiceName() throw(RuntimeException, std::exception) +OUString SAL_CALL OFormsCollection::getServiceName() { return OUString("com.sun.star.form.Forms"); } -Sequence< sal_Int8 > SAL_CALL OFormsCollection::getImplementationId( ) throw(RuntimeException, std::exception) +Sequence< sal_Int8 > SAL_CALL OFormsCollection::getImplementationId( ) { return css::uno::Sequence<sal_Int8>(); } -Sequence<Type> SAL_CALL OFormsCollection::getTypes() throw(RuntimeException, std::exception) +Sequence<Type> SAL_CALL OFormsCollection::getTypes() { return concatSequences(OInterfaceContainer::getTypes(), FormsCollectionComponentBase::getTypes(), OFormsCollection_BASE::getTypes()); } @@ -69,7 +69,7 @@ OFormsCollection::~OFormsCollection() } } -Any SAL_CALL OFormsCollection::queryAggregation(const Type& _rType) throw(RuntimeException, std::exception) +Any SAL_CALL OFormsCollection::queryAggregation(const Type& _rType) { Any aReturn = OFormsCollection_BASE::queryInterface(_rType); if (!aReturn.hasValue()) @@ -83,17 +83,17 @@ Any SAL_CALL OFormsCollection::queryAggregation(const Type& _rType) throw(Runtim return aReturn; } -OUString SAL_CALL OFormsCollection::getImplementationName() throw(RuntimeException, std::exception) +OUString SAL_CALL OFormsCollection::getImplementationName() { return OUString("com.sun.star.form.OFormsCollection"); } -sal_Bool SAL_CALL OFormsCollection::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL OFormsCollection::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -css::uno::Sequence<OUString> SAL_CALL OFormsCollection::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OFormsCollection::getSupportedServiceNames() { css::uno::Sequence<OUString> aReturn(2); @@ -104,7 +104,7 @@ css::uno::Sequence<OUString> SAL_CALL OFormsCollection::getSupportedServiceNames } // XCloneable -Reference< XCloneable > SAL_CALL OFormsCollection::createClone( ) throw (RuntimeException, std::exception) +Reference< XCloneable > SAL_CALL OFormsCollection::createClone( ) { OFormsCollection* pClone = new OFormsCollection( *this ); osl_atomic_increment( &pClone->m_refCount ); @@ -127,13 +127,13 @@ void OFormsCollection::disposing() //XChild -void OFormsCollection::setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw( NoSupportException, RuntimeException, std::exception ) +void OFormsCollection::setParent(const css::uno::Reference<css::uno::XInterface>& Parent) { ::osl::MutexGuard aGuard( m_aMutex ); m_xParent = Parent; } -css::uno::Reference<css::uno::XInterface> OFormsCollection::getParent() throw( RuntimeException, std::exception ) +css::uno::Reference<css::uno::XInterface> OFormsCollection::getParent() { return m_xParent; } diff --git a/forms/source/component/FormsCollection.hxx b/forms/source/component/FormsCollection.hxx index f0e64b3d4946..50e3f51a3864 100644 --- a/forms/source/component/FormsCollection.hxx +++ b/forms/source/component/FormsCollection.hxx @@ -56,126 +56,93 @@ public: public: DECLARE_UNO3_AGG_DEFAULTS(OFormsCollection, FormsCollectionComponentBase) - virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) override; // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override; // XPersistObject - virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames( ) override; // XCloneable - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) override; // OComponentHelper virtual void SAL_CALL disposing() override; // css::container::XChild - virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getParent() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getParent() override; + virtual void SAL_CALL setParent(const css::uno::Reference<css::uno::XInterface>& Parent) override; // prevent method hiding using OInterfaceContainer::disposing; // inheritance ambiguity - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Type SAL_CALL getElementType() override { return OInterfaceContainer::getElementType(); } - virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements() override { return OInterfaceContainer::hasElements(); } - virtual css::uno::Any SAL_CALL getByName(const rtl::OUString& p1) - throw (css::container::NoSuchElementException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual css::uno::Any SAL_CALL getByName(const rtl::OUString& p1) override { return OInterfaceContainer::getByName(p1); } - virtual css::uno::Sequence<rtl::OUString> SAL_CALL getElementNames() throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Sequence<rtl::OUString> SAL_CALL getElementNames() override { return OInterfaceContainer::getElementNames(); } - virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& p1) throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& p1) override { return OInterfaceContainer::hasByName(p1); } - virtual void SAL_CALL replaceByName(const rtl::OUString& p1, const css::uno::Any& p2) - throw (css::lang::IllegalArgumentException, - css::container::NoSuchElementException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL replaceByName(const rtl::OUString& p1, const css::uno::Any& p2) override { OInterfaceContainer::replaceByName(p1, p2); } - virtual void SAL_CALL insertByName(const rtl::OUString& p1, const css::uno::Any& p2) - throw (css::lang::IllegalArgumentException, - css::container::ElementExistException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL insertByName(const rtl::OUString& p1, const css::uno::Any& p2) override { OInterfaceContainer::insertByName(p1, p2); } - virtual void SAL_CALL removeByName(const rtl::OUString& p1) - throw (css::container::NoSuchElementException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeByName(const rtl::OUString& p1) override { OInterfaceContainer::removeByName(p1); } - virtual sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) override + virtual sal_Int32 SAL_CALL getCount() override { return OInterfaceContainer::getCount(); } - virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 p1) - throw (css::lang::IndexOutOfBoundsException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 p1) override { return OInterfaceContainer::getByIndex(p1); } - virtual void SAL_CALL replaceByIndex(sal_Int32 p1, const css::uno::Any& p2) - throw (css::lang::IllegalArgumentException, - css::lang::IndexOutOfBoundsException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL replaceByIndex(sal_Int32 p1, const css::uno::Any& p2) override { return OInterfaceContainer::replaceByIndex(p1, p2); } - virtual void SAL_CALL insertByIndex(sal_Int32 p1, const css::uno::Any& p2) - throw (css::lang::IllegalArgumentException, - css::lang::IndexOutOfBoundsException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL insertByIndex(sal_Int32 p1, const css::uno::Any& p2) override { return OInterfaceContainer::insertByIndex(p1, p2); } - virtual void SAL_CALL removeByIndex(sal_Int32 p1) - throw (css::lang::IndexOutOfBoundsException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeByIndex(sal_Int32 p1) override { return OInterfaceContainer::removeByIndex(p1); } - virtual css::uno::Reference<css::container::XEnumeration> SAL_CALL createEnumeration() throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference<css::container::XEnumeration> SAL_CALL createEnumeration() override { return OInterfaceContainer::createEnumeration(); } - virtual void SAL_CALL registerScriptEvent(sal_Int32 p1, const css::script::ScriptEventDescriptor& p2) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL registerScriptEvent(sal_Int32 p1, const css::script::ScriptEventDescriptor& p2) override { OInterfaceContainer::registerScriptEvent(p1, p2); } - virtual void SAL_CALL registerScriptEvents(sal_Int32 p1, const css::uno::Sequence<css::script::ScriptEventDescriptor>& p2) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL registerScriptEvents(sal_Int32 p1, const css::uno::Sequence<css::script::ScriptEventDescriptor>& p2) override { OInterfaceContainer::registerScriptEvents(p1, p2); } - virtual void SAL_CALL revokeScriptEvent(sal_Int32 p1, const rtl::OUString& p2, const rtl::OUString& p3, const rtl::OUString& p4) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL revokeScriptEvent(sal_Int32 p1, const rtl::OUString& p2, const rtl::OUString& p3, const rtl::OUString& p4) override { OInterfaceContainer::revokeScriptEvent(p1, p2, p3, p4); } - virtual void SAL_CALL revokeScriptEvents(sal_Int32 p1) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL revokeScriptEvents(sal_Int32 p1) override { OInterfaceContainer::revokeScriptEvents(p1); } - virtual void SAL_CALL insertEntry(sal_Int32 p1) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL insertEntry(sal_Int32 p1) override { OInterfaceContainer::insertEntry(p1); } - virtual void SAL_CALL removeEntry(sal_Int32 p1) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeEntry(sal_Int32 p1) override { OInterfaceContainer::removeEntry(p1); } - virtual css::uno::Sequence<css::script::ScriptEventDescriptor> SAL_CALL getScriptEvents(sal_Int32 p1) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override + virtual css::uno::Sequence<css::script::ScriptEventDescriptor> SAL_CALL getScriptEvents(sal_Int32 p1) override { return OInterfaceContainer::getScriptEvents(p1); } - virtual void SAL_CALL attach(sal_Int32 p1, const css::uno::Reference<css::uno::XInterface>& p2, const css::uno::Any& p3) - throw (css::lang::IllegalArgumentException, - css::lang::ServiceNotRegisteredException, - css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL attach(sal_Int32 p1, const css::uno::Reference<css::uno::XInterface>& p2, const css::uno::Any& p3) override { OInterfaceContainer::attach(p1, p2, p3); } - virtual void SAL_CALL detach(sal_Int32 p1, const css::uno::Reference<css::uno::XInterface>& p2) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL detach(sal_Int32 p1, const css::uno::Reference<css::uno::XInterface>& p2) override { OInterfaceContainer::detach(p1, p2); } - virtual void SAL_CALL addScriptListener(const css::uno::Reference<css::script::XScriptListener>& p1) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL addScriptListener(const css::uno::Reference<css::script::XScriptListener>& p1) override { OInterfaceContainer::addScriptListener(p1); } - virtual void SAL_CALL removeScriptListener(const css::uno::Reference<css::script::XScriptListener>& p1) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeScriptListener(const css::uno::Reference<css::script::XScriptListener>& p1) override { OInterfaceContainer::removeScriptListener(p1); } - virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL dispose() override { FormsCollectionComponentBase::dispose(); } - virtual void SAL_CALL addEventListener(const css::uno::Reference<css::lang::XEventListener>& p1) throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL addEventListener(const css::uno::Reference<css::lang::XEventListener>& p1) override { FormsCollectionComponentBase::addEventListener(p1); } - virtual void SAL_CALL removeEventListener(const css::uno::Reference<css::lang::XEventListener>& p1) throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeEventListener(const css::uno::Reference<css::lang::XEventListener>& p1) override { FormsCollectionComponentBase::removeEventListener(p1); } - virtual void SAL_CALL addContainerListener(const css::uno::Reference<css::container::XContainerListener>& p1) throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL addContainerListener(const css::uno::Reference<css::container::XContainerListener>& p1) override { OInterfaceContainer::addContainerListener(p1); } - virtual void SAL_CALL removeContainerListener(const css::uno::Reference<css::container::XContainerListener>& p1) throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeContainerListener(const css::uno::Reference<css::container::XContainerListener>& p1) override { OInterfaceContainer::removeContainerListener(p1); } }; diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx index 2b16c87705ae..c8128f3e8d9e 100644 --- a/forms/source/component/Grid.cxx +++ b/forms/source/component/Grid.cxx @@ -122,7 +122,7 @@ OGridControlModel::~OGridControlModel() } // XCloneable -Reference< XCloneable > SAL_CALL OGridControlModel::createClone( ) throw (RuntimeException, std::exception) +Reference< XCloneable > SAL_CALL OGridControlModel::createClone( ) { OGridControlModel* pClone = new OGridControlModel( this, getContext() ); osl_atomic_increment( &pClone->m_refCount ); @@ -166,7 +166,7 @@ void OGridControlModel::cloneColumns( const OGridControlModel* _pOriginalContain } // XServiceInfo -css::uno::Sequence<OUString> OGridControlModel::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> OGridControlModel::getSupportedServiceNames() { css::uno::Sequence<OUString> aSupported = OControlModel::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 4); @@ -176,7 +176,7 @@ css::uno::Sequence<OUString> OGridControlModel::getSupportedServiceNames() throw aSupported[aSupported.getLength()-1] = FRM_COMPONENT_GRIDCONTROL; return aSupported; } -Any SAL_CALL OGridControlModel::queryAggregation( const Type& _rType ) throw (RuntimeException, std::exception) +Any SAL_CALL OGridControlModel::queryAggregation( const Type& _rType ) { Any aReturn = OGridControlModel_BASE::queryInterface(_rType); if ( !aReturn.hasValue() ) @@ -193,36 +193,36 @@ Any SAL_CALL OGridControlModel::queryAggregation( const Type& _rType ) throw (Ru } // XSQLErrorListener -void SAL_CALL OGridControlModel::errorOccured( const SQLErrorEvent& _rEvent ) throw (RuntimeException, std::exception) +void SAL_CALL OGridControlModel::errorOccured( const SQLErrorEvent& _rEvent ) { // forward the errors which happened to my columns to my own listeners onError( _rEvent ); } // XRowSetSupplier -Reference< XRowSet > SAL_CALL OGridControlModel::getRowSet( ) throw (RuntimeException, std::exception) +Reference< XRowSet > SAL_CALL OGridControlModel::getRowSet( ) { return Reference< XRowSet >( getParent(), UNO_QUERY ); } -void SAL_CALL OGridControlModel::setRowSet( const Reference< XRowSet >& /*_rxDataSource*/ ) throw (RuntimeException, std::exception) +void SAL_CALL OGridControlModel::setRowSet( const Reference< XRowSet >& /*_rxDataSource*/ ) { OSL_FAIL( "OGridControlModel::setRowSet: not supported!" ); } -void SAL_CALL OGridControlModel::addRowSetChangeListener( const Reference< XRowSetChangeListener >& i_Listener ) throw (RuntimeException, std::exception) +void SAL_CALL OGridControlModel::addRowSetChangeListener( const Reference< XRowSetChangeListener >& i_Listener ) { if ( i_Listener.is() ) m_aRowSetChangeListeners.addInterface( i_Listener ); } -void SAL_CALL OGridControlModel::removeRowSetChangeListener( const Reference< XRowSetChangeListener >& i_Listener ) throw (RuntimeException, std::exception) +void SAL_CALL OGridControlModel::removeRowSetChangeListener( const Reference< XRowSetChangeListener >& i_Listener ) { m_aRowSetChangeListeners.removeInterface( i_Listener ); } // XChild -void SAL_CALL OGridControlModel::setParent( const css::uno::Reference<css::uno::XInterface>& i_Parent ) throw(NoSupportException, RuntimeException, std::exception) +void SAL_CALL OGridControlModel::setParent( const css::uno::Reference<css::uno::XInterface>& i_Parent ) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); if ( i_Parent == getParent() ) @@ -232,7 +232,7 @@ void SAL_CALL OGridControlModel::setParent( const css::uno::Reference<css::uno:: aGuard.clear(); m_aRowSetChangeListeners.notifyEach( &XRowSetChangeListener::onRowSetChanged, aEvent ); } -Sequence< Type > SAL_CALL OGridControlModel::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL OGridControlModel::getTypes( ) { return concatSequences( concatSequences( @@ -258,14 +258,14 @@ void OGridControlModel::disposing() } // XEventListener -void OGridControlModel::disposing(const EventObject& _rEvent) throw( RuntimeException, std::exception ) +void OGridControlModel::disposing(const EventObject& _rEvent) { OControlModel::disposing( _rEvent ); OInterfaceContainer::disposing( _rEvent ); } // XSelectionSupplier -sal_Bool SAL_CALL OGridControlModel::select(const Any& rElement) throw(IllegalArgumentException, RuntimeException, std::exception) +sal_Bool SAL_CALL OGridControlModel::select(const Any& rElement) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); Reference<XPropertySet> xSel; @@ -295,23 +295,23 @@ sal_Bool SAL_CALL OGridControlModel::select(const Any& rElement) throw(IllegalAr } return false; } -Any SAL_CALL OGridControlModel::getSelection() throw(RuntimeException, std::exception) +Any SAL_CALL OGridControlModel::getSelection() { return makeAny(m_xSelection); } -void OGridControlModel::addSelectionChangeListener(const Reference< XSelectionChangeListener >& _rxListener) throw( RuntimeException, std::exception ) +void OGridControlModel::addSelectionChangeListener(const Reference< XSelectionChangeListener >& _rxListener) { m_aSelectListeners.addInterface(_rxListener); } -void OGridControlModel::removeSelectionChangeListener(const Reference< XSelectionChangeListener >& _rxListener) throw( RuntimeException, std::exception ) +void OGridControlModel::removeSelectionChangeListener(const Reference< XSelectionChangeListener >& _rxListener) { m_aSelectListeners.removeInterface(_rxListener); } // XGridColumnFactory -Reference<XPropertySet> SAL_CALL OGridControlModel::createColumn(const OUString& ColumnType) throw (::css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) +Reference<XPropertySet> SAL_CALL OGridControlModel::createColumn(const OUString& ColumnType) { SolarMutexGuard g; const Sequence< OUString >& rColumnTypes = frm::getColumnTypes(); @@ -338,13 +338,13 @@ Reference<XPropertySet> OGridControlModel::createColumnById(sal_Int32 nTypeId) } return xReturn; } -css::uno::Sequence<OUString> SAL_CALL OGridControlModel::getColumnTypes() throw ( css::uno::RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OGridControlModel::getColumnTypes() { return frm::getColumnTypes(); } // XReset -void SAL_CALL OGridControlModel::reset() throw ( css::uno::RuntimeException, std::exception) +void SAL_CALL OGridControlModel::reset() { ::comphelper::OInterfaceIteratorHelper2 aIter(m_aResetListeners); EventObject aEvt(static_cast<XWeak*>(this)); @@ -357,11 +357,11 @@ void SAL_CALL OGridControlModel::reset() throw ( css::uno::RuntimeException, std m_aResetListeners.notifyEach( &XResetListener::resetted, aEvt ); } } -void SAL_CALL OGridControlModel::addResetListener(const Reference<XResetListener>& _rxListener) throw ( css::uno::RuntimeException, std::exception) +void SAL_CALL OGridControlModel::addResetListener(const Reference<XResetListener>& _rxListener) { m_aResetListeners.addInterface(_rxListener); } -void SAL_CALL OGridControlModel::removeResetListener(const Reference<XResetListener>& _rxListener) throw ( css::uno::RuntimeException, std::exception) +void SAL_CALL OGridControlModel::removeResetListener(const Reference<XResetListener>& _rxListener) { m_aResetListeners.removeInterface(_rxListener); } @@ -488,7 +488,6 @@ void OGridControlModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle ) co sal_Bool OGridControlModel::convertFastPropertyValue( Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw(IllegalArgumentException, RuntimeException, std::exception) { bool bModified(false); switch (nHandle) @@ -574,7 +573,7 @@ sal_Bool OGridControlModel::convertFastPropertyValue( Any& rConvertedValue, Any& } return bModified; } -void OGridControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw ( css::uno::Exception, std::exception) +void OGridControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) { switch (nHandle) { @@ -766,12 +765,12 @@ void OGridControlModel::approveNewElement( const Reference< XPropertySet >& _rxO } // XPersistObject -OUString SAL_CALL OGridControlModel::getServiceName() throw ( css::uno::RuntimeException, std::exception) +OUString SAL_CALL OGridControlModel::getServiceName() { return OUString(FRM_COMPONENT_GRID); // old (non-sun) name for compatibility! } -void OGridControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) +void OGridControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream) { OControlModel::write(_rxOutStream); Reference<XMarkableStream> xMark(_rxOutStream, UNO_QUERY); @@ -863,7 +862,7 @@ void OGridControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream _rxOutStream->writeLong(getINT32(m_aBackgroundColor)); } -void OGridControlModel::read(const Reference<XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) +void OGridControlModel::read(const Reference<XObjectInputStream>& _rxInStream) { SolarMutexGuard g; OControlModel::read(_rxInStream); diff --git a/forms/source/component/Grid.hxx b/forms/source/component/Grid.hxx index 1a07ed0a0d52..63811a77812e 100644 --- a/forms/source/component/Grid.hxx +++ b/forms/source/component/Grid.hxx @@ -102,67 +102,65 @@ public: // UNO Binding DECLARE_UNO3_AGG_DEFAULTS(OGridControlModel, OControlModel) - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override; // XChild - virtual void SAL_CALL setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setParent(const css::uno::Reference<css::uno::XInterface>& Parent) override; // XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.form.OGridControlModel"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; // OComponentHelper virtual void SAL_CALL disposing() override; // XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) override; // XReset - virtual void SAL_CALL reset() throw ( css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addResetListener(const css::uno::Reference< css::form::XResetListener>& _rxListener) throw ( css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeResetListener(const css::uno::Reference< css::form::XResetListener>& _rxListener) throw ( css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL reset() override; + virtual void SAL_CALL addResetListener(const css::uno::Reference< css::form::XResetListener>& _rxListener) override; + virtual void SAL_CALL removeResetListener(const css::uno::Reference< css::form::XResetListener>& _rxListener) override; // XSelectionSupplier - virtual sal_Bool SAL_CALL select(const css::uno::Any& aElement) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getSelection() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addSelectionChangeListener(const css::uno::Reference< css::view::XSelectionChangeListener >& xListener) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeSelectionChangeListener(const css::uno::Reference< css::view::XSelectionChangeListener >& xListener) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL select(const css::uno::Any& aElement) override; + virtual css::uno::Any SAL_CALL getSelection() override; + virtual void SAL_CALL addSelectionChangeListener(const css::uno::Reference< css::view::XSelectionChangeListener >& xListener) override; + virtual void SAL_CALL removeSelectionChangeListener(const css::uno::Reference< css::view::XSelectionChangeListener >& xListener) override; // XGridColumnFactory - virtual css::uno::Reference< css::beans::XPropertySet> SAL_CALL createColumn(const OUString& ColumnType) throw (::css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence<OUString> SAL_CALL getColumnTypes() throw ( css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet> SAL_CALL createColumn(const OUString& ColumnType) override; + virtual css::uno::Sequence<OUString> SAL_CALL getColumnTypes() override; // XPersistObject - virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; + virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override; + virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override; // XPropertySet virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const override; virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, - sal_Int32 nHandle, const css::uno::Any& rValue ) - throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw ( css::uno::Exception, std::exception) override; + sal_Int32 nHandle, const css::uno::Any& rValue ) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) override; // XPropertyState virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const override; // XSQLErrorListener - virtual void SAL_CALL errorOccured( const css::sdb::SQLErrorEvent& _rEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL errorOccured( const css::sdb::SQLErrorEvent& _rEvent ) override; // XRowSetSupplier - virtual css::uno::Reference< css::sdbc::XRowSet > SAL_CALL getRowSet( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRowSet( const css::uno::Reference< css::sdbc::XRowSet >& xDataSource ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XRowSet > SAL_CALL getRowSet( ) override; + virtual void SAL_CALL setRowSet( const css::uno::Reference< css::sdbc::XRowSet >& xDataSource ) override; // XRowSetChangeBroadcaster - virtual void SAL_CALL addRowSetChangeListener( const css::uno::Reference< css::sdb::XRowSetChangeListener >& i_Listener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeRowSetChangeListener( const css::uno::Reference< css::sdb::XRowSetChangeListener >& i_Listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addRowSetChangeListener( const css::uno::Reference< css::sdb::XRowSetChangeListener >& i_Listener ) override; + virtual void SAL_CALL removeRowSetChangeListener( const css::uno::Reference< css::sdb::XRowSetChangeListener >& i_Listener ) override; // OControlModel's property handling virtual void describeFixedProperties( @@ -174,7 +172,7 @@ public: using OControlModel::getFastPropertyValue; protected: - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) override; protected: virtual void approveNewElement( diff --git a/forms/source/component/GroupBox.cxx b/forms/source/component/GroupBox.cxx index 6408e216cb94..6c696a20ca8d 100644 --- a/forms/source/component/GroupBox.cxx +++ b/forms/source/component/GroupBox.cxx @@ -57,7 +57,7 @@ OGroupBoxModel::OGroupBoxModel( const OGroupBoxModel* _pOriginal, const Referenc // XServiceInfo -css::uno::Sequence<OUString> SAL_CALL OGroupBoxModel::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OGroupBoxModel::getSupportedServiceNames() { css::uno::Sequence<OUString> aSupported = OControlModel::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); @@ -85,14 +85,13 @@ void OGroupBoxModel::describeAggregateProperties( Sequence< Property >& _rAggreg } -OUString SAL_CALL OGroupBoxModel::getServiceName() throw(RuntimeException, std::exception) +OUString SAL_CALL OGroupBoxModel::getServiceName() { return OUString(FRM_COMPONENT_GROUPBOX); // old (non-sun) name for compatibility ! } void SAL_CALL OGroupBoxModel::write(const Reference< XObjectOutputStream>& _rxOutStream) - throw(IOException, RuntimeException, std::exception) { OControlModel::write(_rxOutStream); @@ -102,7 +101,7 @@ void SAL_CALL OGroupBoxModel::write(const Reference< XObjectOutputStream>& _rxOu } -void SAL_CALL OGroupBoxModel::read(const Reference< XObjectInputStream>& _rxInStream) throw(IOException, RuntimeException, std::exception) +void SAL_CALL OGroupBoxModel::read(const Reference< XObjectInputStream>& _rxInStream) { OControlModel::read( _rxInStream ); @@ -128,7 +127,7 @@ OGroupBoxControl::OGroupBoxControl(const Reference<XComponentContext>& _rxFactor } -css::uno::Sequence<OUString> SAL_CALL OGroupBoxControl::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OGroupBoxControl::getSupportedServiceNames() { css::uno::Sequence<OUString> aSupported = OControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); diff --git a/forms/source/component/GroupBox.hxx b/forms/source/component/GroupBox.hxx index c47cbcdada55..2c76cfe6b20b 100644 --- a/forms/source/component/GroupBox.hxx +++ b/forms/source/component/GroupBox.hxx @@ -33,18 +33,17 @@ public: DECLARE_DEFAULT_LEAF_XTOR( OGroupBoxModel ); // XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.form.OGroupBoxModel"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XPersistObject - virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; virtual void SAL_CALL - write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; + write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override; virtual void SAL_CALL - read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; + read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override; // OControlModel's property handling virtual void describeAggregateProperties( @@ -52,7 +51,7 @@ public: ) const override; protected: - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) override; }; @@ -64,11 +63,10 @@ public: explicit OGroupBoxControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory); // XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.form.OGroupBoxControl"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; }; diff --git a/forms/source/component/GroupManager.cxx b/forms/source/component/GroupManager.cxx index 615c0558274a..d3281221615d 100644 --- a/forms/source/component/GroupManager.cxx +++ b/forms/source/component/GroupManager.cxx @@ -208,7 +208,7 @@ OGroupManager::~OGroupManager() } // XPropertyChangeListener -void OGroupManager::disposing(const EventObject& evt) throw( RuntimeException, std::exception ) +void OGroupManager::disposing(const EventObject& evt) { Reference<XContainer> xContainer(evt.Source, UNO_QUERY); if (xContainer.get() == m_xContainer.get()) @@ -261,7 +261,7 @@ void OGroupManager::removeFromGroupMap(const OUString& _sGroupName,const Referen _xSet->removePropertyChangeListener( PROPERTY_TABINDEX, this ); } -void SAL_CALL OGroupManager::propertyChange(const PropertyChangeEvent& evt) throw ( css::uno::RuntimeException, std::exception) +void SAL_CALL OGroupManager::propertyChange(const PropertyChangeEvent& evt) { Reference<XPropertySet> xSet(evt.Source, UNO_QUERY); @@ -292,7 +292,7 @@ void SAL_CALL OGroupManager::propertyChange(const PropertyChangeEvent& evt) thro } // XContainerListener -void SAL_CALL OGroupManager::elementInserted(const ContainerEvent& Event) throw ( css::uno::RuntimeException, std::exception) +void SAL_CALL OGroupManager::elementInserted(const ContainerEvent& Event) { Reference< XPropertySet > xProps; Event.Element >>= xProps; @@ -300,7 +300,7 @@ void SAL_CALL OGroupManager::elementInserted(const ContainerEvent& Event) throw InsertElement( xProps ); } -void SAL_CALL OGroupManager::elementRemoved(const ContainerEvent& Event) throw ( css::uno::RuntimeException, std::exception) +void SAL_CALL OGroupManager::elementRemoved(const ContainerEvent& Event) { Reference<XPropertySet> xProps; Event.Element >>= xProps; @@ -308,7 +308,7 @@ void SAL_CALL OGroupManager::elementRemoved(const ContainerEvent& Event) throw ( RemoveElement( xProps ); } -void SAL_CALL OGroupManager::elementReplaced(const ContainerEvent& Event) throw ( css::uno::RuntimeException, std::exception) +void SAL_CALL OGroupManager::elementReplaced(const ContainerEvent& Event) { Reference<XPropertySet> xProps; Event.ReplacedElement >>= xProps; diff --git a/forms/source/component/GroupManager.hxx b/forms/source/component/GroupManager.hxx index ec6893081375..aea4379fd8be 100644 --- a/forms/source/component/GroupManager.hxx +++ b/forms/source/component/GroupManager.hxx @@ -178,15 +178,15 @@ public: virtual ~OGroupManager() override; // css::lang::XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) override; // css::beans::XPropertyChangeListener - virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw ( css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) override; // css::container::XContainerListener - virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& _rEvent) throw ( css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& _rEvent) throw ( css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& _rEvent) throw ( css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& _rEvent) override; + virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& _rEvent) override; + virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& _rEvent) override; // Other functions sal_Int32 getGroupCount(); diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx index 92953dd9e2f9..739dbb9b1e3f 100644 --- a/forms/source/component/Hidden.cxx +++ b/forms/source/component/Hidden.cxx @@ -74,7 +74,7 @@ void OHiddenModel::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) const } -void OHiddenModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw (css::uno::Exception, std::exception) +void OHiddenModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) { switch (_nHandle) { @@ -90,7 +90,6 @@ void OHiddenModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const An sal_Bool OHiddenModel::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue) - throw (IllegalArgumentException, RuntimeException, std::exception) { bool bModified(false); switch (_nHandle) @@ -118,7 +117,7 @@ void OHiddenModel::describeFixedProperties( Sequence< Property >& _rProps ) cons // XServiceInfo -css::uno::Sequence<OUString> SAL_CALL OHiddenModel::getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OHiddenModel::getSupportedServiceNames() { return css::uno::Sequence<OUString>{ FRM_SUN_COMPONENT_HIDDENCONTROL, FRM_SUN_FORMCOMPONENT, @@ -126,14 +125,13 @@ css::uno::Sequence<OUString> SAL_CALL OHiddenModel::getSupportedServiceNames() t } -OUString SAL_CALL OHiddenModel::getServiceName() throw(RuntimeException, std::exception) +OUString SAL_CALL OHiddenModel::getServiceName() { return OUString(FRM_COMPONENT_HIDDEN); // old (non-sun) name for compatibility ! } void SAL_CALL OHiddenModel::write(const Reference<XObjectOutputStream>& _rxOutStream) - throw(IOException, RuntimeException, std::exception) { // Version _rxOutStream->writeShort(0x0002); @@ -145,7 +143,7 @@ void SAL_CALL OHiddenModel::write(const Reference<XObjectOutputStream>& _rxOutSt } -void SAL_CALL OHiddenModel::read(const Reference<XObjectInputStream>& _rxInStream) throw(IOException, RuntimeException, std::exception) +void SAL_CALL OHiddenModel::read(const Reference<XObjectInputStream>& _rxInStream) { // Version sal_uInt16 nVersion = _rxInStream->readShort(); diff --git a/forms/source/component/Hidden.hxx b/forms/source/component/Hidden.hxx index 28952caebcf1..827355eed8ec 100644 --- a/forms/source/component/Hidden.hxx +++ b/forms/source/component/Hidden.hxx @@ -36,25 +36,22 @@ public: // OPropertySetHelper virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) - throw (css::uno::Exception, std::exception) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override; virtual sal_Bool SAL_CALL convertFastPropertyValue( - css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) override; // XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.form.OHiddenModel"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XPersistObject - virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; virtual void SAL_CALL - write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; + write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override; virtual void SAL_CALL - read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; + read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override; // OControlModel's property handling virtual void describeFixedProperties( @@ -65,7 +62,7 @@ public: using OControlModel::getFastPropertyValue; protected: - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) override; }; #endif // INCLUDED_FORMS_SOURCE_COMPONENT_HIDDEN_HXX diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx index 4b2fec5dd410..cb3979ecca88 100644 --- a/forms/source/component/ImageButton.cxx +++ b/forms/source/component/ImageButton.cxx @@ -61,7 +61,7 @@ OImageButtonModel::~OImageButtonModel() } // XServiceInfo -css::uno::Sequence<OUString> OImageButtonModel::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> OImageButtonModel::getSupportedServiceNames() { css::uno::Sequence<OUString> aSupported = OClickableImageBaseModel::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); @@ -83,12 +83,12 @@ void OImageButtonModel::describeFixedProperties( Sequence< Property >& _rProps ) END_DESCRIBE_PROPERTIES(); } -OUString OImageButtonModel::getServiceName() throw ( css::uno::RuntimeException, std::exception) +OUString OImageButtonModel::getServiceName() { return OUString(FRM_COMPONENT_IMAGEBUTTON); // old (non-sun) name for compatibility ! } -void OImageButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) +void OImageButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream) { OControlModel::write(_rxOutStream); @@ -102,7 +102,7 @@ void OImageButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream writeHelpTextCompatibly(_rxOutStream); } -void OImageButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) +void OImageButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) { OControlModel::read(_rxInStream); @@ -150,7 +150,7 @@ Sequence<Type> OImageButtonControl::_getTypes() return aTypes; } -css::uno::Sequence<OUString> OImageButtonControl::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> OImageButtonControl::getSupportedServiceNames() { css::uno::Sequence<OUString> aSupported = OClickableImageBaseControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); @@ -176,7 +176,7 @@ OImageButtonControl::OImageButtonControl(const Reference<XComponentContext>& _rx } // UNO Binding -Any SAL_CALL OImageButtonControl::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception) +Any SAL_CALL OImageButtonControl::queryAggregation(const Type& _rType) { Any aReturn = OClickableImageBaseControl::queryAggregation(_rType); if (!aReturn.hasValue()) @@ -185,7 +185,7 @@ Any SAL_CALL OImageButtonControl::queryAggregation(const Type& _rType) throw (Ru return aReturn; } -void OImageButtonControl::mousePressed(const awt::MouseEvent& e) throw ( css::uno::RuntimeException, std::exception) +void OImageButtonControl::mousePressed(const awt::MouseEvent& e) { SolarMutexGuard aSolarGuard; @@ -208,15 +208,15 @@ void OImageButtonControl::mousePressed(const awt::MouseEvent& e) throw ( css::un } } -void SAL_CALL OImageButtonControl::mouseReleased(const awt::MouseEvent& /*e*/) throw ( RuntimeException, std::exception) +void SAL_CALL OImageButtonControl::mouseReleased(const awt::MouseEvent& /*e*/) { } -void SAL_CALL OImageButtonControl::mouseEntered(const awt::MouseEvent& /*e*/) throw ( RuntimeException, std::exception) +void SAL_CALL OImageButtonControl::mouseEntered(const awt::MouseEvent& /*e*/) { } -void SAL_CALL OImageButtonControl::mouseExited(const awt::MouseEvent& /*e*/) throw ( RuntimeException, std::exception) +void SAL_CALL OImageButtonControl::mouseExited(const awt::MouseEvent& /*e*/) { } diff --git a/forms/source/component/ImageButton.hxx b/forms/source/component/ImageButton.hxx index 0635d09dd10d..37d2ef3cb608 100644 --- a/forms/source/component/ImageButton.hxx +++ b/forms/source/component/ImageButton.hxx @@ -34,16 +34,15 @@ public: DECLARE_DEFAULT_LEAF_XTOR( OImageButtonModel ); // css::lang::XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.form.OImageButtonModel"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // css::io::XPersistObject - virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; + virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override; + virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override; // OControlModel's property handling virtual void describeFixedProperties( @@ -51,7 +50,7 @@ public: ) const override; protected: - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) override; }; typedef ::cppu::ImplHelper1< css::awt::XMouseListener> OImageButtonControl_BASE; @@ -66,25 +65,24 @@ public: explicit OImageButtonControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory); // XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.form.OImageButtonControl"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // UNO Binding DECLARE_UNO3_AGG_DEFAULTS(OImageButtonControl, OClickableImageBaseControl) - virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) override; // XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) throw(css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) override { OControl::disposing(_rSource); } // XMouseListener - virtual void SAL_CALL mousePressed(const css::awt::MouseEvent& e) throw ( css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL mouseReleased(const css::awt::MouseEvent& e) throw ( css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL mouseEntered(const css::awt::MouseEvent& e) throw ( css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL mouseExited(const css::awt::MouseEvent& e) throw ( css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mousePressed(const css::awt::MouseEvent& e) override; + virtual void SAL_CALL mouseReleased(const css::awt::MouseEvent& e) override; + virtual void SAL_CALL mouseEntered(const css::awt::MouseEvent& e) override; + virtual void SAL_CALL mouseExited(const css::awt::MouseEvent& e) override; // prevent method hiding using OClickableImageBaseControl::disposing; diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index a519f9c31724..fe677cd82845 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -185,7 +185,7 @@ IMPLEMENT_DEFAULT_CLONING( OImageControlModel ) // XServiceInfo -css::uno::Sequence<OUString> OImageControlModel::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> OImageControlModel::getSupportedServiceNames() { css::uno::Sequence<OUString> aSupported = OBoundControlModel::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); @@ -197,7 +197,7 @@ css::uno::Sequence<OUString> OImageControlModel::getSupportedServiceNames() thr } -Any SAL_CALL OImageControlModel::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception) +Any SAL_CALL OImageControlModel::queryAggregation(const Type& _rType) { // Order matters: we want to "override" the XImageProducer interface of the aggregate without // own XImageProducer interface, thus we need to query OImageControlModel_Base first @@ -239,7 +239,7 @@ void OImageControlModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle) co } -void OImageControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) throw ( css::uno::Exception, std::exception) +void OImageControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) { switch (nHandle) { @@ -298,7 +298,6 @@ void OImageControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, con sal_Bool OImageControlModel::convertFastPropertyValue(Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue) - throw( IllegalArgumentException, RuntimeException, std::exception ) { switch (nHandle) { @@ -342,13 +341,13 @@ void OImageControlModel::describeAggregateProperties( Sequence< Property >& /* [ } -OUString OImageControlModel::getServiceName() throw ( css::uno::RuntimeException, std::exception) +OUString OImageControlModel::getServiceName() { return OUString(FRM_COMPONENT_IMAGECONTROL); // old (non-sun) name for compatibility ! } -void OImageControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) +void OImageControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream) { // Base class OBoundControlModel::write(_rxOutStream); @@ -362,7 +361,7 @@ void OImageControlModel::write(const Reference<XObjectOutputStream>& _rxOutStrea } -void OImageControlModel::read(const Reference<XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) +void OImageControlModel::read(const Reference<XObjectInputStream>& _rxInStream) { OBoundControlModel::read(_rxInStream); @@ -630,25 +629,25 @@ void OImageControlModel::resetNoBroadcast() } -Reference< XImageProducer > SAL_CALL OImageControlModel::getImageProducer() throw ( RuntimeException, std::exception) +Reference< XImageProducer > SAL_CALL OImageControlModel::getImageProducer() { return this; } -void SAL_CALL OImageControlModel::addConsumer( const Reference< XImageConsumer >& _rxConsumer ) throw (RuntimeException, std::exception) +void SAL_CALL OImageControlModel::addConsumer( const Reference< XImageConsumer >& _rxConsumer ) { GetImageProducer()->addConsumer( _rxConsumer ); } -void SAL_CALL OImageControlModel::removeConsumer( const Reference< XImageConsumer >& _rxConsumer ) throw (RuntimeException, std::exception) +void SAL_CALL OImageControlModel::removeConsumer( const Reference< XImageConsumer >& _rxConsumer ) { GetImageProducer()->removeConsumer( _rxConsumer ); } -void SAL_CALL OImageControlModel::startProduction( ) throw (RuntimeException, std::exception) +void SAL_CALL OImageControlModel::startProduction( ) { GetImageProducer()->startProduction(); } @@ -697,7 +696,7 @@ OImageControlControl::OImageControlControl(const Reference<XComponentContext>& _ } -Any SAL_CALL OImageControlControl::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception) +Any SAL_CALL OImageControlControl::queryAggregation(const Type& _rType) { Any aReturn = OBoundControl::queryAggregation( _rType ); if ( !aReturn.hasValue() ) @@ -711,7 +710,7 @@ Any SAL_CALL OImageControlControl::queryAggregation(const Type& _rType) throw (R } -css::uno::Sequence<OUString> OImageControlControl::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> OImageControlControl::getSupportedServiceNames() { css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); @@ -723,13 +722,13 @@ css::uno::Sequence<OUString> OImageControlControl::getSupportedServiceNames() t } -void SAL_CALL OImageControlControl::addModifyListener( const Reference< XModifyListener >& Listener ) throw (RuntimeException, std::exception) +void SAL_CALL OImageControlControl::addModifyListener( const Reference< XModifyListener >& Listener ) { m_aModifyListeners.addInterface( Listener ); } -void SAL_CALL OImageControlControl::removeModifyListener( const Reference< XModifyListener >& Listener ) throw (RuntimeException, std::exception) +void SAL_CALL OImageControlControl::removeModifyListener( const Reference< XModifyListener >& Listener ) { m_aModifyListeners.removeInterface( Listener ); } @@ -744,7 +743,7 @@ void SAL_CALL OImageControlControl::disposing() } -void SAL_CALL OImageControlControl::disposing( const EventObject& Event ) throw(RuntimeException, std::exception) +void SAL_CALL OImageControlControl::disposing( const EventObject& Event ) { OBoundControl::disposing( Event ); } @@ -860,7 +859,7 @@ bool OImageControlControl::impl_isEmptyGraphics_nothrow() const // MouseListener -void OImageControlControl::mousePressed(const css::awt::MouseEvent& e) throw ( css::uno::RuntimeException, std::exception) +void OImageControlControl::mousePressed(const css::awt::MouseEvent& e) { SolarMutexGuard aGuard; @@ -959,17 +958,17 @@ void OImageControlControl::mousePressed(const css::awt::MouseEvent& e) throw ( c } -void SAL_CALL OImageControlControl::mouseReleased(const awt::MouseEvent& /*e*/) throw ( RuntimeException, std::exception ) +void SAL_CALL OImageControlControl::mouseReleased(const awt::MouseEvent& /*e*/) { } -void SAL_CALL OImageControlControl::mouseEntered(const awt::MouseEvent& /*e*/) throw ( RuntimeException, std::exception ) +void SAL_CALL OImageControlControl::mouseEntered(const awt::MouseEvent& /*e*/) { } -void SAL_CALL OImageControlControl::mouseExited(const awt::MouseEvent& /*e*/) throw ( RuntimeException, std::exception ) +void SAL_CALL OImageControlControl::mouseExited(const awt::MouseEvent& /*e*/) { } diff --git a/forms/source/component/ImageControl.hxx b/forms/source/component/ImageControl.hxx index 596cdb22a119..724d00429d65 100644 --- a/forms/source/component/ImageControl.hxx +++ b/forms/source/component/ImageControl.hxx @@ -65,34 +65,32 @@ public: DECLARE_DEFAULT_LEAF_XTOR( OImageControlModel ); virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw ( css::uno::Exception, std::exception) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) override; - virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) - throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) override; // UNO Anbindung DECLARE_UNO3_AGG_DEFAULTS(OImageControlModel, OBoundControlModel) - virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) override; // XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.form.OImageControlModel"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XPersistObject - virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; + virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override; + virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override; // XImageProducerSupplier - virtual css::uno::Reference< css::awt::XImageProducer> SAL_CALL getImageProducer() throw ( css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XImageProducer> SAL_CALL getImageProducer() override; // XImageProducer - virtual void SAL_CALL addConsumer( const css::uno::Reference< css::awt::XImageConsumer >& xConsumer ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeConsumer( const css::uno::Reference< css::awt::XImageConsumer >& xConsumer ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL startProduction( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addConsumer( const css::uno::Reference< css::awt::XImageConsumer >& xConsumer ) override; + virtual void SAL_CALL removeConsumer( const css::uno::Reference< css::awt::XImageConsumer >& xConsumer ) override; + virtual void SAL_CALL startProduction( ) override; // OControlModel's property handling virtual void describeAggregateProperties( @@ -121,7 +119,7 @@ protected: virtual void resetNoBroadcast() override; protected: - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) override; void implConstruct(); @@ -156,27 +154,26 @@ public: // UNO DECLARE_UNO3_AGG_DEFAULTS( OImageControlControl, OBoundControl ) - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override; // XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) override; // XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.form.OImageControlControl"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XMouseListener - virtual void SAL_CALL mousePressed(const css::awt::MouseEvent& e) throw ( css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL mouseReleased(const css::awt::MouseEvent& e) throw ( css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL mouseEntered(const css::awt::MouseEvent& e) throw ( css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL mouseExited(const css::awt::MouseEvent& e) throw ( css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mousePressed(const css::awt::MouseEvent& e) override; + virtual void SAL_CALL mouseReleased(const css::awt::MouseEvent& e) override; + virtual void SAL_CALL mouseEntered(const css::awt::MouseEvent& e) override; + virtual void SAL_CALL mouseExited(const css::awt::MouseEvent& e) override; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; + virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // OComponentHelper virtual void SAL_CALL disposing() override; diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index 6874feb25059..2b5426f23a6c 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -205,7 +205,7 @@ namespace frm // XServiceInfo - css::uno::Sequence<OUString> SAL_CALL OListBoxModel::getSupportedServiceNames() throw(RuntimeException, std::exception) + css::uno::Sequence<OUString> SAL_CALL OListBoxModel::getSupportedServiceNames() { css::uno::Sequence<OUString> aSupported = OBoundControlModel::getSupportedServiceNames(); @@ -230,7 +230,7 @@ namespace frm } - Any SAL_CALL OListBoxModel::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception) + Any SAL_CALL OListBoxModel::queryAggregation(const Type& _rType) { Any aReturn = OBoundControlModel::queryAggregation( _rType ); if ( !aReturn.hasValue() ) @@ -292,7 +292,7 @@ namespace frm } - void OListBoxModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw (css::uno::Exception, std::exception) + void OListBoxModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) { switch (_nHandle) { @@ -390,7 +390,6 @@ namespace frm sal_Bool OListBoxModel::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue) - throw (IllegalArgumentException, RuntimeException, std::exception) { bool bModified(false); switch (_nHandle) @@ -442,7 +441,7 @@ namespace frm } - void SAL_CALL OListBoxModel::setPropertyValues( const Sequence< OUString >& _rPropertyNames, const Sequence< Any >& _rValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) + void SAL_CALL OListBoxModel::setPropertyValues( const Sequence< OUString >& _rPropertyNames, const Sequence< Any >& _rValues ) { // if both SelectedItems and StringItemList are set, care for this // #i27024# @@ -494,7 +493,7 @@ namespace frm } - void OListBoxModel::_propertyChanged( const PropertyChangeEvent& i_rEvent ) throw ( RuntimeException ) + void OListBoxModel::_propertyChanged( const PropertyChangeEvent& i_rEvent ) { if ( i_rEvent.PropertyName == PROPERTY_STRINGITEMLIST ) { @@ -519,14 +518,13 @@ namespace frm } - OUString SAL_CALL OListBoxModel::getServiceName() throw(RuntimeException, std::exception) + OUString SAL_CALL OListBoxModel::getServiceName() { return OUString(FRM_COMPONENT_LISTBOX); // old (non-sun) name for compatibility ! } void SAL_CALL OListBoxModel::write(const Reference<XObjectOutputStream>& _rxOutStream) - throw(IOException, RuntimeException, std::exception) { OBoundControlModel::write(_rxOutStream); @@ -562,7 +560,7 @@ namespace frm } - void SAL_CALL OListBoxModel::read(const Reference<XObjectInputStream>& _rxInStream) throw(IOException, RuntimeException, std::exception) + void SAL_CALL OListBoxModel::read(const Reference<XObjectInputStream>& _rxInStream) { // We need to respect dependencies for certain variables. // Therefore, we need to set them explicitly via setPropertyValue(). @@ -1280,7 +1278,7 @@ namespace frm } - void SAL_CALL OListBoxModel::disposing( const EventObject& _rSource ) throw ( RuntimeException, std::exception ) + void SAL_CALL OListBoxModel::disposing( const EventObject& _rSource ) { if ( !OEntryListHelper::handleDisposing( _rSource ) ) OBoundControlModel::disposing( _rSource ); @@ -1763,7 +1761,7 @@ namespace frm } - Any SAL_CALL OListBoxControl::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception) + Any SAL_CALL OListBoxControl::queryAggregation(const Type& _rType) { Any aReturn = OListBoxControl_BASE::queryInterface( _rType ); @@ -1817,7 +1815,7 @@ namespace frm } - css::uno::Sequence<OUString> SAL_CALL OListBoxControl::getSupportedServiceNames() throw(RuntimeException, std::exception) + css::uno::Sequence<OUString> SAL_CALL OListBoxControl::getSupportedServiceNames() { css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); @@ -1831,7 +1829,7 @@ namespace frm // XFocusListener - void SAL_CALL OListBoxControl::focusGained(const FocusEvent& /*_rEvent*/) throw(RuntimeException, std::exception) + void SAL_CALL OListBoxControl::focusGained(const FocusEvent& /*_rEvent*/) { ::osl::MutexGuard aGuard(m_aMutex); if ( m_aChangeListeners.getLength() ) // only if there are listeners @@ -1846,14 +1844,14 @@ namespace frm } - void SAL_CALL OListBoxControl::focusLost(const FocusEvent& /*_rEvent*/) throw(RuntimeException, std::exception) + void SAL_CALL OListBoxControl::focusLost(const FocusEvent& /*_rEvent*/) { m_aCurrentSelection.clear(); } // XItemListener - void SAL_CALL OListBoxControl::itemStateChanged(const ItemEvent& _rEvent) throw(RuntimeException, std::exception) + void SAL_CALL OListBoxControl::itemStateChanged(const ItemEvent& _rEvent) { // forward this to our listeners Reference< XChild > xChild( getModel(), UNO_QUERY ); @@ -1923,20 +1921,20 @@ namespace frm // XEventListener - void SAL_CALL OListBoxControl::disposing(const EventObject& _rSource) throw (RuntimeException, std::exception) + void SAL_CALL OListBoxControl::disposing(const EventObject& _rSource) { OBoundControl::disposing(_rSource); } // XChangeBroadcaster - void SAL_CALL OListBoxControl::addChangeListener(const Reference<XChangeListener>& _rxListener) throw(RuntimeException, std::exception) + void SAL_CALL OListBoxControl::addChangeListener(const Reference<XChangeListener>& _rxListener) { m_aChangeListeners.addInterface( _rxListener ); } - void SAL_CALL OListBoxControl::removeChangeListener(const Reference<XChangeListener>& _rxListener) throw(RuntimeException, std::exception) + void SAL_CALL OListBoxControl::removeChangeListener(const Reference<XChangeListener>& _rxListener) { m_aChangeListeners.removeInterface( _rxListener ); } @@ -1990,54 +1988,54 @@ namespace frm } - void SAL_CALL OListBoxControl::addItemListener( const Reference< XItemListener >& l ) throw (RuntimeException, std::exception) + void SAL_CALL OListBoxControl::addItemListener( const Reference< XItemListener >& l ) { m_aItemListeners.addInterface( l ); } - void SAL_CALL OListBoxControl::removeItemListener( const Reference< XItemListener >& l ) throw (RuntimeException, std::exception) + void SAL_CALL OListBoxControl::removeItemListener( const Reference< XItemListener >& l ) { m_aItemListeners.removeInterface( l ); } - void SAL_CALL OListBoxControl::addActionListener( const Reference< XActionListener >& l ) throw (RuntimeException, std::exception) + void SAL_CALL OListBoxControl::addActionListener( const Reference< XActionListener >& l ) { if ( m_xAggregateListBox.is() ) m_xAggregateListBox->addActionListener( l ); } - void SAL_CALL OListBoxControl::removeActionListener( const Reference< XActionListener >& l ) throw (RuntimeException, std::exception) + void SAL_CALL OListBoxControl::removeActionListener( const Reference< XActionListener >& l ) { if ( m_xAggregateListBox.is() ) m_xAggregateListBox->removeActionListener( l ); } - void SAL_CALL OListBoxControl::addItem( const OUString& aItem, ::sal_Int16 nPos ) throw (RuntimeException, std::exception) + void SAL_CALL OListBoxControl::addItem( const OUString& aItem, ::sal_Int16 nPos ) { if ( m_xAggregateListBox.is() ) m_xAggregateListBox->addItem( aItem, nPos ); } - void SAL_CALL OListBoxControl::addItems( const Sequence< OUString >& aItems, ::sal_Int16 nPos ) throw (RuntimeException, std::exception) + void SAL_CALL OListBoxControl::addItems( const Sequence< OUString >& aItems, ::sal_Int16 nPos ) { if ( m_xAggregateListBox.is() ) m_xAggregateListBox->addItems( aItems, nPos ); } - void SAL_CALL OListBoxControl::removeItems( ::sal_Int16 nPos, ::sal_Int16 nCount ) throw (RuntimeException, std::exception) + void SAL_CALL OListBoxControl::removeItems( ::sal_Int16 nPos, ::sal_Int16 nCount ) { if ( m_xAggregateListBox.is() ) m_xAggregateListBox->removeItems( nPos, nCount ); } - ::sal_Int16 SAL_CALL OListBoxControl::getItemCount( ) throw (RuntimeException, std::exception) + ::sal_Int16 SAL_CALL OListBoxControl::getItemCount( ) { if ( m_xAggregateListBox.is() ) return m_xAggregateListBox->getItemCount(); @@ -2045,7 +2043,7 @@ namespace frm } - OUString SAL_CALL OListBoxControl::getItem( ::sal_Int16 nPos ) throw (RuntimeException, std::exception) + OUString SAL_CALL OListBoxControl::getItem( ::sal_Int16 nPos ) { if ( m_xAggregateListBox.is() ) return m_xAggregateListBox->getItem( nPos ); @@ -2053,7 +2051,7 @@ namespace frm } - Sequence< OUString > SAL_CALL OListBoxControl::getItems( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL OListBoxControl::getItems( ) { if ( m_xAggregateListBox.is() ) return m_xAggregateListBox->getItems(); @@ -2061,7 +2059,7 @@ namespace frm } - ::sal_Int16 SAL_CALL OListBoxControl::getSelectedItemPos( ) throw (RuntimeException, std::exception) + ::sal_Int16 SAL_CALL OListBoxControl::getSelectedItemPos( ) { if ( m_xAggregateListBox.is() ) return m_xAggregateListBox->getSelectedItemPos(); @@ -2069,7 +2067,7 @@ namespace frm } - Sequence< ::sal_Int16 > SAL_CALL OListBoxControl::getSelectedItemsPos( ) throw (RuntimeException, std::exception) + Sequence< ::sal_Int16 > SAL_CALL OListBoxControl::getSelectedItemsPos( ) { if ( m_xAggregateListBox.is() ) return m_xAggregateListBox->getSelectedItemsPos(); @@ -2077,7 +2075,7 @@ namespace frm } - OUString SAL_CALL OListBoxControl::getSelectedItem( ) throw (RuntimeException, std::exception) + OUString SAL_CALL OListBoxControl::getSelectedItem( ) { if ( m_xAggregateListBox.is() ) return m_xAggregateListBox->getSelectedItem(); @@ -2085,7 +2083,7 @@ namespace frm } - Sequence< OUString > SAL_CALL OListBoxControl::getSelectedItems( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL OListBoxControl::getSelectedItems( ) { if ( m_xAggregateListBox.is() ) return m_xAggregateListBox->getSelectedItems(); @@ -2093,28 +2091,28 @@ namespace frm } - void SAL_CALL OListBoxControl::selectItemPos( ::sal_Int16 nPos, sal_Bool bSelect ) throw (RuntimeException, std::exception) + void SAL_CALL OListBoxControl::selectItemPos( ::sal_Int16 nPos, sal_Bool bSelect ) { if ( m_xAggregateListBox.is() ) m_xAggregateListBox->selectItemPos( nPos, bSelect ); } - void SAL_CALL OListBoxControl::selectItemsPos( const Sequence< ::sal_Int16 >& aPositions, sal_Bool bSelect ) throw (RuntimeException, std::exception) + void SAL_CALL OListBoxControl::selectItemsPos( const Sequence< ::sal_Int16 >& aPositions, sal_Bool bSelect ) { if ( m_xAggregateListBox.is() ) m_xAggregateListBox->selectItemsPos( aPositions, bSelect ); } - void SAL_CALL OListBoxControl::selectItem( const OUString& aItem, sal_Bool bSelect ) throw (RuntimeException, std::exception) + void SAL_CALL OListBoxControl::selectItem( const OUString& aItem, sal_Bool bSelect ) { if ( m_xAggregateListBox.is() ) m_xAggregateListBox->selectItem( aItem, bSelect ); } - sal_Bool SAL_CALL OListBoxControl::isMutipleMode( ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL OListBoxControl::isMutipleMode( ) { if ( m_xAggregateListBox.is() ) return m_xAggregateListBox->isMutipleMode(); @@ -2122,14 +2120,14 @@ namespace frm } - void SAL_CALL OListBoxControl::setMultipleMode( sal_Bool bMulti ) throw (RuntimeException, std::exception) + void SAL_CALL OListBoxControl::setMultipleMode( sal_Bool bMulti ) { if ( m_xAggregateListBox.is() ) m_xAggregateListBox->setMultipleMode( bMulti ); } - ::sal_Int16 SAL_CALL OListBoxControl::getDropDownLineCount( ) throw (RuntimeException, std::exception) + ::sal_Int16 SAL_CALL OListBoxControl::getDropDownLineCount( ) { if ( m_xAggregateListBox.is() ) return m_xAggregateListBox->getDropDownLineCount(); @@ -2137,14 +2135,14 @@ namespace frm } - void SAL_CALL OListBoxControl::setDropDownLineCount( ::sal_Int16 nLines ) throw (RuntimeException, std::exception) + void SAL_CALL OListBoxControl::setDropDownLineCount( ::sal_Int16 nLines ) { if ( m_xAggregateListBox.is() ) m_xAggregateListBox->setDropDownLineCount( nLines ); } - void SAL_CALL OListBoxControl::makeVisible( ::sal_Int16 nEntry ) throw (RuntimeException, std::exception) + void SAL_CALL OListBoxControl::makeVisible( ::sal_Int16 nEntry ) { if ( m_xAggregateListBox.is() ) m_xAggregateListBox->makeVisible( nEntry ); diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx index f12391e00817..f6f591b102e6 100644 --- a/forms/source/component/ListBox.hxx +++ b/forms/source/component/ListBox.hxx @@ -127,40 +127,37 @@ public: DECLARE_DEFAULT_LEAF_XTOR( OListBoxModel ); // XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.form.OListBoxModel"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // UNO Anbindung DECLARE_UNO3_AGG_DEFAULTS(OListBoxModel, OBoundControlModel) - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override; // OComponentHelper virtual void SAL_CALL disposing() override; // OPropertySetHelper virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) - throw (css::uno::Exception, std::exception) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override; virtual sal_Bool SAL_CALL convertFastPropertyValue( - css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) override; protected: static const ::connectivity::ORowSetValue s_aEmptyValue; static const ::connectivity::ORowSetValue s_aEmptyStringValue; // XMultiPropertySet - virtual void SAL_CALL setPropertyValues(const css::uno::Sequence< OUString >& PropertyNames, const css::uno::Sequence< css::uno::Any >& Values) throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues(const css::uno::Sequence< OUString >& PropertyNames, const css::uno::Sequence< css::uno::Any >& Values) override; // XPersistObject - virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; virtual void SAL_CALL - write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; + write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override; virtual void SAL_CALL - read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; + read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override; // OControlModel's property handling virtual void describeFixedProperties( @@ -171,10 +168,10 @@ protected: ) const override; // XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) override; // OPropertyChangeListener - virtual void _propertyChanged( const css::beans::PropertyChangeEvent& _rEvt ) throw ( css::uno::RuntimeException ) override; + virtual void _propertyChanged( const css::beans::PropertyChangeEvent& _rEvt ) override; // prevent method hiding using OBoundControlModel::getFastPropertyValue; @@ -205,7 +202,7 @@ protected: virtual void refreshInternalEntryList() override; protected: - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) override; void init(); css::uno::Any getCurrentSingleValue() const; @@ -272,55 +269,54 @@ public: // UNO Anbindung DECLARE_UNO3_AGG_DEFAULTS(OListBoxControl, OBoundControl) - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override; // XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.form.OListBoxControl"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XChangeBroadcaster - virtual void SAL_CALL addChangeListener(const css::uno::Reference< css::form::XChangeListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeChangeListener(const css::uno::Reference< css::form::XChangeListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addChangeListener(const css::uno::Reference< css::form::XChangeListener>& _rxListener) override; + virtual void SAL_CALL removeChangeListener(const css::uno::Reference< css::form::XChangeListener>& _rxListener) override; // XFocusListener - virtual void SAL_CALL focusGained(const css::awt::FocusEvent& _rEvent) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL focusLost(const css::awt::FocusEvent& _rEvent) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL focusGained(const css::awt::FocusEvent& _rEvent) override; + virtual void SAL_CALL focusLost(const css::awt::FocusEvent& _rEvent) override; // XItemListener - virtual void SAL_CALL itemStateChanged(const css::awt::ItemEvent& _rEvent) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL itemStateChanged(const css::awt::ItemEvent& _rEvent) override; // XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) override; // OComponentHelper virtual void SAL_CALL disposing() override; // XListBox - virtual void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addItem( const OUString& aItem, ::sal_Int16 nPos ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addItems( const css::uno::Sequence< OUString >& aItems, ::sal_Int16 nPos ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeItems( ::sal_Int16 nPos, ::sal_Int16 nCount ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int16 SAL_CALL getItemCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getItem( ::sal_Int16 nPos ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getItems( ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int16 SAL_CALL getSelectedItemPos( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< ::sal_Int16 > SAL_CALL getSelectedItemsPos( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSelectedItem( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSelectedItems( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL selectItemPos( ::sal_Int16 nPos, sal_Bool bSelect ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL selectItemsPos( const css::uno::Sequence< ::sal_Int16 >& aPositions, sal_Bool bSelect ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL selectItem( const OUString& aItem, sal_Bool bSelect ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isMutipleMode( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMultipleMode( sal_Bool bMulti ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int16 SAL_CALL getDropDownLineCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDropDownLineCount( ::sal_Int16 nLines ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL makeVisible( ::sal_Int16 nEntry ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override; + virtual void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override; + virtual void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override; + virtual void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override; + virtual void SAL_CALL addItem( const OUString& aItem, ::sal_Int16 nPos ) override; + virtual void SAL_CALL addItems( const css::uno::Sequence< OUString >& aItems, ::sal_Int16 nPos ) override; + virtual void SAL_CALL removeItems( ::sal_Int16 nPos, ::sal_Int16 nCount ) override; + virtual ::sal_Int16 SAL_CALL getItemCount( ) override; + virtual OUString SAL_CALL getItem( ::sal_Int16 nPos ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getItems( ) override; + virtual ::sal_Int16 SAL_CALL getSelectedItemPos( ) override; + virtual css::uno::Sequence< ::sal_Int16 > SAL_CALL getSelectedItemsPos( ) override; + virtual OUString SAL_CALL getSelectedItem( ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSelectedItems( ) override; + virtual void SAL_CALL selectItemPos( ::sal_Int16 nPos, sal_Bool bSelect ) override; + virtual void SAL_CALL selectItemsPos( const css::uno::Sequence< ::sal_Int16 >& aPositions, sal_Bool bSelect ) override; + virtual void SAL_CALL selectItem( const OUString& aItem, sal_Bool bSelect ) override; + virtual sal_Bool SAL_CALL isMutipleMode( ) override; + virtual void SAL_CALL setMultipleMode( sal_Bool bMulti ) override; + virtual ::sal_Int16 SAL_CALL getDropDownLineCount( ) override; + virtual void SAL_CALL setDropDownLineCount( ::sal_Int16 nLines ) override; + virtual void SAL_CALL makeVisible( ::sal_Int16 nEntry ) override; protected: // IEventProcessor diff --git a/forms/source/component/Numeric.cxx b/forms/source/component/Numeric.cxx index 9045f05f630f..ab9ab0c78c30 100644 --- a/forms/source/component/Numeric.cxx +++ b/forms/source/component/Numeric.cxx @@ -42,7 +42,7 @@ ONumericControl::ONumericControl(const Reference<XComponentContext>& _rxFactory) } -css::uno::Sequence<OUString> ONumericControl::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> ONumericControl::getSupportedServiceNames() { css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); @@ -81,7 +81,7 @@ IMPLEMENT_DEFAULT_CLONING( ONumericModel ) // XServiceInfo -css::uno::Sequence<OUString> ONumericModel::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> ONumericModel::getSupportedServiceNames() { css::uno::Sequence<OUString> aSupported = OBoundControlModel::getSupportedServiceNames(); @@ -115,7 +115,7 @@ void ONumericModel::describeFixedProperties( Sequence< Property >& _rProps ) con } -OUString SAL_CALL ONumericModel::getServiceName() throw ( css::uno::RuntimeException, std::exception) +OUString SAL_CALL ONumericModel::getServiceName() { return OUString(FRM_COMPONENT_NUMERICFIELD); // old (non-sun) name for compatibility ! } diff --git a/forms/source/component/Numeric.hxx b/forms/source/component/Numeric.hxx index fff9bbc738bb..2175b5beb55c 100644 --- a/forms/source/component/Numeric.hxx +++ b/forms/source/component/Numeric.hxx @@ -36,14 +36,13 @@ public: DECLARE_DEFAULT_LEAF_XTOR( ONumericModel ); // css::lang::XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.form.ONumericModel"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // css::io::XPersistObject - virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; // OControlModel's property handling virtual void describeFixedProperties( @@ -61,7 +60,7 @@ protected: virtual void resetNoBroadcast() override; protected: - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) override; }; class ONumericControl: public OBoundControl @@ -70,11 +69,10 @@ public: explicit ONumericControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory); // css::lang::XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.form.ONumericControl"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; }; diff --git a/forms/source/component/Pattern.cxx b/forms/source/component/Pattern.cxx index 9c2778ea1807..bd0918061326 100644 --- a/forms/source/component/Pattern.cxx +++ b/forms/source/component/Pattern.cxx @@ -41,7 +41,7 @@ OPatternControl::OPatternControl(const Reference<XComponentContext>& _rxFactory) { } -css::uno::Sequence<OUString> OPatternControl::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> OPatternControl::getSupportedServiceNames() { css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); @@ -82,7 +82,7 @@ IMPLEMENT_DEFAULT_CLONING( OPatternModel ) // XServiceInfo -css::uno::Sequence<OUString> SAL_CALL OPatternModel::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> SAL_CALL OPatternModel::getSupportedServiceNames() { css::uno::Sequence<OUString> aSupported = OBoundControlModel::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 3); @@ -106,7 +106,7 @@ void OPatternModel::describeFixedProperties( Sequence< Property >& _rProps ) con } -OUString SAL_CALL OPatternModel::getServiceName() throw ( css::uno::RuntimeException, std::exception) +OUString SAL_CALL OPatternModel::getServiceName() { return OUString(FRM_COMPONENT_PATTERNFIELD); // old (non-sun) name for compatibility ! } diff --git a/forms/source/component/Pattern.hxx b/forms/source/component/Pattern.hxx index 8c9b94c656c0..d1405f481909 100644 --- a/forms/source/component/Pattern.hxx +++ b/forms/source/component/Pattern.hxx @@ -42,14 +42,13 @@ public: DECLARE_DEFAULT_LEAF_XTOR( OPatternModel ); // css::lang::XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.form.OPatternModel"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // css::io::XPersistObject - virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; // OControlModel's property handling virtual void describeFixedProperties( @@ -67,7 +66,7 @@ protected: virtual void resetNoBroadcast() override; protected: - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) override; }; class OPatternControl: public OBoundControl @@ -76,11 +75,10 @@ public: explicit OPatternControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory); // css::lang::XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.form.OPatternControl"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; }; diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx index 863d0a21175e..4ba80eac0cc2 100644 --- a/forms/source/component/RadioButton.cxx +++ b/forms/source/component/RadioButton.cxx @@ -43,7 +43,7 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::form::binding; -css::uno::Sequence<OUString> SAL_CALL ORadioButtonControl::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL ORadioButtonControl::getSupportedServiceNames() { css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); @@ -89,7 +89,7 @@ IMPLEMENT_DEFAULT_CLONING( ORadioButtonModel ) // XServiceInfo -css::uno::Sequence<OUString> SAL_CALL ORadioButtonModel::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL ORadioButtonModel::getSupportedServiceNames() { css::uno::Sequence<OUString> aSupported = OReferenceValueComponent::getSupportedServiceNames(); @@ -156,7 +156,7 @@ void ORadioButtonModel::SetSiblingPropsTo(const OUString& rPropName, const Any& } -void ORadioButtonModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) throw (Exception, std::exception) +void ORadioButtonModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) { OReferenceValueComponent::setFastPropertyValue_NoBroadcast( nHandle, rValue ); @@ -248,14 +248,13 @@ void ORadioButtonModel::describeFixedProperties( Sequence< Property >& _rProps ) } -OUString SAL_CALL ORadioButtonModel::getServiceName() throw(RuntimeException, std::exception) +OUString SAL_CALL ORadioButtonModel::getServiceName() { return OUString(FRM_COMPONENT_RADIOBUTTON); // old (non-sun) name for compatibility ! } void SAL_CALL ORadioButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream) - throw(IOException, RuntimeException, std::exception) { OReferenceValueComponent::write(_rxOutStream); @@ -272,7 +271,7 @@ void SAL_CALL ORadioButtonModel::write(const Reference<XObjectOutputStream>& _rx } -void SAL_CALL ORadioButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) throw(IOException, RuntimeException, std::exception) +void SAL_CALL ORadioButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) { OReferenceValueComponent::read(_rxInStream); ::osl::MutexGuard aGuard(m_aMutex); @@ -315,7 +314,7 @@ void SAL_CALL ORadioButtonModel::read(const Reference<XObjectInputStream>& _rxIn } -void ORadioButtonModel::_propertyChanged(const PropertyChangeEvent& _rEvent) throw(RuntimeException) +void ORadioButtonModel::_propertyChanged(const PropertyChangeEvent& _rEvent) { if ( _rEvent.PropertyName == PROPERTY_STATE ) { diff --git a/forms/source/component/RadioButton.hxx b/forms/source/component/RadioButton.hxx index 0f148397e4d7..3a3a4a6e53dd 100644 --- a/forms/source/component/RadioButton.hxx +++ b/forms/source/component/RadioButton.hxx @@ -32,25 +32,23 @@ public: DECLARE_DEFAULT_LEAF_XTOR( ORadioButtonModel ); // XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.form.ORadioButtonModel"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // OPropertySetHelper - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) - throw (css::uno::Exception, std::exception) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override; // XPersistObject - virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; virtual void SAL_CALL - write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; + write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override; virtual void SAL_CALL - read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; + read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override; // OPropertyChangeListener - virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException) override; + virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) override; // OControlModel's property handling virtual void describeFixedProperties( @@ -66,7 +64,7 @@ protected: protected: void SetSiblingPropsTo(const OUString& rPropName, const css::uno::Any& rValue); - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) override; private: void setControlSource(); @@ -78,11 +76,10 @@ public: explicit ORadioButtonControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory); // XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.form.ORadioButtonControl"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; }; diff --git a/forms/source/component/Time.cxx b/forms/source/component/Time.cxx index 317eaad4b7ae..f54e160c038c 100644 --- a/forms/source/component/Time.cxx +++ b/forms/source/component/Time.cxx @@ -56,7 +56,7 @@ Sequence<Type> OTimeControl::_getTypes() } -css::uno::Sequence<OUString> SAL_CALL OTimeControl::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> SAL_CALL OTimeControl::getSupportedServiceNames() { css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); @@ -72,7 +72,7 @@ css::uno::Sequence<OUString> SAL_CALL OTimeControl::getSupportedServiceNames() t // XServiceInfo -css::uno::Sequence<OUString> SAL_CALL OTimeModel::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> SAL_CALL OTimeModel::getSupportedServiceNames() { css::uno::Sequence<OUString> aSupported = OBoundControlModel::getSupportedServiceNames(); @@ -136,7 +136,7 @@ OTimeModel::~OTimeModel( ) IMPLEMENT_DEFAULT_CLONING( OTimeModel ) -OUString SAL_CALL OTimeModel::getServiceName() throw ( css::uno::RuntimeException, std::exception) +OUString SAL_CALL OTimeModel::getServiceName() { return OUString(FRM_COMPONENT_TIMEFIELD); // old (non-sun) name for compatibility ! } @@ -172,7 +172,7 @@ void SAL_CALL OTimeModel::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle sal_Bool SAL_CALL OTimeModel::convertFastPropertyValue(Any& _rConvertedValue, Any& _rOldValue, - sal_Int32 _nHandle, const Any& _rValue ) throw(IllegalArgumentException, RuntimeException, std::exception) + sal_Int32 _nHandle, const Any& _rValue ) { if (PROPERTY_ID_FORMATKEY == _nHandle) return convertFormatKeyPropertyValue(_rConvertedValue, _rOldValue, _rValue); @@ -181,7 +181,7 @@ sal_Bool SAL_CALL OTimeModel::convertFastPropertyValue(Any& _rConvertedValue, An } -void SAL_CALL OTimeModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw ( css::uno::Exception, std::exception) +void SAL_CALL OTimeModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) { if (PROPERTY_ID_FORMATKEY == _nHandle) setFormatKeyPropertyValue(_rValue); diff --git a/forms/source/component/Time.hxx b/forms/source/component/Time.hxx index 5a3f599f21b4..2c980e80f702 100644 --- a/forms/source/component/Time.hxx +++ b/forms/source/component/Time.hxx @@ -42,21 +42,19 @@ public: DECLARE_DEFAULT_LEAF_XTOR( OTimeModel ); // css::io::XPersistObject - virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; // css::beans::XPropertySet virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const override; virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, - sal_Int32 nHandle, const css::uno::Any& rValue ) - throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw ( css::uno::Exception, std::exception) override; + sal_Int32 nHandle, const css::uno::Any& rValue ) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) override; // css::lang::XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.form.OTimeModel"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // OControlModel's property handling virtual void describeFixedProperties( @@ -85,7 +83,7 @@ protected: virtual void onConnectedDbColumn( const css::uno::Reference< css::uno::XInterface >& _rxForm ) override; protected: - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) override; }; class OTimeControl: public OBoundControl @@ -98,11 +96,10 @@ public: DECLARE_UNO3_AGG_DEFAULTS(OTimeControl, OBoundControl) // css::lang::XServiceInfo - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.form.OTimeControl"); } - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; }; diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx index 9bedc978d383..3484dacb0b89 100644 --- a/forms/source/component/clickableimage.cxx +++ b/forms/source/component/clickableimage.cxx @@ -102,7 +102,7 @@ namespace frm // UNO Binding - Any SAL_CALL OClickableImageBaseControl::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception) + Any SAL_CALL OClickableImageBaseControl::queryAggregation(const Type& _rType) { Any aReturn = OControl::queryAggregation(_rType); if (!aReturn.hasValue()) @@ -113,26 +113,26 @@ namespace frm // XApproveActionBroadcaster void OClickableImageBaseControl::addApproveActionListener( - const Reference<XApproveActionListener>& l) throw( RuntimeException, std::exception ) + const Reference<XApproveActionListener>& l) { m_aApproveActionListeners.addInterface(l); } void OClickableImageBaseControl::removeApproveActionListener( - const Reference<XApproveActionListener>& l) throw( RuntimeException, std::exception ) + const Reference<XApproveActionListener>& l) { m_aApproveActionListeners.removeInterface(l); } - void SAL_CALL OClickableImageBaseControl::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException, std::exception) + void SAL_CALL OClickableImageBaseControl::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) { m_pFeatureInterception->registerDispatchProviderInterceptor( _rxInterceptor ); } - void SAL_CALL OClickableImageBaseControl::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException, std::exception) + void SAL_CALL OClickableImageBaseControl::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) { m_pFeatureInterception->releaseDispatchProviderInterceptor( _rxInterceptor ); } @@ -340,31 +340,31 @@ namespace frm } - void SAL_CALL OClickableImageBaseControl::addSubmissionVetoListener( const Reference< submission::XSubmissionVetoListener >& listener ) throw (NoSupportException, RuntimeException, std::exception) + void SAL_CALL OClickableImageBaseControl::addSubmissionVetoListener( const Reference< submission::XSubmissionVetoListener >& listener ) { m_aSubmissionVetoListeners.addInterface( listener ); } - void SAL_CALL OClickableImageBaseControl::removeSubmissionVetoListener( const Reference< submission::XSubmissionVetoListener >& listener ) throw (NoSupportException, RuntimeException, std::exception) + void SAL_CALL OClickableImageBaseControl::removeSubmissionVetoListener( const Reference< submission::XSubmissionVetoListener >& listener ) { m_aSubmissionVetoListeners.removeInterface( listener ); } - void SAL_CALL OClickableImageBaseControl::submitWithInteraction( const Reference< XInteractionHandler >& _rxHandler ) throw (VetoException, WrappedTargetException, RuntimeException, std::exception) + void SAL_CALL OClickableImageBaseControl::submitWithInteraction( const Reference< XInteractionHandler >& _rxHandler ) { implSubmit( MouseEvent(), _rxHandler ); } - void SAL_CALL OClickableImageBaseControl::submit( ) throw (VetoException, WrappedTargetException, RuntimeException, std::exception) + void SAL_CALL OClickableImageBaseControl::submit( ) { implSubmit( MouseEvent(), nullptr ); } - Sequence< OUString > SAL_CALL OClickableImageBaseControl::getSupportedServiceNames( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL OClickableImageBaseControl::getSupportedServiceNames( ) { Sequence< OUString > aSupported = OControl::getSupportedServiceNames(); aSupported.realloc( aSupported.getLength() + 1 ); @@ -519,40 +519,40 @@ namespace frm // XImageProducer - void SAL_CALL OClickableImageBaseModel::addConsumer( const Reference< XImageConsumer >& _rxConsumer ) throw (RuntimeException, std::exception) + void SAL_CALL OClickableImageBaseModel::addConsumer( const Reference< XImageConsumer >& _rxConsumer ) { ImageModelMethodGuard aGuard( *this ); GetImageProducer()->addConsumer( _rxConsumer ); } - void SAL_CALL OClickableImageBaseModel::removeConsumer( const Reference< XImageConsumer >& _rxConsumer ) throw (RuntimeException, std::exception) + void SAL_CALL OClickableImageBaseModel::removeConsumer( const Reference< XImageConsumer >& _rxConsumer ) { ImageModelMethodGuard aGuard( *this ); GetImageProducer()->removeConsumer( _rxConsumer ); } - void SAL_CALL OClickableImageBaseModel::startProduction( ) throw (RuntimeException, std::exception) + void SAL_CALL OClickableImageBaseModel::startProduction( ) { ImageModelMethodGuard aGuard( *this ); GetImageProducer()->startProduction(); } - Reference< submission::XSubmission > SAL_CALL OClickableImageBaseModel::getSubmission() throw (RuntimeException, std::exception) + Reference< submission::XSubmission > SAL_CALL OClickableImageBaseModel::getSubmission() { return m_xSubmissionDelegate; } - void SAL_CALL OClickableImageBaseModel::setSubmission( const Reference< submission::XSubmission >& _submission ) throw (RuntimeException, std::exception) + void SAL_CALL OClickableImageBaseModel::setSubmission( const Reference< submission::XSubmission >& _submission ) { m_xSubmissionDelegate = _submission; } - Sequence< OUString > SAL_CALL OClickableImageBaseModel::getSupportedServiceNames( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL OClickableImageBaseModel::getSupportedServiceNames( ) { Sequence< OUString > aSupported = OControlModel::getSupportedServiceNames(); aSupported.realloc( aSupported.getLength() + 1 ); @@ -578,7 +578,7 @@ namespace frm } - Any SAL_CALL OClickableImageBaseModel::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception) + Any SAL_CALL OClickableImageBaseModel::queryAggregation(const Type& _rType) { // order matters: // we definitely want to "override" the XImageProducer interface of our aggregate, @@ -610,7 +610,7 @@ namespace frm } - void OClickableImageBaseModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) throw ( Exception, std::exception) + void OClickableImageBaseModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) { switch (nHandle) { @@ -641,7 +641,6 @@ namespace frm sal_Bool OClickableImageBaseModel::convertFastPropertyValue(Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue) - throw( IllegalArgumentException, RuntimeException, std::exception ) { switch (nHandle) { @@ -822,7 +821,6 @@ namespace frm void OClickableImageBaseModel::_propertyChanged( const PropertyChangeEvent& rEvt ) - throw( RuntimeException, std::exception ) { // If a URL was set, it needs to be passed onto the ImageProducer. ::osl::MutexGuard aGuard(m_aMutex); diff --git a/forms/source/component/clickableimage.hxx b/forms/source/component/clickableimage.hxx index 5250f6bed786..539da5b2d518 100644 --- a/forms/source/component/clickableimage.hxx +++ b/forms/source/component/clickableimage.hxx @@ -100,41 +100,40 @@ namespace frm // UNO Binding DECLARE_UNO3_AGG_DEFAULTS(OClickableImageBaseModel, OControlModel) - virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) override; protected: // OComponentHelper virtual void SAL_CALL disposing() override; // css::form::XImageProducerSupplier - virtual css::uno::Reference< css::awt::XImageProducer> SAL_CALL getImageProducer() throw (css::uno::RuntimeException, std::exception) override { return m_xProducer.get(); } + virtual css::uno::Reference< css::awt::XImageProducer> SAL_CALL getImageProducer() override { return m_xProducer.get(); } // OPropertySetHelper virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw (css::uno::Exception, std::exception) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) override; - virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) - throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) override; using ::cppu::OPropertySetHelper::getFastPropertyValue; // OPropertyChangeListener - virtual void _propertyChanged(const css::beans::PropertyChangeEvent&) throw(css::uno::RuntimeException, std::exception) override; + virtual void _propertyChanged(const css::beans::PropertyChangeEvent&) override; // XPropertyState virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const override; // XImageProducer - virtual void SAL_CALL addConsumer( const css::uno::Reference< css::awt::XImageConsumer >& xConsumer ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeConsumer( const css::uno::Reference< css::awt::XImageConsumer >& xConsumer ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL startProduction( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addConsumer( const css::uno::Reference< css::awt::XImageConsumer >& xConsumer ) override; + virtual void SAL_CALL removeConsumer( const css::uno::Reference< css::awt::XImageConsumer >& xConsumer ) override; + virtual void SAL_CALL startProduction( ) override; // XSubmissionSupplier - virtual css::uno::Reference< css::form::submission::XSubmission > SAL_CALL getSubmission() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSubmission( const css::uno::Reference< css::form::submission::XSubmission >& _submission ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::form::submission::XSubmission > SAL_CALL getSubmission() override; + virtual void SAL_CALL setSubmission( const css::uno::Reference< css::form::submission::XSubmission >& _submission ) override; // XServiceInfo - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XEventListener using OControlModel::disposing; @@ -197,13 +196,13 @@ namespace frm OUString m_aActionCommand; // XSubmission - virtual void SAL_CALL submit( ) throw (css::util::VetoException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL submitWithInteraction( const css::uno::Reference< css::task::XInteractionHandler >& aHandler ) throw (css::util::VetoException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addSubmissionVetoListener( const css::uno::Reference< css::form::submission::XSubmissionVetoListener >& listener ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeSubmissionVetoListener( const css::uno::Reference< css::form::submission::XSubmissionVetoListener >& listener ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL submit( ) override; + virtual void SAL_CALL submitWithInteraction( const css::uno::Reference< css::task::XInteractionHandler >& aHandler ) override; + virtual void SAL_CALL addSubmissionVetoListener( const css::uno::Reference< css::form::submission::XSubmissionVetoListener >& listener ) override; + virtual void SAL_CALL removeSubmissionVetoListener( const css::uno::Reference< css::form::submission::XSubmissionVetoListener >& listener ) override; // XServiceInfo - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XEventListener using OControl::disposing; @@ -217,20 +216,18 @@ namespace frm protected: // UNO Binding DECLARE_UNO3_AGG_DEFAULTS(OClickableImageBaseControl, OControl) - virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) override; // OComponentHelper virtual void SAL_CALL disposing() override; // css::form::XApproveActionBroadcaster - virtual void SAL_CALL addApproveActionListener(const css::uno::Reference< css::form::XApproveActionListener>& _rxListener) - throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeApproveActionListener(const css::uno::Reference< css::form::XApproveActionListener>& _rxListener) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addApproveActionListener(const css::uno::Reference< css::form::XApproveActionListener>& _rxListener) override; + virtual void SAL_CALL removeApproveActionListener(const css::uno::Reference< css::form::XApproveActionListener>& _rxListener) override; // XDispatchProviderInterception - virtual void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) override; + virtual void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) override; protected: virtual void actionPerformed_Impl( bool bNotifyListener, const css::awt::MouseEvent& rEvt ); diff --git a/forms/source/component/entrylisthelper.cxx b/forms/source/component/entrylisthelper.cxx index 3d419b9ce5ab..b306256463f9 100644 --- a/forms/source/component/entrylisthelper.cxx +++ b/forms/source/component/entrylisthelper.cxx @@ -56,7 +56,7 @@ namespace frm } - void SAL_CALL OEntryListHelper::setListEntrySource( const Reference< XListEntrySource >& _rxSource ) throw (RuntimeException, std::exception) + void SAL_CALL OEntryListHelper::setListEntrySource( const Reference< XListEntrySource >& _rxSource ) { ControlModelLock aLock( m_rControlModel ); @@ -69,13 +69,13 @@ namespace frm } - Reference< XListEntrySource > SAL_CALL OEntryListHelper::getListEntrySource( ) throw (RuntimeException, std::exception) + Reference< XListEntrySource > SAL_CALL OEntryListHelper::getListEntrySource( ) { return m_xListSource; } - void SAL_CALL OEntryListHelper::entryChanged( const ListEntryEvent& _rEvent ) throw (RuntimeException, std::exception) + void SAL_CALL OEntryListHelper::entryChanged( const ListEntryEvent& _rEvent ) { ControlModelLock aLock( m_rControlModel ); @@ -97,7 +97,7 @@ namespace frm } - void SAL_CALL OEntryListHelper::entryRangeInserted( const ListEntryEvent& _rEvent ) throw (RuntimeException, std::exception) + void SAL_CALL OEntryListHelper::entryRangeInserted( const ListEntryEvent& _rEvent ) { ControlModelLock aLock( m_rControlModel ); @@ -118,7 +118,7 @@ namespace frm } - void SAL_CALL OEntryListHelper::entryRangeRemoved( const ListEntryEvent& _rEvent ) throw (RuntimeException, std::exception) + void SAL_CALL OEntryListHelper::entryRangeRemoved( const ListEntryEvent& _rEvent ) { ControlModelLock aLock( m_rControlModel ); @@ -139,7 +139,7 @@ namespace frm } - void SAL_CALL OEntryListHelper::allEntriesChanged( const EventObject& _rEvent ) throw (RuntimeException, std::exception) + void SAL_CALL OEntryListHelper::allEntriesChanged( const EventObject& _rEvent ) { ControlModelLock aLock( m_rControlModel ); @@ -155,21 +155,21 @@ namespace frm // XRefreshable - void SAL_CALL OEntryListHelper::addRefreshListener(const Reference<XRefreshListener>& _rxListener) throw(RuntimeException, std::exception) + void SAL_CALL OEntryListHelper::addRefreshListener(const Reference<XRefreshListener>& _rxListener) { if ( _rxListener.is() ) m_aRefreshListeners.addInterface( _rxListener ); } - void SAL_CALL OEntryListHelper::removeRefreshListener(const Reference<XRefreshListener>& _rxListener) throw(RuntimeException, std::exception) + void SAL_CALL OEntryListHelper::removeRefreshListener(const Reference<XRefreshListener>& _rxListener) { if ( _rxListener.is() ) m_aRefreshListeners.removeInterface( _rxListener ); } - void SAL_CALL OEntryListHelper::refresh() throw(RuntimeException, std::exception) + void SAL_CALL OEntryListHelper::refresh() { { ControlModelLock aLock( m_rControlModel ); diff --git a/forms/source/component/entrylisthelper.hxx b/forms/source/component/entrylisthelper.hxx index d2f205a88d00..3ae722c92e3e 100644 --- a/forms/source/component/entrylisthelper.hxx +++ b/forms/source/component/entrylisthelper.hxx @@ -82,7 +82,7 @@ namespace frm void disposing( ); // prevent method hiding - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override = 0; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override = 0; /** helper for implementing convertFastPropertyValue( StringItemList ) @@ -131,19 +131,19 @@ namespace frm private: // XListEntrySink - virtual void SAL_CALL setListEntrySource( const css::uno::Reference< css::form::binding::XListEntrySource >& _rxSource ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::form::binding::XListEntrySource > SAL_CALL getListEntrySource( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setListEntrySource( const css::uno::Reference< css::form::binding::XListEntrySource >& _rxSource ) override; + virtual css::uno::Reference< css::form::binding::XListEntrySource > SAL_CALL getListEntrySource( ) override; // XListEntryListener - virtual void SAL_CALL entryChanged( const css::form::binding::ListEntryEvent& _rSource ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL entryRangeInserted( const css::form::binding::ListEntryEvent& _rSource ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL entryRangeRemoved( const css::form::binding::ListEntryEvent& _rSource ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL allEntriesChanged( const css::lang::EventObject& _rSource ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL entryChanged( const css::form::binding::ListEntryEvent& _rSource ) override; + virtual void SAL_CALL entryRangeInserted( const css::form::binding::ListEntryEvent& _rSource ) override; + virtual void SAL_CALL entryRangeRemoved( const css::form::binding::ListEntryEvent& _rSource ) override; + virtual void SAL_CALL allEntriesChanged( const css::lang::EventObject& _rSource ) override; // XRefreshable - virtual void SAL_CALL refresh() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addRefreshListener(const css::uno::Reference< css::util::XRefreshListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeRefreshListener(const css::uno::Reference< css::util::XRefreshListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refresh() override; + virtual void SAL_CALL addRefreshListener(const css::uno::Reference< css::util::XRefreshListener>& _rxListener) override; + virtual void SAL_CALL removeRefreshListener(const css::uno::Reference< css::util::XRefreshListener>& _rxListener) override; private: /** disconnects from the active external list source, if present diff --git a/forms/source/component/errorbroadcaster.cxx b/forms/source/component/errorbroadcaster.cxx index e619d0952401..f0602891adbf 100644 --- a/forms/source/component/errorbroadcaster.cxx +++ b/forms/source/component/errorbroadcaster.cxx @@ -82,13 +82,13 @@ namespace frm } - void SAL_CALL OErrorBroadcaster::addSQLErrorListener( const Reference< XSQLErrorListener >& _rxListener ) throw( RuntimeException, std::exception ) + void SAL_CALL OErrorBroadcaster::addSQLErrorListener( const Reference< XSQLErrorListener >& _rxListener ) { m_aErrorListeners.addInterface( _rxListener ); } - void SAL_CALL OErrorBroadcaster::removeSQLErrorListener( const Reference< XSQLErrorListener >& _rxListener ) throw( RuntimeException, std::exception ) + void SAL_CALL OErrorBroadcaster::removeSQLErrorListener( const Reference< XSQLErrorListener >& _rxListener ) { m_aErrorListeners.removeInterface( _rxListener ); } diff --git a/forms/source/component/errorbroadcaster.hxx b/forms/source/component/errorbroadcaster.hxx index f5d036e0ef8c..0f445900a85f 100644 --- a/forms/source/component/errorbroadcaster.hxx +++ b/forms/source/component/errorbroadcaster.hxx @@ -51,8 +51,8 @@ namespace frm protected: // XSQLErrorBroadcaster - virtual void SAL_CALL addSQLErrorListener( const css::uno::Reference< css::sdb::XSQLErrorListener >& _rListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeSQLErrorListener( const css::uno::Reference< css::sdb::XSQLErrorListener >& _rListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addSQLErrorListener( const css::uno::Reference< css::sdb::XSQLErrorListener >& _rListener ) override; + virtual void SAL_CALL removeSQLErrorListener( const css::uno::Reference< css::sdb::XSQLErrorListener >& _rListener ) override; }; diff --git a/forms/source/component/formcontrolfont.cxx b/forms/source/component/formcontrolfont.cxx index 00d5e855a731..cadf6c095a75 100644 --- a/forms/source/component/formcontrolfont.cxx +++ b/forms/source/component/formcontrolfont.cxx @@ -249,7 +249,7 @@ namespace frm bool FontControlModel::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, - sal_Int32 _nHandle, const Any& _rValue ) throw( IllegalArgumentException, RuntimeException, std::exception ) + sal_Int32 _nHandle, const Any& _rValue ) { bool bModified = false; switch( _nHandle ) @@ -350,7 +350,7 @@ namespace frm /// @throws Exception static void setFastPropertyValue_NoBroadcast_implimpl( FontDescriptor & rFont, - sal_Int32 nHandle, const Any& rValue) throw (Exception) + sal_Int32 nHandle, const Any& rValue) { switch (nHandle) { @@ -434,7 +434,7 @@ namespace frm void FontControlModel::setFastPropertyValue_NoBroadcast_impl( ::cppu::OPropertySetHelper & rBase, void (::cppu::OPropertySetHelper::*pSet)(sal_Int32, Any const&), - sal_Int32 nHandle, const Any& rValue) throw (Exception) + sal_Int32 nHandle, const Any& rValue) { if (isFontAggregateProperty(nHandle)) { diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx index 945d45d719fa..dc18ff8edc76 100644 --- a/forms/source/component/imgprod.cxx +++ b/forms/source/component/imgprod.cxx @@ -176,7 +176,7 @@ ImageProducer::~ImageProducer() // XInterface -css::uno::Any ImageProducer::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) +css::uno::Any ImageProducer::queryInterface( const css::uno::Type & rType ) { css::uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< css::lang::XInitialization* >(this)), @@ -186,8 +186,6 @@ css::uno::Any ImageProducer::queryInterface( const css::uno::Type & rType ) thro void ImageProducer::addConsumer( const css::uno::Reference< css::awt::XImageConsumer >& rxConsumer ) - throw(css::uno::RuntimeException, - std::exception) { DBG_ASSERT( rxConsumer.is(), "::AddConsumer(...): No consumer referenced!" ); if( rxConsumer.is() ) @@ -195,7 +193,7 @@ void ImageProducer::addConsumer( const css::uno::Reference< css::awt::XImageCons } -void ImageProducer::removeConsumer( const css::uno::Reference< css::awt::XImageConsumer >& rxConsumer ) throw(css::uno::RuntimeException, std::exception) +void ImageProducer::removeConsumer( const css::uno::Reference< css::awt::XImageConsumer >& rxConsumer ) { ConsumerList_t::reverse_iterator riter = std::find(maConsList.rbegin(),maConsList.rend(),rxConsumer); @@ -257,7 +255,7 @@ void ImageProducer::NewDataAvailable() } -void ImageProducer::startProduction() throw(css::uno::RuntimeException, std::exception) +void ImageProducer::startProduction() { if( !maConsList.empty() || maDoneHdl.IsSet() ) { @@ -516,7 +514,7 @@ void ImageProducer::ImplUpdateConsumer( const Graphic& rGraphic ) } -void ImageProducer::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) +void ImageProducer::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) { if ( aArguments.getLength() == 1 ) { diff --git a/forms/source/component/imgprod.hxx b/forms/source/component/imgprod.hxx index ceb9bf35e047..6fe3625a4e83 100644 --- a/forms/source/component/imgprod.hxx +++ b/forms/source/component/imgprod.hxx @@ -71,7 +71,7 @@ public: void SetDoneHdl( const Link<Graphic*,void>& i_rHdl ) { maDoneHdl = i_rHdl; } // css::uno::XInterface - css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } void SAL_CALL release() throw() override { OWeakObject::release(); } @@ -79,14 +79,12 @@ public: void setImage( css::uno::Reference< css::io::XInputStream > & rStmRef ); // css::awt::XImageProducer - void SAL_CALL addConsumer( const css::uno::Reference< css::awt::XImageConsumer >& rxConsumer ) - throw(css::uno::RuntimeException, - std::exception) override; - void SAL_CALL removeConsumer( const css::uno::Reference< css::awt::XImageConsumer >& rxConsumer ) throw(css::uno::RuntimeException, std::exception) override; - void SAL_CALL startProduction( ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL addConsumer( const css::uno::Reference< css::awt::XImageConsumer >& rxConsumer ) override; + void SAL_CALL removeConsumer( const css::uno::Reference< css::awt::XImageConsumer >& rxConsumer ) override; + void SAL_CALL startProduction( ) override; // css::lang::XInitialization - void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; }; diff --git a/forms/source/component/navigationbar.cxx b/forms/source/component/navigationbar.cxx index a5ca482f7d75..4b617e2646eb 100644 --- a/forms/source/component/navigationbar.cxx +++ b/forms/source/component/navigationbar.cxx @@ -126,7 +126,7 @@ namespace frm } - Any SAL_CALL ONavigationBarModel::queryAggregation( const Type& _rType ) throw ( RuntimeException, std::exception ) + Any SAL_CALL ONavigationBarModel::queryAggregation( const Type& _rType ) { Any aReturn = ONavigationBarModel_BASE::queryInterface( _rType ); @@ -143,13 +143,13 @@ namespace frm IMPLEMENT_DEFAULT_CLONING( ONavigationBarModel ) - OUString SAL_CALL ONavigationBarModel::getImplementationName() throw(RuntimeException, std::exception) + OUString SAL_CALL ONavigationBarModel::getImplementationName() { return OUString( "com.sun.star.comp.form.ONavigationBarModel" ); } - Sequence< OUString > SAL_CALL ONavigationBarModel::getSupportedServiceNames() throw(RuntimeException, std::exception) + Sequence< OUString > SAL_CALL ONavigationBarModel::getSupportedServiceNames() { Sequence< OUString > aSupported = OControlModel::getSupportedServiceNames_Static(); aSupported.realloc( aSupported.getLength() + 2 ); @@ -160,7 +160,7 @@ namespace frm return aSupported; } - OUString SAL_CALL ONavigationBarModel::getServiceName() throw ( RuntimeException, std::exception ) + OUString SAL_CALL ONavigationBarModel::getServiceName() { return OUString(FRM_SUN_COMPONENT_NAVTOOLBAR); } @@ -179,7 +179,7 @@ namespace frm #define PERSIST_SHOW_FILTERSORT 0x0040 - void SAL_CALL ONavigationBarModel::write( const Reference< XObjectOutputStream >& _rxOutStream ) throw ( IOException, RuntimeException, std::exception ) + void SAL_CALL ONavigationBarModel::write( const Reference< XObjectOutputStream >& _rxOutStream ) { // open a section for compatibility - if we later on write additional members, // then older versions can skip them @@ -252,7 +252,7 @@ namespace frm } - void SAL_CALL ONavigationBarModel::read( const Reference< XObjectInputStream >& _rxInStream ) throw ( IOException, RuntimeException, std::exception ) + void SAL_CALL ONavigationBarModel::read( const Reference< XObjectInputStream >& _rxInStream ) { OStreamSection aEnsureBlockCompat( _rxInStream ); @@ -331,7 +331,7 @@ namespace frm sal_Bool SAL_CALL ONavigationBarModel::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, - sal_Int32 _nHandle, const Any& _rValue ) throw( IllegalArgumentException, RuntimeException, std::exception ) + sal_Int32 _nHandle, const Any& _rValue ) { bool bModified = false; @@ -352,7 +352,7 @@ namespace frm } - void SAL_CALL ONavigationBarModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception, std::exception ) + void SAL_CALL ONavigationBarModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) { if ( isRegisteredProperty( _nHandle ) ) { diff --git a/forms/source/component/navigationbar.hxx b/forms/source/component/navigationbar.hxx index 862a2121cd83..29f9993e8e7d 100644 --- a/forms/source/component/navigationbar.hxx +++ b/forms/source/component/navigationbar.hxx @@ -70,26 +70,25 @@ namespace frm protected: // UNO DECLARE_UNO3_AGG_DEFAULTS( ONavigationBarModel, OControlModel ) - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XTypeProvider DECLARE_XTYPEPROVIDER() // XPersistObject - virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; + virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override; + virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override; // XPropertySet virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const override; virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, - sal_Int32 nHandle, const css::uno::Any& rValue ) - throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw ( css::uno::Exception, std::exception) override; + sal_Int32 nHandle, const css::uno::Any& rValue ) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) override; // XPropertyState virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const override; @@ -104,7 +103,7 @@ namespace frm using OControlModel::getFastPropertyValue; protected: - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) override; private: void implInitPropertyContainer(); diff --git a/forms/source/component/refvaluecomponent.cxx b/forms/source/component/refvaluecomponent.cxx index b931b7ded39f..fbb4aeed1ab6 100644 --- a/forms/source/component/refvaluecomponent.cxx +++ b/forms/source/component/refvaluecomponent.cxx @@ -84,7 +84,7 @@ namespace frm } - void SAL_CALL OReferenceValueComponent::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw (Exception, std::exception) + void SAL_CALL OReferenceValueComponent::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) { switch ( _nHandle ) { @@ -119,7 +119,7 @@ namespace frm } - sal_Bool SAL_CALL OReferenceValueComponent::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw (IllegalArgumentException, RuntimeException, std::exception) + sal_Bool SAL_CALL OReferenceValueComponent::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) { bool bModified = false; switch ( _nHandle ) diff --git a/forms/source/component/refvaluecomponent.hxx b/forms/source/component/refvaluecomponent.hxx index 72491bbac527..b6b9805a56ea 100644 --- a/forms/source/component/refvaluecomponent.hxx +++ b/forms/source/component/refvaluecomponent.hxx @@ -58,11 +58,9 @@ namespace frm // OPropertySet and friends virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) - throw (css::uno::Exception, std::exception) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override; virtual sal_Bool SAL_CALL convertFastPropertyValue( - css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) override; virtual void describeFixedProperties( css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps ) const override; diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx index 1bc7a678bb5c..52cce8bc3522 100644 --- a/forms/source/component/scrollbar.cxx +++ b/forms/source/component/scrollbar.cxx @@ -106,7 +106,7 @@ namespace frm { } - OUString SAL_CALL OScrollBarModel::getImplementationName() throw ( RuntimeException, std::exception ) + OUString SAL_CALL OScrollBarModel::getImplementationName() { return OUString( "com.sun.star.comp.forms.OScrollBarModel" ); } @@ -115,7 +115,7 @@ namespace frm // OBoundControlModel, our real base class, claims to support the DataAwareControlModel // service, which isn't really true for us. We only derive from this class // to benefit from the functionality for binding to spreadsheet cells - Sequence< OUString > SAL_CALL OScrollBarModel::getSupportedServiceNames() throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL OScrollBarModel::getSupportedServiceNames() { Sequence< OUString > aOwnNames( 2 ); aOwnNames[ 0 ] = FRM_SUN_COMPONENT_SCROLLBAR; @@ -156,7 +156,7 @@ namespace frm } - void OScrollBarModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception, std::exception ) + void OScrollBarModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) { switch ( _nHandle ) { @@ -173,7 +173,6 @@ namespace frm sal_Bool OScrollBarModel::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) - throw ( IllegalArgumentException, RuntimeException, std::exception ) { bool bModified( false ); switch ( _nHandle ) @@ -229,14 +228,13 @@ namespace frm } - OUString SAL_CALL OScrollBarModel::getServiceName() throw( RuntimeException, std::exception ) + OUString SAL_CALL OScrollBarModel::getServiceName() { return OUString(FRM_SUN_COMPONENT_SCROLLBAR); } void SAL_CALL OScrollBarModel::write( const Reference< XObjectOutputStream >& _rxOutStream ) - throw( IOException, RuntimeException, std::exception ) { OBoundControlModel::write( _rxOutStream ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -252,7 +250,7 @@ namespace frm } - void SAL_CALL OScrollBarModel::read( const Reference< XObjectInputStream>& _rxInStream ) throw( IOException, RuntimeException, std::exception ) + void SAL_CALL OScrollBarModel::read( const Reference< XObjectInputStream>& _rxInStream ) { OBoundControlModel::read( _rxInStream ); ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/forms/source/component/scrollbar.hxx b/forms/source/component/scrollbar.hxx index 838c2974ced0..9d23b6351143 100644 --- a/forms/source/component/scrollbar.hxx +++ b/forms/source/component/scrollbar.hxx @@ -36,14 +36,14 @@ namespace frm protected: // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::css::uno::RuntimeException, std::exception) override; - virtual ::css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual ::css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XPersistObject DECLARE_XPERSISTOBJECT() // XCloneable - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) override; // XPropertyState virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 _nHandle ) const override; @@ -55,10 +55,8 @@ namespace frm // OPropertySetHelper virtual void SAL_CALL getFastPropertyValue( css::uno::Any& _rValue, sal_Int32 _nHandle ) const override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const css::uno::Any& _rValue ) - throw ( css::uno::Exception, std::exception ) override; - virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) - throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const css::uno::Any& _rValue ) override; + virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) override; // OBoundControlModel virtual css::uno::Any translateDbColumnToControlValue( ) override; diff --git a/forms/source/component/spinbutton.cxx b/forms/source/component/spinbutton.cxx index 02fedc312ac2..7c257dd21544 100644 --- a/forms/source/component/spinbutton.cxx +++ b/forms/source/component/spinbutton.cxx @@ -59,7 +59,7 @@ namespace frm { } - OUString SAL_CALL OSpinButtonModel::getImplementationName() throw ( RuntimeException, std::exception ) + OUString SAL_CALL OSpinButtonModel::getImplementationName() { return OUString( "com.sun.star.comp.forms.OSpinButtonModel" ); } @@ -68,7 +68,7 @@ namespace frm // OBoundControlModel, our real base class, claims to support the DataAwareControlModel // service, which isn't really true for us. We only derive from this class // to benefit from the functionality for binding to spreadsheet cells - Sequence< OUString > SAL_CALL OSpinButtonModel::getSupportedServiceNames() throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL OSpinButtonModel::getSupportedServiceNames() { Sequence< OUString > aOwnNames( 2 ); aOwnNames[ 0 ] = FRM_SUN_COMPONENT_SPINBUTTON; @@ -110,7 +110,7 @@ namespace frm } - void OSpinButtonModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception, std::exception ) + void OSpinButtonModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) { switch ( _nHandle ) { @@ -127,7 +127,6 @@ namespace frm sal_Bool OSpinButtonModel::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) - throw ( IllegalArgumentException, RuntimeException, std::exception ) { bool bModified( false ); switch ( _nHandle ) @@ -183,14 +182,13 @@ namespace frm } - OUString SAL_CALL OSpinButtonModel::getServiceName() throw( RuntimeException, std::exception ) + OUString SAL_CALL OSpinButtonModel::getServiceName() { return OUString(FRM_SUN_COMPONENT_SPINBUTTON); } void SAL_CALL OSpinButtonModel::write( const Reference< XObjectOutputStream >& _rxOutStream ) - throw( IOException, RuntimeException, std::exception ) { OBoundControlModel::write( _rxOutStream ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -206,7 +204,7 @@ namespace frm } - void SAL_CALL OSpinButtonModel::read( const Reference< XObjectInputStream>& _rxInStream ) throw( IOException, RuntimeException, std::exception ) + void SAL_CALL OSpinButtonModel::read( const Reference< XObjectInputStream>& _rxInStream ) { OBoundControlModel::read( _rxInStream ); ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/forms/source/component/spinbutton.hxx b/forms/source/component/spinbutton.hxx index e680d2c03160..0a60ea52979f 100644 --- a/forms/source/component/spinbutton.hxx +++ b/forms/source/component/spinbutton.hxx @@ -37,14 +37,14 @@ namespace frm protected: // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::css::uno::RuntimeException, std::exception) override; - virtual ::css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual ::css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XPersistObject DECLARE_XPERSISTOBJECT() // XCloneable - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) override; // XPropertyState virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 _nHandle ) const override; @@ -56,10 +56,8 @@ namespace frm // OPropertySetHelper virtual void SAL_CALL getFastPropertyValue( css::uno::Any& _rValue, sal_Int32 _nHandle ) const override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const css::uno::Any& _rValue ) - throw ( css::uno::Exception, std::exception ) override; - virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) - throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const css::uno::Any& _rValue ) override; + virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) override; // OBoundControlModel virtual css::uno::Any translateDbColumnToControlValue( ) override; diff --git a/forms/source/helper/controlfeatureinterception.cxx b/forms/source/helper/controlfeatureinterception.cxx index 4a3740f47f17..1196afd70742 100644 --- a/forms/source/helper/controlfeatureinterception.cxx +++ b/forms/source/helper/controlfeatureinterception.cxx @@ -37,7 +37,7 @@ namespace frm } - void SAL_CALL ControlFeatureInterception::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException ) + void SAL_CALL ControlFeatureInterception::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) { if ( !_rxInterceptor.is() ) { @@ -60,7 +60,7 @@ namespace frm } - void SAL_CALL ControlFeatureInterception::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException ) + void SAL_CALL ControlFeatureInterception::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) { if ( !_rxInterceptor.is() ) { diff --git a/forms/source/helper/formnavigation.cxx b/forms/source/helper/formnavigation.cxx index e56f2f27b3b0..1a8cde45eaae 100644 --- a/forms/source/helper/formnavigation.cxx +++ b/forms/source/helper/formnavigation.cxx @@ -52,7 +52,7 @@ namespace frm } - void SAL_CALL OFormNavigationHelper::dispose( ) throw( RuntimeException ) + void SAL_CALL OFormNavigationHelper::dispose( ) { m_pFeatureInterception->dispose(); disconnectDispatchers(); @@ -77,21 +77,21 @@ namespace frm } - void SAL_CALL OFormNavigationHelper::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException, std::exception) + void SAL_CALL OFormNavigationHelper::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) { m_pFeatureInterception->registerDispatchProviderInterceptor( _rxInterceptor ); interceptorsChanged(); } - void SAL_CALL OFormNavigationHelper::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException, std::exception) + void SAL_CALL OFormNavigationHelper::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) { m_pFeatureInterception->releaseDispatchProviderInterceptor( _rxInterceptor ); interceptorsChanged(); } - void SAL_CALL OFormNavigationHelper::statusChanged( const FeatureStateEvent& _rState ) throw (RuntimeException, std::exception) + void SAL_CALL OFormNavigationHelper::statusChanged( const FeatureStateEvent& _rState ) { for ( FeatureMap::iterator aFeature = m_aSupportedFeatures.begin(); aFeature != m_aSupportedFeatures.end(); @@ -119,7 +119,7 @@ namespace frm } - void SAL_CALL OFormNavigationHelper::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception) + void SAL_CALL OFormNavigationHelper::disposing( const EventObject& _rSource ) { // was it one of our external dispatchers? if ( m_nConnectedFeatures ) diff --git a/forms/source/helper/windowstateguard.cxx b/forms/source/helper/windowstateguard.cxx index e2f17d705d93..b7c07f05484b 100644 --- a/forms/source/helper/windowstateguard.cxx +++ b/forms/source/helper/windowstateguard.cxx @@ -63,17 +63,17 @@ namespace frm protected: // XWindowListener2 - virtual void SAL_CALL windowEnabled( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowDisabled( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowEnabled( const css::lang::EventObject& e ) override; + virtual void SAL_CALL windowDisabled( const css::lang::EventObject& e ) override; // XWindowListener - virtual void SAL_CALL windowResized( const css::awt::WindowEvent& e ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& e ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowShown( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL windowHidden( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowResized( const css::awt::WindowEvent& e ) override; + virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& e ) override; + virtual void SAL_CALL windowShown( const css::lang::EventObject& e ) override; + virtual void SAL_CALL windowHidden( const css::lang::EventObject& e ) override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; private: /** ensures that the window's Enabled state matches what is described at the model @@ -140,43 +140,43 @@ namespace frm } - void SAL_CALL WindowStateGuard_Impl::windowEnabled( const EventObject& /*e*/ ) throw (RuntimeException, std::exception) + void SAL_CALL WindowStateGuard_Impl::windowEnabled( const EventObject& /*e*/ ) { impl_ensureEnabledState_nothrow_nolck(); } - void SAL_CALL WindowStateGuard_Impl::windowDisabled( const EventObject& /*e*/ ) throw (RuntimeException, std::exception) + void SAL_CALL WindowStateGuard_Impl::windowDisabled( const EventObject& /*e*/ ) { impl_ensureEnabledState_nothrow_nolck(); } - void SAL_CALL WindowStateGuard_Impl::windowResized( const WindowEvent& /*e*/ ) throw (RuntimeException, std::exception) + void SAL_CALL WindowStateGuard_Impl::windowResized( const WindowEvent& /*e*/ ) { // not interested in } - void SAL_CALL WindowStateGuard_Impl::windowMoved( const WindowEvent& /*e*/ ) throw (RuntimeException, std::exception) + void SAL_CALL WindowStateGuard_Impl::windowMoved( const WindowEvent& /*e*/ ) { // not interested in } - void SAL_CALL WindowStateGuard_Impl::windowShown( const EventObject& /*e*/ ) throw (RuntimeException, std::exception) + void SAL_CALL WindowStateGuard_Impl::windowShown( const EventObject& /*e*/ ) { // not interested in } - void SAL_CALL WindowStateGuard_Impl::windowHidden( const EventObject& /*e*/ ) throw (RuntimeException, std::exception) + void SAL_CALL WindowStateGuard_Impl::windowHidden( const EventObject& /*e*/ ) { // not interested in } - void SAL_CALL WindowStateGuard_Impl::disposing( const EventObject& Source ) throw (RuntimeException, std::exception) + void SAL_CALL WindowStateGuard_Impl::disposing( const EventObject& Source ) { OSL_ENSURE( Source.Source == m_xWindow, "WindowStateGuard_Impl::disposing: where does this come from?" ); (void)Source; diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index 934bd526d890..9009c305f334 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -82,9 +82,9 @@ namespace frm // macros for quickly declaring/implementing XServiceInfo #define DECLARE_XPERSISTOBJECT() \ - virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; \ - virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; \ - virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; \ + virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override; \ + virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override; class OControlModel; @@ -208,42 +208,42 @@ protected: // UNO DECLARE_UNO3_AGG_DEFAULTS(OControl, OComponentHelper) - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override; // XTypeProvider - virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Type> SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type> SAL_CALL getTypes() override; // OComponentHelper virtual void SAL_CALL disposing() override; // XComponent (as base of XControl) - virtual void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL dispose( ) override { OComponentHelper::dispose(); } - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener>& _rxListener) override { OComponentHelper::addEventListener(_rxListener); } - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener>& _rxListener) override { OComponentHelper::removeEventListener(_rxListener); } // XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) override; // XServiceInfo - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override = 0; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; + virtual OUString SAL_CALL getImplementationName() override = 0; // XControl - virtual void SAL_CALL setContext(const css::uno::Reference<css::uno::XInterface>& Context) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getContext() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL createPeer(const css::uno::Reference<css::awt::XToolkit>& Toolkit, const css::uno::Reference<css::awt::XWindowPeer>& Parent) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference<css::awt::XWindowPeer> SAL_CALL getPeer() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setModel(const css::uno::Reference<css::awt::XControlModel>& Model) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference<css::awt::XControlModel> SAL_CALL getModel() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference<css::awt::XView> SAL_CALL getView() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDesignMode(sal_Bool bOn) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isDesignMode() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isTransparent() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setContext(const css::uno::Reference<css::uno::XInterface>& Context) override; + virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getContext() override; + virtual void SAL_CALL createPeer(const css::uno::Reference<css::awt::XToolkit>& Toolkit, const css::uno::Reference<css::awt::XWindowPeer>& Parent) override; + virtual css::uno::Reference<css::awt::XWindowPeer> SAL_CALL getPeer() override; + virtual sal_Bool SAL_CALL setModel(const css::uno::Reference<css::awt::XControlModel>& Model) override; + virtual css::uno::Reference<css::awt::XControlModel> SAL_CALL getModel() override; + virtual css::uno::Reference<css::awt::XView> SAL_CALL getView() override; + virtual void SAL_CALL setDesignMode(sal_Bool bOn) override; + virtual sal_Bool SAL_CALL isDesignMode() override; + virtual sal_Bool SAL_CALL isTransparent() override; protected: virtual css::uno::Sequence< css::uno::Type> _getTypes(); @@ -274,18 +274,18 @@ public: virtual ~OBoundControl() override; DECLARE_UNO3_AGG_DEFAULTS(OBoundControl, OControl) - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override; // XBoundControl - virtual sal_Bool SAL_CALL getLock() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLock(sal_Bool _bLock) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getLock() override; + virtual void SAL_CALL setLock(sal_Bool _bLock) override; // default implementation just disables the controls, overwrite _setLock to change this behaviour // XControl - virtual sal_Bool SAL_CALL setModel(const css::uno::Reference< css::awt::XControlModel >& Model) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL setModel(const css::uno::Reference< css::awt::XControlModel >& Model) override; // XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) override; // OComponentHelper virtual void SAL_CALL disposing() override; @@ -381,49 +381,47 @@ protected: public: DECLARE_UNO3_AGG_DEFAULTS(OControl, OComponentHelper) - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override; // XTypeProvider - virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Type> SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type> SAL_CALL getTypes() override; // OComponentHelper virtual void SAL_CALL disposing() override; // XNamed - virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName(const OUString& aName) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName(const OUString& aName) override; // XServiceInfo - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override = 0; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; + virtual OUString SAL_CALL getImplementationName() override = 0; // XSericeInfo - static version(s) /// @throws css::uno::RuntimeException - static css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames_Static() throw(css::uno::RuntimeException); + static css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames_Static(); // XPersistObject - virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override = 0; + virtual OUString SAL_CALL getServiceName() override = 0; virtual void SAL_CALL - write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; + write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) override; virtual void SAL_CALL - read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; + read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) override; // XChild (base of XFormComponent) - virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getParent() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getParent() override; + virtual void SAL_CALL setParent(const css::uno::Reference<css::uno::XInterface>& Parent) override; // XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) override; // XPropertySet virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const override; virtual sal_Bool SAL_CALL convertFastPropertyValue( - css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) - throw (css::uno::Exception, std::exception) override; + css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override; using ::cppu::OPropertySetHelper::getFastPropertyValue; // css::beans::XPropertyState @@ -432,15 +430,15 @@ public: virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const override; // XCloneable - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override = 0; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) override = 0; // XPropertyContainer - virtual void SAL_CALL addProperty( const OUString& Name, ::sal_Int16 Attributes, const css::uno::Any& DefaultValue ) throw (css::beans::PropertyExistException, css::beans::IllegalTypeException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeProperty( const OUString& Name ) throw (css::beans::UnknownPropertyException, css::beans::NotRemoveableException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addProperty( const OUString& Name, ::sal_Int16 Attributes, const css::uno::Any& DefaultValue ) override; + virtual void SAL_CALL removeProperty( const OUString& Name ) override; // XPropertyAccess - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues( ) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) override; protected: using OPropertySetAggregationHelper::setPropertyValues; @@ -452,7 +450,7 @@ protected: protected: // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw( css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override; // OPropertySetHelper virtual cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; @@ -522,7 +520,7 @@ public: #define IMPLEMENT_DEFAULT_CLONING( classname ) \ - css::uno::Reference< css::util::XCloneable > SAL_CALL classname::createClone( ) throw (css::uno::RuntimeException, std::exception) \ + css::uno::Reference< css::util::XCloneable > SAL_CALL classname::createClone( ) \ { \ classname* pClone = new classname( this, getContext() ); \ pClone->clonedFrom( this ); \ @@ -964,90 +962,88 @@ public: public: // UNO link DECLARE_UNO3_AGG_DEFAULTS(OBoundControlModel, OControlModel) - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override; // OComponentHelper virtual void SAL_CALL disposing() override; // XReset - virtual void SAL_CALL reset( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addResetListener( const css::uno::Reference< css::form::XResetListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeResetListener( const css::uno::Reference< css::form::XResetListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL reset( ) override; + virtual void SAL_CALL addResetListener( const css::uno::Reference< css::form::XResetListener >& aListener ) override; + virtual void SAL_CALL removeResetListener( const css::uno::Reference< css::form::XResetListener >& aListener ) override; // XServiceInfo - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames( ) override; // XServiceInfo - static version /// @throws css::uno::RuntimeException - static css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames_Static() throw(css::uno::RuntimeException); + static css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames_Static(); // XChild - virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override; // XPersistObject - virtual void SAL_CALL write( const css::uno::Reference< css::io::XObjectOutputStream >& OutStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL read( const css::uno::Reference< css::io::XObjectInputStream >& InStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL write( const css::uno::Reference< css::io::XObjectOutputStream >& OutStream ) override; + virtual void SAL_CALL read( const css::uno::Reference< css::io::XObjectInputStream >& InStream ) override; // XBoundComponent - virtual sal_Bool SAL_CALL commit() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL commit() override; // XUpdateBroadcaster (base of XBoundComponent) - virtual void SAL_CALL addUpdateListener( const css::uno::Reference< css::form::XUpdateListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeUpdateListener( const css::uno::Reference< css::form::XUpdateListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addUpdateListener( const css::uno::Reference< css::form::XUpdateListener >& aListener ) override; + virtual void SAL_CALL removeUpdateListener( const css::uno::Reference< css::form::XUpdateListener >& aListener ) override; // XPropertySet virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const override; virtual sal_Bool SAL_CALL convertFastPropertyValue( - css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) - throw (css::uno::Exception, std::exception) override; + css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override; using ::cppu::OPropertySetHelper::getFastPropertyValue; // css::beans::XPropertyState virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const override; // XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) override; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) override; // XRowSetChangeListener - virtual void SAL_CALL onRowSetChanged( const css::lang::EventObject& i_Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL onRowSetChanged( const css::lang::EventObject& i_Event ) override; // XLoadListener - virtual void SAL_CALL loaded( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL unloading( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL unloaded( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL reloading( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL reloaded( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL loaded( const css::lang::EventObject& aEvent ) override; + virtual void SAL_CALL unloading( const css::lang::EventObject& aEvent ) override; + virtual void SAL_CALL unloaded( const css::lang::EventObject& aEvent ) override; + virtual void SAL_CALL reloading( const css::lang::EventObject& aEvent ) override; + virtual void SAL_CALL reloaded( const css::lang::EventObject& aEvent ) override; protected: // XBindableValue - virtual void SAL_CALL setValueBinding( const css::uno::Reference< css::form::binding::XValueBinding >& _rxBinding ) throw (css::form::binding::IncompatibleTypesException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::form::binding::XValueBinding > SAL_CALL getValueBinding( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setValueBinding( const css::uno::Reference< css::form::binding::XValueBinding >& _rxBinding ) override; + virtual css::uno::Reference< css::form::binding::XValueBinding > SAL_CALL getValueBinding( ) override; // XModifyListener - virtual void SAL_CALL modified( const css::lang::EventObject& _rEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL modified( const css::lang::EventObject& _rEvent ) override; // XValidatable - virtual void SAL_CALL setValidator( const css::uno::Reference< css::form::validation::XValidator >& Validator ) throw (css::util::VetoException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::form::validation::XValidator > SAL_CALL getValidator( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setValidator( const css::uno::Reference< css::form::validation::XValidator >& Validator ) override; + virtual css::uno::Reference< css::form::validation::XValidator > SAL_CALL getValidator( ) override; // XValidityConstraintListener - virtual void SAL_CALL validityConstraintChanged( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL validityConstraintChanged( const css::lang::EventObject& Source ) override; // XValidatableFormComponent - virtual sal_Bool SAL_CALL isValid( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getCurrentValue( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addFormComponentValidityListener( const css::uno::Reference< css::form::validation::XFormComponentValidityListener >& Listener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeFormComponentValidityListener( const css::uno::Reference< css::form::validation::XFormComponentValidityListener >& Listener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isValid( ) override; + virtual css::uno::Any SAL_CALL getCurrentValue( ) override; + virtual void SAL_CALL addFormComponentValidityListener( const css::uno::Reference< css::form::validation::XFormComponentValidityListener >& Listener ) override; + virtual void SAL_CALL removeFormComponentValidityListener( const css::uno::Reference< css::form::validation::XFormComponentValidityListener >& Listener ) override; protected: // OPropertyChangeListener virtual void - _propertyChanged( const css::beans::PropertyChangeEvent& _rEvt ) throw ( css::uno::RuntimeException, std::exception ) override; + _propertyChanged( const css::beans::PropertyChangeEvent& _rEvt ) override; /// checks whether we currently have an external value binding in place inline bool hasExternalValueBinding() const { return m_xExternalBinding.is(); } diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx index fc3a5fbe4a6e..2b57d987951b 100644 --- a/forms/source/inc/InterfaceContainer.hxx +++ b/forms/source/inc/InterfaceContainer.hxx @@ -118,69 +118,69 @@ public: // late constructor for cloning /// @throws css::uno::RuntimeException - void clonedFrom(const OInterfaceContainer& _cloneSource) throw(css::uno::RuntimeException, std::exception); + void clonedFrom(const OInterfaceContainer& _cloneSource); protected: virtual ~OInterfaceContainer(); public: // css::io::XPersistObject - virtual OUString SAL_CALL getServiceName( ) throw(css::uno::RuntimeException, std::exception) override = 0; - virtual void SAL_CALL write( const css::uno::Reference< css::io::XObjectOutputStream >& OutStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL read( const css::uno::Reference< css::io::XObjectInputStream >& InStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName( ) override = 0; + virtual void SAL_CALL write( const css::uno::Reference< css::io::XObjectOutputStream >& OutStream ) override; + virtual void SAL_CALL read( const css::uno::Reference< css::io::XObjectInputStream >& InStream ) override; // css::lang::XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) override; // css::beans::XPropertyChangeListener - virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) override; // css::container::XElementAccess - virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override ; - virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() override ; + virtual sal_Bool SAL_CALL hasElements() override; // css::container::XEnumerationAccess - virtual css::uno::Reference< css::container::XEnumeration> SAL_CALL createEnumeration() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration> SAL_CALL createEnumeration() override; // css::container::XNameAccess - virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence<OUString> SAL_CALL getElementNames( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override; + virtual css::uno::Sequence<OUString> SAL_CALL getElementNames( ) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // css::container::XNameReplace - virtual void SAL_CALL replaceByName(const OUString& Name, const css::uno::Any& _rElement) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByName(const OUString& Name, const css::uno::Any& _rElement) override; // css::container::XNameContainer - virtual void SAL_CALL insertByName(const OUString& Name, const css::uno::Any& _rElement) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName(const OUString& Name) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByName(const OUString& Name, const css::uno::Any& _rElement) override; + virtual void SAL_CALL removeByName(const OUString& Name) override; // css::container::XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 _nIndex) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() override; + virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 _nIndex) override; // css::container::XIndexReplace - virtual void SAL_CALL replaceByIndex(sal_Int32 _nIndex, const css::uno::Any& _rElement) throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByIndex(sal_Int32 _nIndex, const css::uno::Any& _rElement) override; // css::container::XIndexContainer - virtual void SAL_CALL insertByIndex(sal_Int32 _nIndex, const css::uno::Any& Element) throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByIndex(sal_Int32 _nIndex) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByIndex(sal_Int32 _nIndex, const css::uno::Any& Element) override; + virtual void SAL_CALL removeByIndex(sal_Int32 _nIndex) override; // css::container::XContainer - virtual void SAL_CALL addContainerListener(const css::uno::Reference< css::container::XContainerListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeContainerListener(const css::uno::Reference< css::container::XContainerListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addContainerListener(const css::uno::Reference< css::container::XContainerListener>& _rxListener) override; + virtual void SAL_CALL removeContainerListener(const css::uno::Reference< css::container::XContainerListener>& _rxListener) override; // css::script::XEventAttacherManager - virtual void SAL_CALL registerScriptEvent( sal_Int32 nIndex, const css::script::ScriptEventDescriptor& aScriptEvent ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL registerScriptEvents( sal_Int32 nIndex, const css::uno::Sequence< css::script::ScriptEventDescriptor >& aScriptEvents ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL revokeScriptEvent( sal_Int32 nIndex, const OUString& aListenerType, const OUString& aEventMethod, const OUString& aRemoveListenerParam ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL revokeScriptEvents( sal_Int32 nIndex ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertEntry( sal_Int32 nIndex ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEntry( sal_Int32 nIndex ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::script::ScriptEventDescriptor > SAL_CALL getScriptEvents( sal_Int32 Index ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL attach( sal_Int32 nIndex, const css::uno::Reference< css::uno::XInterface >& xObject, const css::uno::Any& aHelper ) throw(css::lang::IllegalArgumentException, css::lang::ServiceNotRegisteredException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL detach( sal_Int32 nIndex, const css::uno::Reference< css::uno::XInterface >& xObject ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addScriptListener( const css::uno::Reference< css::script::XScriptListener >& xListener ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeScriptListener( const css::uno::Reference< css::script::XScriptListener >& Listener ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL registerScriptEvent( sal_Int32 nIndex, const css::script::ScriptEventDescriptor& aScriptEvent ) override; + virtual void SAL_CALL registerScriptEvents( sal_Int32 nIndex, const css::uno::Sequence< css::script::ScriptEventDescriptor >& aScriptEvents ) override; + virtual void SAL_CALL revokeScriptEvent( sal_Int32 nIndex, const OUString& aListenerType, const OUString& aEventMethod, const OUString& aRemoveListenerParam ) override; + virtual void SAL_CALL revokeScriptEvents( sal_Int32 nIndex ) override; + virtual void SAL_CALL insertEntry( sal_Int32 nIndex ) override; + virtual void SAL_CALL removeEntry( sal_Int32 nIndex ) override; + virtual css::uno::Sequence< css::script::ScriptEventDescriptor > SAL_CALL getScriptEvents( sal_Int32 Index ) override; + virtual void SAL_CALL attach( sal_Int32 nIndex, const css::uno::Reference< css::uno::XInterface >& xObject, const css::uno::Any& aHelper ) override; + virtual void SAL_CALL detach( sal_Int32 nIndex, const css::uno::Reference< css::uno::XInterface >& xObject ) override; + virtual void SAL_CALL addScriptListener( const css::uno::Reference< css::script::XScriptListener >& xListener ) override; + virtual void SAL_CALL removeScriptListener( const css::uno::Reference< css::script::XScriptListener >& Listener ) override; protected: // helper @@ -218,7 +218,7 @@ protected: bool _bEvents /* = sal_True */, ElementDescription* _pApprovalResult /* = NULL */ , bool _bFire /* = sal_True */ - ) throw(css::lang::IllegalArgumentException); + ); // called after the object is inserted, but before the "real listeners" are notified virtual void implInserted( const ElementDescription* _pElement ); @@ -292,15 +292,15 @@ public: DECLARE_UNO3_AGG_DEFAULTS(OFormComponents, FormComponentsBase) - virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; // OComponentHelper virtual void SAL_CALL disposing() override; // css::form::XFormComponent - virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getParent() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getParent() override; + virtual void SAL_CALL setParent(const css::uno::Reference<css::uno::XInterface>& Parent) override; // XEventListener using OInterfaceContainer::disposing; diff --git a/forms/source/inc/controlfeatureinterception.hxx b/forms/source/inc/controlfeatureinterception.hxx index e17f45278e75..b757e20ca198 100644 --- a/forms/source/inc/controlfeatureinterception.hxx +++ b/forms/source/inc/controlfeatureinterception.hxx @@ -61,9 +61,9 @@ namespace frm // XDispatchProviderInterception /// @throws css::uno::RuntimeException - void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) throw (css::uno::RuntimeException ); + void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ); /// @throws css::uno::RuntimeException - void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) throw (css::uno::RuntimeException ); + void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ); // XComponent void SAL_CALL dispose(); diff --git a/forms/source/inc/formcontrolfont.hxx b/forms/source/inc/formcontrolfont.hxx index 0de0c449793d..67135d041a7f 100644 --- a/forms/source/inc/formcontrolfont.hxx +++ b/forms/source/inc/formcontrolfont.hxx @@ -75,13 +75,12 @@ namespace frm void getFastPropertyValue ( css::uno::Any& _rValue, sal_Int32 _nHandle ) const; /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException - bool convertFastPropertyValue ( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ); + bool convertFastPropertyValue ( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ); /// @throws css::uno::Exception void setFastPropertyValue_NoBroadcast_impl( ::cppu::OPropertySetHelper & rBase, void (::cppu::OPropertySetHelper::*pSet)( sal_Int32, css::uno::Any const&), - sal_Int32 nHandle, const css::uno::Any& rValue) - throw ( css::uno::Exception ); + sal_Int32 nHandle, const css::uno::Any& rValue); css::uno::Any getPropertyDefaultByHandle ( sal_Int32 _nHandle ) const; diff --git a/forms/source/inc/formnavigation.hxx b/forms/source/inc/formnavigation.hxx index 32f8c8017d04..b0f8663075fe 100644 --- a/forms/source/inc/formnavigation.hxx +++ b/forms/source/inc/formnavigation.hxx @@ -79,17 +79,17 @@ namespace frm // XComponent /// @throws css::uno::RuntimeException - void SAL_CALL dispose( ) throw( css::uno::RuntimeException ); + void SAL_CALL dispose( ); // XDispatchProviderInterception - virtual void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) override; + virtual void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) override; // XStatusListener - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& State ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& State ) override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // IFeatureDispatcher virtual void dispatch( sal_Int16 _nFeatureId ) const override; diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx index e8973e7d6000..19b98ea87e8e 100644 --- a/forms/source/misc/InterfaceContainer.cxx +++ b/forms/source/misc/InterfaceContainer.cxx @@ -199,7 +199,7 @@ OInterfaceContainer::OInterfaceContainer( ::osl::Mutex& _rMutex, const OInterfac impl_createEventAttacher_nothrow(); } -void OInterfaceContainer::clonedFrom(const OInterfaceContainer& _cloneSource) throw(RuntimeException, std::exception) +void OInterfaceContainer::clonedFrom(const OInterfaceContainer& _cloneSource) { try { @@ -450,7 +450,7 @@ void SAL_CALL OInterfaceContainer::readEvents(const Reference<XObjectInputStream } -void SAL_CALL OInterfaceContainer::write( const Reference< XObjectOutputStream >& _rxOutStream ) throw(IOException, RuntimeException, std::exception) +void SAL_CALL OInterfaceContainer::write( const Reference< XObjectOutputStream >& _rxOutStream ) { ::osl::MutexGuard aGuard( m_rMutex ); sal_Int32 nLen = m_aItems.size(); @@ -508,7 +508,7 @@ namespace } -void SAL_CALL OInterfaceContainer::read( const Reference< XObjectInputStream >& _rxInStream ) throw(IOException, RuntimeException, std::exception) +void SAL_CALL OInterfaceContainer::read( const Reference< XObjectInputStream >& _rxInStream ) { ::osl::MutexGuard aGuard( m_rMutex ); @@ -597,20 +597,20 @@ void SAL_CALL OInterfaceContainer::read( const Reference< XObjectInputStream >& // XContainer -void SAL_CALL OInterfaceContainer::addContainerListener(const Reference<XContainerListener>& _rxListener) throw( RuntimeException, std::exception ) +void SAL_CALL OInterfaceContainer::addContainerListener(const Reference<XContainerListener>& _rxListener) { m_aContainerListeners.addInterface(_rxListener); } -void SAL_CALL OInterfaceContainer::removeContainerListener(const Reference<XContainerListener>& _rxListener) throw( RuntimeException, std::exception ) +void SAL_CALL OInterfaceContainer::removeContainerListener(const Reference<XContainerListener>& _rxListener) { m_aContainerListeners.removeInterface(_rxListener); } // XEventListener -void SAL_CALL OInterfaceContainer::disposing(const css::lang::EventObject& _rSource) throw( RuntimeException, std::exception ) +void SAL_CALL OInterfaceContainer::disposing(const css::lang::EventObject& _rSource) { ::osl::MutexGuard aGuard( m_rMutex ); @@ -655,8 +655,7 @@ void SAL_CALL OInterfaceContainer::disposing(const css::lang::EventObject& _rSou // XPropertyChangeListener -void OInterfaceContainer::propertyChange(const PropertyChangeEvent& evt) -throw (css::uno::RuntimeException, std::exception) { +void OInterfaceContainer::propertyChange(const PropertyChangeEvent& evt) { if (evt.PropertyName == PROPERTY_NAME) { ::osl::MutexGuard aGuard( m_rMutex ); @@ -672,20 +671,20 @@ throw (css::uno::RuntimeException, std::exception) { // XElementAccess -sal_Bool SAL_CALL OInterfaceContainer::hasElements() throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL OInterfaceContainer::hasElements() { return !m_aMap.empty(); } -Type SAL_CALL OInterfaceContainer::getElementType() throw(RuntimeException, std::exception) +Type SAL_CALL OInterfaceContainer::getElementType() { return m_aElementType; } // XEnumerationAccess -Reference<XEnumeration> SAL_CALL OInterfaceContainer::createEnumeration() throw( RuntimeException, std::exception ) +Reference<XEnumeration> SAL_CALL OInterfaceContainer::createEnumeration() { ::osl::MutexGuard aGuard( m_rMutex ); return new ::comphelper::OEnumerationByIndex(static_cast<XIndexAccess*>(this)); @@ -693,7 +692,7 @@ Reference<XEnumeration> SAL_CALL OInterfaceContainer::createEnumeration() throw( // XNameAccess -Any SAL_CALL OInterfaceContainer::getByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) +Any SAL_CALL OInterfaceContainer::getByName( const OUString& _rName ) { ::std::pair <OInterfaceMap::iterator, OInterfaceMap::iterator> aPair = m_aMap.equal_range(_rName); @@ -705,13 +704,13 @@ Any SAL_CALL OInterfaceContainer::getByName( const OUString& _rName ) throw(NoSu } -css::uno::Sequence<OUString> SAL_CALL OInterfaceContainer::getElementNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OInterfaceContainer::getElementNames() { return comphelper::mapKeysToSequence(m_aMap); } -sal_Bool SAL_CALL OInterfaceContainer::hasByName( const OUString& _rName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL OInterfaceContainer::hasByName( const OUString& _rName ) { ::std::pair <OInterfaceMap::iterator, OInterfaceMap::iterator> aPair = m_aMap.equal_range(_rName); @@ -720,13 +719,13 @@ sal_Bool SAL_CALL OInterfaceContainer::hasByName( const OUString& _rName ) throw // XIndexAccess -sal_Int32 OInterfaceContainer::getCount() throw( RuntimeException, std::exception ) +sal_Int32 OInterfaceContainer::getCount() { return m_aItems.size(); } -Any OInterfaceContainer::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) +Any OInterfaceContainer::getByIndex(sal_Int32 _nIndex) { if (_nIndex < 0 || (_nIndex >= (sal_Int32)m_aItems.size())) throw IndexOutOfBoundsException(); @@ -770,7 +769,7 @@ void OInterfaceContainer::approveNewElement( const Reference< XPropertySet >& _r void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XPropertySet >& _rxElement, - bool _bEvents, ElementDescription* _pApprovalResult, bool _bFire ) throw( IllegalArgumentException ) + bool _bEvents, ElementDescription* _pApprovalResult, bool _bFire ) { const bool bHandleEvents = _bEvents && m_xEventAttacher.is(); @@ -912,7 +911,7 @@ void OInterfaceContainer::impl_replacedElement( const ContainerEvent& _rEvent, : // XIndexContainer -void SAL_CALL OInterfaceContainer::insertByIndex( sal_Int32 _nIndex, const Any& _rElement ) throw(IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL OInterfaceContainer::insertByIndex( sal_Int32 _nIndex, const Any& _rElement ) { Reference< XPropertySet > xElement; _rElement >>= xElement; @@ -1000,7 +999,7 @@ void OInterfaceContainer::implCheckIndex( const sal_Int32 _nIndex ) } -void SAL_CALL OInterfaceContainer::replaceByIndex(sal_Int32 _nIndex, const Any& Element) throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) +void SAL_CALL OInterfaceContainer::replaceByIndex(sal_Int32 _nIndex, const Any& Element) { ::osl::ClearableMutexGuard aGuard( m_rMutex ); // check the index @@ -1053,7 +1052,7 @@ void OInterfaceContainer::implRemoveByIndex( const sal_Int32 _nIndex, ::osl::Cle } -void SAL_CALL OInterfaceContainer::removeByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) +void SAL_CALL OInterfaceContainer::removeByIndex(sal_Int32 _nIndex) { ::osl::ClearableMutexGuard aGuard( m_rMutex ); // check the index @@ -1069,7 +1068,7 @@ ElementDescription* OInterfaceContainer::createElementMetaData( ) } -void SAL_CALL OInterfaceContainer::insertByName(const OUString& _rName, const Any& _rElement) throw( IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception ) +void SAL_CALL OInterfaceContainer::insertByName(const OUString& _rName, const Any& _rElement) { Reference< XPropertySet > xElementProps; @@ -1100,7 +1099,7 @@ void SAL_CALL OInterfaceContainer::insertByName(const OUString& _rName, const An } -void SAL_CALL OInterfaceContainer::replaceByName(const OUString& Name, const Any& Element) throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) +void SAL_CALL OInterfaceContainer::replaceByName(const OUString& Name, const Any& Element) { ::osl::ClearableMutexGuard aGuard( m_rMutex ); ::std::pair <OInterfaceMap::iterator, @@ -1128,7 +1127,7 @@ void SAL_CALL OInterfaceContainer::replaceByName(const OUString& Name, const Any } -void SAL_CALL OInterfaceContainer::removeByName(const OUString& Name) throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) +void SAL_CALL OInterfaceContainer::removeByName(const OUString& Name) { ::osl::MutexGuard aGuard( m_rMutex ); ::std::pair <OInterfaceMap::iterator, @@ -1143,7 +1142,7 @@ void SAL_CALL OInterfaceContainer::removeByName(const OUString& Name) throw( NoS // XEventAttacherManager -void SAL_CALL OInterfaceContainer::registerScriptEvent( sal_Int32 nIndex, const ScriptEventDescriptor& aScriptEvent ) throw(IllegalArgumentException, RuntimeException, std::exception) +void SAL_CALL OInterfaceContainer::registerScriptEvent( sal_Int32 nIndex, const ScriptEventDescriptor& aScriptEvent ) { ::osl::ClearableMutexGuard aGuard( m_rMutex ); if ( m_xEventAttacher.is() ) @@ -1155,7 +1154,7 @@ void SAL_CALL OInterfaceContainer::registerScriptEvent( sal_Int32 nIndex, const } -void SAL_CALL OInterfaceContainer::registerScriptEvents( sal_Int32 nIndex, const Sequence< ScriptEventDescriptor >& aScriptEvents ) throw(IllegalArgumentException, RuntimeException, std::exception) +void SAL_CALL OInterfaceContainer::registerScriptEvents( sal_Int32 nIndex, const Sequence< ScriptEventDescriptor >& aScriptEvents ) { ::osl::ClearableMutexGuard aGuard( m_rMutex ); if ( m_xEventAttacher.is() ) @@ -1167,35 +1166,35 @@ void SAL_CALL OInterfaceContainer::registerScriptEvents( sal_Int32 nIndex, const } -void SAL_CALL OInterfaceContainer::revokeScriptEvent( sal_Int32 nIndex, const OUString& aListenerType, const OUString& aEventMethod, const OUString& aRemoveListenerParam ) throw(IllegalArgumentException, RuntimeException, std::exception) +void SAL_CALL OInterfaceContainer::revokeScriptEvent( sal_Int32 nIndex, const OUString& aListenerType, const OUString& aEventMethod, const OUString& aRemoveListenerParam ) { if ( m_xEventAttacher.is() ) m_xEventAttacher->revokeScriptEvent( nIndex, aListenerType, aEventMethod, aRemoveListenerParam ); } -void SAL_CALL OInterfaceContainer::revokeScriptEvents( sal_Int32 nIndex ) throw(IllegalArgumentException, RuntimeException, std::exception) +void SAL_CALL OInterfaceContainer::revokeScriptEvents( sal_Int32 nIndex ) { if ( m_xEventAttacher.is() ) m_xEventAttacher->revokeScriptEvents( nIndex ); } -void SAL_CALL OInterfaceContainer::insertEntry( sal_Int32 nIndex ) throw(IllegalArgumentException, RuntimeException, std::exception) +void SAL_CALL OInterfaceContainer::insertEntry( sal_Int32 nIndex ) { if ( m_xEventAttacher.is() ) m_xEventAttacher->insertEntry( nIndex ); } -void SAL_CALL OInterfaceContainer::removeEntry( sal_Int32 nIndex ) throw(IllegalArgumentException, RuntimeException, std::exception) +void SAL_CALL OInterfaceContainer::removeEntry( sal_Int32 nIndex ) { if ( m_xEventAttacher.is() ) m_xEventAttacher->removeEntry( nIndex ); } -Sequence< ScriptEventDescriptor > SAL_CALL OInterfaceContainer::getScriptEvents( sal_Int32 nIndex ) throw(IllegalArgumentException, RuntimeException, std::exception) +Sequence< ScriptEventDescriptor > SAL_CALL OInterfaceContainer::getScriptEvents( sal_Int32 nIndex ) { Sequence< ScriptEventDescriptor > aReturn; if ( m_xEventAttacher.is() ) @@ -1210,28 +1209,28 @@ Sequence< ScriptEventDescriptor > SAL_CALL OInterfaceContainer::getScriptEvents( } -void SAL_CALL OInterfaceContainer::attach( sal_Int32 nIndex, const Reference< XInterface >& xObject, const Any& aHelper ) throw(IllegalArgumentException, ServiceNotRegisteredException, RuntimeException, std::exception) +void SAL_CALL OInterfaceContainer::attach( sal_Int32 nIndex, const Reference< XInterface >& xObject, const Any& aHelper ) { if ( m_xEventAttacher.is() ) m_xEventAttacher->attach( nIndex, xObject, aHelper ); } -void SAL_CALL OInterfaceContainer::detach( sal_Int32 nIndex, const Reference< XInterface >& xObject ) throw(IllegalArgumentException, RuntimeException, std::exception) +void SAL_CALL OInterfaceContainer::detach( sal_Int32 nIndex, const Reference< XInterface >& xObject ) { if ( m_xEventAttacher.is() ) m_xEventAttacher->detach( nIndex, xObject ); } -void SAL_CALL OInterfaceContainer::addScriptListener( const Reference< XScriptListener >& xListener ) throw(IllegalArgumentException, RuntimeException, std::exception) +void SAL_CALL OInterfaceContainer::addScriptListener( const Reference< XScriptListener >& xListener ) { if ( m_xEventAttacher.is() ) m_xEventAttacher->addScriptListener( xListener ); } -void SAL_CALL OInterfaceContainer::removeScriptListener( const Reference< XScriptListener >& xListener ) throw(IllegalArgumentException, RuntimeException, std::exception) +void SAL_CALL OInterfaceContainer::removeScriptListener( const Reference< XScriptListener >& xListener ) { if ( m_xEventAttacher.is() ) m_xEventAttacher->removeScriptListener( xListener ); @@ -1241,7 +1240,7 @@ void SAL_CALL OInterfaceContainer::removeScriptListener( const Reference< XScrip //= OFormComponents -Any SAL_CALL OFormComponents::queryAggregation(const Type& _rType) throw(RuntimeException, std::exception) +Any SAL_CALL OFormComponents::queryAggregation(const Type& _rType) { Any aReturn = OFormComponents_BASE::queryInterface(_rType); if (!aReturn.hasValue()) @@ -1256,7 +1255,7 @@ Any SAL_CALL OFormComponents::queryAggregation(const Type& _rType) throw(Runtime } -Sequence<Type> SAL_CALL OFormComponents::getTypes() throw(RuntimeException, std::exception) +Sequence<Type> SAL_CALL OFormComponents::getTypes() { return ::comphelper::concatSequences(OInterfaceContainer::getTypes(), FormComponentsBase::getTypes(), OFormComponents_BASE::getTypes()); } @@ -1298,14 +1297,14 @@ void OFormComponents::disposing() //XChild -void OFormComponents::setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw( NoSupportException, RuntimeException, std::exception ) +void OFormComponents::setParent(const css::uno::Reference<css::uno::XInterface>& Parent) { ::osl::MutexGuard aGuard( m_aMutex ); m_xParent = Parent; } -css::uno::Reference<css::uno::XInterface> OFormComponents::getParent() throw( RuntimeException, std::exception ) +css::uno::Reference<css::uno::XInterface> OFormComponents::getParent() { return m_xParent; } diff --git a/forms/source/richtext/attributedispatcher.cxx b/forms/source/richtext/attributedispatcher.cxx index abc6ab789283..af06c8a26811 100644 --- a/forms/source/richtext/attributedispatcher.cxx +++ b/forms/source/richtext/attributedispatcher.cxx @@ -80,7 +80,7 @@ namespace frm } - void SAL_CALL OAttributeDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArguments ) throw (RuntimeException, std::exception) + void SAL_CALL OAttributeDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArguments ) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/forms/source/richtext/attributedispatcher.hxx b/forms/source/richtext/attributedispatcher.hxx index a2e89f829be2..42a673209da1 100644 --- a/forms/source/richtext/attributedispatcher.hxx +++ b/forms/source/richtext/attributedispatcher.hxx @@ -58,7 +58,7 @@ namespace frm virtual ~OAttributeDispatcher( ) override; // XDispatch - virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override; // ITextAttributeListener virtual void onAttributeStateChanged( AttributeId _nAttributeId, const AttributeState& _rState ) override; diff --git a/forms/source/richtext/clipboarddispatcher.cxx b/forms/source/richtext/clipboarddispatcher.cxx index 9d068b428f26..125e47bd0d2f 100644 --- a/forms/source/richtext/clipboarddispatcher.cxx +++ b/forms/source/richtext/clipboarddispatcher.cxx @@ -106,7 +106,7 @@ namespace frm } - void SAL_CALL OClipboardDispatcher::dispatch( const URL& /*_rURL*/, const Sequence< PropertyValue >& /*Arguments*/ ) throw (RuntimeException, std::exception) + void SAL_CALL OClipboardDispatcher::dispatch( const URL& /*_rURL*/, const Sequence< PropertyValue >& /*Arguments*/ ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !getEditView() ) diff --git a/forms/source/richtext/clipboarddispatcher.hxx b/forms/source/richtext/clipboarddispatcher.hxx index 64ef645dc28f..914b9bc86640 100644 --- a/forms/source/richtext/clipboarddispatcher.hxx +++ b/forms/source/richtext/clipboarddispatcher.hxx @@ -49,7 +49,7 @@ namespace frm protected: // XDispatch - virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override; // ORichTextFeatureDispatcher virtual void invalidateFeatureState_Broadcast() override; diff --git a/forms/source/richtext/featuredispatcher.cxx b/forms/source/richtext/featuredispatcher.cxx index 6da6c8d9ba85..d01571bff032 100644 --- a/forms/source/richtext/featuredispatcher.cxx +++ b/forms/source/richtext/featuredispatcher.cxx @@ -65,7 +65,7 @@ namespace frm } - void SAL_CALL ORichTextFeatureDispatcher::addStatusListener( const Reference< XStatusListener >& _rxControl, const URL& _rURL ) throw (RuntimeException, std::exception) + void SAL_CALL ORichTextFeatureDispatcher::addStatusListener( const Reference< XStatusListener >& _rxControl, const URL& _rURL ) { OSL_ENSURE( !m_bDisposed, "ORichTextFeatureDispatcher::addStatusListener: already disposed!" ); if ( m_bDisposed ) @@ -81,7 +81,7 @@ namespace frm } - void SAL_CALL ORichTextFeatureDispatcher::removeStatusListener( const Reference< XStatusListener >& _rxControl, const URL& /*_rURL*/ ) throw (RuntimeException, std::exception) + void SAL_CALL ORichTextFeatureDispatcher::removeStatusListener( const Reference< XStatusListener >& _rxControl, const URL& /*_rURL*/ ) { m_aStatusListeners.removeInterface( _rxControl ); } diff --git a/forms/source/richtext/featuredispatcher.hxx b/forms/source/richtext/featuredispatcher.hxx index 4fc296272bd0..423f88bb5db0 100644 --- a/forms/source/richtext/featuredispatcher.hxx +++ b/forms/source/richtext/featuredispatcher.hxx @@ -79,8 +79,8 @@ namespace frm ); // XDispatch - virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxControl, const css::util::URL& _rURL ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxControl, const css::util::URL& _rURL ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxControl, const css::util::URL& _rURL ) override; + virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxControl, const css::util::URL& _rURL ) override; }; diff --git a/forms/source/richtext/parametrizedattributedispatcher.cxx b/forms/source/richtext/parametrizedattributedispatcher.cxx index 607cba973d84..c52f3cc93763 100644 --- a/forms/source/richtext/parametrizedattributedispatcher.cxx +++ b/forms/source/richtext/parametrizedattributedispatcher.cxx @@ -110,7 +110,7 @@ namespace frm } - void SAL_CALL OParametrizedAttributeDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArguments ) throw (RuntimeException, std::exception) + void SAL_CALL OParametrizedAttributeDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArguments ) { ::osl::MutexGuard aGuard( m_aMutex ); OSL_ENSURE( _rURL.Complete == getFeatureURL().Complete, "OParametrizedAttributeDispatcher::dispatch: invalid URL!" ); diff --git a/forms/source/richtext/parametrizedattributedispatcher.hxx b/forms/source/richtext/parametrizedattributedispatcher.hxx index 0dbe9d48ca34..8fe9cfbc2187 100644 --- a/forms/source/richtext/parametrizedattributedispatcher.hxx +++ b/forms/source/richtext/parametrizedattributedispatcher.hxx @@ -41,7 +41,7 @@ namespace frm virtual ~OParametrizedAttributeDispatcher() override; // XDispatch - virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override; // OAttributeDispatcher virtual void fillFeatureEventFromAttributeState( css::frame::FeatureStateEvent& _rEvent, const AttributeState& _rState ) const override; diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index 6d1aa2c708f5..5bdd44154c93 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -63,7 +63,7 @@ namespace frm IMPLEMENT_FORWARD_XTYPEPROVIDER2( ORichTextControl, UnoEditControl, ORichTextControl_Base ) - Any SAL_CALL ORichTextControl::queryAggregation( const Type& _rType ) throw ( RuntimeException, std::exception ) + Any SAL_CALL ORichTextControl::queryAggregation( const Type& _rType ) { Any aReturn = UnoEditControl::queryAggregation( _rType ); @@ -144,7 +144,7 @@ namespace frm } - void SAL_CALL ORichTextControl::createPeer( const Reference< XToolkit >& _rToolkit, const Reference< XWindowPeer >& _rParentPeer ) throw( RuntimeException, std::exception ) + void SAL_CALL ORichTextControl::createPeer( const Reference< XToolkit >& _rToolkit, const Reference< XWindowPeer >& _rParentPeer ) { bool bReallyActAsRichText = false; try @@ -215,19 +215,19 @@ namespace frm } } - OUString SAL_CALL ORichTextControl::getImplementationName() throw( RuntimeException, std::exception ) + OUString SAL_CALL ORichTextControl::getImplementationName() { return OUString( "com.sun.star.comp.form.ORichTextControl" ); } - Sequence< OUString > SAL_CALL ORichTextControl::getSupportedServiceNames() throw( RuntimeException, std::exception ) + Sequence< OUString > SAL_CALL ORichTextControl::getSupportedServiceNames() { return { "com.sun.star.awt.UnoControl", "com.sun.star.awt.UnoControlEdit", FRM_SUN_CONTROL_RICHTEXTCONTROL }; } - Reference< XDispatch > SAL_CALL ORichTextControl::queryDispatch( const css::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _nSearchFlags ) throw (RuntimeException, std::exception) + Reference< XDispatch > SAL_CALL ORichTextControl::queryDispatch( const css::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _nSearchFlags ) { Reference< XDispatch > aReturn; Reference< XDispatchProvider > xTypedPeer( getPeer(), UNO_QUERY ); @@ -238,7 +238,7 @@ namespace frm return aReturn; } - Sequence< Reference< XDispatch > > SAL_CALL ORichTextControl::queryDispatches( const Sequence< DispatchDescriptor >& _rRequests ) throw (RuntimeException, std::exception) + Sequence< Reference< XDispatch > > SAL_CALL ORichTextControl::queryDispatches( const Sequence< DispatchDescriptor >& _rRequests ) { Sequence< Reference< XDispatch > > aReturn; Reference< XDispatchProvider > xTypedPeer( getPeer(), UNO_QUERY ); @@ -290,7 +290,7 @@ namespace frm } - void ORichTextPeer::dispose( ) throw(RuntimeException, std::exception) + void ORichTextPeer::dispose( ) { { SolarMutexGuard aGuard; @@ -316,7 +316,7 @@ namespace frm } - void SAL_CALL ORichTextPeer::draw( sal_Int32 _nX, sal_Int32 _nY ) throw(css::uno::RuntimeException, std::exception) + void SAL_CALL ORichTextPeer::draw( sal_Int32 _nX, sal_Int32 _nY ) { SolarMutexGuard aGuard; @@ -344,8 +344,6 @@ namespace frm void SAL_CALL ORichTextPeer::setProperty( const OUString& _rPropertyName, const Any& _rValue ) - throw (RuntimeException, - std::exception) { SolarMutexGuard g; @@ -594,7 +592,7 @@ namespace frm } - Reference< XDispatch > SAL_CALL ORichTextPeer::queryDispatch( const css::util::URL& _rURL, const OUString& /*_rTargetFrameName*/, sal_Int32 /*_nSearchFlags*/ ) throw (RuntimeException, std::exception) + Reference< XDispatch > SAL_CALL ORichTextPeer::queryDispatch( const css::util::URL& _rURL, const OUString& /*_rTargetFrameName*/, sal_Int32 /*_nSearchFlags*/ ) { Reference< XDispatch > xReturn; if ( !GetWindow() ) @@ -631,7 +629,7 @@ namespace frm } - Sequence< Reference< XDispatch > > SAL_CALL ORichTextPeer::queryDispatches( const Sequence< DispatchDescriptor >& _rRequests ) throw (RuntimeException, std::exception) + Sequence< Reference< XDispatch > > SAL_CALL ORichTextPeer::queryDispatches( const Sequence< DispatchDescriptor >& _rRequests ) { Sequence< Reference< XDispatch > > aReturn( _rRequests.getLength() ); Reference< XDispatch >* pReturn = aReturn.getArray(); diff --git a/forms/source/richtext/richtextcontrol.hxx b/forms/source/richtext/richtextcontrol.hxx index f0b9cb66c775..e19d68b08d8e 100644 --- a/forms/source/richtext/richtextcontrol.hxx +++ b/forms/source/richtext/richtextcontrol.hxx @@ -53,21 +53,21 @@ namespace frm // UNO DECLARE_UNO3_AGG_DEFAULTS( ORichTextControl, UnoEditControl ) - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override; // XControl - virtual void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& _rToolkit, const css::uno::Reference< css::awt::XWindowPeer >& _rParent ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& _rToolkit, const css::uno::Reference< css::awt::XWindowPeer >& _rParent ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XTypeProvider DECLARE_XTYPEPROVIDER() // XDispatchProvider - virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _rSearchFlags ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& Requests ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _rSearchFlags ) override; + virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& Requests ) override; // UnoControl virtual bool requiresNewPeer( const OUString& _rPropertyName ) const override; @@ -103,22 +103,20 @@ namespace frm virtual ~ORichTextPeer() override; // XView - void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) override; // XVclWindowPeer - virtual void SAL_CALL setProperty( const OUString& _rPropertyName, const css::uno::Any& _rValue ) - throw (css::uno::RuntimeException, - std::exception) override; + virtual void SAL_CALL setProperty( const OUString& _rPropertyName, const css::uno::Any& _rValue ) override; // XTypeProvider DECLARE_XTYPEPROVIDER( ) // XComponent - virtual void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose( ) override; // XDispatchProvider - virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _rSearchFlags ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& Requests ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _rSearchFlags ) override; + virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& Requests ) override; // ITextSelectionListener virtual void onSelectionChanged( const ESelection& _rSelection ) override; diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx index 928dfc3a4877..6c7c58f9ff78 100644 --- a/forms/source/richtext/richtextmodel.cxx +++ b/forms/source/richtext/richtextmodel.cxx @@ -212,7 +212,7 @@ namespace frm } - Any SAL_CALL ORichTextModel::queryAggregation( const Type& _rType ) throw ( RuntimeException, std::exception ) + Any SAL_CALL ORichTextModel::queryAggregation( const Type& _rType ) { Any aReturn = ORichTextModel_BASE::queryInterface( _rType ); @@ -225,12 +225,12 @@ namespace frm IMPLEMENT_FORWARD_XTYPEPROVIDER2( ORichTextModel, OControlModel, ORichTextModel_BASE ) - OUString SAL_CALL ORichTextModel::getImplementationName() throw ( RuntimeException, std::exception ) + OUString SAL_CALL ORichTextModel::getImplementationName() { return OUString( "com.sun.star.comp.forms.ORichTextModel" ); } - Sequence< OUString > SAL_CALL ORichTextModel::getSupportedServiceNames() throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL ORichTextModel::getSupportedServiceNames() { Sequence< OUString > aOwnNames( 8 ); aOwnNames[ 0 ] = FRM_SUN_COMPONENT_RICHTEXTCONTROL; @@ -329,7 +329,7 @@ namespace frm } - sal_Bool SAL_CALL ORichTextModel::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw( IllegalArgumentException, RuntimeException, std::exception ) + sal_Bool SAL_CALL ORichTextModel::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) { bool bModified = false; @@ -350,7 +350,7 @@ namespace frm } - void SAL_CALL ORichTextModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception, std::exception) + void SAL_CALL ORichTextModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) { if ( isRegisteredProperty( _nHandle ) ) { @@ -494,7 +494,7 @@ namespace frm } - OUString SAL_CALL ORichTextModel::getServiceName() throw ( RuntimeException, std::exception) + OUString SAL_CALL ORichTextModel::getServiceName() { return OUString(FRM_SUN_COMPONENT_RICHTEXTCONTROL); } @@ -552,7 +552,7 @@ namespace frm } - sal_Int64 SAL_CALL ORichTextModel::getSomething( const Sequence< sal_Int8 >& _rId ) throw (RuntimeException, std::exception) + sal_Int64 SAL_CALL ORichTextModel::getSomething( const Sequence< sal_Int8 >& _rId ) { Sequence< sal_Int8 > aEditEngineAccessId( getEditEngineTunnelId() ); if ( ( _rId.getLength() == aEditEngineAccessId.getLength() ) @@ -568,13 +568,13 @@ namespace frm } - void SAL_CALL ORichTextModel::addModifyListener( const Reference< XModifyListener >& _rxListener ) throw (RuntimeException, std::exception) + void SAL_CALL ORichTextModel::addModifyListener( const Reference< XModifyListener >& _rxListener ) { m_aModifyListeners.addInterface( _rxListener ); } - void SAL_CALL ORichTextModel::removeModifyListener( const Reference< XModifyListener >& _rxListener ) throw (RuntimeException, std::exception) + void SAL_CALL ORichTextModel::removeModifyListener( const Reference< XModifyListener >& _rxListener ) { m_aModifyListeners.removeInterface( _rxListener ); } diff --git a/forms/source/richtext/richtextmodel.hxx b/forms/source/richtext/richtextmodel.hxx index 4325dd6f3bff..f8a141642f66 100644 --- a/forms/source/richtext/richtextmodel.hxx +++ b/forms/source/richtext/richtextmodel.hxx @@ -105,34 +105,33 @@ namespace frm // UNO DECLARE_UNO3_AGG_DEFAULTS( ORichTextModel, OControlModel ) - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::css::uno::RuntimeException, std::exception) override; - virtual ::css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual ::css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XPersistObject - virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; // XTypeProvider DECLARE_XTYPEPROVIDER() // XCloneable - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; + virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // XPropertySet and friends virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle ) const override; virtual sal_Bool SAL_CALL convertFastPropertyValue(css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, - sal_Int32 nHandle, const css::uno::Any& rValue ) - throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) throw ( css::uno::Exception, std::exception) override; + sal_Int32 nHandle, const css::uno::Any& rValue ) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const css::uno::Any& rValue) override; virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const override; // OControlModel's property handling diff --git a/forms/source/richtext/specialdispatchers.cxx b/forms/source/richtext/specialdispatchers.cxx index a745bb45caf4..e40711e26f14 100644 --- a/forms/source/richtext/specialdispatchers.cxx +++ b/forms/source/richtext/specialdispatchers.cxx @@ -51,8 +51,6 @@ namespace frm void SAL_CALL OSelectAllDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& /*_rArguments*/ ) - throw (RuntimeException, - std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); OSL_ENSURE( _rURL.Complete == getFeatureURL().Complete, "OSelectAllDispatcher::dispatch: invalid URL!" ); @@ -107,7 +105,7 @@ namespace frm } - void SAL_CALL OTextDirectionDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& /*_rArguments*/ ) throw (RuntimeException, std::exception) + void SAL_CALL OTextDirectionDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& /*_rArguments*/ ) { ::osl::MutexGuard aGuard( m_aMutex ); OSL_ENSURE( _rURL.Complete == getFeatureURL().Complete, "OTextDirectionDispatcher::dispatch: invalid URL!" ); diff --git a/forms/source/richtext/specialdispatchers.hxx b/forms/source/richtext/specialdispatchers.hxx index f7b2e0f0a169..aa60816e11dd 100644 --- a/forms/source/richtext/specialdispatchers.hxx +++ b/forms/source/richtext/specialdispatchers.hxx @@ -35,9 +35,7 @@ namespace frm virtual ~OSelectAllDispatcher() override; // XDispatch - virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) - throw (css::uno::RuntimeException, - std::exception) override; + virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override; // ORichTextFeatureDispatcher virtual css::frame::FeatureStateEvent buildStatusEvent() const override; @@ -65,7 +63,7 @@ namespace frm protected: // XDispatch - virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override; // ORichTextFeatureDispatcher virtual css::frame::FeatureStateEvent buildStatusEvent() const override; diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx index 75c56f19aee0..cf0571314994 100644 --- a/forms/source/runtime/formoperations.cxx +++ b/forms/source/runtime/formoperations.cxx @@ -131,7 +131,7 @@ namespace frm { } - void SAL_CALL FormOperations::initialize( const Sequence< Any >& _arguments ) throw (Exception, RuntimeException, std::exception) + void SAL_CALL FormOperations::initialize( const Sequence< Any >& _arguments ) { if ( m_bConstructed ) throw AlreadyInitializedException(); @@ -152,56 +152,56 @@ namespace frm throw IllegalArgumentException( OUString(), *this, 0 ); } - OUString SAL_CALL FormOperations::getImplementationName( ) throw (RuntimeException, std::exception) + OUString SAL_CALL FormOperations::getImplementationName( ) { return OUString( "com.sun.star.comp.forms.FormOperations" ); } - sal_Bool SAL_CALL FormOperations::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL FormOperations::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } - Sequence< OUString > SAL_CALL FormOperations::getSupportedServiceNames( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL FormOperations::getSupportedServiceNames( ) { return { "com.sun.star.form.runtime.FormOperations" }; } - Reference< XRowSet > SAL_CALL FormOperations::getCursor() throw (RuntimeException, std::exception) + Reference< XRowSet > SAL_CALL FormOperations::getCursor() { MethodGuard aGuard( *this ); return m_xCursor; } - Reference< XResultSetUpdate > SAL_CALL FormOperations::getUpdateCursor() throw (RuntimeException, std::exception) + Reference< XResultSetUpdate > SAL_CALL FormOperations::getUpdateCursor() { MethodGuard aGuard( *this ); return m_xUpdateCursor; } - Reference< XFormController > SAL_CALL FormOperations::getController() throw (RuntimeException, std::exception) + Reference< XFormController > SAL_CALL FormOperations::getController() { MethodGuard aGuard( *this ); return m_xController; } - Reference< XFeatureInvalidation > SAL_CALL FormOperations::getFeatureInvalidation() throw (RuntimeException, std::exception) + Reference< XFeatureInvalidation > SAL_CALL FormOperations::getFeatureInvalidation() { MethodGuard aGuard( *this ); return m_xFeatureInvalidation; } - void SAL_CALL FormOperations::setFeatureInvalidation( const Reference< XFeatureInvalidation > & _rxFeatureInvalidation ) throw (RuntimeException, std::exception) + void SAL_CALL FormOperations::setFeatureInvalidation( const Reference< XFeatureInvalidation > & _rxFeatureInvalidation ) { MethodGuard aGuard( *this ); m_xFeatureInvalidation = _rxFeatureInvalidation; } - FeatureState SAL_CALL FormOperations::getState( ::sal_Int16 _nFeature ) throw (RuntimeException, std::exception) + FeatureState SAL_CALL FormOperations::getState( ::sal_Int16 _nFeature ) { MethodGuard aGuard( *this ); @@ -384,7 +384,7 @@ namespace frm } - sal_Bool SAL_CALL FormOperations::isEnabled( ::sal_Int16 _nFeature ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL FormOperations::isEnabled( ::sal_Int16 _nFeature ) { MethodGuard aGuard( *this ); @@ -538,7 +538,7 @@ namespace frm } } - void SAL_CALL FormOperations::execute( ::sal_Int16 _nFeature ) throw (RuntimeException, IllegalArgumentException, SQLException, WrappedTargetException, std::exception) + void SAL_CALL FormOperations::execute( ::sal_Int16 _nFeature ) { SolarMutexGuard aSolarGuard; MethodGuard aGuard( *this ); @@ -797,7 +797,7 @@ namespace frm } - void SAL_CALL FormOperations::executeWithArguments( ::sal_Int16 _nFeature, const Sequence< NamedValue >& _rArguments ) throw (RuntimeException, IllegalArgumentException, SQLException, WrappedTargetException, std::exception) + void SAL_CALL FormOperations::executeWithArguments( ::sal_Int16 _nFeature, const Sequence< NamedValue >& _rArguments ) { if ( !lcl_requiresArguments( _nFeature ) ) { @@ -854,7 +854,7 @@ namespace frm } - sal_Bool SAL_CALL FormOperations::commitCurrentRecord( sal_Bool& _out_rRecordInserted ) throw (RuntimeException, SQLException, std::exception) + sal_Bool SAL_CALL FormOperations::commitCurrentRecord( sal_Bool& _out_rRecordInserted ) { MethodGuard aGuard( *this ); _out_rRecordInserted = false; @@ -891,7 +891,7 @@ namespace frm } - sal_Bool SAL_CALL FormOperations::commitCurrentControl() throw (RuntimeException, SQLException, std::exception) + sal_Bool SAL_CALL FormOperations::commitCurrentControl() { MethodGuard aGuard( *this ); return impl_commitCurrentControl_throw(); @@ -942,7 +942,7 @@ namespace frm } - sal_Bool SAL_CALL FormOperations::isInsertionRow() throw (RuntimeException, WrappedTargetException, std::exception) + sal_Bool SAL_CALL FormOperations::isInsertionRow() { bool bIs = false; try @@ -958,7 +958,7 @@ namespace frm } - sal_Bool SAL_CALL FormOperations::isModifiedRow() throw (RuntimeException, WrappedTargetException, std::exception) + sal_Bool SAL_CALL FormOperations::isModifiedRow() { bool bIs = false; try @@ -974,7 +974,7 @@ namespace frm } - void SAL_CALL FormOperations::cursorMoved( const EventObject& /*_Event*/ ) throw (RuntimeException, std::exception) + void SAL_CALL FormOperations::cursorMoved( const EventObject& /*_Event*/ ) { MethodGuard aGuard( *this ); m_bActiveControlModified = false; @@ -983,19 +983,19 @@ namespace frm } - void SAL_CALL FormOperations::rowChanged( const EventObject& /*_Event*/ ) throw (RuntimeException, std::exception) + void SAL_CALL FormOperations::rowChanged( const EventObject& /*_Event*/ ) { // not interested in } - void SAL_CALL FormOperations::rowSetChanged( const EventObject& /*_Event*/ ) throw (RuntimeException, std::exception) + void SAL_CALL FormOperations::rowSetChanged( const EventObject& /*_Event*/ ) { // not interested in } - void SAL_CALL FormOperations::modified( const EventObject& /*_Source*/ ) throw( RuntimeException, std::exception ) + void SAL_CALL FormOperations::modified( const EventObject& /*_Source*/ ) { MethodGuard aGuard( *this ); @@ -1008,7 +1008,7 @@ namespace frm } - void SAL_CALL FormOperations::propertyChange( const PropertyChangeEvent& _rEvent ) throw (RuntimeException, std::exception) + void SAL_CALL FormOperations::propertyChange( const PropertyChangeEvent& _rEvent ) { MethodGuard aGuard( *this ); @@ -1056,7 +1056,7 @@ namespace frm } - void SAL_CALL FormOperations::disposing( const EventObject& /*_Source*/ ) throw (RuntimeException, std::exception) + void SAL_CALL FormOperations::disposing( const EventObject& /*_Source*/ ) { // TODO: should we react on this? Or is this the responsibility of our owner to dispose us? } diff --git a/forms/source/runtime/formoperations.hxx b/forms/source/runtime/formoperations.hxx index 1e43dcd58801..29b2e04d5b73 100644 --- a/forms/source/runtime/formoperations.hxx +++ b/forms/source/runtime/formoperations.hxx @@ -101,41 +101,41 @@ namespace frm virtual ~FormOperations() override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XFormOperations - virtual css::uno::Reference< css::sdbc::XRowSet > SAL_CALL getCursor() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSetUpdate > SAL_CALL getUpdateCursor() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::form::runtime::XFormController > SAL_CALL getController() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::form::runtime::XFeatureInvalidation > SAL_CALL getFeatureInvalidation() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFeatureInvalidation(const css::uno::Reference< css::form::runtime::XFeatureInvalidation > & the_value) throw (css::uno::RuntimeException, std::exception) override; - virtual css::form::runtime::FeatureState SAL_CALL getState(::sal_Int16 Feature) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isEnabled(::sal_Int16 Feature) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL execute(::sal_Int16 Feature) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::sdbc::SQLException, css::lang::WrappedTargetException, std::exception) override; - virtual void SAL_CALL executeWithArguments(::sal_Int16 Feature, const css::uno::Sequence< css::beans::NamedValue >& Arguments) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::sdbc::SQLException, css::lang::WrappedTargetException, std::exception) override; - virtual sal_Bool SAL_CALL commitCurrentRecord(sal_Bool & RecordInserted) throw (css::uno::RuntimeException, css::sdbc::SQLException, std::exception) override; - virtual sal_Bool SAL_CALL commitCurrentControl() throw (css::uno::RuntimeException, css::sdbc::SQLException, std::exception) override; - virtual sal_Bool SAL_CALL isInsertionRow() throw (css::uno::RuntimeException, css::lang::WrappedTargetException, std::exception) override; - virtual sal_Bool SAL_CALL isModifiedRow() throw (css::uno::RuntimeException, css::lang::WrappedTargetException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XRowSet > SAL_CALL getCursor() override; + virtual css::uno::Reference< css::sdbc::XResultSetUpdate > SAL_CALL getUpdateCursor() override; + virtual css::uno::Reference< css::form::runtime::XFormController > SAL_CALL getController() override; + virtual css::uno::Reference< css::form::runtime::XFeatureInvalidation > SAL_CALL getFeatureInvalidation() override; + virtual void SAL_CALL setFeatureInvalidation(const css::uno::Reference< css::form::runtime::XFeatureInvalidation > & the_value) override; + virtual css::form::runtime::FeatureState SAL_CALL getState(::sal_Int16 Feature) override; + virtual sal_Bool SAL_CALL isEnabled(::sal_Int16 Feature) override; + virtual void SAL_CALL execute(::sal_Int16 Feature) override; + virtual void SAL_CALL executeWithArguments(::sal_Int16 Feature, const css::uno::Sequence< css::beans::NamedValue >& Arguments) override; + virtual sal_Bool SAL_CALL commitCurrentRecord(sal_Bool & RecordInserted) override; + virtual sal_Bool SAL_CALL commitCurrentControl() override; + virtual sal_Bool SAL_CALL isInsertionRow() override; + virtual sal_Bool SAL_CALL isModifiedRow() override; // XRowSetListener - virtual void SAL_CALL cursorMoved( const css::lang::EventObject& event ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rowChanged( const css::lang::EventObject& event ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rowSetChanged( const css::lang::EventObject& event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cursorMoved( const css::lang::EventObject& event ) override; + virtual void SAL_CALL rowChanged( const css::lang::EventObject& event ) override; + virtual void SAL_CALL rowSetChanged( const css::lang::EventObject& event ) override; // XModifyListener - virtual void SAL_CALL modified( const css::lang::EventObject& _rSource ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL modified( const css::lang::EventObject& _rSource ) override; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // XComponent/OComponentHelper virtual void SAL_CALL disposing() override; diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx index cd0f1c33fe47..e6aca3a50d95 100644 --- a/forms/source/solar/component/navbarcontrol.cxx +++ b/forms/source/solar/component/navbarcontrol.cxx @@ -71,7 +71,7 @@ namespace frm IMPLEMENT_FORWARD_XTYPEPROVIDER2( ONavigationBarControl, UnoControl, ONavigationBarControl_Base ) - Any SAL_CALL ONavigationBarControl::queryAggregation( const Type& _rType ) throw ( RuntimeException, std::exception ) + Any SAL_CALL ONavigationBarControl::queryAggregation( const Type& _rType ) { Any aReturn = UnoControl::queryAggregation( _rType ); @@ -112,7 +112,7 @@ namespace frm } - void SAL_CALL ONavigationBarControl::createPeer( const Reference< XToolkit >& /*_rToolkit*/, const Reference< XWindowPeer >& _rParentPeer ) throw( RuntimeException, std::exception ) + void SAL_CALL ONavigationBarControl::createPeer( const Reference< XToolkit >& /*_rToolkit*/, const Reference< XWindowPeer >& _rParentPeer ) { SolarMutexGuard aGuard; @@ -163,32 +163,32 @@ namespace frm } - OUString SAL_CALL ONavigationBarControl::getImplementationName() throw( RuntimeException, std::exception ) + OUString SAL_CALL ONavigationBarControl::getImplementationName() { return OUString( "com.sun.star.comp.form.ONavigationBarControl" ); } - Sequence< OUString > SAL_CALL ONavigationBarControl::getSupportedServiceNames() throw( RuntimeException, std::exception ) + Sequence< OUString > SAL_CALL ONavigationBarControl::getSupportedServiceNames() { return { "com.sun.star.awt.UnoControl", "com.sun.star.form.control.NavigationToolBar" }; } - void SAL_CALL ONavigationBarControl::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException, std::exception) + void SAL_CALL ONavigationBarControl::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) { FORWARD_TO_PEER_1( XDispatchProviderInterception, registerDispatchProviderInterceptor, _rxInterceptor ); } - void SAL_CALL ONavigationBarControl::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException, std::exception) + void SAL_CALL ONavigationBarControl::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) { FORWARD_TO_PEER_1( XDispatchProviderInterception, releaseDispatchProviderInterceptor, _rxInterceptor ); } - void SAL_CALL ONavigationBarControl::setDesignMode( sal_Bool _bOn ) throw( RuntimeException, std::exception ) + void SAL_CALL ONavigationBarControl::setDesignMode( sal_Bool _bOn ) { UnoControl::setDesignMode( _bOn ); FORWARD_TO_PEER_1( XVclWindowPeer, setDesignMode, _bOn ); @@ -253,14 +253,14 @@ namespace frm IMPLEMENT_FORWARD_XTYPEPROVIDER2( ONavigationBarPeer, VCLXWindow, OFormNavigationHelper ) - void SAL_CALL ONavigationBarPeer::dispose( ) throw( RuntimeException, std::exception ) + void SAL_CALL ONavigationBarPeer::dispose( ) { VCLXWindow::dispose(); OFormNavigationHelper::dispose(); } - void SAL_CALL ONavigationBarPeer::setProperty( const OUString& _rPropertyName, const Any& _rValue ) throw( RuntimeException, std::exception ) + void SAL_CALL ONavigationBarPeer::setProperty( const OUString& _rPropertyName, const Any& _rValue ) { SolarMutexGuard aGuard; @@ -340,7 +340,7 @@ namespace frm } - Any SAL_CALL ONavigationBarPeer::getProperty( const OUString& _rPropertyName ) throw( RuntimeException, std::exception ) + Any SAL_CALL ONavigationBarPeer::getProperty( const OUString& _rPropertyName ) { SolarMutexGuard aGuard; @@ -446,7 +446,7 @@ namespace frm } - void SAL_CALL ONavigationBarPeer::setDesignMode( sal_Bool _bOn ) throw( RuntimeException, std::exception ) + void SAL_CALL ONavigationBarPeer::setDesignMode( sal_Bool _bOn ) { VCLXWindow::setDesignMode( _bOn ); @@ -458,7 +458,7 @@ namespace frm } - void SAL_CALL ONavigationBarPeer::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception) + void SAL_CALL ONavigationBarPeer::disposing( const EventObject& _rSource ) { VCLXWindow::disposing( _rSource ); OFormNavigationHelper::disposing( _rSource ); diff --git a/forms/source/solar/component/navbarcontrol.hxx b/forms/source/solar/component/navbarcontrol.hxx index 8f73cbe53a93..b13995a6ee0c 100644 --- a/forms/source/solar/component/navbarcontrol.hxx +++ b/forms/source/solar/component/navbarcontrol.hxx @@ -53,24 +53,24 @@ namespace frm // UNO DECLARE_UNO3_AGG_DEFAULTS( ONavigationBarControl, UnoControl ) - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override; // XControl - virtual void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& _rToolkit, const css::uno::Reference< css::awt::XWindowPeer >& _rParent ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& _rToolkit, const css::uno::Reference< css::awt::XWindowPeer >& _rParent ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XTypeProvider DECLARE_XTYPEPROVIDER() // XVclWindowPeer - virtual void SAL_CALL setDesignMode( sal_Bool _bOn ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setDesignMode( sal_Bool _bOn ) override; // XDispatchProviderInterception - virtual void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) override; + virtual void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) override; }; class ONavigationBarPeer @@ -99,7 +99,7 @@ namespace frm DECLARE_XINTERFACE( ) // XVclWindowPeer - virtual void SAL_CALL setDesignMode( sal_Bool _bOn ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setDesignMode( sal_Bool _bOn ) override; // XWindow2 using VCLXWindow::isEnabled; @@ -109,14 +109,14 @@ namespace frm DECLARE_XTYPEPROVIDER( ) // XComponent - void SAL_CALL dispose( ) throw( css::uno::RuntimeException, std::exception ) override; + void SAL_CALL dispose( ) override; // XVclWindowPeer - void SAL_CALL setProperty( const OUString& _rPropertyName, const css::uno::Any& _rValue ) throw( css::uno::RuntimeException, std::exception ) override; - css::uno::Any SAL_CALL getProperty( const OUString& _rPropertyName ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL setProperty( const OUString& _rPropertyName, const css::uno::Any& _rValue ) override; + css::uno::Any SAL_CALL getProperty( const OUString& _rPropertyName ) override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // OFormNavigationHelper overriables virtual void interceptorsChanged( ) override; diff --git a/forms/source/xforms/NameContainer.hxx b/forms/source/xforms/NameContainer.hxx index aa2a86c10535..f5aad0950ea2 100644 --- a/forms/source/xforms/NameContainer.hxx +++ b/forms/source/xforms/NameContainer.hxx @@ -83,14 +83,12 @@ public: // methods for XElementAccess - virtual css::uno::Type SAL_CALL getElementType() - throw( css::uno::RuntimeException, std::exception ) override + virtual css::uno::Type SAL_CALL getElementType() override { return cppu::UnoType<T>::get(); } - virtual sal_Bool SAL_CALL hasElements() - throw( css::uno::RuntimeException, std::exception ) override + virtual sal_Bool SAL_CALL hasElements() override { return ! maItems.empty(); } @@ -100,10 +98,7 @@ public: virtual css::uno::Any SAL_CALL getByName( - const OUString& rName ) - throw( css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override + const OUString& rName ) override { typename map_t::const_iterator aIter = findItem( rName ); if( aIter == maItems.end() ) @@ -112,15 +107,13 @@ public: return css::uno::makeAny( aIter->second ); } - virtual css::uno::Sequence<OUString> SAL_CALL getElementNames() - throw( css::uno::RuntimeException, std::exception ) override + virtual css::uno::Sequence<OUString> SAL_CALL getElementNames() override { return comphelper::mapKeysToSequence(maItems); } virtual sal_Bool SAL_CALL hasByName( - const OUString& rName ) - throw( css::uno::RuntimeException, std::exception ) override + const OUString& rName ) override { return hasItem( rName ); } @@ -131,11 +124,7 @@ public: virtual void SAL_CALL replaceByName( const OUString& rName, - const css::uno::Any& aElement ) - throw( css::lang::IllegalArgumentException, - css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override + const css::uno::Any& aElement ) override { T aItem; if( aElement >>= aItem ) @@ -153,11 +142,7 @@ public: virtual void SAL_CALL insertByName( const OUString& rName, - const css::uno::Any& aElement ) - throw( css::lang::IllegalArgumentException, - css::container::ElementExistException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override + const css::uno::Any& aElement ) override { T aItem; if( aElement >>= aItem ) @@ -170,10 +155,7 @@ public: } virtual void SAL_CALL removeByName( - const OUString& rName ) - throw( css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override + const OUString& rName ) override { if( hasByName( rName ) ) remove( rName ); diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx index 120cc66faebc..b2ffdeb1aba3 100644 --- a/forms/source/xforms/binding.cxx +++ b/forms/source/xforms/binding.cxx @@ -450,7 +450,6 @@ bool Binding::getExternalData() const void Binding::checkLive() - throw( RuntimeException ) { if( ! isLive() ) throw RuntimeException( EXCEPT("Binding not initialized") ); @@ -994,20 +993,16 @@ void Binding::_checkBindingID() css::uno::Sequence<css::uno::Type> Binding::getSupportedValueTypes() - throw( RuntimeException, std::exception ) { return Convert::get().getTypes(); } sal_Bool Binding::supportsType( const css::uno::Type& rType ) - throw( RuntimeException, std::exception ) { return Convert::get().hasType( rType ); } css::uno::Any Binding::getValue( const css::uno::Type& rType ) - throw( IncompatibleTypesException, - RuntimeException, std::exception ) { // first, check for model checkLive(); @@ -1028,10 +1023,6 @@ css::uno::Any Binding::getValue( const css::uno::Type& rType ) } void Binding::setValue( const css::uno::Any& aValue ) - throw( IncompatibleTypesException, - InvalidBindingStateException, - NoSupportException, - RuntimeException, std::exception ) { // first, check for model checkLive(); @@ -1062,7 +1053,6 @@ void Binding::setValue( const css::uno::Any& aValue ) sal_Int32 Binding::getListEntryCount() - throw( RuntimeException, std::exception ) { // first, check for model checkLive(); @@ -1097,8 +1087,6 @@ static OUString lcl_getString( const Reference<XNode>& xNode ) } OUString Binding::getListEntry( sal_Int32 nPosition ) - throw( IndexOutOfBoundsException, - RuntimeException, std::exception ) { // first, check for model checkLive(); @@ -1111,7 +1099,6 @@ OUString Binding::getListEntry( sal_Int32 nPosition ) } Sequence<OUString> Binding::getAllListEntries() - throw( RuntimeException, std::exception ) { // first, check for model checkLive(); @@ -1129,8 +1116,6 @@ Sequence<OUString> Binding::getAllListEntries() } void Binding::addListEntryListener( const css::uno::Reference<css::form::binding::XListEntryListener>& xListener ) - throw( NullPointerException, - RuntimeException, std::exception ) { OSL_ENSURE( xListener.is(), "need listener!" ); if( ::std::find( maListEntryListeners.begin(), @@ -1141,8 +1126,6 @@ void Binding::addListEntryListener( const css::uno::Reference<css::form::binding } void Binding::removeListEntryListener( const css::uno::Reference<css::form::binding::XListEntryListener>& xListener ) - throw( NullPointerException, - RuntimeException, std::exception ) { XListEntryListeners_t::iterator aIter = ::std::find( maListEntryListeners.begin(), maListEntryListeners.end(), @@ -1156,7 +1139,6 @@ void Binding::removeListEntryListener( const css::uno::Reference<css::form::bind sal_Bool Binding::isValid( const css::uno::Any& ) - throw( RuntimeException, std::exception ) { // first, check for model checkLive(); @@ -1167,7 +1149,6 @@ sal_Bool Binding::isValid( const css::uno::Any& ) OUString Binding::explainInvalid( const css::uno::Any& /*Value*/ ) - throw( RuntimeException, std::exception ) { // first, check for model checkLive(); @@ -1178,8 +1159,6 @@ OUString Binding::explainInvalid( void Binding::addValidityConstraintListener( const css::uno::Reference<css::form::validation::XValidityConstraintListener>& xListener ) - throw( NullPointerException, - RuntimeException, std::exception ) { OSL_ENSURE( xListener.is(), "need listener!" ); if( ::std::find(maValidityListeners.begin(), maValidityListeners.end(), xListener) @@ -1189,8 +1168,6 @@ void Binding::addValidityConstraintListener( void Binding::removeValidityConstraintListener( const css::uno::Reference<css::form::validation::XValidityConstraintListener>& xListener ) - throw( NullPointerException, - RuntimeException, std::exception ) { XValidityConstraintListeners_t::iterator aIter = ::std::find( maValidityListeners.begin(), maValidityListeners.end(), @@ -1204,7 +1181,6 @@ void Binding::removeValidityConstraintListener( void Binding::handleEvent( const css::uno::Reference<css::xml::dom::events::XEvent>& xEvent ) - throw( RuntimeException, std::exception ) { OUString sType(xEvent->getType()); //OUString sEventMIPChanged("xforms-generic"); @@ -1236,7 +1212,6 @@ void Binding::handleEvent( const css::uno::Reference<css::xml::dom::events::XEve sal_Int64 Binding::getSomething( const css::uno::Sequence<sal_Int8>& xId ) - throw( RuntimeException, std::exception ) { return reinterpret_cast<sal_Int64>( ( xId == getUnoTunnelID() ) ? this : nullptr ); } @@ -1246,7 +1221,6 @@ sal_Int64 Binding::getSomething( const css::uno::Sequence<sal_Int8>& xId ) css::uno::Reference<css::util::XCloneable> SAL_CALL Binding::createClone() - throw( RuntimeException, std::exception ) { Reference< XPropertySet > xClone; @@ -1302,7 +1276,6 @@ void Binding::initializePropertySet() void Binding::addModifyListener( const css::uno::Reference<css::util::XModifyListener>& xListener ) - throw( RuntimeException, std::exception ) { OSL_ENSURE( xListener.is(), "need listener!" ); if( ::std::find( maModifyListeners.begin(), maModifyListeners.end(), xListener ) @@ -1317,7 +1290,6 @@ void Binding::addModifyListener( void Binding::removeModifyListener( const css::uno::Reference<css::util::XModifyListener>& xListener ) - throw( RuntimeException, std::exception ) { ModifyListeners_t::iterator aIter = ::std::find( maModifyListeners.begin(), maModifyListeners.end(), xListener ); @@ -1327,13 +1299,11 @@ void Binding::removeModifyListener( OUString Binding::getName() - throw( RuntimeException, std::exception ) { return getBindingID(); } void SAL_CALL Binding::setName( const OUString& rName ) - throw( RuntimeException, std::exception ) { // use the XPropertySet methods, so the change in the name is notified to the // property listeners diff --git a/forms/source/xforms/binding.hxx b/forms/source/xforms/binding.hxx index 6a75a7e9ea98..9f1220ff1618 100644 --- a/forms/source/xforms/binding.hxx +++ b/forms/source/xforms/binding.hxx @@ -266,7 +266,7 @@ private: /// (to be used be API methods before acting on the object) /// /// @throws css::uno::RuntimeException - void checkLive() throw( css::uno::RuntimeException ); + void checkLive(); /// determine whether object is live /// live: has model, and model has been initialized @@ -321,65 +321,43 @@ private: public: - virtual css::uno::Sequence<css::uno::Type> SAL_CALL getSupportedValueTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence<css::uno::Type> SAL_CALL getSupportedValueTypes() override; - virtual sal_Bool SAL_CALL supportsType( const css::uno::Type& aType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsType( const css::uno::Type& aType ) override; - virtual css::uno::Any SAL_CALL getValue( const css::uno::Type& aType ) - throw( css::form::binding::IncompatibleTypesException, - css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getValue( const css::uno::Type& aType ) override; - virtual void SAL_CALL setValue( const css::uno::Any& aValue ) - throw( css::form::binding::IncompatibleTypesException, - css::form::binding::InvalidBindingStateException, - css::lang::NoSupportException, - css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setValue( const css::uno::Any& aValue ) override; // XListEntry Source - virtual sal_Int32 SAL_CALL getListEntryCount() - throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getListEntryCount() override; - virtual OUString SAL_CALL getListEntry( sal_Int32 nPosition ) - throw( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getListEntry( sal_Int32 nPosition ) override; - virtual css::uno::Sequence<OUString> SAL_CALL getAllListEntries() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence<OUString> SAL_CALL getAllListEntries() override; - virtual void SAL_CALL addListEntryListener( const css::uno::Reference<css::form::binding::XListEntryListener>& ) - throw( css::lang::NullPointerException, - css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addListEntryListener( const css::uno::Reference<css::form::binding::XListEntryListener>& ) override; - virtual void SAL_CALL removeListEntryListener( const css::uno::Reference<css::form::binding::XListEntryListener>&) - throw( css::lang::NullPointerException, - css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeListEntryListener( const css::uno::Reference<css::form::binding::XListEntryListener>&) override; // XValidator: virtual sal_Bool SAL_CALL isValid( - const css::uno::Any& ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Any& ) override; virtual OUString SAL_CALL explainInvalid( - const css::uno::Any& ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Any& ) override; virtual void SAL_CALL addValidityConstraintListener( - const css::uno::Reference<css::form::validation::XValidityConstraintListener>& xListener ) - throw( css::lang::NullPointerException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference<css::form::validation::XValidityConstraintListener>& xListener ) override; virtual void SAL_CALL removeValidityConstraintListener( - const css::uno::Reference<css::form::validation::XValidityConstraintListener>& xListener ) - throw( css::lang::NullPointerException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference<css::form::validation::XValidityConstraintListener>& xListener ) override; // XModifyBroadcaster & friends: @@ -389,12 +367,10 @@ public: public: virtual void SAL_CALL addModifyListener( - const css::uno::Reference<css::util::XModifyListener>& xListener ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference<css::util::XModifyListener>& xListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference<css::util::XModifyListener>& xListener ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference<css::util::XModifyListener>& xListener ) override; // XNamed: @@ -403,11 +379,9 @@ public: public: - virtual OUString SAL_CALL getName() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getName() override; - virtual void SAL_CALL setName( const OUString& ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setName( const OUString& ) override; // xml::dom::event::XEventListener @@ -415,22 +389,19 @@ public: virtual void SAL_CALL handleEvent( - const css::uno::Reference<css::xml::dom::events::XEvent>& xEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference<css::xml::dom::events::XEvent>& xEvent ) override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence<sal_Int8>& ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence<sal_Int8>& ) override; // XCloneable - virtual css::uno::Reference<css::util::XCloneable> SAL_CALL createClone() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference<css::util::XCloneable> SAL_CALL createClone() override; }; diff --git a/forms/source/xforms/collection.hxx b/forms/source/xforms/collection.hxx index 4f860cc4b46e..fe40dc4c9633 100644 --- a/forms/source/xforms/collection.hxx +++ b/forms/source/xforms/collection.hxx @@ -144,29 +144,23 @@ protected: public: // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() - throw( css::uno::RuntimeException, std::exception ) override + virtual css::uno::Type SAL_CALL getElementType() override { return cppu::UnoType<T>::get(); } - virtual sal_Bool SAL_CALL hasElements() - throw( css::uno::RuntimeException, std::exception ) override + virtual sal_Bool SAL_CALL hasElements() override { return hasItems(); } // XIndexAccess : XElementAccess - virtual sal_Int32 SAL_CALL getCount() - throw( css::uno::RuntimeException, std::exception ) override + virtual sal_Int32 SAL_CALL getCount() override { return countItems(); } - virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) - throw( css::lang::IndexOutOfBoundsException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) override { if( isValidIndex( nIndex ) ) return css::uno::makeAny( getItem( nIndex ) ); @@ -176,11 +170,7 @@ public: // XIndexReplace : XIndexAccess virtual void SAL_CALL replaceByIndex( sal_Int32 nIndex, - const css::uno::Any& aElement ) - throw( css::lang::IllegalArgumentException, - css::lang::IndexOutOfBoundsException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override + const css::uno::Any& aElement ) override { T t; if( isValidIndex( nIndex) ) @@ -193,25 +183,20 @@ public: } // XEnumerationAccess : XElementAccess - virtual css::uno::Reference<css::container::XEnumeration> SAL_CALL createEnumeration() - throw( css::uno::RuntimeException, std::exception ) override + virtual css::uno::Reference<css::container::XEnumeration> SAL_CALL createEnumeration() override { return new Enumeration( this ); } // XSet : XEnumerationAccess - virtual sal_Bool SAL_CALL has( const css::uno::Any& aElement ) - throw( css::uno::RuntimeException, std::exception ) override + virtual sal_Bool SAL_CALL has( const css::uno::Any& aElement ) override { T t; return ( aElement >>= t ) && hasItem( t ); } - virtual void SAL_CALL insert( const css::uno::Any& aElement ) - throw( css::lang::IllegalArgumentException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception ) override + virtual void SAL_CALL insert( const css::uno::Any& aElement ) override { T t; if( ( aElement >>= t ) && isValid( t ) ) @@ -223,10 +208,7 @@ public: throw css::lang::IllegalArgumentException(); } - virtual void SAL_CALL remove( const css::uno::Any& aElement ) - throw( css::lang::IllegalArgumentException, - css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception ) override + virtual void SAL_CALL remove( const css::uno::Any& aElement ) override { T t; if( aElement >>= t ) @@ -241,8 +223,7 @@ public: // XContainer virtual void SAL_CALL addContainerListener( - const css::uno::Reference<css::container::XContainerListener>& xListener ) - throw( css::uno::RuntimeException, std::exception ) override + const css::uno::Reference<css::container::XContainerListener>& xListener ) override { OSL_ENSURE( xListener.is(), "need listener!" ); if( std::find( maListeners.begin(), maListeners.end(), xListener) @@ -251,8 +232,7 @@ public: } virtual void SAL_CALL removeContainerListener( - const css::uno::Reference<css::container::XContainerListener>& xListener ) - throw( css::uno::RuntimeException, std::exception ) override + const css::uno::Reference<css::container::XContainerListener>& xListener ) override { OSL_ENSURE( xListener.is(), "need listener!" ); Listeners_t::iterator aIter = diff --git a/forms/source/xforms/datatyperepository.cxx b/forms/source/xforms/datatyperepository.cxx index 3bb4794344a9..e50b09de09e9 100644 --- a/forms/source/xforms/datatyperepository.cxx +++ b/forms/source/xforms/datatyperepository.cxx @@ -105,7 +105,7 @@ namespace xforms } - Reference< XDataType > SAL_CALL ODataTypeRepository::getBasicDataType( sal_Int16 dataTypeClass ) throw (NoSuchElementException, RuntimeException, std::exception) + Reference< XDataType > SAL_CALL ODataTypeRepository::getBasicDataType( sal_Int16 dataTypeClass ) { Reference< XDataType > xReturn; @@ -125,7 +125,7 @@ namespace xforms } - Reference< XDataType > SAL_CALL ODataTypeRepository::cloneDataType( const OUString& sourceName, const OUString& newName ) throw (NoSuchElementException, ElementExistException, RuntimeException, std::exception) + Reference< XDataType > SAL_CALL ODataTypeRepository::cloneDataType( const OUString& sourceName, const OUString& newName ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -141,7 +141,7 @@ namespace xforms } - void SAL_CALL ODataTypeRepository::revokeDataType( const OUString& typeName ) throw (NoSuchElementException, VetoException, RuntimeException, std::exception) + void SAL_CALL ODataTypeRepository::revokeDataType( const OUString& typeName ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -154,26 +154,26 @@ namespace xforms } - Reference< XDataType > SAL_CALL ODataTypeRepository::getDataType( const OUString& typeName ) throw (NoSuchElementException, RuntimeException, std::exception) + Reference< XDataType > SAL_CALL ODataTypeRepository::getDataType( const OUString& typeName ) { ::osl::MutexGuard aGuard( m_aMutex ); return implLocate( typeName )->second.get(); } - Reference< XEnumeration > SAL_CALL ODataTypeRepository::createEnumeration( ) throw (RuntimeException, std::exception) + Reference< XEnumeration > SAL_CALL ODataTypeRepository::createEnumeration( ) { return new ::comphelper::OEnumerationByName( this ); } - Any SAL_CALL ODataTypeRepository::getByName( const OUString& aName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) + Any SAL_CALL ODataTypeRepository::getByName( const OUString& aName ) { return makeAny( getDataType( aName ) ); } - Sequence< OUString > SAL_CALL ODataTypeRepository::getElementNames( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL ODataTypeRepository::getElementNames( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -181,20 +181,20 @@ namespace xforms } - sal_Bool SAL_CALL ODataTypeRepository::hasByName( const OUString& aName ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL ODataTypeRepository::hasByName( const OUString& aName ) { ::osl::MutexGuard aGuard( m_aMutex ); return m_aRepository.find( aName ) != m_aRepository.end(); } - Type SAL_CALL ODataTypeRepository::getElementType( ) throw (RuntimeException, std::exception) + Type SAL_CALL ODataTypeRepository::getElementType( ) { return cppu::UnoType<XDataType>::get(); } - sal_Bool SAL_CALL ODataTypeRepository::hasElements( ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL ODataTypeRepository::hasElements( ) { return !m_aRepository.empty(); } diff --git a/forms/source/xforms/datatyperepository.hxx b/forms/source/xforms/datatyperepository.hxx index 15c7702c19f3..9138a1a5e8d6 100644 --- a/forms/source/xforms/datatyperepository.hxx +++ b/forms/source/xforms/datatyperepository.hxx @@ -50,22 +50,22 @@ namespace xforms virtual ~ODataTypeRepository( ) override; // XDataTypeRepository - virtual css::uno::Reference< css::xsd::XDataType > SAL_CALL getBasicDataType( sal_Int16 dataTypeClass ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::xsd::XDataType > SAL_CALL cloneDataType( const OUString& sourceName, const OUString& newName ) throw (css::container::NoSuchElementException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL revokeDataType( const OUString& typeName ) throw (css::container::NoSuchElementException, css::util::VetoException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::xsd::XDataType > SAL_CALL getDataType( const OUString& typeName ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xsd::XDataType > SAL_CALL getBasicDataType( sal_Int16 dataTypeClass ) override; + virtual css::uno::Reference< css::xsd::XDataType > SAL_CALL cloneDataType( const OUString& sourceName, const OUString& newName ) override; + virtual void SAL_CALL revokeDataType( const OUString& typeName ) override; + virtual css::uno::Reference< css::xsd::XDataType > SAL_CALL getDataType( const OUString& typeName ) override; // XEnumerationAccess (base of XDataTypeRepository) - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration( ) override; // XNameAccess (base of XDataTypeRepository) - virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // XElementAccess (base of XEnumerationAccess and XNameAccess) - virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; private: ODataTypeRepository( const ODataTypeRepository& ) = delete; diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx index 90e307ab0b30..707dce52a2eb 100644 --- a/forms/source/xforms/datatypes.cxx +++ b/forms/source/xforms/datatypes.cxx @@ -108,62 +108,62 @@ namespace xforms SAL_WARN_IF( member != value, "forms.misc", "OXSDDataType::setFoo: inconsistency!" ); - OUString SAL_CALL OXSDDataType::getName( ) throw (RuntimeException, std::exception) + OUString SAL_CALL OXSDDataType::getName( ) { return m_sName; } - void SAL_CALL OXSDDataType::setName( const OUString& aName ) throw (RuntimeException, VetoException, std::exception) + void SAL_CALL OXSDDataType::setName( const OUString& aName ) { // TODO: check the name for conflicts in the repository SET_PROPERTY( NAME, aName, m_sName ); } - OUString SAL_CALL OXSDDataType::getPattern() throw (RuntimeException, std::exception) + OUString SAL_CALL OXSDDataType::getPattern() { return m_sPattern; } - void SAL_CALL OXSDDataType::setPattern( const OUString& _pattern ) throw (RuntimeException, std::exception) + void SAL_CALL OXSDDataType::setPattern( const OUString& _pattern ) { SET_PROPERTY( XSD_PATTERN, _pattern, m_sPattern ); } - sal_Int16 SAL_CALL OXSDDataType::getWhiteSpaceTreatment() throw (RuntimeException, std::exception) + sal_Int16 SAL_CALL OXSDDataType::getWhiteSpaceTreatment() { return m_nWST; } - void SAL_CALL OXSDDataType::setWhiteSpaceTreatment( sal_Int16 _whitespacetreatment ) throw (RuntimeException, IllegalArgumentException, std::exception) + void SAL_CALL OXSDDataType::setWhiteSpaceTreatment( sal_Int16 _whitespacetreatment ) { SET_PROPERTY( XSD_WHITESPACE, _whitespacetreatment, m_nWST ); } - sal_Bool SAL_CALL OXSDDataType::getIsBasic() throw (RuntimeException, std::exception) + sal_Bool SAL_CALL OXSDDataType::getIsBasic() { return m_bIsBasic; } - sal_Int16 SAL_CALL OXSDDataType::getTypeClass() throw (RuntimeException, std::exception) + sal_Int16 SAL_CALL OXSDDataType::getTypeClass() { return m_nTypeClass; } - sal_Bool OXSDDataType::validate( const OUString& sValue ) throw( RuntimeException, std::exception ) + sal_Bool OXSDDataType::validate( const OUString& sValue ) { return ( _validate( sValue ) == 0 ); } - OUString OXSDDataType::explainInvalid( const OUString& sValue ) throw( RuntimeException, std::exception ) + OUString OXSDDataType::explainInvalid( const OUString& sValue ) { // get reason sal_uInt16 nReason = _validate( sValue ); @@ -237,7 +237,7 @@ namespace xforms } - sal_Bool OXSDDataType::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw(IllegalArgumentException) + sal_Bool OXSDDataType::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) { // let the base class do the conversion if ( !OXSDDataType_PBase::convertFastPropertyValue( _rConvertedValue, _rOldValue, _nHandle, _rValue ) ) @@ -257,7 +257,7 @@ namespace xforms } - void SAL_CALL OXSDDataType::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw (Exception, std::exception) + void SAL_CALL OXSDDataType::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) { OXSDDataType_PBase::setFastPropertyValue_NoBroadcast( _nHandle, _rValue ); if ( _nHandle == PROPERTY_ID_XSD_PATTERN ) @@ -285,37 +285,37 @@ namespace xforms } - void SAL_CALL OXSDDataType::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) + void SAL_CALL OXSDDataType::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) { OXSDDataType_PBase::setPropertyValue( aPropertyName, aValue ); } - Any SAL_CALL OXSDDataType::getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) + Any SAL_CALL OXSDDataType::getPropertyValue( const OUString& PropertyName ) { return OXSDDataType_PBase::getPropertyValue( PropertyName ); } - void SAL_CALL OXSDDataType::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) + void SAL_CALL OXSDDataType::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) { OXSDDataType_PBase::addPropertyChangeListener( aPropertyName, xListener ); } - void SAL_CALL OXSDDataType::removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) + void SAL_CALL OXSDDataType::removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& aListener ) { OXSDDataType_PBase::removePropertyChangeListener( aPropertyName, aListener ); } - void SAL_CALL OXSDDataType::addVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) + void SAL_CALL OXSDDataType::addVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) { OXSDDataType_PBase::addVetoableChangeListener( PropertyName, aListener ); } - void SAL_CALL OXSDDataType::removeVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) + void SAL_CALL OXSDDataType::removeVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) { OXSDDataType_PBase::removeVetoableChangeListener( PropertyName, aListener ); } @@ -351,7 +351,7 @@ namespace xforms void SAL_CALL OValueLimitedType_Base::setFastPropertyValue_NoBroadcast( - sal_Int32 _nHandle, const css::uno::Any& _rValue ) throw (css::uno::Exception, std::exception) + sal_Int32 _nHandle, const css::uno::Any& _rValue ) { OXSDDataType::setFastPropertyValue_NoBroadcast( _nHandle, _rValue ); @@ -955,7 +955,7 @@ template< typename CONCRETE_DATA_TYPE_IMPL, typename SUPERCLASS > template< typename CONCRETE_DATA_TYPE_IMPL, typename SUPERCLASS > -css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL ODerivedDataType< CONCRETE_DATA_TYPE_IMPL, SUPERCLASS >::getPropertySetInfo() throw( css::uno::RuntimeException ) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL ODerivedDataType< CONCRETE_DATA_TYPE_IMPL, SUPERCLASS >::getPropertySetInfo() { return ::cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() ); } diff --git a/forms/source/xforms/datatypes.hxx b/forms/source/xforms/datatypes.hxx index 5f1d40551535..db20dfb758c0 100644 --- a/forms/source/xforms/datatypes.hxx +++ b/forms/source/xforms/datatypes.hxx @@ -81,37 +81,36 @@ namespace xforms DECLARE_XINTERFACE() DECLARE_XTYPEPROVIDER() - virtual OUString SAL_CALL getName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) throw (css::uno::RuntimeException, css::util::VetoException, std::exception) override; - virtual OUString SAL_CALL getPattern() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPattern( const OUString& _pattern ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getWhiteSpaceTreatment() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setWhiteSpaceTreatment( sal_Int16 _whitespacetreatment ) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override; - virtual sal_Bool SAL_CALL getIsBasic() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getTypeClass() throw (css::uno::RuntimeException, std::exception) override; - - virtual sal_Bool SAL_CALL validate( const OUString& value ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL explainInvalid( const OUString& value ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName( ) override; + virtual void SAL_CALL setName( const OUString& aName ) override; + virtual OUString SAL_CALL getPattern() override; + virtual void SAL_CALL setPattern( const OUString& _pattern ) override; + virtual sal_Int16 SAL_CALL getWhiteSpaceTreatment() override; + virtual void SAL_CALL setWhiteSpaceTreatment( sal_Int16 _whitespacetreatment ) override; + virtual sal_Bool SAL_CALL getIsBasic() override; + virtual sal_Int16 SAL_CALL getTypeClass() override; + + virtual sal_Bool SAL_CALL validate( const OUString& value ) override; + virtual OUString SAL_CALL explainInvalid( const OUString& value ) override; // XPropertySet - is a base of XDataType and needs to be disambiguated - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; public: OXSDDataType* clone( const OUString& _rNewName ) const; protected: // XPropertySet and friends - virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) throw(css::lang::IllegalArgumentException) override; + virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue - ) - throw (css::uno::Exception, std::exception) override; + ) override; // --- own overridables --- // helper for implementing cloning of data types @@ -174,8 +173,7 @@ namespace xforms virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue - ) - throw (css::uno::Exception, std::exception) override; + ) override; // OXSDDataType overridables virtual bool _getValue( const OUString& value, double& fValue ); @@ -236,7 +234,7 @@ namespace xforms virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const SAL_OVERRIDE; // XPropertySet - virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() SAL_OVERRIDE; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; }; diff --git a/forms/source/xforms/enumeration.cxx b/forms/source/xforms/enumeration.cxx index 623666b7c686..ace7e3f5ae2b 100644 --- a/forms/source/xforms/enumeration.cxx +++ b/forms/source/xforms/enumeration.cxx @@ -43,7 +43,6 @@ Enumeration::Enumeration( XIndexAccess* pContainer ) } sal_Bool Enumeration::hasMoreElements() - throw( RuntimeException, std::exception ) { if( ! mxContainer.is() ) throw RuntimeException(); @@ -52,9 +51,6 @@ sal_Bool Enumeration::hasMoreElements() } Any Enumeration::nextElement() - throw( NoSuchElementException, - WrappedTargetException, - RuntimeException, std::exception ) { if( ! mxContainer.is() ) throw RuntimeException(); diff --git a/forms/source/xforms/enumeration.hxx b/forms/source/xforms/enumeration.hxx index 6b9b24b6041f..f5cc97ae0dd5 100644 --- a/forms/source/xforms/enumeration.hxx +++ b/forms/source/xforms/enumeration.hxx @@ -43,13 +43,9 @@ class Enumeration public: explicit Enumeration( css::container::XIndexAccess* ); - virtual sal_Bool SAL_CALL hasMoreElements() - throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL hasMoreElements() override; - virtual css::uno::Any SAL_CALL nextElement() - throw( css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL nextElement() override; }; #endif diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx index 5420394189a3..f90bf15c3553 100644 --- a/forms/source/xforms/model.cxx +++ b/forms/source/xforms/model.cxx @@ -399,21 +399,18 @@ bool Model::isValid() const OUString Model::getID() - throw( RuntimeException, std::exception ) { DBG_INVARIANT(); return msID; } void Model::setID( const OUString& sID ) - throw( RuntimeException, std::exception ) { DBG_INVARIANT(); msID = sID; } void Model::initialize() - throw( RuntimeException, std::exception ) { DBG_ASSERT( ! mbInitialized, "model already initialized" ); @@ -426,7 +423,6 @@ void Model::initialize() } void Model::rebuild() - throw( RuntimeException, std::exception ) { if( ! mbInitialized ) initialize(); @@ -435,19 +431,16 @@ void Model::rebuild() } void Model::recalculate() - throw( RuntimeException, std::exception ) { rebind(); } void Model::revalidate() - throw( RuntimeException, std::exception ) { // do nothing. We don't validate anyways! } void Model::refresh() - throw( RuntimeException, std::exception ) { rebind(); } @@ -456,9 +449,6 @@ void Model::refresh() void SAL_CALL Model::submitWithInteraction( const OUString& sID, const css::uno::Reference<css::task::XInteractionHandler>& _rxHandler ) - throw( VetoException, - WrappedTargetException, - RuntimeException, std::exception ) { DBG_INVARIANT(); @@ -476,13 +466,11 @@ void SAL_CALL Model::submitWithInteraction( } void Model::submit( const OUString& sID ) - throw( VetoException, WrappedTargetException, RuntimeException, std::exception ) { submitWithInteraction( sID, nullptr ); } css::uno::Reference<css::xforms::XDataTypeRepository> SAL_CALL Model::getDataTypeRepository( ) - throw( RuntimeException, std::exception ) { if ( !mxDataTypes.is() ) mxDataTypes = new ODataTypeRepository; @@ -495,13 +483,11 @@ css::uno::Reference<css::xforms::XDataTypeRepository> SAL_CALL Model::getDataTyp css::uno::Reference<css::container::XSet> Model::getInstances() - throw( RuntimeException, std::exception ) { return mxInstances.get(); } css::uno::Reference<css::xml::dom::XDocument> Model::getInstanceDocument( const OUString& rName ) - throw( RuntimeException, std::exception ) { ensureAtLeastOneInstance(); Reference<XDocument> aInstance; @@ -513,7 +499,6 @@ css::uno::Reference<css::xml::dom::XDocument> Model::getInstanceDocument( const } css::uno::Reference<css::xml::dom::XDocument> SAL_CALL Model::getDefaultInstance() - throw( RuntimeException, std::exception ) { ensureAtLeastOneInstance(); DBG_ASSERT( mxInstances->countItems() > 0, "no instance?" ); @@ -527,14 +512,12 @@ css::uno::Reference<css::xml::dom::XDocument> SAL_CALL Model::getDefaultInstance Model::XPropertySet_t SAL_CALL Model::createBinding() - throw( RuntimeException, std::exception ) { DBG_INVARIANT(); return new Binding(); } Model::XPropertySet_t Model::cloneBinding( const XPropertySet_t& xBinding ) - throw( RuntimeException, std::exception ) { DBG_INVARIANT(); XPropertySet_t xNewBinding = createBinding(); @@ -543,14 +526,12 @@ Model::XPropertySet_t Model::cloneBinding( const XPropertySet_t& xBinding ) } Model::XPropertySet_t Model::getBinding( const OUString& sId ) - throw( RuntimeException, std::exception ) { DBG_INVARIANT(); return mxBindings->hasItem( sId ) ? mxBindings->getItem( sId ) : nullptr; } css::uno::Reference<css::container::XSet> Model::getBindings() - throw( RuntimeException, std::exception ) { DBG_INVARIANT(); return mxBindings.get(); @@ -561,14 +542,12 @@ css::uno::Reference<css::container::XSet> Model::getBindings() css::uno::Reference<css::xforms::XSubmission> Model::createSubmission() - throw( RuntimeException, std::exception ) { DBG_INVARIANT(); return new Submission(); } css::uno::Reference<css::xforms::XSubmission> Model::cloneSubmission(const XPropertySet_t& xSubmission) - throw( RuntimeException, std::exception ) { DBG_INVARIANT(); css::uno::Reference<css::xforms::XSubmission> xNewSubmission = createSubmission(); @@ -578,7 +557,6 @@ css::uno::Reference<css::xforms::XSubmission> Model::cloneSubmission(const XProp } css::uno::Reference<css::xforms::XSubmission> Model::getSubmission( const OUString& sId ) - throw( RuntimeException, std::exception ) { DBG_INVARIANT(); css::uno::Reference<css::xforms::XSubmission> xSubmission; @@ -588,7 +566,6 @@ css::uno::Reference<css::xforms::XSubmission> Model::getSubmission( const OUStri } css::uno::Reference<css::container::XSet> Model::getSubmissions() - throw( RuntimeException, std::exception ) { DBG_INVARIANT(); return mxSubmissions.get(); @@ -626,38 +603,32 @@ void Model::initializePropertySet() } void Model::update() - throw( RuntimeException, std::exception ) { rebuild(); } sal_Int64 Model::getSomething( const css::uno::Sequence<sal_Int8>& xId ) - throw( RuntimeException, std::exception ) { return reinterpret_cast<sal_Int64>( ( xId == getUnoTunnelID() ) ? this : nullptr ); } Sequence<sal_Int8> Model::getImplementationId() - throw( RuntimeException ) { return css::uno::Sequence<sal_Int8>(); } OUString Model::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.form.Model"); } sal_Bool Model::supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence<OUString> Model::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<OUString>{"com.sun.star.xforms.Model"}; } diff --git a/forms/source/xforms/model.hxx b/forms/source/xforms/model.hxx index 2b79153a22b5..cda182010041 100644 --- a/forms/source/xforms/model.hxx +++ b/forms/source/xforms/model.hxx @@ -182,106 +182,78 @@ public: // implement the xforms::XModel implementation - virtual OUString SAL_CALL getID() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getID() override; - virtual void SAL_CALL setID( const OUString& sID ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setID( const OUString& sID ) override; - virtual void SAL_CALL initialize() - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL initialize() override; - virtual void SAL_CALL rebuild() - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL rebuild() override; - virtual void SAL_CALL recalculate() - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL recalculate() override; - virtual void SAL_CALL revalidate() - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL revalidate() override; - virtual void SAL_CALL refresh() - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL refresh() override; - virtual void SAL_CALL submit( const OUString& sID ) - throw( css::util::VetoException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL submit( const OUString& sID ) override; - virtual void SAL_CALL submitWithInteraction( const OUString& id, const css::uno::Reference<css::task::XInteractionHandler>& _rxHandler ) - throw( css::util::VetoException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL submitWithInteraction( const OUString& id, const css::uno::Reference<css::task::XInteractionHandler>& _rxHandler ) override; - virtual css::uno::Reference<css::xforms::XDataTypeRepository> SAL_CALL getDataTypeRepository( ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference<css::xforms::XDataTypeRepository> SAL_CALL getDataTypeRepository( ) override; // XModel: instance management - virtual css::uno::Reference<css::container::XSet> SAL_CALL getInstances() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference<css::container::XSet> SAL_CALL getInstances() override; - virtual css::uno::Reference<css::xml::dom::XDocument> SAL_CALL getInstanceDocument( const OUString& ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference<css::xml::dom::XDocument> SAL_CALL getInstanceDocument( const OUString& ) override; - virtual css::uno::Reference<css::xml::dom::XDocument> SAL_CALL getDefaultInstance() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference<css::xml::dom::XDocument> SAL_CALL getDefaultInstance() override; // XModel: binding management - virtual XPropertySet_t SAL_CALL createBinding() - throw( css::uno::RuntimeException, std::exception ) override; + virtual XPropertySet_t SAL_CALL createBinding() override; - virtual XPropertySet_t SAL_CALL cloneBinding( const XPropertySet_t& ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual XPropertySet_t SAL_CALL cloneBinding( const XPropertySet_t& ) override; - virtual XPropertySet_t SAL_CALL getBinding( const OUString& ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual XPropertySet_t SAL_CALL getBinding( const OUString& ) override; - virtual css::uno::Reference<css::container::XSet> SAL_CALL getBindings() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference<css::container::XSet> SAL_CALL getBindings() override; // XModel: submission management - virtual css::uno::Reference<css::xforms::XSubmission> SAL_CALL createSubmission() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference<css::xforms::XSubmission> SAL_CALL createSubmission() override; - virtual css::uno::Reference<css::xforms::XSubmission> SAL_CALL cloneSubmission( const XPropertySet_t& ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference<css::xforms::XSubmission> SAL_CALL cloneSubmission( const XPropertySet_t& ) override; - virtual css::uno::Reference<css::xforms::XSubmission> SAL_CALL getSubmission( const OUString& ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference<css::xforms::XSubmission> SAL_CALL getSubmission( const OUString& ) override; - virtual css::uno::Reference<css::container::XSet> SAL_CALL getSubmissions() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference<css::container::XSet> SAL_CALL getSubmissions() override; // XPropertySet - virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p) - throw( css::uno::RuntimeException, std::exception ) override + virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p) override { return PropertySetBase::getPropertyValue(p); } - virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) override { PropertySetBase::addPropertyChangeListener(p1, p2); } - virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) override { PropertySetBase::removePropertyChangeListener(p1, p2); } - virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override { PropertySetBase::addVetoableChangeListener(p1, p2); } - virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) - throw( css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception ) override + virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override { PropertySetBase::removeVetoableChangeListener(p1, p2); } - virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() - throw( css::uno::RuntimeException, std::exception ) override + virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override { return PropertySetBase::getPropertySetInfo(); } - virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2) - throw( css::uno::RuntimeException, std::exception ) override + virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2) override { PropertySetBase::setPropertyValue(p1, p2); } @@ -291,10 +263,10 @@ public: /// determine a reasonable control service for a given node /// (based on data type MIP assigned to the node) - virtual OUString SAL_CALL getDefaultServiceNameForNode( const XNode_t& xNode ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getDefaultServiceNameForNode( const XNode_t& xNode ) override; /// call getDefaultBindingExpressionForNode with default evaluation context - virtual OUString SAL_CALL getDefaultBindingExpressionForNode( const XNode_t& xNode ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getDefaultBindingExpressionForNode( const XNode_t& xNode ) override; /// determine a reasonable default binding expression for a given node /// and a given evaluation context @@ -304,122 +276,95 @@ public: const EvaluationContext& ); virtual OUString SAL_CALL getNodeDisplayName( const XNode_t&, - sal_Bool bDetail ) - throw( css::uno::RuntimeException, std::exception ) override; + sal_Bool bDetail ) override; - virtual OUString SAL_CALL getNodeName( const XNode_t& ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getNodeName( const XNode_t& ) override; virtual OUString SAL_CALL getBindingName( const XPropertySet_t&, - sal_Bool bDetail ) - throw( css::uno::RuntimeException, std::exception ) override; + sal_Bool bDetail ) override; virtual OUString SAL_CALL getSubmissionName( const XPropertySet_t&, - sal_Bool bDetail ) - throw( css::uno::RuntimeException, std::exception ) override; + sal_Bool bDetail ) override; - virtual XPropertySet_t SAL_CALL cloneBindingAsGhost( const XPropertySet_t& ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual XPropertySet_t SAL_CALL cloneBindingAsGhost( const XPropertySet_t& ) override; - virtual void SAL_CALL removeBindingIfUseless( const XPropertySet_t& ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeBindingIfUseless( const XPropertySet_t& ) override; virtual css::uno::Reference<css::xml::dom::XDocument> SAL_CALL newInstance( const OUString& sName, const OUString& sURL, - sal_Bool bURLOnce ) - throw( css::uno::RuntimeException, std::exception ) override; + sal_Bool bURLOnce ) override; virtual void SAL_CALL renameInstance( const OUString& sFrom, const OUString& sTo, const OUString& sURL, - sal_Bool bURLOnce ) - throw( css::uno::RuntimeException, std::exception ) override; + sal_Bool bURLOnce ) override; - virtual void SAL_CALL removeInstance( const OUString& sName ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeInstance( const OUString& sName ) override; virtual css::uno::Reference<css::xforms::XModel> SAL_CALL newModel( const css::uno::Reference<css::frame::XModel>& xComponent, - const OUString& sName ) - throw( css::uno::RuntimeException, std::exception ) override; + const OUString& sName ) override; virtual void SAL_CALL renameModel( const css::uno::Reference<css::frame::XModel>& xComponent, const OUString& sFrom, - const OUString& sTo ) - throw( css::uno::RuntimeException, std::exception ) override; + const OUString& sTo ) override; virtual void SAL_CALL removeModel( const css::uno::Reference<css::frame::XModel>& xComponent, - const OUString& sName ) - throw( css::uno::RuntimeException, std::exception ) override; + const OUString& sName ) override; virtual XNode_t SAL_CALL createElement( const XNode_t& xParent, - const OUString& sName ) - throw( css::uno::RuntimeException, std::exception ) override; + const OUString& sName ) override; virtual XNode_t SAL_CALL createAttribute( const XNode_t& xParent, - const OUString& sName ) - throw( css::uno::RuntimeException, std::exception ) override; + const OUString& sName ) override; virtual XNode_t SAL_CALL renameNode( const XNode_t& xNode, - const OUString& sName ) - throw( css::uno::RuntimeException, std::exception ) override; + const OUString& sName ) override; virtual XPropertySet_t SAL_CALL getBindingForNode( const XNode_t&, - sal_Bool bCreate ) - throw( css::uno::RuntimeException, std::exception ) override; + sal_Bool bCreate ) override; - virtual void SAL_CALL removeBindingForNode( const XNode_t& ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeBindingForNode( const XNode_t& ) override; virtual OUString SAL_CALL getResultForExpression( const XPropertySet_t& xBinding, sal_Bool bIsBindingExpression, - const OUString& sExpression ) - throw( css::uno::RuntimeException, std::exception ) override; + const OUString& sExpression ) override; - virtual sal_Bool SAL_CALL isValidXMLName( const OUString& sName ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL isValidXMLName( const OUString& sName ) override; - virtual sal_Bool SAL_CALL isValidPrefixName( const OUString& sName ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL isValidPrefixName( const OUString& sName ) override; virtual void SAL_CALL setNodeValue( const XNode_t& xNode, - const OUString& sValue ) - throw( css::uno::RuntimeException, std::exception ) override; + const OUString& sValue ) override; // XUpdatable public: - virtual void SAL_CALL update() - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL update() override; // XUnoTunnel public: - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence<sal_Int8>& ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence<sal_Int8>& ) override; // XTypeProvider::getImplementationId public: - virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() - throw( css::uno::RuntimeException ) override; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override; - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getImplementationName() override; - sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override; - css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; }; } // namespace diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx index b279301ad8fc..e5a899340836 100644 --- a/forms/source/xforms/model_ui.cxx +++ b/forms/source/xforms/model_ui.cxx @@ -68,7 +68,6 @@ using namespace com::sun::star::xml::xpath; OUString Model::getDefaultServiceNameForNode( const XNode_t& xNode ) - throw( RuntimeException, std::exception ) { // determine service for control. string/text field is default. OUString sService = "com.sun.star.form.component.TextField"; @@ -250,7 +249,6 @@ OUString Model::getDefaultBindingExpressionForNode( OUString Model::getDefaultBindingExpressionForNode( const XNode_t& xNode ) - throw( RuntimeException, std::exception ) { return getDefaultBindingExpressionForNode( xNode, getEvaluationContext() ); } @@ -274,7 +272,6 @@ static bool lcl_isWhitespace( const OUString& rString ) OUString Model::getNodeDisplayName( const XNode_t& xNode, sal_Bool bDetail ) - throw( RuntimeException, std::exception ) { OUStringBuffer aBuffer; @@ -316,7 +313,6 @@ OUString Model::getNodeDisplayName( const XNode_t& xNode, } OUString Model::getNodeName( const XNode_t& xNode ) - throw( RuntimeException, std::exception ) { OUStringBuffer aBuffer; @@ -340,7 +336,6 @@ OUString Model::getNodeName( const XNode_t& xNode ) OUString Model::getBindingName( const XPropertySet_t& xBinding, sal_Bool /*bDetail*/ ) - throw( RuntimeException, std::exception ) { OUString sID; xBinding->getPropertyValue( "BindingID" ) >>= sID; @@ -360,7 +355,6 @@ OUString Model::getBindingName( const XPropertySet_t& xBinding, OUString Model::getSubmissionName( const XPropertySet_t& xSubmission, sal_Bool /*bDetail*/ ) - throw( RuntimeException, std::exception ) { OUString sID; xSubmission->getPropertyValue( "ID" ) >>= sID; @@ -368,7 +362,6 @@ OUString Model::getSubmissionName( const XPropertySet_t& xSubmission, } Model::XPropertySet_t Model::cloneBindingAsGhost( const XPropertySet_t &xBinding ) - throw( RuntimeException, std::exception ) { // Create a new binding instance first... Binding *pBinding = new Binding(); @@ -385,7 +378,6 @@ Model::XPropertySet_t Model::cloneBindingAsGhost( const XPropertySet_t &xBinding } void Model::removeBindingIfUseless( const XPropertySet_t& xBinding ) - throw( RuntimeException, std::exception ) { Binding* pBinding = Binding::getBinding( xBinding ); if( pBinding != nullptr ) @@ -398,7 +390,6 @@ void Model::removeBindingIfUseless( const XPropertySet_t& xBinding ) css::uno::Reference<css::xml::dom::XDocument> Model::newInstance( const OUString& sName, const OUString& sURL, sal_Bool bURLOnce ) - throw( RuntimeException, std::exception ) { // create a default instance with <instanceData> element css::uno::Reference<css::xml::dom::XDocument> xInstance = getDocumentBuilder()->newDocument(); @@ -449,7 +440,6 @@ void Model::renameInstance( const OUString& sFrom, const OUString& sTo, const OUString& sURL, sal_Bool bURLOnce ) - throw( RuntimeException, std::exception ) { sal_Int32 nPos = lcl_findInstance( mxInstances.get(), sFrom ); if( nPos != -1 ) @@ -487,7 +477,6 @@ void Model::renameInstance( const OUString& sFrom, } void Model::removeInstance( const OUString& sName ) - throw( RuntimeException, std::exception ) { sal_Int32 nPos = lcl_findInstance( mxInstances.get(), sName ); if( nPos != -1 ) @@ -508,7 +497,6 @@ static Reference<XNameContainer> lcl_getModels( css::uno::Reference<css::xforms::XModel> Model::newModel( const Reference<css::frame::XModel>& xCmp, const OUString& sName ) - throw( RuntimeException, std::exception ) { css::uno::Reference<css::xforms::XModel> xModel; Reference<XNameContainer> xModels = lcl_getModels( xCmp ); @@ -530,7 +518,6 @@ css::uno::Reference<css::xforms::XModel> Model::newModel( const Reference<css::f void Model::renameModel( const Reference<css::frame::XModel>& xCmp, const OUString& sFrom, const OUString& sTo ) - throw( RuntimeException, std::exception ) { Reference<XNameContainer> xModels = lcl_getModels( xCmp ); if( xModels.is() @@ -546,7 +533,6 @@ void Model::renameModel( const Reference<css::frame::XModel>& xCmp, void Model::removeModel( const Reference<css::frame::XModel>& xCmp, const OUString& sName ) - throw( RuntimeException, std::exception ) { Reference<XNameContainer> xModels = lcl_getModels( xCmp ); if( xModels.is() @@ -558,7 +544,6 @@ void Model::removeModel( const Reference<css::frame::XModel>& xCmp, Model::XNode_t Model::createElement( const XNode_t& xParent, const OUString& sName ) - throw( RuntimeException, std::exception ) { Reference<XNode> xNode; if( xParent.is() @@ -573,7 +558,6 @@ Model::XNode_t Model::createElement( const XNode_t& xParent, Model::XNode_t Model::createAttribute( const XNode_t& xParent, const OUString& sName ) - throw( RuntimeException, std::exception ) { Reference<XNode> xNode; Reference<XElement> xElement( xParent, UNO_QUERY ); @@ -599,7 +583,6 @@ Model::XNode_t Model::createAttribute( const XNode_t& xParent, Model::XNode_t Model::renameNode( const XNode_t& xNode, const OUString& sName ) - throw( RuntimeException, std::exception ) { // early out if we don't have to change the name if( xNode->getNodeName() == sName ) @@ -683,7 +666,6 @@ Model::XNode_t Model::renameNode( const XNode_t& xNode, Model::XPropertySet_t Model::getBindingForNode( const XNode_t& xNode, sal_Bool bCreate ) - throw( RuntimeException, std::exception ) { OSL_ENSURE( xNode.is(), "no node?" ); @@ -739,7 +721,6 @@ Model::XPropertySet_t Model::getBindingForNode( const XNode_t& xNode, } void Model::removeBindingForNode( const XNode_t& ) - throw( RuntimeException, std::exception ) { // determine whether suitable binding is still used } @@ -880,7 +861,6 @@ OUString Model::getResultForExpression( const XPropertySet_t& xBinding, sal_Bool bIsBindingExpression, const OUString& sExpression ) - throw( RuntimeException, std::exception ) { Binding* pBinding = Binding::getBinding( xBinding ); if( pBinding == nullptr ) @@ -914,13 +894,11 @@ OUString Model::getResultForExpression( } sal_Bool Model::isValidXMLName( const OUString& sName ) - throw( RuntimeException, std::exception ) { return isValidQName( sName, nullptr ); } sal_Bool Model::isValidPrefixName( const OUString& sName ) - throw( RuntimeException, std::exception ) { return ::isValidPrefixName( sName, nullptr ); } @@ -928,7 +906,6 @@ sal_Bool Model::isValidPrefixName( const OUString& sName ) void Model::setNodeValue( const XNode_t& xNode, const OUString& sValue ) - throw( RuntimeException, std::exception ) { setSimpleContent( xNode, sValue ); } diff --git a/forms/source/xforms/namedcollection.hxx b/forms/source/xforms/namedcollection.hxx index 4cd629b54688..c0a31bd99b83 100644 --- a/forms/source/xforms/namedcollection.hxx +++ b/forms/source/xforms/namedcollection.hxx @@ -84,24 +84,19 @@ protected: public: // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() - throw( css::uno::RuntimeException ) override + virtual css::uno::Type SAL_CALL getElementType() override { return Collection<T>::getElementType(); } - virtual sal_Bool SAL_CALL hasElements() - throw( css::uno::RuntimeException ) override + virtual sal_Bool SAL_CALL hasElements() override { return Collection<T>::hasElements(); } // XNameAccess : XElementAccess virtual css::uno::Any SAL_CALL getByName( - const OUString& aName ) - throw( css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException ) override + const OUString& aName ) override { if( hasItem( aName ) ) return css::uno::makeAny( getItem( aName ) ); @@ -110,15 +105,13 @@ public: } - virtual css::uno::Sequence<OUString> SAL_CALL getElementNames() - throw( css::uno::RuntimeException ) override + virtual css::uno::Sequence<OUString> SAL_CALL getElementNames() override { return getNames(); } virtual sal_Bool SAL_CALL hasByName( - const OUString& aName ) - throw( css::uno::RuntimeException ) override + const OUString& aName ) override { return hasItem( aName ); } diff --git a/forms/source/xforms/propertysetbase.cxx b/forms/source/xforms/propertysetbase.cxx index db3c36cf1d22..cf0dfa62613e 100644 --- a/forms/source/xforms/propertysetbase.cxx +++ b/forms/source/xforms/propertysetbase.cxx @@ -63,7 +63,7 @@ cppu::IPropertyArrayHelper& SAL_CALL PropertySetBase::getInfoHelper() return *m_pProperties; } -Reference< XPropertySetInfo > SAL_CALL PropertySetBase::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< XPropertySetInfo > SAL_CALL PropertySetBase::getPropertySetInfo( ) { return cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() ); } @@ -139,7 +139,6 @@ PropertyAccessorBase& PropertySetBase::locatePropertyHandler( sal_Int32 nHandle sal_Bool SAL_CALL PropertySetBase::convertFastPropertyValue( Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw (IllegalArgumentException) { PropertyAccessorBase& rAccessor = locatePropertyHandler( nHandle ); if ( !rAccessor.approveValue( rValue ) ) @@ -155,7 +154,6 @@ sal_Bool SAL_CALL PropertySetBase::convertFastPropertyValue( Any& rConvertedValu } void SAL_CALL PropertySetBase::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) - throw (Exception, std::exception) { PropertyAccessorBase& rAccessor = locatePropertyHandler( nHandle ); rAccessor.setValue( rValue ); diff --git a/forms/source/xforms/propertysetbase.hxx b/forms/source/xforms/propertysetbase.hxx index 7d9f6b6a337c..a02a6a7e00bc 100644 --- a/forms/source/xforms/propertysetbase.hxx +++ b/forms/source/xforms/propertysetbase.hxx @@ -253,14 +253,12 @@ protected: void initializePropertyValueCache( sal_Int32 nHandle ); /// OPropertysetHelper methods - virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) - throw (css::lang::IllegalArgumentException) override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) - throw (css::uno::Exception, std::exception) override; + virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override; virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override; virtual cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; public: /// helper struct for granting selective access to some notification-related methods diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx index 7ad6dd810688..c2ebb3e23f14 100644 --- a/forms/source/xforms/submission.cxx +++ b/forms/source/xforms/submission.cxx @@ -284,7 +284,6 @@ Submission* Submission::getSubmission( void Submission::liveCheck() - throw( RuntimeException ) { bool bValid = mxModel.is(); @@ -355,7 +354,6 @@ void Submission::initializePropertySet() sal_Bool SAL_CALL Submission::convertFastPropertyValue( Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw ( IllegalArgumentException ) { if ( nHandle == HANDLE_IncludeNamespacePrefixes ) { @@ -378,13 +376,11 @@ sal_Bool SAL_CALL Submission::convertFastPropertyValue( } OUString SAL_CALL Submission::getName() - throw( RuntimeException, std::exception ) { return getID(); } void SAL_CALL Submission::setName( const OUString& sID ) - throw( RuntimeException, std::exception ) { setID( sID ); } @@ -392,7 +388,6 @@ void SAL_CALL Submission::setName( const OUString& sID ) sal_Int64 SAL_CALL Submission::getSomething( const Sequence<sal_Int8>& aId ) - throw( RuntimeException, std::exception ) { return ( aId == getUnoTunnelID() ) ? reinterpret_cast<sal_Int64>(this) : 0; } @@ -406,9 +401,6 @@ static OUString lcl_message( const OUString& rID, const OUString& rText ) void SAL_CALL Submission::submitWithInteraction( const Reference<XInteractionHandler>& _rxHandler ) - throw ( VetoException, - WrappedTargetException, - RuntimeException, std::exception ) { // as long as this class is not really threadsafe, we need to copy // the members we're interested in @@ -497,18 +489,18 @@ void SAL_CALL Submission::submitWithInteraction( } } -void SAL_CALL Submission::submit( ) throw ( VetoException, WrappedTargetException, RuntimeException, std::exception ) +void SAL_CALL Submission::submit( ) { submitWithInteraction( nullptr ); } -void SAL_CALL Submission::addSubmissionVetoListener( const Reference< XSubmissionVetoListener >& /*listener*/ ) throw (NoSupportException, RuntimeException, std::exception) +void SAL_CALL Submission::addSubmissionVetoListener( const Reference< XSubmissionVetoListener >& /*listener*/ ) { // TODO throw NoSupportException(); } -void SAL_CALL Submission::removeSubmissionVetoListener( const Reference< XSubmissionVetoListener >& /*listener*/ ) throw (NoSupportException, RuntimeException, std::exception) +void SAL_CALL Submission::removeSubmissionVetoListener( const Reference< XSubmissionVetoListener >& /*listener*/ ) { // TODO throw NoSupportException(); @@ -590,31 +582,31 @@ Reference< XDocumentFragment > Submission::createSubmissionDocument(const Refere // some forwarding: XPropertySet is implemented in our base class, // but also available as base of XSubmission -Reference< css::beans::XPropertySetInfo > SAL_CALL Submission::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< css::beans::XPropertySetInfo > SAL_CALL Submission::getPropertySetInfo( ) { return PropertySetBase::getPropertySetInfo(); } -void SAL_CALL Submission::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL Submission::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) { PropertySetBase::setPropertyValue( aPropertyName, aValue ); } -Any SAL_CALL Submission::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +Any SAL_CALL Submission::getPropertyValue( const OUString& PropertyName ) { return PropertySetBase::getPropertyValue( PropertyName ); } -void SAL_CALL Submission::addPropertyChangeListener( const OUString& aPropertyName, const Reference< css::beans::XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL Submission::addPropertyChangeListener( const OUString& aPropertyName, const Reference< css::beans::XPropertyChangeListener >& xListener ) { PropertySetBase::addPropertyChangeListener( aPropertyName, xListener ); } -void SAL_CALL Submission::removePropertyChangeListener( const OUString& aPropertyName, const Reference< css::beans::XPropertyChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL Submission::removePropertyChangeListener( const OUString& aPropertyName, const Reference< css::beans::XPropertyChangeListener >& aListener ) { PropertySetBase::removePropertyChangeListener( aPropertyName, aListener ); } -void SAL_CALL Submission::addVetoableChangeListener( const OUString& PropertyName, const Reference< css::beans::XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL Submission::addVetoableChangeListener( const OUString& PropertyName, const Reference< css::beans::XVetoableChangeListener >& aListener ) { PropertySetBase::addVetoableChangeListener( PropertyName, aListener ); } -void SAL_CALL Submission::removeVetoableChangeListener( const OUString& PropertyName, const Reference< css::beans::XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL Submission::removeVetoableChangeListener( const OUString& PropertyName, const Reference< css::beans::XVetoableChangeListener >& aListener ) { PropertySetBase::removeVetoableChangeListener( PropertyName, aListener ); } diff --git a/forms/source/xforms/submission.hxx b/forms/source/xforms/submission.hxx index fac867fc753d..836e3a098c07 100644 --- a/forms/source/xforms/submission.hxx +++ b/forms/source/xforms/submission.hxx @@ -167,8 +167,7 @@ private: /// (to be used be API methods before acting on the object) /// /// @throws css::uno::RuntimeException - void liveCheck() - throw( css::uno::RuntimeException ); + void liveCheck(); /// get the model implementation xforms::Model* getModelImpl() const; @@ -184,8 +183,7 @@ protected: css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw ( css::lang::IllegalArgumentException ) override; + const css::uno::Any& rValue ) override; private: void initializePropertySet(); @@ -198,51 +196,40 @@ public: // get/set name - virtual OUString SAL_CALL getName() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getName() override; - virtual void SAL_CALL setName( const OUString& ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setName( const OUString& ) override; // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( - const css::uno::Sequence<sal_Int8>& ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Sequence<sal_Int8>& ) override; // XSubmission - virtual void SAL_CALL submit( ) - throw ( css::util::VetoException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL submit( ) override; virtual void SAL_CALL submitWithInteraction( - const css::uno::Reference< css::task::XInteractionHandler >& aHandler ) - throw ( css::util::VetoException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::task::XInteractionHandler >& aHandler ) override; virtual void SAL_CALL addSubmissionVetoListener( - const css::uno::Reference< css::form::submission::XSubmissionVetoListener >& listener ) - throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::form::submission::XSubmissionVetoListener >& listener ) override; virtual void SAL_CALL removeSubmissionVetoListener( - const css::uno::Reference< css::form::submission::XSubmissionVetoListener >& listener ) - throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::form::submission::XSubmissionVetoListener >& listener ) override; // XPropertySet // (need to disambiguate this) - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; }; diff --git a/forms/source/xforms/submission/submission.hxx b/forms/source/xforms/submission/submission.hxx index bfdb0922898d..facbc64d5be7 100644 --- a/forms/source/xforms/submission/submission.hxx +++ b/forms/source/xforms/submission/submission.hxx @@ -62,11 +62,11 @@ protected: css::uno::Reference< css::ucb::XProgressHandler > m_aProgressHandler; public: - virtual css::uno::Reference< css::task::XInteractionHandler > SAL_CALL getInteractionHandler() throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::task::XInteractionHandler > SAL_CALL getInteractionHandler() override { return m_aInteractionHandler; } - virtual css::uno::Reference< css::ucb::XProgressHandler > SAL_CALL getProgressHandler() throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::ucb::XProgressHandler > SAL_CALL getProgressHandler() override { return m_aProgressHandler; } @@ -85,16 +85,16 @@ public: CProgressHandlerHelper() : m_count(0) {} - virtual void SAL_CALL push( const css::uno::Any& /*aStatus*/) throw(css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL push( const css::uno::Any& /*aStatus*/) override { m_mLock.acquire(); m_count++; m_mLock.release(); } - virtual void SAL_CALL update(const css::uno::Any& /*aStatus*/) throw(css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL update(const css::uno::Any& /*aStatus*/) override { } - virtual void SAL_CALL pop() throw(css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL pop() override { m_mLock.acquire(); m_count--; diff --git a/forms/source/xforms/xforms_services.cxx b/forms/source/xforms/xforms_services.cxx index 1ca4843f2bac..9c6081abe2af 100644 --- a/forms/source/xforms/xforms_services.cxx +++ b/forms/source/xforms/xforms_services.cxx @@ -35,16 +35,13 @@ class Implementation: NameContainer<css::uno::Reference<css::beans::XPropertySet>>, css::lang::XServiceInfo> { - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.form.XForms"); } - sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override + sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } - css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override { return css::uno::Sequence<OUString>{"com.sun.star.xforms.XForms"}; } diff --git a/forms/source/xforms/xformsevent.cxx b/forms/source/xforms/xformsevent.cxx index 63bcc482539d..c11664308295 100644 --- a/forms/source/xforms/xformsevent.cxx +++ b/forms/source/xforms/xformsevent.cxx @@ -29,57 +29,56 @@ using com::sun::star::uno::RuntimeException; void SAL_CALL XFormsEventConcrete::initXFormsEvent(const OUString& typeArg, sal_Bool canBubbleArg, sal_Bool cancelableArg) - throw (RuntimeException, std::exception) { initEvent(typeArg, canBubbleArg, cancelableArg); } -OUString SAL_CALL XFormsEventConcrete::getType() throw (RuntimeException, std::exception) +OUString SAL_CALL XFormsEventConcrete::getType() { return m_eventType; } -css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL XFormsEventConcrete::getTarget() throw (RuntimeException, std::exception) +css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL XFormsEventConcrete::getTarget() { return m_target; } -css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL XFormsEventConcrete::getCurrentTarget() throw (RuntimeException, std::exception) +css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL XFormsEventConcrete::getCurrentTarget() { return m_currentTarget; } -css::xml::dom::events::PhaseType SAL_CALL XFormsEventConcrete::getEventPhase() throw (RuntimeException, std::exception) +css::xml::dom::events::PhaseType SAL_CALL XFormsEventConcrete::getEventPhase() { return css::xml::dom::events::PhaseType_CAPTURING_PHASE; } -sal_Bool SAL_CALL XFormsEventConcrete::getBubbles() throw (RuntimeException, std::exception) +sal_Bool SAL_CALL XFormsEventConcrete::getBubbles() { return m_bubbles; } -sal_Bool SAL_CALL XFormsEventConcrete::getCancelable() throw (RuntimeException, std::exception) +sal_Bool SAL_CALL XFormsEventConcrete::getCancelable() { return m_cancelable; } -css::util::Time SAL_CALL XFormsEventConcrete::getTimeStamp() throw (RuntimeException, std::exception) +css::util::Time SAL_CALL XFormsEventConcrete::getTimeStamp() { return m_time; } -void SAL_CALL XFormsEventConcrete::stopPropagation() throw (RuntimeException, std::exception) +void SAL_CALL XFormsEventConcrete::stopPropagation() { if(m_cancelable) m_canceled = true; } -void SAL_CALL XFormsEventConcrete::preventDefault() throw (RuntimeException, std::exception) +void SAL_CALL XFormsEventConcrete::preventDefault() { } void SAL_CALL XFormsEventConcrete::initEvent(const OUString& eventTypeArg, sal_Bool canBubbleArg, - sal_Bool cancelableArg) throw (RuntimeException, std::exception) + sal_Bool cancelableArg) { m_eventType = eventTypeArg; m_bubbles = canBubbleArg; diff --git a/forms/source/xforms/xformsevent.hxx b/forms/source/xforms/xformsevent.hxx index 36bbcecddb94..3bdfb857cbe3 100644 --- a/forms/source/xforms/xformsevent.hxx +++ b/forms/source/xforms/xformsevent.hxx @@ -41,27 +41,25 @@ class XFormsEventConcrete : public cppu::WeakImplHelper< XFormsEvent > { { } - virtual OUString SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() throw (css::uno::RuntimeException, std::exception) override; - virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getBubbles() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getCancelable() throw (css::uno::RuntimeException, std::exception) override; - virtual css::util::Time SAL_CALL getTimeStamp() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL stopPropagation() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL preventDefault() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getType() override; + virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() override; + virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() override; + virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() override; + virtual sal_Bool SAL_CALL getBubbles() override; + virtual sal_Bool SAL_CALL getCancelable() override; + virtual css::util::Time SAL_CALL getTimeStamp() override; + virtual void SAL_CALL stopPropagation() override; + virtual void SAL_CALL preventDefault() override; virtual void SAL_CALL initXFormsEvent( const OUString& typeArg, sal_Bool canBubbleArg, - sal_Bool cancelableArg ) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool cancelableArg ) override; virtual void SAL_CALL initEvent( const OUString& eventTypeArg, sal_Bool canBubbleArg, - sal_Bool cancelableArg) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool cancelableArg) override; private: diff --git a/forms/source/xforms/xpathlib/extension.cxx b/forms/source/xforms/xpathlib/extension.cxx index 5bf519918960..e171ac422328 100644 --- a/forms/source/xforms/xpathlib/extension.cxx +++ b/forms/source/xforms/xpathlib/extension.cxx @@ -30,7 +30,7 @@ using namespace com::sun::star::xforms; using namespace com::sun::star::xml::xpath; using namespace com::sun::star::beans; -Libxml2ExtensionHandle SAL_CALL CLibxml2XFormsExtension::getLibxml2ExtensionHandle() throw (RuntimeException, std::exception) +Libxml2ExtensionHandle SAL_CALL CLibxml2XFormsExtension::getLibxml2ExtensionHandle() { Libxml2ExtensionHandle aHandle; aHandle.functionLookupFunction = reinterpret_cast< sal_Int64 >( &xforms_lookupFunc ); @@ -40,7 +40,7 @@ Libxml2ExtensionHandle SAL_CALL CLibxml2XFormsExtension::getLibxml2ExtensionHand return aHandle; } -void SAL_CALL CLibxml2XFormsExtension::initialize(const Sequence< Any >& aSequence) throw (RuntimeException, std::exception) +void SAL_CALL CLibxml2XFormsExtension::initialize(const Sequence< Any >& aSequence) { if (aSequence.getLength() == 2 && (aSequence[0] >>= m_aModel) diff --git a/forms/source/xforms/xpathlib/extension.hxx b/forms/source/xforms/xpathlib/extension.hxx index b364a9be1f5b..906b4b70de28 100644 --- a/forms/source/xforms/xpathlib/extension.hxx +++ b/forms/source/xforms/xpathlib/extension.hxx @@ -49,8 +49,8 @@ public: const css::uno::Reference< css::xforms::XModel >& getModel() { return m_aModel;} const css::uno::Reference< css::xml::dom::XNode >& getContextNode() { return m_aContextNode;} - virtual css::xml::xpath::Libxml2ExtensionHandle SAL_CALL getLibxml2ExtensionHandle() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& aSequence) throw (css::uno::RuntimeException, std::exception) override; + virtual css::xml::xpath::Libxml2ExtensionHandle SAL_CALL getLibxml2ExtensionHandle() override; + virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& aSequence) override; }; |