From 5e21a413c788f839a66d9e4c14e745ed18058db8 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 25 Feb 2014 21:31:58 +0100 Subject: cppuhelper: retrofit std::exception into overriding exception specs Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3 --- forms/source/component/Button.cxx | 44 ++-- forms/source/component/Button.hxx | 44 ++-- forms/source/component/CheckBox.cxx | 10 +- forms/source/component/CheckBox.hxx | 10 +- forms/source/component/Columns.cxx | 14 +- forms/source/component/Columns.hxx | 18 +- forms/source/component/ComboBox.cxx | 18 +- forms/source/component/ComboBox.hxx | 18 +- forms/source/component/Currency.cxx | 6 +- forms/source/component/Currency.hxx | 6 +- forms/source/component/DatabaseForm.cxx | 232 ++++++++++---------- forms/source/component/DatabaseForm.hxx | 236 ++++++++++----------- forms/source/component/Date.cxx | 8 +- forms/source/component/Date.hxx | 8 +- forms/source/component/Edit.cxx | 30 +-- forms/source/component/Edit.hxx | 30 +-- forms/source/component/EditBase.cxx | 6 +- forms/source/component/EditBase.hxx | 6 +- forms/source/component/EventThread.cxx | 4 +- forms/source/component/EventThread.hxx | 4 +- forms/source/component/File.cxx | 18 +- forms/source/component/File.hxx | 18 +- forms/source/component/Filter.cxx | 48 ++--- forms/source/component/Filter.hxx | 52 ++--- forms/source/component/FixedText.cxx | 8 +- forms/source/component/FixedText.hxx | 8 +- forms/source/component/FormComponent.cxx | 138 ++++++------ forms/source/component/FormattedField.cxx | 30 +-- forms/source/component/FormattedField.hxx | 30 +-- forms/source/component/FormattedFieldWrapper.cxx | 16 +- forms/source/component/FormattedFieldWrapper.hxx | 16 +- forms/source/component/FormsCollection.cxx | 20 +- forms/source/component/FormsCollection.hxx | 80 +++---- forms/source/component/Grid.cxx | 48 ++--- forms/source/component/Grid.hxx | 46 ++-- forms/source/component/GroupBox.cxx | 10 +- forms/source/component/GroupBox.hxx | 10 +- forms/source/component/GroupManager.cxx | 10 +- forms/source/component/GroupManager.hxx | 10 +- forms/source/component/Hidden.cxx | 10 +- forms/source/component/Hidden.hxx | 10 +- forms/source/component/ImageButton.cxx | 20 +- forms/source/component/ImageButton.hxx | 22 +- forms/source/component/ImageControl.cxx | 38 ++-- forms/source/component/ImageControl.hxx | 38 ++-- forms/source/component/ListBox.cxx | 76 +++---- forms/source/component/ListBox.hxx | 76 +++---- forms/source/component/Numeric.cxx | 6 +- forms/source/component/Numeric.hxx | 6 +- forms/source/component/Pattern.cxx | 6 +- forms/source/component/Pattern.hxx | 6 +- forms/source/component/RadioButton.cxx | 14 +- forms/source/component/RadioButton.hxx | 14 +- forms/source/component/Time.cxx | 8 +- forms/source/component/Time.hxx | 8 +- forms/source/component/clickableimage.cxx | 36 ++-- forms/source/component/clickableimage.hxx | 38 ++-- forms/source/component/entrylisthelper.cxx | 18 +- forms/source/component/entrylisthelper.hxx | 20 +- forms/source/component/errorbroadcaster.cxx | 4 +- forms/source/component/errorbroadcaster.hxx | 4 +- forms/source/component/imgprod.cxx | 8 +- forms/source/component/imgprod.hxx | 8 +- forms/source/component/navigationbar.cxx | 14 +- forms/source/component/navigationbar.hxx | 14 +- forms/source/component/refvaluecomponent.cxx | 2 +- forms/source/component/refvaluecomponent.hxx | 2 +- forms/source/component/scrollbar.cxx | 8 +- forms/source/component/scrollbar.hxx | 2 +- forms/source/component/spinbutton.cxx | 8 +- forms/source/component/spinbutton.hxx | 2 +- forms/source/helper/formnavigation.cxx | 8 +- forms/source/helper/windowstateguard.cxx | 28 +-- forms/source/inc/FormComponent.hxx | 164 +++++++------- forms/source/inc/InterfaceContainer.hxx | 72 +++---- forms/source/inc/formnavigation.hxx | 8 +- forms/source/inc/forms_module.hxx | 8 +- forms/source/misc/InterfaceContainer.cxx | 70 +++--- forms/source/richtext/attributedispatcher.cxx | 2 +- forms/source/richtext/attributedispatcher.hxx | 2 +- forms/source/richtext/clipboarddispatcher.cxx | 2 +- forms/source/richtext/clipboarddispatcher.hxx | 2 +- forms/source/richtext/featuredispatcher.cxx | 4 +- forms/source/richtext/featuredispatcher.hxx | 4 +- .../richtext/parametrizedattributedispatcher.cxx | 2 +- .../richtext/parametrizedattributedispatcher.hxx | 2 +- forms/source/richtext/richtextcontrol.cxx | 20 +- forms/source/richtext/richtextcontrol.hxx | 20 +- forms/source/richtext/richtextmodel.cxx | 16 +- forms/source/richtext/richtextmodel.hxx | 10 +- forms/source/richtext/specialdispatchers.cxx | 2 +- forms/source/richtext/specialdispatchers.hxx | 2 +- forms/source/runtime/formoperations.cxx | 46 ++-- forms/source/runtime/formoperations.hxx | 46 ++-- forms/source/solar/component/navbarcontrol.cxx | 24 +-- forms/source/solar/component/navbarcontrol.hxx | 24 +-- forms/source/xforms/NameContainer.hxx | 16 +- forms/source/xforms/binding.cxx | 40 ++-- forms/source/xforms/binding.hxx | 40 ++-- forms/source/xforms/collection.hxx | 22 +- forms/source/xforms/datatyperepository.cxx | 20 +- forms/source/xforms/datatyperepository.hxx | 20 +- forms/source/xforms/datatypes.cxx | 36 ++-- forms/source/xforms/datatypes.hxx | 38 ++-- forms/source/xforms/enumeration.cxx | 4 +- forms/source/xforms/enumeration.hxx | 4 +- forms/source/xforms/model.cxx | 46 ++-- forms/source/xforms/model.hxx | 106 ++++----- forms/source/xforms/model_ui.cxx | 46 ++-- forms/source/xforms/propertysetbase.cxx | 4 +- forms/source/xforms/propertysetbase.hxx | 4 +- forms/source/xforms/submission.cxx | 28 +-- forms/source/xforms/submission.hxx | 28 +-- forms/source/xforms/submission/submission.hxx | 10 +- forms/source/xforms/xformsevent.cxx | 22 +- forms/source/xforms/xformsevent.hxx | 22 +- forms/source/xforms/xpathlib/extension.cxx | 4 +- forms/source/xforms/xpathlib/extension.hxx | 4 +- 118 files changed, 1533 insertions(+), 1533 deletions(-) (limited to 'forms/source') diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx index 59cdb0e4c5d6..54b770b8cc0f 100644 --- a/forms/source/component/Button.cxx +++ b/forms/source/component/Button.cxx @@ -69,7 +69,7 @@ OButtonModel::OButtonModel(const Reference& _rxFactory) } -Any SAL_CALL OButtonModel::queryAggregation( const Type& _type ) throw(RuntimeException) +Any SAL_CALL OButtonModel::queryAggregation( const Type& _type ) throw(RuntimeException, std::exception) { Any aReturn = OClickableImageBaseModel::queryAggregation( _type ); if ( !aReturn.hasValue() ) @@ -120,7 +120,7 @@ IMPLEMENT_DEFAULT_CLONING( OButtonModel ) // XServiceInfo -StringSequence OButtonModel::getSupportedServiceNames() throw() +StringSequence OButtonModel::getSupportedServiceNames() throw(std::exception) { StringSequence aSupported = OClickableImageBaseModel::getSupportedServiceNames(); aSupported.realloc( aSupported.getLength() + 1 ); @@ -132,13 +132,13 @@ StringSequence OButtonModel::getSupportedServiceNames() throw() } -OUString OButtonModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) +OUString OButtonModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) { return OUString(FRM_COMPONENT_COMMANDBUTTON); // old (non-sun) name for compatibility ! } -void OButtonModel::write(const Reference& _rxOutStream) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) +void OButtonModel::write(const Reference& _rxOutStream) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { OClickableImageBaseModel::write(_rxOutStream); @@ -159,7 +159,7 @@ void OButtonModel::write(const Reference& _rxOutStream) thr } -void OButtonModel::read(const Reference& _rxInStream) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) +void OButtonModel::read(const Reference& _rxInStream) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { OClickableImageBaseModel::read(_rxInStream); @@ -226,7 +226,7 @@ void SAL_CALL OButtonModel::disposing() } -void SAL_CALL OButtonModel::reset() throw (RuntimeException) +void SAL_CALL OButtonModel::reset() throw (RuntimeException, std::exception) { if ( !m_aResetHelper.approveReset() ) return; @@ -237,13 +237,13 @@ void SAL_CALL OButtonModel::reset() throw (RuntimeException) } -void SAL_CALL OButtonModel::addResetListener( const Reference< XResetListener >& _listener ) throw (RuntimeException) +void SAL_CALL OButtonModel::addResetListener( const Reference< XResetListener >& _listener ) throw (RuntimeException, std::exception) { m_aResetHelper.addResetListener( _listener ); } -void SAL_CALL OButtonModel::removeResetListener( const Reference< XResetListener >& _listener ) throw (RuntimeException) +void SAL_CALL OButtonModel::removeResetListener( const Reference< XResetListener >& _listener ) throw (RuntimeException, std::exception) { m_aResetHelper.removeResetListener( _listener ); } @@ -264,7 +264,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) +void SAL_CALL OButtonModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw (Exception, std::exception) { switch ( _nHandle ) { @@ -350,7 +350,7 @@ Sequence OButtonControl::_getTypes() } -StringSequence OButtonControl::getSupportedServiceNames() throw() +StringSequence OButtonControl::getSupportedServiceNames() throw(std::exception) { StringSequence aSupported = OClickableImageBaseControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); @@ -389,7 +389,7 @@ OButtonControl::~OButtonControl() // UNO binding -Any SAL_CALL OButtonControl::queryAggregation(const Type& _rType) throw (RuntimeException) +Any SAL_CALL OButtonControl::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception) { // if asked for the XTypeProvider, don't let OButtonControl_BASE do this Any aReturn; @@ -415,7 +415,7 @@ void SAL_CALL OButtonControl::disposing() } -void SAL_CALL OButtonControl::disposing( const EventObject& _rSource ) throw( RuntimeException ) +void SAL_CALL OButtonControl::disposing( const EventObject& _rSource ) throw( RuntimeException, std::exception ) { OControl::disposing( _rSource ); OFormNavigationHelper::disposing( _rSource ); @@ -423,7 +423,7 @@ void SAL_CALL OButtonControl::disposing( const EventObject& _rSource ) throw( Ru // ActionListener -void OButtonControl::actionPerformed(const ActionEvent& /*rEvent*/) throw ( ::com::sun::star::uno::RuntimeException) +void OButtonControl::actionPerformed(const ActionEvent& /*rEvent*/) throw ( ::com::sun::star::uno::RuntimeException, std::exception) { // Asynchronous for starutil::URL-Button sal_uLong n = Application::PostUserEvent( LINK(this, OButtonControl,OnClick) ); @@ -514,7 +514,7 @@ void OButtonControl::actionPerformed_Impl( sal_Bool _bNotifyListener, const ::co // XButton -void OButtonControl::setLabel(const OUString& Label) throw( RuntimeException ) +void OButtonControl::setLabel(const OUString& Label) throw( RuntimeException, std::exception ) { Reference xButton; query_aggregation( m_xAggregate, xButton ); @@ -523,7 +523,7 @@ void OButtonControl::setLabel(const OUString& Label) throw( RuntimeException ) } -void SAL_CALL OButtonControl::setActionCommand(const OUString& _rCommand) throw( RuntimeException ) +void SAL_CALL OButtonControl::setActionCommand(const OUString& _rCommand) throw( RuntimeException, std::exception ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -537,13 +537,13 @@ void SAL_CALL OButtonControl::setActionCommand(const OUString& _rCommand) throw( } -void SAL_CALL OButtonControl::addActionListener(const Reference& _rxListener) throw( RuntimeException ) +void SAL_CALL OButtonControl::addActionListener(const Reference& _rxListener) throw( RuntimeException, std::exception ) { m_aActionListeners.addInterface(_rxListener); } -void SAL_CALL OButtonControl::removeActionListener(const Reference& _rxListener) throw( RuntimeException ) +void SAL_CALL OButtonControl::removeActionListener(const Reference& _rxListener) throw( RuntimeException, std::exception ) { m_aActionListeners.removeInterface(_rxListener); } @@ -600,7 +600,7 @@ void OButtonControl::startOrStopModelPropertyListening( bool _bStart ) } -sal_Bool SAL_CALL OButtonControl::setModel( const Reference< XControlModel >& _rxModel ) throw ( RuntimeException ) +sal_Bool SAL_CALL OButtonControl::setModel( const Reference< XControlModel >& _rxModel ) throw ( RuntimeException, std::exception ) { startOrStopModelPropertyListening( false ); sal_Bool bResult = OClickableImageBaseControl::setModel( _rxModel ); @@ -632,7 +632,7 @@ void OButtonControl::modelFeatureUrlPotentiallyChanged( ) } -void SAL_CALL OButtonControl::propertyChange( const PropertyChangeEvent& _rEvent ) throw ( RuntimeException ) +void SAL_CALL OButtonControl::propertyChange( const PropertyChangeEvent& _rEvent ) throw ( RuntimeException, std::exception ) { if ( _rEvent.PropertyName.equals( PROPERTY_TARGET_URL ) || _rEvent.PropertyName.equals( PROPERTY_BUTTONTYPE ) @@ -687,7 +687,7 @@ sal_Int16 OButtonControl::getModelUrlFeatureId( ) const } -void SAL_CALL OButtonControl::setDesignMode( sal_Bool _bOn ) throw( RuntimeException ) +void SAL_CALL OButtonControl::setDesignMode( sal_Bool _bOn ) throw( RuntimeException, std::exception ) { OClickableImageBaseControl::setDesignMode( _bOn ); @@ -746,14 +746,14 @@ bool OButtonControl::isEnabled( sal_Int16 _nFeatureId ) const } -void SAL_CALL OButtonControl::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException) +void SAL_CALL OButtonControl::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException, std::exception) { OClickableImageBaseControl::registerDispatchProviderInterceptor( _rxInterceptor ); OFormNavigationHelper::registerDispatchProviderInterceptor( _rxInterceptor ); } -void SAL_CALL OButtonControl::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException) +void SAL_CALL OButtonControl::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException, std::exception) { OClickableImageBaseControl::releaseDispatchProviderInterceptor( _rxInterceptor ); OFormNavigationHelper::releaseDispatchProviderInterceptor( _rxInterceptor ); diff --git a/forms/source/component/Button.hxx b/forms/source/component/Button.hxx index 7845413ec913..4f6891d12832 100644 --- a/forms/source/component/Button.hxx +++ b/forms/source/component/Button.hxx @@ -53,23 +53,23 @@ public: // UNO DECLARE_UNO3_AGG_DEFAULTS( OButtonModel, OClickableImageBaseModel ); - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes(); // ::com::sun::star::lang::XServiceInfo IMPLEMENTATION_NAME(OButtonModel); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception); // ::com::sun::star::io::XPersistObject - virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); // XReset - virtual void SAL_CALL reset( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addResetListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeResetListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL reset( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addResetListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeResetListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); // OControlModel's property handling virtual void describeFixedProperties( @@ -79,7 +79,7 @@ public: // XPropertySet and friends virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception); + throw (::com::sun::star::uno::Exception, std::exception); virtual sal_Bool SAL_CALL convertFastPropertyValue( ::com::sun::star::uno::Any& _rConvertedValue, ::com::sun::star::uno::Any& _rOldValue, sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::lang::IllegalArgumentException); @@ -135,33 +135,33 @@ public: // XServiceInfo IMPLEMENTATION_NAME(OButtonControl); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception); // UNO binding DECLARE_UNO3_AGG_DEFAULTS(OButtonControl, OClickableImageBaseControl); - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception); // XActionListener - virtual void SAL_CALL actionPerformed(const ::com::sun::star::awt::ActionEvent& rEvent) throw ( ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actionPerformed(const ::com::sun::star::awt::ActionEvent& rEvent) throw ( ::com::sun::star::uno::RuntimeException, std::exception); // XButton - virtual void SAL_CALL addActionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeActionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setLabel(const OUString& Label) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setActionCommand(const OUString& _rCommand) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addActionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeActionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setLabel(const OUString& Label) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setActionCommand(const OUString& _rCommand) throw(::com::sun::star::uno::RuntimeException, std::exception); // OComponentHelper virtual void SAL_CALL disposing(); // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException, std::exception); // XControl - virtual sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxModel ) throw ( ::com::sun::star::uno::RuntimeException ); - void SAL_CALL setDesignMode(sal_Bool bOn) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxModel ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + void SAL_CALL setDesignMode(sal_Bool bOn) throw (::com::sun::star::uno::RuntimeException, std::exception); protected: // OFormNavigationHelper overriables @@ -171,8 +171,8 @@ protected: virtual bool isEnabled( sal_Int16 _nFeatureId ) const; // XDispatchProviderInterception disambiguaiton - virtual void SAL_CALL registerDispatchProviderInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& Interceptor ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL releaseDispatchProviderInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& Interceptor ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL registerDispatchProviderInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& Interceptor ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL releaseDispatchProviderInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& Interceptor ) throw (::com::sun::star::uno::RuntimeException, std::exception); // OImageControl overridables virtual void actionPerformed_Impl( sal_Bool bNotifyListener, const ::com::sun::star::awt::MouseEvent& _rEvt ); diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx index c6d712679122..95acfd2eb609 100644 --- a/forms/source/component/CheckBox.cxx +++ b/forms/source/component/CheckBox.cxx @@ -58,7 +58,7 @@ InterfaceRef SAL_CALL OCheckBoxControl_CreateInstance(const Reference& _rProps ) co } -OUString SAL_CALL OCheckBoxModel::getServiceName() throw(RuntimeException) +OUString SAL_CALL OCheckBoxModel::getServiceName() throw(RuntimeException, std::exception) { return OUString(FRM_COMPONENT_CHECKBOX); // old (non-sun) name for compatibility ! } void SAL_CALL OCheckBoxModel::write(const Reference& _rxOutStream) - throw(stario::IOException, RuntimeException) + throw(stario::IOException, RuntimeException, std::exception) { OReferenceValueComponent::write(_rxOutStream); @@ -158,7 +158,7 @@ void SAL_CALL OCheckBoxModel::write(const Reference } -void SAL_CALL OCheckBoxModel::read(const Reference& _rxInStream) throw(stario::IOException, RuntimeException) +void SAL_CALL OCheckBoxModel::read(const Reference& _rxInStream) throw(stario::IOException, RuntimeException, std::exception) { OReferenceValueComponent::read(_rxInStream); osl::MutexGuard aGuard(m_aMutex); diff --git a/forms/source/component/CheckBox.hxx b/forms/source/component/CheckBox.hxx index ba729be6bd65..175d55c330b5 100644 --- a/forms/source/component/CheckBox.hxx +++ b/forms/source/component/CheckBox.hxx @@ -40,14 +40,14 @@ public: // XServiceInfo IMPLEMENTATION_NAME(OCheckBoxModel); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); // XPersistObject - virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL - write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL - read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); // OControlModel's property handling virtual void describeFixedProperties( @@ -73,7 +73,7 @@ public: // XServiceInfo IMPLEMENTATION_NAME(OCheckBoxControl); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); }; //......................................................................... diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx index 5f5994520cab..8e934e41dccf 100644 --- a/forms/source/component/Columns.cxx +++ b/forms/source/component/Columns.cxx @@ -125,7 +125,7 @@ const Sequence& OGridColumn::getUnoTunnelImplementationId() } -sal_Int64 SAL_CALL OGridColumn::getSomething( const Sequence& _rIdentifier) throw(RuntimeException) +sal_Int64 SAL_CALL OGridColumn::getSomething( const Sequence& _rIdentifier) throw(RuntimeException, std::exception) { sal_Int64 nReturn(0); @@ -145,13 +145,13 @@ sal_Int64 SAL_CALL OGridColumn::getSomething( const Sequence& _rIdenti } -Sequence SAL_CALL OGridColumn::getImplementationId() throw(RuntimeException) +Sequence SAL_CALL OGridColumn::getImplementationId() throw(RuntimeException, std::exception) { return OImplementationIds::getImplementationId(getTypes()); } -Sequence SAL_CALL OGridColumn::getTypes() throw(RuntimeException) +Sequence SAL_CALL OGridColumn::getTypes() throw(RuntimeException, std::exception) { TypeBag aTypes( OGridColumn_BASE::getTypes() ); // erase the types which we do not support @@ -175,7 +175,7 @@ Sequence SAL_CALL OGridColumn::getTypes() throw(RuntimeException) } -Any SAL_CALL OGridColumn::queryAggregation( const Type& _rType ) throw (RuntimeException) +Any SAL_CALL OGridColumn::queryAggregation( const Type& _rType ) throw (RuntimeException, std::exception) { Any aReturn; // some functionality at our aggregate cannot be reasonably fullfilled here. @@ -273,7 +273,7 @@ OGridColumn::~OGridColumn() // XEventListener -void SAL_CALL OGridColumn::disposing(const EventObject& _rSource) throw(RuntimeException) +void SAL_CALL OGridColumn::disposing(const EventObject& _rSource) throw(RuntimeException, std::exception) { OPropertySetAggregationHelper::disposing(_rSource); @@ -424,7 +424,7 @@ sal_Bool OGridColumn::convertFastPropertyValue( Any& rConvertedValue, Any& rOldV } -void OGridColumn::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (::com::sun::star::uno::Exception) +void OGridColumn::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception) { switch (nHandle) { @@ -463,7 +463,7 @@ Any OGridColumn::getPropertyDefaultByHandle( sal_Int32 nHandle ) const // XCloneable -Reference< XCloneable > SAL_CALL OGridColumn::createClone( ) throw (RuntimeException) +Reference< XCloneable > SAL_CALL OGridColumn::createClone( ) throw (RuntimeException, std::exception) { OGridColumn* pNewColumn = createCloneColumn(); return pNewColumn; diff --git a/forms/source/component/Columns.hxx b/forms/source/component/Columns.hxx index a4892cca50c9..dcb6617857ff 100644 --- a/forms/source/component/Columns.hxx +++ b/forms/source/component/Columns.hxx @@ -72,21 +72,21 @@ public: // UNO binding DECLARE_UNO3_AGG_DEFAULTS(OGridControlModel, OGridColumn_BASE); - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception); static const ::com::sun::star::uno::Sequence& getUnoTunnelImplementationId(); // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence& _rIdentifier) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence& _rIdentifier) throw(::com::sun::star::uno::RuntimeException, std::exception); // XTypeProvider - virtual ::com::sun::star::uno::Sequence SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); // OComponentHelper virtual void SAL_CALL disposing(); // XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException, std::exception); // XPersistObject virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream); @@ -98,7 +98,7 @@ public: virtual sal_Bool SAL_CALL convertFastPropertyValue(::com::sun::star::uno::Any& rConvertedValue, ::com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::lang::IllegalArgumentException); - virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::uno::Exception); + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::uno::Exception, std::exception); using OPropertySetAggregationHelper::getFastPropertyValue; @@ -106,7 +106,7 @@ public: virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const; // XCloneable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception); const OUString& getModelName() const { return m_aModelName; } @@ -126,7 +126,7 @@ public: ClassName(const css::uno::Reference& _rContext ); \ ClassName(const ClassName* _pCloneFrom); \ \ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); \ + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception); \ virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); \ \ virtual void fillProperties( \ @@ -147,7 +147,7 @@ ClassName::ClassName( const ClassName* _pCloneFrom ) \ :OGridColumn( _pCloneFrom ) \ { \ } \ -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> ClassName::getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException) \ +::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> ClassName::getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) \ { \ ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); \ return xInfo; \ diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx index 4c35487289ea..02e81129690a 100644 --- a/forms/source/component/ComboBox.cxx +++ b/forms/source/component/ComboBox.cxx @@ -90,7 +90,7 @@ Sequence OComboBoxModel::_getTypes() // XServiceInfo -StringSequence SAL_CALL OComboBoxModel::getSupportedServiceNames() throw(RuntimeException) +StringSequence SAL_CALL OComboBoxModel::getSupportedServiceNames() throw(RuntimeException, std::exception) { StringSequence aSupported = OBoundControlModel::getSupportedServiceNames(); @@ -113,7 +113,7 @@ StringSequence SAL_CALL OComboBoxModel::getSupportedServiceNames() throw(Runtime } -Any SAL_CALL OComboBoxModel::queryAggregation(const Type& _rType) throw (RuntimeException) +Any SAL_CALL OComboBoxModel::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception) { Any aReturn = OBoundControlModel::queryAggregation( _rType ); if ( !aReturn.hasValue() ) @@ -207,7 +207,7 @@ void OComboBoxModel::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) cons void OComboBoxModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) - throw (Exception) + throw (Exception, std::exception) { switch (_nHandle) { @@ -318,14 +318,14 @@ void OComboBoxModel::describeAggregateProperties( Sequence< Property >& _rAggreg } -OUString SAL_CALL OComboBoxModel::getServiceName() throw(RuntimeException) +OUString SAL_CALL OComboBoxModel::getServiceName() throw(RuntimeException, std::exception) { return OUString(FRM_COMPONENT_COMBOBOX); // old (non-sun) name for compatibility ! } void SAL_CALL OComboBoxModel::write(const Reference& _rxOutStream) - throw(stario::IOException, RuntimeException) + throw(stario::IOException, RuntimeException, std::exception) { OBoundControlModel::write(_rxOutStream); @@ -362,7 +362,7 @@ void SAL_CALL OComboBoxModel::write(const Reference } -void SAL_CALL OComboBoxModel::read(const Reference& _rxInStream) throw(stario::IOException, RuntimeException) +void SAL_CALL OComboBoxModel::read(const Reference& _rxInStream) throw(stario::IOException, RuntimeException, std::exception) { OBoundControlModel::read(_rxInStream); ControlModelLock aLock( *this ); @@ -701,7 +701,7 @@ void OComboBoxModel::onDisconnectedDbColumn() } -void SAL_CALL OComboBoxModel::reloaded( const EventObject& aEvent ) throw(RuntimeException) +void SAL_CALL OComboBoxModel::reloaded( const EventObject& aEvent ) throw(RuntimeException, std::exception) { OBoundControlModel::reloaded(aEvent); @@ -858,7 +858,7 @@ void OComboBoxModel::refreshInternalEntryList() } -void SAL_CALL OComboBoxModel::disposing( const EventObject& _rSource ) throw ( RuntimeException ) +void SAL_CALL OComboBoxModel::disposing( const EventObject& _rSource ) throw ( RuntimeException, std::exception ) { if ( !OEntryListHelper::handleDisposing( _rSource ) ) OBoundControlModel::disposing( _rSource ); @@ -881,7 +881,7 @@ OComboBoxControl::OComboBoxControl(const Reference& _rxContex } -StringSequence SAL_CALL OComboBoxControl::getSupportedServiceNames() throw(RuntimeException) +StringSequence SAL_CALL OComboBoxControl::getSupportedServiceNames() throw(RuntimeException, std::exception) { StringSequence aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); diff --git a/forms/source/component/ComboBox.hxx b/forms/source/component/ComboBox.hxx index b6afbd3c140f..6cd9d1d18da1 100644 --- a/forms/source/component/ComboBox.hxx +++ b/forms/source/component/ComboBox.hxx @@ -81,28 +81,28 @@ public: // OPropertySetHelper virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception); + throw (::com::sun::star::uno::Exception, std::exception); virtual sal_Bool SAL_CALL convertFastPropertyValue( ::com::sun::star::uno::Any& _rConvertedValue, ::com::sun::star::uno::Any& _rOldValue, sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::lang::IllegalArgumentException); // XLoadListener - virtual void SAL_CALL reloaded( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL reloaded( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo IMPLEMENTATION_NAME(OComboBoxModel); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); // UNO DECLARE_UNO3_AGG_DEFAULTS(OComboBoxModel, OBoundControlModel); - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XPersistObject - virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL - write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL - read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); // OControlModel's property handling virtual void describeFixedProperties( @@ -113,7 +113,7 @@ public: ) const; // XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException, std::exception); // prevent method hiding using OBoundControlModel::getFastPropertyValue; @@ -155,7 +155,7 @@ public: // XServiceInfo IMPLEMENTATION_NAME(OComboBoxControl); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); }; //......................................................................... diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx index 4a88cfb24b89..2bac133ff194 100644 --- a/forms/source/component/Currency.cxx +++ b/forms/source/component/Currency.cxx @@ -62,7 +62,7 @@ Sequence OCurrencyControl::_getTypes() } -StringSequence SAL_CALL OCurrencyControl::getSupportedServiceNames() throw() +StringSequence SAL_CALL OCurrencyControl::getSupportedServiceNames() throw(std::exception) { StringSequence aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); @@ -163,7 +163,7 @@ IMPLEMENT_DEFAULT_CLONING( OCurrencyModel ) // XServiceInfo -StringSequence SAL_CALL OCurrencyModel::getSupportedServiceNames() throw() +StringSequence SAL_CALL OCurrencyModel::getSupportedServiceNames() throw(std::exception) { StringSequence aSupported = OBoundControlModel::getSupportedServiceNames(); @@ -193,7 +193,7 @@ void OCurrencyModel::describeFixedProperties( Sequence< Property >& _rProps ) co } -OUString SAL_CALL OCurrencyModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OCurrencyModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) { 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 606ae9100008..b8ed78bb70fa 100644 --- a/forms/source/component/Currency.hxx +++ b/forms/source/component/Currency.hxx @@ -43,10 +43,10 @@ public: // ::com::sun::star::lang::XServiceInfo IMPLEMENTATION_NAME(OCurrencyModel); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception); // ::com::sun::star::io::XPersistObject - virtual OUString SAL_CALL getServiceName() throw ( ::com::sun ::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw ( ::com::sun ::star::uno::RuntimeException, std::exception); // OControlModel's property handling virtual void describeFixedProperties( @@ -82,7 +82,7 @@ public: OCurrencyControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext); // ::com::sun::star::lang::XServiceInfo IMPLEMENTATION_NAME(OCurrencyControl); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception); }; //......................................................................... diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index f49ca913c73b..7dcec5fd63b6 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -219,13 +219,13 @@ Reference< XInterface > SAL_CALL ODatabaseForm::Create( const Reference< XMultiS } -Sequence SAL_CALL ODatabaseForm::getImplementationId() throw(RuntimeException) +Sequence SAL_CALL ODatabaseForm::getImplementationId() throw(RuntimeException, std::exception) { return OImplementationIds::getImplementationId(getTypes()); } -Sequence SAL_CALL ODatabaseForm::getTypes() throw(RuntimeException) +Sequence SAL_CALL ODatabaseForm::getTypes() throw(RuntimeException, std::exception) { // ask the aggregate Sequence aAggregateTypes; @@ -241,7 +241,7 @@ Sequence SAL_CALL ODatabaseForm::getTypes() throw(RuntimeException) } -Any SAL_CALL ODatabaseForm::queryAggregation(const Type& _rType) throw(RuntimeException) +Any SAL_CALL ODatabaseForm::queryAggregation(const Type& _rType) throw(RuntimeException, std::exception) { Any aReturn = ODatabaseForm_BASE1::queryInterface(_rType); // our own interfaces @@ -1416,49 +1416,49 @@ Reference< XMultiPropertySet > ODatabaseForm::getPropertiesInterface() } -Reference< XPropertySetInfo > ODatabaseForm::getPropertySetInfo() throw( RuntimeException ) +Reference< XPropertySetInfo > ODatabaseForm::getPropertySetInfo() throw( RuntimeException, std::exception ) { return createPropertySetInfo( getInfoHelper() ); } -void SAL_CALL ODatabaseForm::addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException) +void SAL_CALL ODatabaseForm::addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) { m_aPropertyBagHelper.addProperty( _rName, _nAttributes, _rInitialValue ); } -void SAL_CALL ODatabaseForm::removeProperty( const OUString& _rName ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException) +void SAL_CALL ODatabaseForm::removeProperty( const OUString& _rName ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException, std::exception) { m_aPropertyBagHelper.removeProperty( _rName ); } -Sequence< PropertyValue > SAL_CALL ODatabaseForm::getPropertyValues() throw (RuntimeException) +Sequence< PropertyValue > SAL_CALL ODatabaseForm::getPropertyValues() throw (RuntimeException, std::exception) { return m_aPropertyBagHelper.getPropertyValues(); } -void SAL_CALL ODatabaseForm::setPropertyValues( const Sequence< PropertyValue >& _rProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) +void SAL_CALL ODatabaseForm::setPropertyValues( const Sequence< PropertyValue >& _rProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { m_aPropertyBagHelper.setPropertyValues( _rProps ); } -Any SAL_CALL ODatabaseForm::getWarnings( ) throw (SQLException, RuntimeException) +Any SAL_CALL ODatabaseForm::getWarnings( ) throw (SQLException, RuntimeException, std::exception) { return m_aWarnings.getWarnings(); } -void SAL_CALL ODatabaseForm::clearWarnings( ) throw (SQLException, RuntimeException) +void SAL_CALL ODatabaseForm::clearWarnings( ) throw (SQLException, RuntimeException, std::exception) { m_aWarnings.clearWarnings(); } -Reference< XCloneable > SAL_CALL ODatabaseForm::createClone( ) throw (RuntimeException) +Reference< XCloneable > SAL_CALL ODatabaseForm::createClone( ) throw (RuntimeException, std::exception) { ODatabaseForm* pClone = new ODatabaseForm( *this ); osl_atomic_increment( &pClone->m_refCount ); @@ -1507,7 +1507,7 @@ void ODatabaseForm::fire( sal_Int32* pnHandles, const Any* pNewValues, const Any Any SAL_CALL ODatabaseForm::getFastPropertyValue( sal_Int32 nHandle ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException) + throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { if ((nHandle == PROPERTY_ID_ISMODIFIED) && (m_nResetsPending > 0)) return css::uno::Any(false); @@ -1682,7 +1682,7 @@ sal_Bool ODatabaseForm::convertFastPropertyValue( Any& rConvertedValue, Any& rOl } -void ODatabaseForm::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw( Exception ) +void ODatabaseForm::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw( Exception, std::exception ) { switch (nHandle) { @@ -1937,7 +1937,7 @@ Any ODatabaseForm::getPropertyDefaultByHandle( sal_Int32 nHandle ) const //============================================================================== // com::sun::star::form::XReset -void SAL_CALL ODatabaseForm::reset() throw( RuntimeException ) +void SAL_CALL ODatabaseForm::reset() throw( RuntimeException, std::exception ) { ::osl::ResettableMutexGuard aGuard(m_aMutex); @@ -2097,13 +2097,13 @@ void ODatabaseForm::reset_impl(bool _bAproveByListeners) } -void SAL_CALL ODatabaseForm::addResetListener(const Reference& _rListener) throw( RuntimeException ) +void SAL_CALL ODatabaseForm::addResetListener(const Reference& _rListener) throw( RuntimeException, std::exception ) { m_aResetListeners.addTypedListener( _rListener ); } -void SAL_CALL ODatabaseForm::removeResetListener(const Reference& _rListener) throw( RuntimeException ) +void SAL_CALL ODatabaseForm::removeResetListener(const Reference& _rListener) throw( RuntimeException, std::exception ) { m_aResetListeners.removeTypedListener( _rListener ); } @@ -2112,7 +2112,7 @@ void SAL_CALL ODatabaseForm::removeResetListener(const Reference // com::sun::star::form::XSubmit void SAL_CALL ODatabaseForm::submit( const Reference& Control, - const ::com::sun::star::awt::MouseEvent& MouseEvt ) throw( RuntimeException ) + const ::com::sun::star::awt::MouseEvent& MouseEvt ) throw( RuntimeException, std::exception ) { { ::osl::MutexGuard aGuard(m_aMutex); @@ -2315,13 +2315,13 @@ void ODatabaseForm::submit_impl(const Reference& Control, const ::com: // XSubmit -void SAL_CALL ODatabaseForm::addSubmitListener(const Reference& _rListener) throw( RuntimeException ) +void SAL_CALL ODatabaseForm::addSubmitListener(const Reference& _rListener) throw( RuntimeException, std::exception ) { m_aSubmitListeners.addInterface(_rListener); } -void SAL_CALL ODatabaseForm::removeSubmitListener(const Reference& _rListener) throw( RuntimeException ) +void SAL_CALL ODatabaseForm::removeSubmitListener(const Reference& _rListener) throw( RuntimeException, std::exception ) { m_aSubmitListeners.removeInterface(_rListener); } @@ -2329,13 +2329,13 @@ void SAL_CALL ODatabaseForm::removeSubmitListener(const Reference& _rListener) throw( RuntimeException ) +void SAL_CALL ODatabaseForm::addSQLErrorListener(const Reference& _rListener) throw( RuntimeException, std::exception ) { m_aErrorListeners.addInterface(_rListener); } -void SAL_CALL ODatabaseForm::removeSQLErrorListener(const Reference& _rListener) throw( RuntimeException ) +void SAL_CALL ODatabaseForm::removeSQLErrorListener(const Reference& _rListener) throw( RuntimeException, std::exception ) { m_aErrorListeners.removeInterface(_rListener); } @@ -2369,7 +2369,7 @@ void ODatabaseForm::_propertyChanged(const PropertyChangeEvent& evt) throw( Runt //============================================================================== // smartXChild -void SAL_CALL ODatabaseForm::setParent(const InterfaceRef& Parent) throw ( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL ODatabaseForm::setParent(const InterfaceRef& Parent) throw ( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) { // SYNCHRONIZED -----> ::osl::ResettableMutexGuard aGuard(m_aMutex); @@ -2430,7 +2430,7 @@ void SAL_CALL ODatabaseForm::setParent(const InterfaceRef& Parent) throw ( ::com //============================================================================== // smartXTabControllerModel -sal_Bool SAL_CALL ODatabaseForm::getGroupControl() throw(com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL ODatabaseForm::getGroupControl() throw(com::sun::star::uno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aGuard(m_aMutex); @@ -2449,7 +2449,7 @@ sal_Bool SAL_CALL ODatabaseForm::getGroupControl() throw(com::sun::star::uno::Ru } -void SAL_CALL ODatabaseForm::setControlModels(const Sequence >& rControls) throw( RuntimeException ) +void SAL_CALL ODatabaseForm::setControlModels(const Sequence >& rControls) throw( RuntimeException, std::exception ) { ::osl::ResettableMutexGuard aGuard(m_aMutex); @@ -2486,14 +2486,14 @@ void SAL_CALL ODatabaseForm::setControlModels(const Sequence > SAL_CALL ODatabaseForm::getControlModels() throw( RuntimeException ) +Sequence > SAL_CALL ODatabaseForm::getControlModels() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard(m_aMutex); return m_pGroupManager->getControlModels(); } -void SAL_CALL ODatabaseForm::setGroup( const Sequence >& _rGroup, const OUString& Name ) throw( RuntimeException ) +void SAL_CALL ODatabaseForm::setGroup( const Sequence >& _rGroup, const OUString& Name ) throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard(m_aMutex); @@ -2522,14 +2522,14 @@ void SAL_CALL ODatabaseForm::setGroup( const Sequence > } -sal_Int32 SAL_CALL ODatabaseForm::getGroupCount() throw( RuntimeException ) +sal_Int32 SAL_CALL ODatabaseForm::getGroupCount() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard(m_aMutex); return m_pGroupManager->getGroupCount(); } -void SAL_CALL ODatabaseForm::getGroup( sal_Int32 nGroup, Sequence >& _rGroup, OUString& _rName ) throw( RuntimeException ) +void SAL_CALL ODatabaseForm::getGroup( sal_Int32 nGroup, Sequence >& _rGroup, OUString& _rName ) throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard(m_aMutex); _rGroup.realloc(0); @@ -2541,7 +2541,7 @@ void SAL_CALL ODatabaseForm::getGroup( sal_Int32 nGroup, Sequence >& _rGroup) throw( RuntimeException ) +void SAL_CALL ODatabaseForm::getGroupByName(const OUString& Name, Sequence< Reference >& _rGroup) throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard(m_aMutex); _rGroup.realloc(0); @@ -2551,7 +2551,7 @@ void SAL_CALL ODatabaseForm::getGroupByName(const OUString& Name, Sequence< Refe //============================================================================== // com::sun::star::lang::XEventListener -void SAL_CALL ODatabaseForm::disposing(const EventObject& Source) throw( RuntimeException ) +void SAL_CALL ODatabaseForm::disposing(const EventObject& Source) throw( RuntimeException, std::exception ) { // does the call come from the connection which we are sharing with our parent? if ( isSharingConnection() ) @@ -2592,7 +2592,7 @@ void ODatabaseForm::impl_createLoadTimer() //============================================================================== // com::sun::star::form::XLoadListener -void SAL_CALL ODatabaseForm::loaded(const EventObject& /*aEvent*/) throw( RuntimeException ) +void SAL_CALL ODatabaseForm::loaded(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -2606,7 +2606,7 @@ void SAL_CALL ODatabaseForm::loaded(const EventObject& /*aEvent*/) throw( Runtim } -void SAL_CALL ODatabaseForm::unloading(const EventObject& /*aEvent*/) throw( RuntimeException ) +void SAL_CALL ODatabaseForm::unloading(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception ) { { // now stop the rowset listening if we are a subform @@ -2624,13 +2624,13 @@ void SAL_CALL ODatabaseForm::unloading(const EventObject& /*aEvent*/) throw( Run } -void SAL_CALL ODatabaseForm::unloaded(const EventObject& /*aEvent*/) throw( RuntimeException ) +void SAL_CALL ODatabaseForm::unloaded(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception ) { // nothing to do } -void SAL_CALL ODatabaseForm::reloading(const EventObject& /*aEvent*/) throw( RuntimeException ) +void SAL_CALL ODatabaseForm::reloading(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception ) { // now stop the rowset listening if we are a subform ::osl::MutexGuard aGuard(m_aMutex); @@ -2643,7 +2643,7 @@ void SAL_CALL ODatabaseForm::reloading(const EventObject& /*aEvent*/) throw( Run } -void SAL_CALL ODatabaseForm::reloaded(const EventObject& /*aEvent*/) throw( RuntimeException ) +void SAL_CALL ODatabaseForm::reloaded(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception ) { reload_impl(sal_True); { @@ -2664,7 +2664,7 @@ IMPL_LINK_NOARG(ODatabaseForm, OnTimeout) //============================================================================== // com::sun::star::form::XLoadable -void SAL_CALL ODatabaseForm::load() throw( RuntimeException ) +void SAL_CALL ODatabaseForm::load() throw( RuntimeException, std::exception ) { load_impl(sal_False); } @@ -2901,7 +2901,7 @@ void ODatabaseForm::load_impl(sal_Bool bCausedByParentForm, sal_Bool bMoveToFirs } -void SAL_CALL ODatabaseForm::unload() throw( RuntimeException ) +void SAL_CALL ODatabaseForm::unload() throw( RuntimeException, std::exception ) { ::osl::ResettableMutexGuard aGuard(m_aMutex); if (!isLoaded()) @@ -2948,7 +2948,7 @@ void SAL_CALL ODatabaseForm::unload() throw( RuntimeException ) } -void SAL_CALL ODatabaseForm::reload() throw( RuntimeException ) +void SAL_CALL ODatabaseForm::reload() throw( RuntimeException, std::exception ) { reload_impl(sal_True); } @@ -3009,19 +3009,19 @@ void ODatabaseForm::reload_impl(sal_Bool bMoveToFirst, const Reference< XInterac } -sal_Bool SAL_CALL ODatabaseForm::isLoaded() throw( RuntimeException ) +sal_Bool SAL_CALL ODatabaseForm::isLoaded() throw( RuntimeException, std::exception ) { return m_bLoaded; } -void SAL_CALL ODatabaseForm::addLoadListener(const Reference& aListener) throw( RuntimeException ) +void SAL_CALL ODatabaseForm::addLoadListener(const Reference& aListener) throw( RuntimeException, std::exception ) { m_aLoadListeners.addInterface(aListener); } -void SAL_CALL ODatabaseForm::removeLoadListener(const Reference& aListener) throw( RuntimeException ) +void SAL_CALL ODatabaseForm::removeLoadListener(const Reference& aListener) throw( RuntimeException, std::exception ) { m_aLoadListeners.removeInterface(aListener); } @@ -3029,7 +3029,7 @@ void SAL_CALL ODatabaseForm::removeLoadListener(const Reference& //============================================================================== // com::sun::star::sdbc::XCloseable //============================================================================== -void SAL_CALL ODatabaseForm::close() throw( SQLException, RuntimeException ) +void SAL_CALL ODatabaseForm::close() throw( SQLException, RuntimeException, std::exception ) { // unload will close the aggregate unload(); @@ -3038,7 +3038,7 @@ void SAL_CALL ODatabaseForm::close() throw( SQLException, RuntimeException ) //============================================================================== // com::sun::star::sdbc::XRowSetListener -void SAL_CALL ODatabaseForm::cursorMoved(const EventObject& /*event*/) throw( RuntimeException ) +void SAL_CALL ODatabaseForm::cursorMoved(const EventObject& /*event*/) throw( RuntimeException, std::exception ) { // reload the subform with the new parameters of the parent // do this handling delayed to provide of execute too many SQL Statements @@ -3056,13 +3056,13 @@ void SAL_CALL ODatabaseForm::cursorMoved(const EventObject& /*event*/) throw( Ru } -void SAL_CALL ODatabaseForm::rowChanged(const EventObject& /*event*/) throw( RuntimeException ) +void SAL_CALL ODatabaseForm::rowChanged(const EventObject& /*event*/) throw( RuntimeException, std::exception ) { // ignore it } -void SAL_CALL ODatabaseForm::rowSetChanged(const EventObject& /*event*/) throw( RuntimeException ) +void SAL_CALL ODatabaseForm::rowSetChanged(const EventObject& /*event*/) throw( RuntimeException, std::exception ) { // not interested in : // if our parent is an ODatabaseForm, too, then after this rowSetChanged we'll get a "reloaded" @@ -3112,7 +3112,7 @@ bool ODatabaseForm::impl_approveRowChange_throw( const EventObject& _rEvent, con } -sal_Bool SAL_CALL ODatabaseForm::approveCursorMove(const EventObject& event) throw( RuntimeException ) +sal_Bool SAL_CALL ODatabaseForm::approveCursorMove(const EventObject& event) throw( RuntimeException, std::exception ) { // is our aggregate calling? if (event.Source == InterfaceRef(static_cast(this))) @@ -3161,7 +3161,7 @@ sal_Bool SAL_CALL ODatabaseForm::approveCursorMove(const EventObject& event) thr } -sal_Bool SAL_CALL ODatabaseForm::approveRowChange(const RowChangeEvent& event) throw( RuntimeException ) +sal_Bool SAL_CALL ODatabaseForm::approveRowChange(const RowChangeEvent& event) throw( RuntimeException, std::exception ) { // is our aggregate calling? if (event.Source == InterfaceRef(static_cast(this))) @@ -3201,7 +3201,7 @@ sal_Bool SAL_CALL ODatabaseForm::approveRowChange(const RowChangeEvent& event) t } -sal_Bool SAL_CALL ODatabaseForm::approveRowSetChange(const EventObject& event) throw( RuntimeException ) +sal_Bool SAL_CALL ODatabaseForm::approveRowSetChange(const EventObject& event) throw( RuntimeException, std::exception ) { if (event.Source == InterfaceRef(static_cast(this))) // ignore our aggregate as we handle this approve ourself { @@ -3230,7 +3230,7 @@ sal_Bool SAL_CALL ODatabaseForm::approveRowSetChange(const EventObject& event) t //============================================================================== // com::sun::star::sdb::XRowSetApproveBroadcaster -void SAL_CALL ODatabaseForm::addRowSetApproveListener(const Reference& _rListener) throw( RuntimeException ) +void SAL_CALL ODatabaseForm::addRowSetApproveListener(const Reference& _rListener) throw( RuntimeException, std::exception ) { ::osl::ResettableMutexGuard aGuard(m_aMutex); m_aRowSetApproveListeners.addInterface(_rListener); @@ -3248,7 +3248,7 @@ void SAL_CALL ODatabaseForm::addRowSetApproveListener(const Reference& _rListener) throw( RuntimeException ) +void SAL_CALL ODatabaseForm::removeRowSetApproveListener(const Reference& _rListener) throw( RuntimeException, std::exception ) { ::osl::ResettableMutexGuard aGuard(m_aMutex); // do we have to remove the multiplex ? @@ -3267,24 +3267,24 @@ void SAL_CALL ODatabaseForm::removeRowSetApproveListener(const Reference& _rListener) throw( RuntimeException ) +void SAL_CALL ODatabaseForm::addDatabaseParameterListener(const Reference& _rListener) throw( RuntimeException, std::exception ) { m_aParameterManager.addParameterListener( _rListener ); } -void SAL_CALL ODatabaseForm::removeDatabaseParameterListener(const Reference& _rListener) throw( RuntimeException ) +void SAL_CALL ODatabaseForm::removeDatabaseParameterListener(const Reference& _rListener) throw( RuntimeException, std::exception ) { m_aParameterManager.removeParameterListener( _rListener ); } -void SAL_CALL ODatabaseForm::addParameterListener(const Reference& _rListener) throw( RuntimeException ) +void SAL_CALL ODatabaseForm::addParameterListener(const Reference& _rListener) throw( RuntimeException, std::exception ) { ODatabaseForm::addDatabaseParameterListener( _rListener ); } -void SAL_CALL ODatabaseForm::removeParameterListener(const Reference& _rListener) throw( RuntimeException ) +void SAL_CALL ODatabaseForm::removeParameterListener(const Reference& _rListener) throw( RuntimeException, std::exception ) { ODatabaseForm::removeDatabaseParameterListener( _rListener ); } @@ -3292,7 +3292,7 @@ void SAL_CALL ODatabaseForm::removeParameterListener(const Reference& _rxHandler ) throw(SQLException, RuntimeException) +void SAL_CALL ODatabaseForm::executeWithCompletion( const Reference< XInteractionHandler >& _rxHandler ) throw(SQLException, RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard(m_aMutex); // the difference between execute and load is, that we position on the first row in case of load @@ -3316,7 +3316,7 @@ void SAL_CALL ODatabaseForm::executeWithCompletion( const Reference< XInteractio //============================================================================== // com::sun::star::sdbc::XRowSet -void SAL_CALL ODatabaseForm::execute() throw( SQLException, RuntimeException ) +void SAL_CALL ODatabaseForm::execute() throw( SQLException, RuntimeException, std::exception ) { ::osl::ResettableMutexGuard aGuard(m_aMutex); // if somebody calls an execute and we're not loaded we reroute this call to our load method. @@ -3340,14 +3340,14 @@ void SAL_CALL ODatabaseForm::execute() throw( SQLException, RuntimeException ) } -void SAL_CALL ODatabaseForm::addRowSetListener(const Reference& _rListener) throw( RuntimeException ) +void SAL_CALL ODatabaseForm::addRowSetListener(const Reference& _rListener) throw( RuntimeException, std::exception ) { if (m_xAggregateAsRowSet.is()) m_xAggregateAsRowSet->addRowSetListener(_rListener); } -void SAL_CALL ODatabaseForm::removeRowSetListener(const Reference& _rListener) throw( RuntimeException ) +void SAL_CALL ODatabaseForm::removeRowSetListener(const Reference& _rListener) throw( RuntimeException, std::exception ) { if (m_xAggregateAsRowSet.is()) m_xAggregateAsRowSet->removeRowSetListener(_rListener); @@ -3356,109 +3356,109 @@ void SAL_CALL ODatabaseForm::removeRowSetListener(const Referencenext(); } -sal_Bool SAL_CALL ODatabaseForm::isBeforeFirst() throw( SQLException, RuntimeException ) +sal_Bool SAL_CALL ODatabaseForm::isBeforeFirst() throw( SQLException, RuntimeException, std::exception ) { return m_xAggregateAsRowSet->isBeforeFirst(); } -sal_Bool SAL_CALL ODatabaseForm::isAfterLast() throw( SQLException, RuntimeException ) +sal_Bool SAL_CALL ODatabaseForm::isAfterLast() throw( SQLException, RuntimeException, std::exception ) { return m_xAggregateAsRowSet->isAfterLast(); } -sal_Bool SAL_CALL ODatabaseForm::isFirst() throw( SQLException, RuntimeException ) +sal_Bool SAL_CALL ODatabaseForm::isFirst() throw( SQLException, RuntimeException, std::exception ) { return m_xAggregateAsRowSet->isFirst(); } -sal_Bool SAL_CALL ODatabaseForm::isLast() throw( SQLException, RuntimeException ) +sal_Bool SAL_CALL ODatabaseForm::isLast() throw( SQLException, RuntimeException, std::exception ) { return m_xAggregateAsRowSet->isLast(); } -void SAL_CALL ODatabaseForm::beforeFirst() throw( SQLException, RuntimeException ) +void SAL_CALL ODatabaseForm::beforeFirst() throw( SQLException, RuntimeException, std::exception ) { m_xAggregateAsRowSet->beforeFirst(); } -void SAL_CALL ODatabaseForm::afterLast() throw( SQLException, RuntimeException ) +void SAL_CALL ODatabaseForm::afterLast() throw( SQLException, RuntimeException, std::exception ) { m_xAggregateAsRowSet->afterLast(); } -sal_Bool SAL_CALL ODatabaseForm::first() throw( SQLException, RuntimeException ) +sal_Bool SAL_CALL ODatabaseForm::first() throw( SQLException, RuntimeException, std::exception ) { return m_xAggregateAsRowSet->first(); } -sal_Bool SAL_CALL ODatabaseForm::last() throw( SQLException, RuntimeException ) +sal_Bool SAL_CALL ODatabaseForm::last() throw( SQLException, RuntimeException, std::exception ) { return m_xAggregateAsRowSet->last(); } -sal_Int32 SAL_CALL ODatabaseForm::getRow() throw( SQLException, RuntimeException ) +sal_Int32 SAL_CALL ODatabaseForm::getRow() throw( SQLException, RuntimeException, std::exception ) { return m_xAggregateAsRowSet->getRow(); } -sal_Bool SAL_CALL ODatabaseForm::absolute(sal_Int32 row) throw( SQLException, RuntimeException ) +sal_Bool SAL_CALL ODatabaseForm::absolute(sal_Int32 row) throw( SQLException, RuntimeException, std::exception ) { return m_xAggregateAsRowSet->absolute(row); } -sal_Bool SAL_CALL ODatabaseForm::relative(sal_Int32 rows) throw( SQLException, RuntimeException ) +sal_Bool SAL_CALL ODatabaseForm::relative(sal_Int32 rows) throw( SQLException, RuntimeException, std::exception ) { return m_xAggregateAsRowSet->relative(rows); } -sal_Bool SAL_CALL ODatabaseForm::previous() throw( SQLException, RuntimeException ) +sal_Bool SAL_CALL ODatabaseForm::previous() throw( SQLException, RuntimeException, std::exception ) { return m_xAggregateAsRowSet->previous(); } -void SAL_CALL ODatabaseForm::refreshRow() throw( SQLException, RuntimeException ) +void SAL_CALL ODatabaseForm::refreshRow() throw( SQLException, RuntimeException, std::exception ) { m_xAggregateAsRowSet->refreshRow(); } -sal_Bool SAL_CALL ODatabaseForm::rowUpdated() throw( SQLException, RuntimeException ) +sal_Bool SAL_CALL ODatabaseForm::rowUpdated() throw( SQLException, RuntimeException, std::exception ) { return m_xAggregateAsRowSet->rowUpdated(); } -sal_Bool SAL_CALL ODatabaseForm::rowInserted() throw( SQLException, RuntimeException ) +sal_Bool SAL_CALL ODatabaseForm::rowInserted() throw( SQLException, RuntimeException, std::exception ) { return m_xAggregateAsRowSet->rowInserted(); } -sal_Bool SAL_CALL ODatabaseForm::rowDeleted() throw( SQLException, RuntimeException ) +sal_Bool SAL_CALL ODatabaseForm::rowDeleted() throw( SQLException, RuntimeException, std::exception ) { return m_xAggregateAsRowSet->rowDeleted(); } -InterfaceRef SAL_CALL ODatabaseForm::getStatement() throw( SQLException, RuntimeException ) +InterfaceRef SAL_CALL ODatabaseForm::getStatement() throw( SQLException, RuntimeException, std::exception ) { return m_xAggregateAsRowSet->getStatement(); } @@ -3466,7 +3466,7 @@ InterfaceRef SAL_CALL ODatabaseForm::getStatement() throw( SQLException, Runtime // com::sun::star::sdbc::XResultSetUpdate // exceptions during insert update and delete will be forwarded to the errorlistener -void SAL_CALL ODatabaseForm::insertRow() throw( SQLException, RuntimeException ) +void SAL_CALL ODatabaseForm::insertRow() throw( SQLException, RuntimeException, std::exception ) { try { @@ -3486,7 +3486,7 @@ void SAL_CALL ODatabaseForm::insertRow() throw( SQLException, RuntimeException ) } -void SAL_CALL ODatabaseForm::updateRow() throw( SQLException, RuntimeException ) +void SAL_CALL ODatabaseForm::updateRow() throw( SQLException, RuntimeException, std::exception ) { try { @@ -3506,7 +3506,7 @@ void SAL_CALL ODatabaseForm::updateRow() throw( SQLException, RuntimeException ) } -void SAL_CALL ODatabaseForm::deleteRow() throw( SQLException, RuntimeException ) +void SAL_CALL ODatabaseForm::deleteRow() throw( SQLException, RuntimeException, std::exception ) { try { @@ -3526,7 +3526,7 @@ void SAL_CALL ODatabaseForm::deleteRow() throw( SQLException, RuntimeException ) } -void SAL_CALL ODatabaseForm::cancelRowUpdates() throw( SQLException, RuntimeException ) +void SAL_CALL ODatabaseForm::cancelRowUpdates() throw( SQLException, RuntimeException, std::exception ) { try { @@ -3546,7 +3546,7 @@ void SAL_CALL ODatabaseForm::cancelRowUpdates() throw( SQLException, RuntimeExce } -void SAL_CALL ODatabaseForm::moveToInsertRow() throw( SQLException, RuntimeException ) +void SAL_CALL ODatabaseForm::moveToInsertRow() throw( SQLException, RuntimeException, std::exception ) { Reference xUpdate; if (query_aggregation( m_xAggregate, xUpdate)) @@ -3581,7 +3581,7 @@ void SAL_CALL ODatabaseForm::moveToInsertRow() throw( SQLException, RuntimeExcep } -void SAL_CALL ODatabaseForm::moveToCurrentRow() throw( SQLException, RuntimeException ) +void SAL_CALL ODatabaseForm::moveToCurrentRow() throw( SQLException, RuntimeException, std::exception ) { Reference xUpdate; if (query_aggregation( m_xAggregate, xUpdate)) @@ -3590,7 +3590,7 @@ void SAL_CALL ODatabaseForm::moveToCurrentRow() throw( SQLException, RuntimeExce // com::sun::star::sdbcx::XDeleteRows -Sequence SAL_CALL ODatabaseForm::deleteRows(const Sequence& rows) throw( SQLException, RuntimeException ) +Sequence SAL_CALL ODatabaseForm::deleteRows(const Sequence& rows) throw( SQLException, RuntimeException, std::exception ) { try { @@ -3613,145 +3613,145 @@ Sequence SAL_CALL ODatabaseForm::deleteRows(const Sequence& rows // com::sun::star::sdbc::XParameters -void SAL_CALL ODatabaseForm::setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) throw( SQLException, RuntimeException ) +void SAL_CALL ODatabaseForm::setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) throw( SQLException, RuntimeException, std::exception ) { m_aParameterManager.setNull(parameterIndex, sqlType); } -void SAL_CALL ODatabaseForm::setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) throw( SQLException, RuntimeException ) +void SAL_CALL ODatabaseForm::setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) throw( SQLException, RuntimeException, std::exception ) { m_aParameterManager.setObjectNull(parameterIndex, sqlType, typeName); } -void SAL_CALL ODatabaseForm::setBoolean(sal_Int32 parameterIndex, sal_Bool x) throw( SQLException, RuntimeException ) +void SAL_CALL ODatabaseForm::setBoolean(sal_Int32 parameterIndex, sal_Bool x) throw( SQLException, RuntimeException, std::exception ) { m_aParameterManager.setBoolean(parameterIndex, x); } -void SAL_CALL ODatabaseForm::setByte(sal_Int32 parameterIndex, sal_Int8 x) throw( SQLException, RuntimeException ) +void SAL_CALL ODatabaseForm::setByte(sal_Int32 parameterIndex, sal_Int8 x) throw( SQLException, RuntimeException, std::exception ) { m_aParameterManager.setByte(parameterIndex, x); } -void SAL_CALL ODatabaseForm::setShort(sal_Int32 parameterIndex, sal_Int16 x) throw( SQLException, RuntimeException ) +void SAL_CALL ODatabaseForm::setShort(sal_Int32 parameterIndex, sal_Int16 x) throw( SQLException, RuntimeException, std::exception ) { m_aParameterManager.setShort(parameterIndex, x); } -void SAL_CALL ODatabaseForm::setInt(sal_Int32 parameterIndex, sal_Int32 x) throw( SQLException, RuntimeException ) +void SAL_CALL ODatabaseForm::setInt(sal_Int32 parameterIndex, sal_Int32 x) throw( SQLException, RuntimeException, std::exception ) { m_aParameterManager.setInt(parameterIndex, x); } -void SAL_CALL ODatabaseForm::setLong(sal_Int32 parameterIndex, sal_Int64 x) throw( SQLException, RuntimeException ) +void SAL_CALL ODatabaseForm::setLong(sal_Int32 parameterIndex, sal_Int64 x) throw( SQLException, RuntimeException, std::exception ) { m_aParameterManager.setLong(parameterIndex, x); } -void SAL_CALL ODatabaseForm::setFloat(sal_Int32 parameterIndex, float x) throw( SQLException, RuntimeException ) +void SAL_CALL ODatabaseForm::setFloat(sal_Int32 parameterIndex, float x) throw( SQLException, RuntimeException, std::exception ) { m_aParameterManager.setFloat(parameterIndex, x); } -void SAL_CALL ODatabaseForm::setDouble(sal_Int32 parameterIndex, double x) throw( SQLException, RuntimeException ) +void SAL_CALL ODatabaseForm::setDouble(sal_Int32 parameterIndex, double x) throw( SQLException, RuntimeException, std::exception ) { m_aParameterManager.setDouble(parameterIndex, x); } -void SAL_CALL ODatabaseForm::setString(sal_Int32 parameterIndex, const OUString& x) throw( SQLException, RuntimeException ) +void SAL_CALL ODatabaseForm::setString(sal_Int32 parameterIndex, const OUString& x) throw( SQLException, RuntimeException, std::exception ) { m_aParameterManager.setString(parameterIndex, x); } -void SAL_CALL ODatabaseForm::setBytes(sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x) throw( SQLException, RuntimeException ) +void SAL_CALL ODatabaseForm::setBytes(sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x) throw( SQLException, RuntimeException, std::exception ) { m_aParameterManager.setBytes(parameterIndex, x); } -void SAL_CALL ODatabaseForm::setDate(sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x) throw( SQLException, RuntimeException ) +void SAL_CALL ODatabaseForm::setDate(sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x) throw( SQLException, RuntimeException, std::exception ) { m_aParameterManager.setDate(parameterIndex, x); } -void SAL_CALL ODatabaseForm::setTime(sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x) throw( SQLException, RuntimeException ) +void SAL_CALL ODatabaseForm::setTime(sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x) throw( SQLException, RuntimeException, std::exception ) { m_aParameterManager.setTime(parameterIndex, x); } -void SAL_CALL ODatabaseForm::setTimestamp(sal_Int32 parameterIndex, const ::com::sun::star::util::DateTime& x) throw( SQLException, RuntimeException ) +void SAL_CALL ODatabaseForm::setTimestamp(sal_Int32 parameterIndex, const ::com::sun::star::util::DateTime& x) throw( SQLException, RuntimeException, std::exception ) { m_aParameterManager.setTimestamp(parameterIndex, x); } -void SAL_CALL ODatabaseForm::setBinaryStream(sal_Int32 parameterIndex, const Reference& x, sal_Int32 length) throw( SQLException, RuntimeException ) +void SAL_CALL ODatabaseForm::setBinaryStream(sal_Int32 parameterIndex, const Reference& x, sal_Int32 length) throw( SQLException, RuntimeException, std::exception ) { m_aParameterManager.setBinaryStream(parameterIndex, x, length); } -void SAL_CALL ODatabaseForm::setCharacterStream(sal_Int32 parameterIndex, const Reference& x, sal_Int32 length) throw( SQLException, RuntimeException ) +void SAL_CALL ODatabaseForm::setCharacterStream(sal_Int32 parameterIndex, const Reference& x, sal_Int32 length) throw( SQLException, RuntimeException, std::exception ) { 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 ) +void SAL_CALL ODatabaseForm::setObjectWithInfo(sal_Int32 parameterIndex, const Any& x, sal_Int32 targetSqlType, sal_Int32 scale) throw( SQLException, RuntimeException, std::exception ) { m_aParameterManager.setObjectWithInfo(parameterIndex, x, targetSqlType, scale); } -void SAL_CALL ODatabaseForm::setObject(sal_Int32 parameterIndex, const Any& x) throw( SQLException, RuntimeException ) +void SAL_CALL ODatabaseForm::setObject(sal_Int32 parameterIndex, const Any& x) throw( SQLException, RuntimeException, std::exception ) { m_aParameterManager.setObject(parameterIndex, x); } -void SAL_CALL ODatabaseForm::setRef(sal_Int32 parameterIndex, const Reference& x) throw( SQLException, RuntimeException ) +void SAL_CALL ODatabaseForm::setRef(sal_Int32 parameterIndex, const Reference& x) throw( SQLException, RuntimeException, std::exception ) { m_aParameterManager.setRef(parameterIndex, x); } -void SAL_CALL ODatabaseForm::setBlob(sal_Int32 parameterIndex, const Reference& x) throw( SQLException, RuntimeException ) +void SAL_CALL ODatabaseForm::setBlob(sal_Int32 parameterIndex, const Reference& x) throw( SQLException, RuntimeException, std::exception ) { m_aParameterManager.setBlob(parameterIndex, x); } -void SAL_CALL ODatabaseForm::setClob(sal_Int32 parameterIndex, const Reference& x) throw( SQLException, RuntimeException ) +void SAL_CALL ODatabaseForm::setClob(sal_Int32 parameterIndex, const Reference& x) throw( SQLException, RuntimeException, std::exception ) { m_aParameterManager.setClob(parameterIndex, x); } -void SAL_CALL ODatabaseForm::setArray(sal_Int32 parameterIndex, const Reference& x) throw( SQLException, RuntimeException ) +void SAL_CALL ODatabaseForm::setArray(sal_Int32 parameterIndex, const Reference& x) throw( SQLException, RuntimeException, std::exception ) { m_aParameterManager.setArray(parameterIndex, x); } -void SAL_CALL ODatabaseForm::clearParameters() throw( SQLException, RuntimeException ) +void SAL_CALL ODatabaseForm::clearParameters() throw( SQLException, RuntimeException, std::exception ) { m_aParameterManager.clearParameters(); } -void SAL_CALL ODatabaseForm::propertyChange( const PropertyChangeEvent& evt ) throw (RuntimeException) +void SAL_CALL ODatabaseForm::propertyChange( const PropertyChangeEvent& evt ) throw (RuntimeException, std::exception) { if ( evt.Source == m_xParent ) { @@ -3810,13 +3810,13 @@ Sequence< OUString > SAL_CALL ODatabaseForm::getSupportedServiceNames_Static() } -OUString SAL_CALL ODatabaseForm::getImplementationName() throw( RuntimeException ) +OUString SAL_CALL ODatabaseForm::getImplementationName() throw( RuntimeException, std::exception ) { return getImplementationName_Static(); } -Sequence< OUString > SAL_CALL ODatabaseForm::getSupportedServiceNames() throw( RuntimeException ) +Sequence< OUString > SAL_CALL ODatabaseForm::getSupportedServiceNames() throw( RuntimeException, std::exception ) { // the services of our aggregate Sequence< OUString > aServices; @@ -3835,7 +3835,7 @@ Sequence< OUString > SAL_CALL ODatabaseForm::getSupportedServiceNames() throw( R // better solution _may_ be to return the compatible names at runtime, too } -sal_Bool SAL_CALL ODatabaseForm::supportsService(const OUString& ServiceName) throw( RuntimeException ) +sal_Bool SAL_CALL ODatabaseForm::supportsService(const OUString& ServiceName) throw( RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } @@ -3844,12 +3844,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 ) +OUString ODatabaseForm::getServiceName() throw( RuntimeException, std::exception ) { return OUString(FRM_COMPONENT_FORM); // old (non-sun) name for compatibility ! } -void SAL_CALL ODatabaseForm::write(const Reference& _rxOutStream) throw( IOException, RuntimeException ) +void SAL_CALL ODatabaseForm::write(const Reference& _rxOutStream) throw( IOException, RuntimeException, std::exception ) { DBG_ASSERT(m_xAggregateSet.is(), "ODatabaseForm::write : only to be called if the aggregate exists !"); @@ -3964,7 +3964,7 @@ void SAL_CALL ODatabaseForm::write(const Reference& _rxOutS } -void SAL_CALL ODatabaseForm::read(const Reference& _rxInStream) throw( IOException, RuntimeException ) +void SAL_CALL ODatabaseForm::read(const Reference& _rxInStream) throw( IOException, RuntimeException, std::exception ) { DBG_ASSERT(m_xAggregateSet.is(), "ODatabaseForm::read : only to be called if the aggregate exists !"); @@ -4088,7 +4088,7 @@ void ODatabaseForm::implRemoved(const InterfaceRef& _rxObject) } -void SAL_CALL ODatabaseForm::errorOccured(const SQLErrorEvent& _rEvent) throw( RuntimeException ) +void SAL_CALL ODatabaseForm::errorOccured(const SQLErrorEvent& _rEvent) throw( RuntimeException, std::exception ) { // give it to my own error listener onError(_rEvent); @@ -4098,7 +4098,7 @@ void SAL_CALL ODatabaseForm::errorOccured(const SQLErrorEvent& _rEvent) throw( R // com::sun::star::container::XNamed -OUString SAL_CALL ODatabaseForm::getName() throw( RuntimeException ) +OUString SAL_CALL ODatabaseForm::getName() throw( RuntimeException, std::exception ) { OUString sReturn; OPropertySetHelper::getFastPropertyValue(PROPERTY_ID_NAME) >>= sReturn; @@ -4106,7 +4106,7 @@ OUString SAL_CALL ODatabaseForm::getName() throw( RuntimeException ) } -void SAL_CALL ODatabaseForm::setName(const OUString& aName) throw( RuntimeException ) +void SAL_CALL ODatabaseForm::setName(const OUString& aName) throw( RuntimeException, std::exception ) { setFastPropertyValue(PROPERTY_ID_NAME, makeAny(aName)); } diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx index d26a11b49f02..dc9b61917578 100644 --- a/forms/source/component/DatabaseForm.hxx +++ b/forms/source/component/DatabaseForm.hxx @@ -227,24 +227,24 @@ public: // UNO binding DECLARE_UNO3_AGG_DEFAULTS(ODatabaseForm, OFormComponents); - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception); // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::lang::XComponent virtual void SAL_CALL disposing(); // property handling - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const; virtual sal_Bool SAL_CALL convertFastPropertyValue(::com::sun::star::uno::Any& rConvertedValue, ::com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::lang::IllegalArgumentException); - virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue) throw ( ::com::sun::star::uno::Exception ); + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue) throw ( ::com::sun::star::uno::Exception, std::exception ); ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue( sal_Int32 nHandle ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); void fire( sal_Int32 * pnHandles, const ::com::sun::star::uno::Any * pNewValues, const ::com::sun::star::uno::Any * pOldValues, sal_Int32 nCount, sal_Bool bVetoable ); // IPropertyBagHelperContext @@ -262,126 +262,126 @@ public: virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle(sal_Int32 nHandle) const; // com::sun::star::sdbc::XSQLErrorBroadcaster - virtual void SAL_CALL addSQLErrorListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLErrorListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeSQLErrorListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLErrorListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addSQLErrorListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLErrorListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeSQLErrorListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLErrorListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception); // com::sun::star::form::XForm // nothing to implement // com::sun::star::form::XReset - virtual void SAL_CALL reset() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addResetListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeResetListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL reset() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addResetListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeResetListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception); // com::sun::star::form::XSubmit - virtual void SAL_CALL submit(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& aControl, const ::com::sun::star::awt::MouseEvent& aMouseEvt) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addSubmitListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XSubmitListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeSubmitListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XSubmitListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL submit(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& aControl, const ::com::sun::star::awt::MouseEvent& aMouseEvt) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addSubmitListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XSubmitListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeSubmitListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XSubmitListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception); // com::sun::star::container::XChild - virtual InterfaceRef SAL_CALL getParent() throw ( ::com::sun::star::uno::RuntimeException) { return OFormComponents::getParent(); } - virtual void SAL_CALL setParent(const InterfaceRef& Parent) throw ( :: com::sun::star::lang::NoSupportException , ::com::sun::star::uno::RuntimeException); + virtual InterfaceRef SAL_CALL getParent() throw ( ::com::sun::star::uno::RuntimeException, std::exception) { return OFormComponents::getParent(); } + virtual void SAL_CALL setParent(const InterfaceRef& Parent) throw ( :: com::sun::star::lang::NoSupportException , ::com::sun::star::uno::RuntimeException, std::exception); // com::sun::star::container::XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName(const OUString& aName) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setName(const OUString& aName) throw(::com::sun::star::uno::RuntimeException, std::exception); // com::sun::star::awt::XTabControllerModel - virtual sal_Bool SAL_CALL getGroupControl() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setGroupControl(sal_Bool /*_bGroupControl*/) throw(::com::sun::star::uno::RuntimeException) { } - virtual void SAL_CALL setControlModels(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rControls) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > SAL_CALL getControlModels() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setGroup(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rGroup, const OUString& _rGroupName) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getGroupCount() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL getGroup(sal_Int32 _nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rxGroup, OUString& _rName) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL getGroupByName(const OUString& _rName, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rxGroup) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL getGroupControl() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setGroupControl(sal_Bool /*_bGroupControl*/) throw(::com::sun::star::uno::RuntimeException, std::exception) { } + virtual void SAL_CALL setControlModels(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rControls) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > SAL_CALL getControlModels() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setGroup(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rGroup, const OUString& _rGroupName) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getGroupCount() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL getGroup(sal_Int32 _nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rxGroup, OUString& _rName) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL getGroupByName(const OUString& _rName, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rxGroup) throw(::com::sun::star::uno::RuntimeException, std::exception); // com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException, std::exception); // com::sun::star::form::XLoadListener - virtual void SAL_CALL loaded(const ::com::sun::star::lang::EventObject& aEvent) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL unloading(const ::com::sun::star::lang::EventObject& aEvent) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL unloaded(const ::com::sun::star::lang::EventObject& aEvent) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL reloading(const ::com::sun::star::lang::EventObject& aEvent) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL reloaded(const ::com::sun::star::lang::EventObject& aEvent) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL loaded(const ::com::sun::star::lang::EventObject& aEvent) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL unloading(const ::com::sun::star::lang::EventObject& aEvent) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL unloaded(const ::com::sun::star::lang::EventObject& aEvent) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL reloading(const ::com::sun::star::lang::EventObject& aEvent) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL reloaded(const ::com::sun::star::lang::EventObject& aEvent) throw(::com::sun::star::uno::RuntimeException, std::exception); // com::sun::star::form::XLoadable - virtual void SAL_CALL load() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL unload() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL reload() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isLoaded() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addLoadListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeLoadListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL load() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL unload() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL reload() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isLoaded() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addLoadListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeLoadListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception); // com::sun::star::sdbc::XCloseable - virtual void SAL_CALL close() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL close() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // com::sun::star::sdbc::XRowSetListener - virtual void SAL_CALL cursorMoved(const ::com::sun::star::lang::EventObject& event) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL rowChanged(const ::com::sun::star::lang::EventObject& event) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL rowSetChanged(const ::com::sun::star::lang::EventObject& event) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL cursorMoved(const ::com::sun::star::lang::EventObject& event) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL rowChanged(const ::com::sun::star::lang::EventObject& event) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL rowSetChanged(const ::com::sun::star::lang::EventObject& event) throw(::com::sun::star::uno::RuntimeException, std::exception); // com::sun::star::sdb::XRowSetApproveListener - virtual sal_Bool SAL_CALL approveCursorMove(const ::com::sun::star::lang::EventObject& event) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL approveRowChange(const ::com::sun::star::sdb::RowChangeEvent& event) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL approveRowSetChange(const ::com::sun::star::lang::EventObject& event) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL approveCursorMove(const ::com::sun::star::lang::EventObject& event) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL approveRowChange(const ::com::sun::star::sdb::RowChangeEvent& event) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL approveRowSetChange(const ::com::sun::star::lang::EventObject& event) throw(::com::sun::star::uno::RuntimeException, std::exception); // com::sun::star::sdb::XRowSetApproveBroadcaster - virtual void SAL_CALL addRowSetApproveListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XRowSetApproveListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeRowSetApproveListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XRowSetApproveListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addRowSetApproveListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XRowSetApproveListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeRowSetApproveListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XRowSetApproveListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception); // com::sun:star::form::XDatabaseParameterBroadcaster2 - virtual void SAL_CALL addDatabaseParameterListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeDatabaseParameterListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addDatabaseParameterListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeDatabaseParameterListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception); // com::sun:star::form::XDatabaseParameterBroadcaster - virtual void SAL_CALL addParameterListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeParameterListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addParameterListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeParameterListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception); // com::sun::star::sdbc::XRowSet - virtual void SAL_CALL execute() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addRowSetListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSetListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeRowSetListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSetListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL execute() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addRowSetListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSetListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeRowSetListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSetListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception); // com::sun::star::sdb::XCompletedExecution - virtual void SAL_CALL executeWithCompletion( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& handler ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL executeWithCompletion( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& handler ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // com::sun::star::sdbc::XResultSet - virtual sal_Bool SAL_CALL next() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isBeforeFirst() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isAfterLast() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isFirst() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isLast() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL beforeFirst() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL afterLast() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL first() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL last() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getRow() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL absolute(sal_Int32 row) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL relative(sal_Int32 rows) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL previous() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL refreshRow() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL rowUpdated() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL rowInserted() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL rowDeleted() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual InterfaceRef SAL_CALL getStatement() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL next() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isBeforeFirst() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isAfterLast() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isFirst() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isLast() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL beforeFirst() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL afterLast() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL first() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL last() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getRow() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL absolute(sal_Int32 row) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL relative(sal_Int32 rows) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL previous() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL refreshRow() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL rowUpdated() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL rowInserted() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL rowDeleted() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual InterfaceRef SAL_CALL getStatement() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // com::sun::star::sdbc::XResultSetUpdate - virtual void SAL_CALL insertRow() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateRow() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL deleteRow() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL cancelRowUpdates() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL moveToInsertRow() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL moveToCurrentRow() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertRow() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateRow() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL deleteRow() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL cancelRowUpdates() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL moveToInsertRow() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL moveToCurrentRow() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // com::sun::star::sdbcx::XDeleteRows - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL deleteRows(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>& rows) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL deleteRows(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>& rows) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // com::sun::star::lang::XServiceInfo - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); // com::sun::star::lang::XServiceInfo - static version static OUString SAL_CALL getImplementationName_Static(); @@ -391,56 +391,56 @@ public: static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory ); // com::sun::star::io::XPersistObject - virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); // com::sun::star::sdbc::XSQLErrorListener - virtual void SAL_CALL errorOccured(const ::com::sun::star::sdb::SQLErrorEvent& aEvent) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL errorOccured(const ::com::sun::star::sdb::SQLErrorEvent& aEvent) throw(::com::sun::star::uno::RuntimeException, std::exception); // com::sun::star::sdbc::XParameters - virtual void SAL_CALL setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setBoolean(sal_Int32 parameterIndex, sal_Bool x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setByte(sal_Int32 parameterIndex, sal_Int8 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setShort(sal_Int32 parameterIndex, sal_Int16 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setInt(sal_Int32 parameterIndex, sal_Int32 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setLong(sal_Int32 parameterIndex, sal_Int64 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFloat(sal_Int32 parameterIndex, float x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDouble(sal_Int32 parameterIndex, double x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString(sal_Int32 parameterIndex, const OUString& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setBytes(sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDate(sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTime(sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTimestamp(sal_Int32 parameterIndex, const ::com::sun::star::util::DateTime& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setBinaryStream(sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream>& x, sal_Int32 length) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCharacterStream(sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream>& x, sal_Int32 length) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObject(sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObjectWithInfo(sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setRef(sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef>& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setBlob(sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob>& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setClob(sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob>& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setArray(sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray>& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearParameters() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setBoolean(sal_Int32 parameterIndex, sal_Bool x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setByte(sal_Int32 parameterIndex, sal_Int8 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setShort(sal_Int32 parameterIndex, sal_Int16 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setInt(sal_Int32 parameterIndex, sal_Int32 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setLong(sal_Int32 parameterIndex, sal_Int64 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setFloat(sal_Int32 parameterIndex, float x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDouble(sal_Int32 parameterIndex, double x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setString(sal_Int32 parameterIndex, const OUString& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setBytes(sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDate(sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTime(sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTimestamp(sal_Int32 parameterIndex, const ::com::sun::star::util::DateTime& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setBinaryStream(sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream>& x, sal_Int32 length) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setCharacterStream(sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream>& x, sal_Int32 length) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setObject(sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setObjectWithInfo(sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setRef(sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef>& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setBlob(sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob>& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setClob(sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob>& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setArray(sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray>& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clearParameters() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XPropertyContainer - virtual void SAL_CALL addProperty( const OUString& Name, ::sal_Int16 Attributes, const ::com::sun::star::uno::Any& DefaultValue ) throw (::com::sun::star::beans::PropertyExistException, ::com::sun::star::beans::IllegalTypeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeProperty( const OUString& Name ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::NotRemoveableException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addProperty( const OUString& Name, ::sal_Int16 Attributes, const ::com::sun::star::uno::Any& DefaultValue ) throw (::com::sun::star::beans::PropertyExistException, ::com::sun::star::beans::IllegalTypeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeProperty( const OUString& Name ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::NotRemoveableException, ::com::sun::star::uno::RuntimeException, std::exception); // XPropertyAccess - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); using OPropertySetAggregationHelper::setPropertyValues; // XWarningsSupplier - virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearWarnings( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clearWarnings( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XCloneable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception); inline void submitNBC( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& Control, const ::com::sun::star::awt::MouseEvent& MouseEvt ); diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx index 3e4ccd0d3a90..739a4894654e 100644 --- a/forms/source/component/Date.cxx +++ b/forms/source/component/Date.cxx @@ -63,7 +63,7 @@ Sequence ODateControl::_getTypes() } -StringSequence SAL_CALL ODateControl::getSupportedServiceNames() throw() +StringSequence SAL_CALL ODateControl::getSupportedServiceNames() throw(std::exception) { StringSequence aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); @@ -133,7 +133,7 @@ IMPLEMENT_DEFAULT_CLONING( ODateModel ) // XServiceInfo -StringSequence SAL_CALL ODateModel::getSupportedServiceNames() throw() +StringSequence SAL_CALL ODateModel::getSupportedServiceNames() throw(std::exception) { StringSequence aSupported = OBoundControlModel::getSupportedServiceNames(); @@ -156,7 +156,7 @@ StringSequence SAL_CALL ODateModel::getSupportedServiceNames() throw() } -OUString SAL_CALL ODateModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) +OUString SAL_CALL ODateModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) { return OUString(FRM_COMPONENT_DATEFIELD); // old (non-sun) name for compatibility ! } @@ -201,7 +201,7 @@ sal_Bool SAL_CALL ODateModel::convertFastPropertyValue(Any& _rConvertedValue, An } -void SAL_CALL ODateModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw ( ::com::sun::star::uno::Exception) +void SAL_CALL ODateModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw ( ::com::sun::star::uno::Exception, std::exception) { if (PROPERTY_ID_FORMATKEY == _nHandle) setFormatKeyPropertyValue(_rValue); diff --git a/forms/source/component/Date.hxx b/forms/source/component/Date.hxx index 6d15c4ee4337..b9a926dec121 100644 --- a/forms/source/component/Date.hxx +++ b/forms/source/component/Date.hxx @@ -45,18 +45,18 @@ public: DECLARE_DEFAULT_LEAF_XTOR( ODateModel ); // XPersistObject - virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // ::com::sun::star::beans::XPropertySet virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const; virtual sal_Bool SAL_CALL convertFastPropertyValue(::com::sun::star::uno::Any& rConvertedValue, ::com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::lang::IllegalArgumentException); - virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue) throw ( ::com::sun::star::uno::Exception); + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue) throw ( ::com::sun::star::uno::Exception, std::exception); // XServiceInfo IMPLEMENTATION_NAME(ODateModel); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception); // XPropertySet using OEditBaseModel::getFastPropertyValue; @@ -114,7 +114,7 @@ public: // ::com::sun::star::lang::XServiceInfo IMPLEMENTATION_NAME(ODateControl); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception); }; //......................................................................... diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx index 4f577eb53876..61c6161c847d 100644 --- a/forms/source/component/Edit.cxx +++ b/forms/source/component/Edit.cxx @@ -80,7 +80,7 @@ Sequence OEditControl::_getTypes() } -Any SAL_CALL OEditControl::queryAggregation(const Type& _rType) throw (RuntimeException) +Any SAL_CALL OEditControl::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception) { Any aReturn = OBoundControl::queryAggregation(_rType); if (!aReturn.hasValue()) @@ -124,13 +124,13 @@ OEditControl::~OEditControl() // XChangeBroadcaster -void OEditControl::addChangeListener(const Reference& l) throw ( ::com::sun::star::uno::RuntimeException) +void OEditControl::addChangeListener(const Reference& l) throw ( ::com::sun::star::uno::RuntimeException, std::exception) { m_aChangeListeners.addInterface( l ); } -void OEditControl::removeChangeListener(const Reference& l) throw ( ::com::sun::star::uno::RuntimeException) +void OEditControl::removeChangeListener(const Reference& l) throw ( ::com::sun::star::uno::RuntimeException, std::exception) { m_aChangeListeners.removeInterface( l ); } @@ -147,7 +147,7 @@ void OEditControl::disposing() // XServiceInfo -StringSequence OEditControl::getSupportedServiceNames() throw() +StringSequence OEditControl::getSupportedServiceNames() throw(std::exception) { StringSequence aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); @@ -159,14 +159,14 @@ StringSequence OEditControl::getSupportedServiceNames() throw() // XEventListener -void OEditControl::disposing(const EventObject& Source) throw( RuntimeException ) +void OEditControl::disposing(const EventObject& Source) throw( RuntimeException, std::exception ) { OBoundControl::disposing(Source); } // XFocusListener -void OEditControl::focusGained( const FocusEvent& /*e*/ ) throw ( ::com::sun::star::uno::RuntimeException) +void OEditControl::focusGained( const FocusEvent& /*e*/ ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) { Reference xSet(getModel(), UNO_QUERY); if (xSet.is()) @@ -174,7 +174,7 @@ void OEditControl::focusGained( const FocusEvent& /*e*/ ) throw ( ::com::sun::st } -void OEditControl::focusLost( const FocusEvent& /*e*/ ) throw ( ::com::sun::star::uno::RuntimeException) +void OEditControl::focusLost( const FocusEvent& /*e*/ ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) { Reference xSet(getModel(), UNO_QUERY); if (xSet.is()) @@ -191,7 +191,7 @@ void OEditControl::focusLost( const FocusEvent& /*e*/ ) throw ( ::com::sun::star // XKeyListener -void OEditControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) throw ( ::com::sun::star::uno::RuntimeException) +void OEditControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) throw ( ::com::sun::star::uno::RuntimeException, std::exception) { if( e.KeyCode != KEY_RETURN || e.Modifiers != 0 ) return; @@ -248,7 +248,7 @@ void OEditControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) throw ( } -void OEditControl::keyReleased(const ::com::sun::star::awt::KeyEvent& /*e*/) throw ( ::com::sun::star::uno::RuntimeException) +void OEditControl::keyReleased(const ::com::sun::star::awt::KeyEvent& /*e*/) throw ( ::com::sun::star::uno::RuntimeException, std::exception) { } @@ -266,7 +266,7 @@ IMPL_LINK(OEditControl, OnKeyPressed, void*, /*EMPTYARG*/) } -void SAL_CALL OEditControl::createPeer( const Reference< XToolkit>& _rxToolkit, const Reference< XWindowPeer>& _rxParent ) throw ( RuntimeException ) +void SAL_CALL OEditControl::createPeer( const Reference< XToolkit>& _rxToolkit, const Reference< XWindowPeer>& _rxParent ) throw ( RuntimeException, std::exception ) { OBoundControl::createPeer(_rxToolkit, _rxParent); } @@ -333,14 +333,14 @@ void OEditModel::disposing() // XPersistObject -OUString SAL_CALL OEditModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OEditModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) { return OUString(FRM_COMPONENT_EDIT); // old (non-sun) name for compatibility ! } // XServiceInfo -StringSequence SAL_CALL OEditModel::getSupportedServiceNames() throw() +StringSequence SAL_CALL OEditModel::getSupportedServiceNames() throw(std::exception) { StringSequence aSupported = OBoundControlModel::getSupportedServiceNames(); @@ -417,7 +417,7 @@ bool OEditModel::implActsAsRichText( ) const } -void SAL_CALL OEditModel::reset( ) throw(RuntimeException) +void SAL_CALL OEditModel::reset( ) throw(RuntimeException, std::exception) { // no reset if we currently act as rich text control if ( implActsAsRichText() ) @@ -538,7 +538,7 @@ void OEditModel::readAggregate( const Reference< XObjectInputStream >& _rxInStre } -void OEditModel::write(const Reference& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) +void OEditModel::write(const Reference& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { Any aCurrentText; sal_Int16 nOldTextLen = 0; @@ -568,7 +568,7 @@ void OEditModel::write(const Reference& _rxOutStream) throw } -void OEditModel::read(const Reference& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) +void OEditModel::read(const Reference& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { OEditBaseModel::read(_rxInStream); diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx index 4e280eda5cc0..b071a1e102b8 100644 --- a/forms/source/component/Edit.hxx +++ b/forms/source/component/Edit.hxx @@ -64,19 +64,19 @@ public: virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const; // XPersistObject - virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception); // XPropertySet using OBoundControlModel::getFastPropertyValue; // XReset - virtual void SAL_CALL reset( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL reset( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo IMPLEMENTATION_NAME(OEditModel); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception); // OControlModel's property handling virtual void describeFixedProperties( @@ -139,7 +139,7 @@ public: virtual ~OEditControl(); DECLARE_UNO3_AGG_DEFAULTS(OEditControl, OBoundControl); - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes(); @@ -147,26 +147,26 @@ public: virtual void SAL_CALL disposing(); // ::com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::lang::XServiceInfo IMPLEMENTATION_NAME(OEditControl); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception); // ::com::sun::star::form::XChangeBroadcaster - virtual void SAL_CALL addChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XChangeListener>& _rxListener) throw ( ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XChangeListener>& _rxListener) throw ( ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XChangeListener>& _rxListener) throw ( ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XChangeListener>& _rxListener) throw ( ::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::awt::XFocusListener - virtual void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw ( ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw ( ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw ( ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw ( ::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::awt::XKeyListener - virtual void SAL_CALL keyPressed(const ::com::sun::star::awt::KeyEvent& e) throw ( ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL keyReleased(const ::com::sun::star::awt::KeyEvent& e) throw ( ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL keyPressed(const ::com::sun::star::awt::KeyEvent& e) throw ( ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL keyReleased(const ::com::sun::star::awt::KeyEvent& e) throw ( ::com::sun::star::uno::RuntimeException, std::exception); // XControl - virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& _rxToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& _rxParent ) throw ( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& _rxToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& _rxParent ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); private: DECL_LINK( OnKeyPressed, void* ); diff --git a/forms/source/component/EditBase.cxx b/forms/source/component/EditBase.cxx index 6c482984c9d3..c7b0cebf6ce8 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& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) +void OEditBaseModel::write(const Reference& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { OBoundControlModel::write(_rxOutStream); @@ -159,7 +159,7 @@ sal_uInt16 OEditBaseModel::getPersistenceFlags() const } -void OEditBaseModel::read(const Reference& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) +void OEditBaseModel::read(const Reference& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { OBoundControlModel::read(_rxInStream); ::osl::MutexGuard aGuard(m_aMutex); @@ -327,7 +327,7 @@ sal_Bool OEditBaseModel::convertFastPropertyValue( Any& rConvertedValue, Any& rO } -void OEditBaseModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw ( ::com::sun::star::uno::Exception) +void OEditBaseModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw ( ::com::sun::star::uno::Exception, std::exception) { switch (nHandle) { diff --git a/forms/source/component/EditBase.hxx b/forms/source/component/EditBase.hxx index fd5240c6d929..56d51280fad6 100644 --- a/forms/source/component/EditBase.hxx +++ b/forms/source/component/EditBase.hxx @@ -70,15 +70,15 @@ public: DECLARE_DEFAULT_BOUND_XTOR( OEditBaseModel ); // XPersistObject - virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); // XPropertySet virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const; virtual sal_Bool SAL_CALL convertFastPropertyValue(::com::sun::star::uno::Any& rConvertedValue, ::com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::lang::IllegalArgumentException); - virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue) throw ( ::com::sun::star::uno::Exception); + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue) throw ( ::com::sun::star::uno::Exception, std::exception); using ::cppu::OPropertySetHelper::getFastPropertyValue; // XPropertyState diff --git a/forms/source/component/EventThread.cxx b/forms/source/component/EventThread.cxx index bdc0fd09ea58..8653402e29e7 100644 --- a/forms/source/component/EventThread.cxx +++ b/forms/source/component/EventThread.cxx @@ -59,7 +59,7 @@ OComponentEventThread::~OComponentEventThread() impl_clearEventQueue(); } -Any SAL_CALL OComponentEventThread::queryInterface(const Type& _rType) throw (RuntimeException) +Any SAL_CALL OComponentEventThread::queryInterface(const Type& _rType) throw (RuntimeException, std::exception) { Any aReturn; @@ -84,7 +84,7 @@ void OComponentEventThread::impl_clearEventQueue() m_aFlags.erase( m_aFlags.begin(), m_aFlags.end() ); } -void OComponentEventThread::disposing( const EventObject& evt ) throw ( ::com::sun::star::uno::RuntimeException) +void OComponentEventThread::disposing( const EventObject& evt ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) { if( evt.Source == m_xComp ) { diff --git a/forms/source/component/EventThread.hxx b/forms/source/component/EventThread.hxx index b17c47ca55f1..88410cc103ac 100644 --- a/forms/source/component/EventThread.hxx +++ b/forms/source/component/EventThread.hxx @@ -88,7 +88,7 @@ public: // UNO Anbindung DECLARE_UNO3_DEFAULTS(OComponentEventThread, OWeakObject); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception); OComponentEventThread(::cppu::OComponentHelper* pCompImpl); virtual ~OComponentEventThread(); @@ -98,7 +98,7 @@ public: sal_Bool bFlag = sal_False ); // ::com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource ) throw (::com::sun::star::uno::RuntimeException, std::exception); /* 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 866067d649e7..ca68edd9cef4 100644 --- a/forms/source/component/File.cxx +++ b/forms/source/component/File.cxx @@ -72,7 +72,7 @@ Sequence OFileControlModel::_getTypes() // XServiceInfo -StringSequence OFileControlModel::getSupportedServiceNames() throw(RuntimeException) +StringSequence OFileControlModel::getSupportedServiceNames() throw(RuntimeException, std::exception) { StringSequence aSupported = OControlModel::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); @@ -114,7 +114,7 @@ OFileControlModel::~OFileControlModel() IMPLEMENT_DEFAULT_CLONING( OFileControlModel ) -Any SAL_CALL OFileControlModel::queryAggregation(const Type& _rType) throw (RuntimeException) +Any SAL_CALL OFileControlModel::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception) { Any aReturn = OControlModel::queryAggregation(_rType); if (!aReturn.hasValue()) @@ -158,7 +158,7 @@ void OFileControlModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle) con } -void OFileControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) throw ( ::com::sun::star::uno::Exception) +void OFileControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) throw ( ::com::sun::star::uno::Exception, std::exception) { switch (nHandle) { @@ -194,13 +194,13 @@ void OFileControlModel::describeFixedProperties( Sequence< Property >& _rProps ) } -OUString SAL_CALL OFileControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OFileControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) { return OUString(FRM_COMPONENT_FILECONTROL); // old (non-sun) name for compatibility ! } -void OFileControlModel::write(const Reference& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) +void OFileControlModel::write(const Reference& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { OControlModel::write(_rxOutStream); @@ -214,7 +214,7 @@ void OFileControlModel::write(const Reference& _rxO } -void OFileControlModel::read(const Reference& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) +void OFileControlModel::read(const Reference& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { OControlModel::read(_rxInStream); ::osl::MutexGuard aGuard(m_aMutex); @@ -240,7 +240,7 @@ void OFileControlModel::read(const Reference& _rxInS } -void SAL_CALL OFileControlModel::reset() throw ( ::com::sun::star::uno::RuntimeException) +void SAL_CALL OFileControlModel::reset() throw ( ::com::sun::star::uno::RuntimeException, std::exception) { ::cppu::OInterfaceIteratorHelper aIter(m_aResetListeners); EventObject aEvt(static_cast(this)); @@ -260,13 +260,13 @@ void SAL_CALL OFileControlModel::reset() throw ( ::com::sun::star::uno::RuntimeE } -void OFileControlModel::addResetListener(const Reference& _rxListener) throw ( ::com::sun::star::uno::RuntimeException) +void OFileControlModel::addResetListener(const Reference& _rxListener) throw ( ::com::sun::star::uno::RuntimeException, std::exception) { m_aResetListeners.addInterface(_rxListener); } -void OFileControlModel::removeResetListener(const Reference& _rxListener) throw ( ::com::sun::star::uno::RuntimeException) +void OFileControlModel::removeResetListener(const Reference& _rxListener) throw ( ::com::sun::star::uno::RuntimeException, std::exception) { m_aResetListeners.removeInterface(_rxListener); } diff --git a/forms/source/component/File.hxx b/forms/source/component/File.hxx index 494b8fa430ab..9b1d710a7975 100644 --- a/forms/source/component/File.hxx +++ b/forms/source/component/File.hxx @@ -44,18 +44,18 @@ public: DECLARE_DEFAULT_LEAF_XTOR( OFileControlModel ); DECLARE_UNO3_AGG_DEFAULTS(OFileControlModel, OControlModel); - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo IMPLEMENTATION_NAME(OFileControlModel); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); // OComponentHelper virtual void SAL_CALL disposing(); // XPropertySet and friends virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue) throw ( ::com::sun::star::uno::Exception); + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue) throw ( ::com::sun::star::uno::Exception, std::exception); virtual sal_Bool SAL_CALL convertFastPropertyValue(::com::sun::star::uno::Any& rConvertedValue, ::com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::lang::IllegalArgumentException); @@ -63,14 +63,14 @@ public: virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 _nHandle ) const; // XPersistObject - virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com ::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com ::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com ::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com ::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); // XReset - virtual void SAL_CALL reset() throw ( ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addResetListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener>& _rxListener) throw ( ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeResetListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener>& _rxListener) throw ( ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL reset() throw ( ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addResetListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener>& _rxListener) throw ( ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeResetListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener>& _rxListener) throw ( ::com::sun::star::uno::RuntimeException, std::exception); // OControlModel's property handling virtual void describeFixedProperties( diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx index cbe592cd47c3..f4ae9c9450a4 100644 --- a/forms/source/component/Filter.cxx +++ b/forms/source/component/Filter.cxx @@ -143,7 +143,7 @@ namespace frm } - Any SAL_CALL OFilterControl::queryAggregation( const Type & rType ) throw(RuntimeException) + Any SAL_CALL OFilterControl::queryAggregation( const Type & rType ) throw(RuntimeException, std::exception) { Any aRet = UnoControl::queryAggregation( rType); if(!aRet.hasValue()) @@ -181,7 +181,7 @@ namespace frm // XComponent - void OFilterControl::dispose() throw( RuntimeException ) + void OFilterControl::dispose() throw( RuntimeException, std::exception ) { EventObject aEvt(*this); m_aTextListeners.disposeAndClear( aEvt ); @@ -189,7 +189,7 @@ namespace frm } - void OFilterControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw(RuntimeException) + void OFilterControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw(RuntimeException, std::exception) { UnoControl::createPeer( rxToolkit, rParentPeer ); @@ -281,14 +281,14 @@ namespace frm // XEventListener - void SAL_CALL OFilterControl::disposing(const EventObject& Source) throw( RuntimeException ) + void SAL_CALL OFilterControl::disposing(const EventObject& Source) throw( RuntimeException, std::exception ) { UnoControl::disposing(Source); } // XItemListener - void SAL_CALL OFilterControl::itemStateChanged( const ItemEvent& rEvent ) throw(RuntimeException) + void SAL_CALL OFilterControl::itemStateChanged( const ItemEvent& rEvent ) throw(RuntimeException, std::exception) { OUStringBuffer aText; switch (m_nControlClass) @@ -490,7 +490,7 @@ namespace frm // XFocusListener - void SAL_CALL OFilterControl::focusGained(const FocusEvent& /*e*/) throw( RuntimeException ) + void SAL_CALL OFilterControl::focusGained(const FocusEvent& /*e*/) throw( RuntimeException, std::exception ) { // should we fill the combobox? if (m_bFilterList && !m_bFilterListFilled) @@ -498,12 +498,12 @@ namespace frm } - void SAL_CALL OFilterControl::focusLost(const FocusEvent& /*e*/) throw( RuntimeException ) + void SAL_CALL OFilterControl::focusLost(const FocusEvent& /*e*/) throw( RuntimeException, std::exception ) { } - sal_Bool SAL_CALL OFilterControl::commit() throw(RuntimeException) + sal_Bool SAL_CALL OFilterControl::commit() throw(RuntimeException, std::exception) { if ( !ensureInitialized( ) ) // already asserted in ensureInitialized @@ -554,19 +554,19 @@ namespace frm // XTextComponent - void SAL_CALL OFilterControl::addTextListener(const Reference< XTextListener > & l) throw(RuntimeException) + void SAL_CALL OFilterControl::addTextListener(const Reference< XTextListener > & l) throw(RuntimeException, std::exception) { m_aTextListeners.addInterface( l ); } - void SAL_CALL OFilterControl::removeTextListener(const Reference< XTextListener > & l) throw(RuntimeException) + void SAL_CALL OFilterControl::removeTextListener(const Reference< XTextListener > & l) throw(RuntimeException, std::exception) { m_aTextListeners.removeInterface( l ); } - void SAL_CALL OFilterControl::setText( const OUString& aText ) throw(RuntimeException) + void SAL_CALL OFilterControl::setText( const OUString& aText ) throw(RuntimeException, std::exception) { if ( !ensureInitialized( ) ) // already asserted in ensureInitialized @@ -665,7 +665,7 @@ namespace frm } - void SAL_CALL OFilterControl::insertText( const ::com::sun::star::awt::Selection& rSel, const OUString& aText ) throw(::com::sun::star::uno::RuntimeException) + void SAL_CALL OFilterControl::insertText( const ::com::sun::star::awt::Selection& rSel, const OUString& aText ) throw(::com::sun::star::uno::RuntimeException, std::exception) { Reference< XTextComponent > xText( getPeer(), UNO_QUERY ); if (xText.is()) @@ -676,13 +676,13 @@ namespace frm } - OUString SAL_CALL OFilterControl::getText() throw(RuntimeException) + OUString SAL_CALL OFilterControl::getText() throw(RuntimeException, std::exception) { return m_aText; } - OUString SAL_CALL OFilterControl::getSelectedText( void ) throw(RuntimeException) + OUString SAL_CALL OFilterControl::getSelectedText( void ) throw(RuntimeException, std::exception) { OUString aSelected; Reference< XTextComponent > xText( getPeer(), UNO_QUERY ); @@ -693,7 +693,7 @@ namespace frm } - void SAL_CALL OFilterControl::setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw(::com::sun::star::uno::RuntimeException) + void SAL_CALL OFilterControl::setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw(::com::sun::star::uno::RuntimeException, std::exception) { Reference< XTextComponent > xText( getPeer(), UNO_QUERY ); if (xText.is()) @@ -701,7 +701,7 @@ namespace frm } - ::com::sun::star::awt::Selection SAL_CALL OFilterControl::getSelection( void ) throw(::com::sun::star::uno::RuntimeException) + ::com::sun::star::awt::Selection SAL_CALL OFilterControl::getSelection( void ) throw(::com::sun::star::uno::RuntimeException, std::exception) { ::com::sun::star::awt::Selection aSel; Reference< XTextComponent > xText( getPeer(), UNO_QUERY ); @@ -711,14 +711,14 @@ namespace frm } - sal_Bool SAL_CALL OFilterControl::isEditable( void ) throw(RuntimeException) + sal_Bool SAL_CALL OFilterControl::isEditable( void ) throw(RuntimeException, std::exception) { Reference< XTextComponent > xText( getPeer(), UNO_QUERY ); return xText.is() && xText->isEditable(); } - void SAL_CALL OFilterControl::setEditable( sal_Bool bEditable ) throw(RuntimeException) + void SAL_CALL OFilterControl::setEditable( sal_Bool bEditable ) throw(RuntimeException, std::exception) { Reference< XTextComponent > xText( getPeer(), UNO_QUERY ); if (xText.is()) @@ -726,14 +726,14 @@ namespace frm } - sal_Int16 SAL_CALL OFilterControl::getMaxTextLen() throw(RuntimeException) + sal_Int16 SAL_CALL OFilterControl::getMaxTextLen() throw(RuntimeException, std::exception) { Reference< XTextComponent > xText( getPeer(), UNO_QUERY ); return xText.is() ? xText->getMaxTextLen() : 0; } - void SAL_CALL OFilterControl::setMaxTextLen( sal_Int16 nLength ) throw(RuntimeException) + void SAL_CALL OFilterControl::setMaxTextLen( sal_Int16 nLength ) throw(RuntimeException, std::exception) { Reference< XTextComponent > xText( getPeer(), UNO_QUERY ); if (xText.is()) @@ -755,7 +755,7 @@ namespace frm } - void SAL_CALL OFilterControl::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException) + void SAL_CALL OFilterControl::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) { const Any* pArguments = aArguments.getConstArray(); const Any* pArgumentsEnd = pArguments + aArguments.getLength(); @@ -874,17 +874,17 @@ namespace frm OSL_ENSURE( m_xConnection.is(), "OFilterControl::initialize: unable to determine the form's connection!" ); } - OUString SAL_CALL OFilterControl::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL OFilterControl::getImplementationName( ) throw (RuntimeException, std::exception) { return getImplementationName_Static(); } - sal_Bool SAL_CALL OFilterControl::supportsService( const OUString& ServiceName ) throw (RuntimeException) + sal_Bool SAL_CALL OFilterControl::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } - Sequence< OUString > SAL_CALL OFilterControl::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL OFilterControl::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } diff --git a/forms/source/component/Filter.hxx b/forms/source/component/Filter.hxx index 802b4ae9f414..8a20b5434e26 100644 --- a/forms/source/component/Filter.hxx +++ b/forms/source/component/Filter.hxx @@ -84,50 +84,50 @@ namespace frm OFilterControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ); DECLARE_UNO3_AGG_DEFAULTS(OFilterControl,OWeakAggObject); - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual OUString GetComponentServiceName(); - virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > & rxToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > & rParentPeer ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > & rxToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > & rParentPeer ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // ::com::sun::star::lang::XComponent - virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // ::com::sun::star::awt::XTextComponent - virtual void SAL_CALL addTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener > & l ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removeTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener > & l ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setText( const OUString& aText ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL insertText( const ::com::sun::star::awt::Selection& rSel, const OUString& aText ) throw( ::com::sun::star::uno::RuntimeException ); - virtual OUString SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException ); - virtual OUString SAL_CALL getSelectedText() throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::awt::Selection SAL_CALL getSelection() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL isEditable() throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setEditable( sal_Bool bEditable ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setMaxTextLen( sal_Int16 nLength ) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Int16 SAL_CALL getMaxTextLen() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL addTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL removeTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setText( const OUString& aText ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL insertText( const ::com::sun::star::awt::Selection& rSel, const OUString& aText ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getSelectedText() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::awt::Selection SAL_CALL getSelection() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL isEditable() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setEditable( sal_Bool bEditable ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setMaxTextLen( sal_Int16 nLength ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Int16 SAL_CALL getMaxTextLen() throw( ::com::sun::star::uno::RuntimeException, std::exception ); // ::com::sun::star::form::XBoundComponent - virtual void SAL_CALL addUpdateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener > & /*l*/) throw( ::com::sun::star::uno::RuntimeException ) {} - virtual void SAL_CALL removeUpdateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener > & /*l*/) throw( ::com::sun::star::uno::RuntimeException ) {} - virtual sal_Bool SAL_CALL commit() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL addUpdateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener > & /*l*/) throw( ::com::sun::star::uno::RuntimeException, std::exception ) {} + virtual void SAL_CALL removeUpdateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener > & /*l*/) throw( ::com::sun::star::uno::RuntimeException, std::exception ) {} + virtual sal_Bool SAL_CALL commit() throw( ::com::sun::star::uno::RuntimeException, std::exception ); // ::com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // ::com::sun::star::awt::XFocusListener - virtual void SAL_CALL focusGained(const ::com::sun::star::awt::FocusEvent& e) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL focusLost(const ::com::sun::star::awt::FocusEvent& e) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL focusGained(const ::com::sun::star::awt::FocusEvent& e) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL focusLost(const ::com::sun::star::awt::FocusEvent& e) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // ::com::sun::star::awt::XItemListener - virtual void SAL_CALL itemStateChanged(const ::com::sun::star::awt::ItemEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL itemStateChanged(const ::com::sun::star::awt::ItemEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // ::com::sun::star::util::XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // com::sun::star::lang::XServiceInfo - static version static OUString SAL_CALL getImplementationName_Static(); diff --git a/forms/source/component/FixedText.cxx b/forms/source/component/FixedText.cxx index 11601ef78a31..5d336292c3e2 100644 --- a/forms/source/component/FixedText.cxx +++ b/forms/source/component/FixedText.cxx @@ -70,7 +70,7 @@ OFixedTextModel::~OFixedTextModel( ) IMPLEMENT_DEFAULT_CLONING( OFixedTextModel ) -StringSequence SAL_CALL OFixedTextModel::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) +StringSequence SAL_CALL OFixedTextModel::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) { StringSequence aSupported = OControlModel::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); @@ -88,14 +88,14 @@ void OFixedTextModel::describeAggregateProperties( Sequence< Property >& _rAggre } -OUString SAL_CALL OFixedTextModel::getServiceName() throw(RuntimeException) +OUString SAL_CALL OFixedTextModel::getServiceName() throw(RuntimeException, std::exception) { return OUString(FRM_COMPONENT_FIXEDTEXT); // old (non-sun) name for compatibility ! } void SAL_CALL OFixedTextModel::write(const Reference& _rxOutStream) - throw(IOException, RuntimeException) + throw(IOException, RuntimeException, std::exception) { OControlModel::write(_rxOutStream); @@ -105,7 +105,7 @@ void SAL_CALL OFixedTextModel::write(const Reference& _rxOu } -void SAL_CALL OFixedTextModel::read(const Reference& _rxInStream) throw(IOException, RuntimeException) +void SAL_CALL OFixedTextModel::read(const Reference& _rxInStream) throw(IOException, RuntimeException, std::exception) { OControlModel::read(_rxInStream); diff --git a/forms/source/component/FixedText.hxx b/forms/source/component/FixedText.hxx index a31c88de7711..e7c789632157 100644 --- a/forms/source/component/FixedText.hxx +++ b/forms/source/component/FixedText.hxx @@ -37,14 +37,14 @@ public: // XServiceInfo IMPLEMENTATION_NAME(OFixedTextModel); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); // XPersistObject - virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL - write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL - read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); // OControlModel's property handling virtual void describeAggregateProperties( diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index 14abb983cdfb..4497dc32ff54 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -156,7 +156,7 @@ void OControl::doSetDelegator() } // UNO Anbindung -Any SAL_CALL OControl::queryAggregation( const Type& _rType ) throw(RuntimeException) +Any SAL_CALL OControl::queryAggregation( const Type& _rType ) throw(RuntimeException, std::exception) { // ask the base class Any aReturn( OComponentHelper::queryAggregation(_rType) ); @@ -172,12 +172,12 @@ Any SAL_CALL OControl::queryAggregation( const Type& _rType ) throw(RuntimeExcep return aReturn; } -Sequence SAL_CALL OControl::getImplementationId() throw(RuntimeException) +Sequence SAL_CALL OControl::getImplementationId() throw(RuntimeException, std::exception) { return OImplementationIds::getImplementationId(getTypes()); } -Sequence SAL_CALL OControl::getTypes() throw(RuntimeException) +Sequence SAL_CALL OControl::getTypes() throw(RuntimeException, std::exception) { TypeBag aTypes( _getTypes() ); @@ -211,7 +211,7 @@ void OControl::disposing() } // XServiceInfo -sal_Bool SAL_CALL OControl::supportsService(const OUString& _rsServiceName) throw ( RuntimeException) +sal_Bool SAL_CALL OControl::supportsService(const OUString& _rsServiceName) throw ( RuntimeException, std::exception) { return cppu::supportsService(this, _rsServiceName); } @@ -226,7 +226,7 @@ Sequence< OUString > OControl::getAggregateServiceNames() return aAggServices; } -Sequence SAL_CALL OControl::getSupportedServiceNames() throw(RuntimeException) +Sequence SAL_CALL OControl::getSupportedServiceNames() throw(RuntimeException, std::exception) { return ::comphelper::concatSequences( getAggregateServiceNames(), @@ -241,7 +241,7 @@ Sequence< OUString > SAL_CALL OControl::getSupportedServiceNames_Static() throw( } // XEventListener -void SAL_CALL OControl::disposing(const com::sun::star::lang::EventObject& _rEvent) throw (RuntimeException) +void SAL_CALL OControl::disposing(const com::sun::star::lang::EventObject& _rEvent) throw (RuntimeException, std::exception) { Reference< XInterface > xAggAsIface; query_aggregation(m_xAggregate, xAggAsIface); @@ -256,13 +256,13 @@ void SAL_CALL OControl::disposing(const com::sun::star::lang::EventObject& _rEve } // XControl -void SAL_CALL OControl::setContext(const Reference< XInterface >& Context) throw (RuntimeException) +void SAL_CALL OControl::setContext(const Reference< XInterface >& Context) throw (RuntimeException, std::exception) { if (m_xControl.is()) m_xControl->setContext(Context); } -Reference< XInterface > SAL_CALL OControl::getContext() throw (RuntimeException) +Reference< XInterface > SAL_CALL OControl::getContext() throw (RuntimeException, std::exception) { return m_xControl.is() ? m_xControl->getContext() : Reference< XInterface >(); } @@ -283,7 +283,7 @@ void OControl::impl_resetStateGuard_nothrow() m_aWindowStateGuard.attach( xWindow, xModel ); } -void SAL_CALL OControl::createPeer(const Reference& _rxToolkit, const Reference& _rxParent) throw (RuntimeException) +void SAL_CALL OControl::createPeer(const Reference& _rxToolkit, const Reference& _rxParent) throw (RuntimeException, std::exception) { if ( m_xControl.is() ) { @@ -293,12 +293,12 @@ void SAL_CALL OControl::createPeer(const Reference& _rxToolkit, const } } -Reference SAL_CALL OControl::getPeer() throw ( RuntimeException) +Reference SAL_CALL OControl::getPeer() throw ( RuntimeException, std::exception) { return m_xControl.is() ? m_xControl->getPeer() : Reference(); } -sal_Bool SAL_CALL OControl::setModel(const Reference& Model) throw ( RuntimeException) +sal_Bool SAL_CALL OControl::setModel(const Reference& Model) throw ( RuntimeException, std::exception) { if ( !m_xControl.is() ) return sal_False; @@ -308,28 +308,28 @@ sal_Bool SAL_CALL OControl::setModel(const Reference& Model) thro return bSuccess; } -Reference SAL_CALL OControl::getModel() throw ( RuntimeException) +Reference SAL_CALL OControl::getModel() throw ( RuntimeException, std::exception) { return m_xControl.is() ? m_xControl->getModel() : Reference(); } -Reference SAL_CALL OControl::getView() throw ( RuntimeException) +Reference SAL_CALL OControl::getView() throw ( RuntimeException, std::exception) { return m_xControl.is() ? m_xControl->getView() : Reference(); } -void SAL_CALL OControl::setDesignMode(sal_Bool bOn) throw ( RuntimeException) +void SAL_CALL OControl::setDesignMode(sal_Bool bOn) throw ( RuntimeException, std::exception) { if (m_xControl.is()) m_xControl->setDesignMode(bOn); } -sal_Bool SAL_CALL OControl::isDesignMode() throw ( RuntimeException) +sal_Bool SAL_CALL OControl::isDesignMode() throw ( RuntimeException, std::exception) { return m_xControl.is() ? m_xControl->isDesignMode() : sal_True; } -sal_Bool SAL_CALL OControl::isTransparent() throw ( RuntimeException) +sal_Bool SAL_CALL OControl::isTransparent() throw ( RuntimeException, std::exception) { return m_xControl.is() ? m_xControl->isTransparent() : sal_True; } @@ -353,7 +353,7 @@ Sequence< Type> OBoundControl::_getTypes() return TypeBag( OControl::_getTypes(), OBoundControl_BASE::getTypes() ).getTypes(); } -Any SAL_CALL OBoundControl::queryAggregation(const Type& _rType) throw(RuntimeException) +Any SAL_CALL OBoundControl::queryAggregation(const Type& _rType) throw(RuntimeException, std::exception) { Any aReturn; @@ -373,12 +373,12 @@ Any SAL_CALL OBoundControl::queryAggregation(const Type& _rType) throw(RuntimeEx return aReturn; } -sal_Bool SAL_CALL OBoundControl::getLock() throw(RuntimeException) +sal_Bool SAL_CALL OBoundControl::getLock() throw(RuntimeException, std::exception) { return m_bLocked; } -void SAL_CALL OBoundControl::setLock(sal_Bool _bLock) throw(RuntimeException) +void SAL_CALL OBoundControl::setLock(sal_Bool _bLock) throw(RuntimeException, std::exception) { if (m_bLocked == _bLock) return; @@ -405,12 +405,12 @@ void OBoundControl::_setLock(sal_Bool _bLock) } } -sal_Bool SAL_CALL OBoundControl::setModel( const Reference< XControlModel >& _rxModel ) throw (RuntimeException) +sal_Bool SAL_CALL OBoundControl::setModel( const Reference< XControlModel >& _rxModel ) throw (RuntimeException, std::exception) { return OControl::setModel( _rxModel ); } -void SAL_CALL OBoundControl::disposing(const EventObject& Source) throw (RuntimeException) +void SAL_CALL OBoundControl::disposing(const EventObject& Source) throw (RuntimeException, std::exception) { // just disambiguate OControl::disposing(Source); @@ -422,12 +422,12 @@ void OBoundControl::disposing() } // OControlModel -Sequence SAL_CALL OControlModel::getImplementationId() throw(RuntimeException) +Sequence SAL_CALL OControlModel::getImplementationId() throw(RuntimeException, std::exception) { return OImplementationIds::getImplementationId(getTypes()); } -Sequence SAL_CALL OControlModel::getTypes() throw(RuntimeException) +Sequence SAL_CALL OControlModel::getTypes() throw(RuntimeException, std::exception) { TypeBag aTypes( _getTypes() ); @@ -447,7 +447,7 @@ Sequence OControlModel::_getTypes() ).getTypes(); } -Any SAL_CALL OControlModel::queryAggregation(const Type& _rType) throw (RuntimeException) +Any SAL_CALL OControlModel::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception) { // base class 1 Any aReturn(OComponentHelper::queryAggregation(_rType)); @@ -619,12 +619,12 @@ void OControlModel::doSetDelegator() } // XChild -Reference< XInterface > SAL_CALL OControlModel::getParent() throw(RuntimeException) +Reference< XInterface > SAL_CALL OControlModel::getParent() throw(RuntimeException, std::exception) { return m_xParent; } -void SAL_CALL OControlModel::setParent(const Reference< XInterface >& _rxParent) throw(com::sun::star::lang::NoSupportException, RuntimeException) +void SAL_CALL OControlModel::setParent(const Reference< XInterface >& _rxParent) throw(com::sun::star::lang::NoSupportException, RuntimeException, std::exception) { osl::MutexGuard aGuard(m_aMutex); @@ -640,20 +640,20 @@ void SAL_CALL OControlModel::setParent(const Reference< XInterface >& _rxParent) } // XNamed -OUString SAL_CALL OControlModel::getName() throw(RuntimeException) +OUString SAL_CALL OControlModel::getName() throw(RuntimeException, std::exception) { OUString aReturn; OPropertySetHelper::getFastPropertyValue(PROPERTY_ID_NAME) >>= aReturn; return aReturn; } -void SAL_CALL OControlModel::setName(const OUString& _rName) throw(RuntimeException) +void SAL_CALL OControlModel::setName(const OUString& _rName) throw(RuntimeException, std::exception) { setFastPropertyValue(PROPERTY_ID_NAME, makeAny(_rName)); } // XServiceInfo -sal_Bool SAL_CALL OControlModel::supportsService(const OUString& _rServiceName) throw ( RuntimeException) +sal_Bool SAL_CALL OControlModel::supportsService(const OUString& _rServiceName) throw ( RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } @@ -667,7 +667,7 @@ Sequence< OUString > OControlModel::getAggregateServiceNames() return aAggServices; } -Sequence SAL_CALL OControlModel::getSupportedServiceNames() throw(RuntimeException) +Sequence SAL_CALL OControlModel::getSupportedServiceNames() throw(RuntimeException, std::exception) { return ::comphelper::concatSequences( getAggregateServiceNames(), @@ -684,7 +684,7 @@ Sequence< OUString > SAL_CALL OControlModel::getSupportedServiceNames_Static() t } // XEventListener -void SAL_CALL OControlModel::disposing(const com::sun::star::lang::EventObject& _rSource) throw (RuntimeException) +void SAL_CALL OControlModel::disposing(const com::sun::star::lang::EventObject& _rSource) throw (RuntimeException, std::exception) { // release the parent if (_rSource.Source == m_xParent) @@ -732,7 +732,7 @@ void OControlModel::readAggregate( const Reference< XObjectInputStream >& _rxInS } void SAL_CALL OControlModel::write(const Reference& _rxOutStream) - throw(stario::IOException, RuntimeException) + throw(stario::IOException, RuntimeException, std::exception) { osl::MutexGuard aGuard(m_aMutex); @@ -776,7 +776,7 @@ void SAL_CALL OControlModel::write(const Reference& // EOIN! } -void OControlModel::read(const Reference& InStream) throw (::com::sun::star::io::IOException, RuntimeException) +void OControlModel::read(const Reference& InStream) throw (::com::sun::star::io::IOException, RuntimeException, std::exception) { osl::MutexGuard aGuard(m_aMutex); @@ -970,7 +970,7 @@ sal_Bool OControlModel::convertFastPropertyValue( } void OControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) - throw (Exception) + throw (Exception, std::exception) { switch (_nHandle) { @@ -1050,7 +1050,7 @@ Reference< XMultiPropertySet > OControlModel::getPropertiesInterface() return Reference< XMultiPropertySet >( *this, UNO_QUERY ); } -Reference< XPropertySetInfo> SAL_CALL OControlModel::getPropertySetInfo() throw( RuntimeException) +Reference< XPropertySetInfo> SAL_CALL OControlModel::getPropertySetInfo() throw( RuntimeException, std::exception) { return createPropertySetInfo( getInfoHelper() ); } @@ -1060,22 +1060,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) +void SAL_CALL OControlModel::addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) { m_aPropertyBagHelper.addProperty( _rName, _nAttributes, _rInitialValue ); } -void SAL_CALL OControlModel::removeProperty( const OUString& _rName ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException) +void SAL_CALL OControlModel::removeProperty( const OUString& _rName ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException, std::exception) { m_aPropertyBagHelper.removeProperty( _rName ); } -Sequence< PropertyValue > SAL_CALL OControlModel::getPropertyValues() throw (RuntimeException) +Sequence< PropertyValue > SAL_CALL OControlModel::getPropertyValues() throw (RuntimeException, std::exception) { return m_aPropertyBagHelper.getPropertyValues(); } -void SAL_CALL OControlModel::setPropertyValues( const Sequence< PropertyValue >& _rProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) +void SAL_CALL OControlModel::setPropertyValues( const Sequence< PropertyValue >& _rProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { m_aPropertyBagHelper.setPropertyValues( _rProps ); } @@ -1107,7 +1107,7 @@ void OControlModel::firePropertyChanges( const Sequence< sal_Int32 >& _rHandles, } // OBoundControlModel -Any SAL_CALL OBoundControlModel::queryAggregation( const Type& _rType ) throw (RuntimeException) +Any SAL_CALL OBoundControlModel::queryAggregation( const Type& _rType ) throw (RuntimeException, std::exception) { Any aReturn( OControlModel::queryAggregation(_rType) ); if (!aReturn.hasValue()) @@ -1448,7 +1448,7 @@ void OBoundControlModel::doFormListening( const bool _bStart ) } // XChild -void SAL_CALL OBoundControlModel::setParent(const Reference& _rxParent) throw(com::sun::star::lang::NoSupportException, RuntimeException) +void SAL_CALL OBoundControlModel::setParent(const Reference& _rxParent) throw(com::sun::star::lang::NoSupportException, RuntimeException, std::exception) { ControlModelLock aLock( *this ); FieldChangeNotifier aBoundFieldNotifier( aLock ); @@ -1475,7 +1475,7 @@ void SAL_CALL OBoundControlModel::setParent(const Reference& _rxPare } // XEventListener -void SAL_CALL OBoundControlModel::disposing(const com::sun::star::lang::EventObject& _rEvent) throw (RuntimeException) +void SAL_CALL OBoundControlModel::disposing(const com::sun::star::lang::EventObject& _rEvent) throw (RuntimeException, std::exception) { ControlModelLock aLock( *this ); if ( _rEvent.Source == getField() ) @@ -1507,7 +1507,7 @@ void SAL_CALL OBoundControlModel::disposing(const com::sun::star::lang::EventObj } // XServiceInfo -StringSequence SAL_CALL OBoundControlModel::getSupportedServiceNames() throw(RuntimeException) +StringSequence SAL_CALL OBoundControlModel::getSupportedServiceNames() throw(RuntimeException, std::exception) { return ::comphelper::concatSequences( getAggregateServiceNames(), @@ -1526,7 +1526,7 @@ Sequence< OUString > SAL_CALL OBoundControlModel::getSupportedServiceNames_Stati } // XPersist -void SAL_CALL OBoundControlModel::write( const Reference& _rxOutStream ) throw(stario::IOException, RuntimeException) +void SAL_CALL OBoundControlModel::write( const Reference& _rxOutStream ) throw(stario::IOException, RuntimeException, std::exception) { OControlModel::write(_rxOutStream); osl::MutexGuard aGuard(m_aMutex); @@ -1599,7 +1599,7 @@ void OBoundControlModel::writeCommonProperties(const ReferencedeleteMark(nMark); } -void SAL_CALL OBoundControlModel::read( const Reference< stario::XObjectInputStream >& _rxInStream ) throw(stario::IOException, RuntimeException) +void SAL_CALL OBoundControlModel::read( const Reference< stario::XObjectInputStream >& _rxInStream ) throw(stario::IOException, RuntimeException, std::exception) { OControlModel::read(_rxInStream); osl::MutexGuard aGuard(m_aMutex); @@ -1693,7 +1693,7 @@ Any OBoundControlModel::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const return aDefault; } -void OBoundControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception) +void OBoundControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception, std::exception) { switch (nHandle) { @@ -1772,7 +1772,7 @@ void OBoundControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, co } // XPropertyChangeListener -void SAL_CALL OBoundControlModel::propertyChange( const PropertyChangeEvent& evt ) throw(RuntimeException) +void SAL_CALL OBoundControlModel::propertyChange( const PropertyChangeEvent& evt ) throw(RuntimeException, std::exception) { // if the DBColumn value changed, transfer it to the control if ( evt.PropertyName.equals( PROPERTY_VALUE ) ) @@ -1818,7 +1818,7 @@ void SAL_CALL OBoundControlModel::propertyChange( const PropertyChangeEvent& evt } } -void SAL_CALL OBoundControlModel::onRowSetChanged( const EventObject& /*i_Event*/ ) throw (RuntimeException) +void SAL_CALL OBoundControlModel::onRowSetChanged( const EventObject& /*i_Event*/ ) throw (RuntimeException, std::exception) { ControlModelLock aLock( *this ); FieldChangeNotifier aBoundFieldNotifier( aLock ); @@ -1838,17 +1838,17 @@ void SAL_CALL OBoundControlModel::onRowSetChanged( const EventObject& /*i_Event* } // XBoundComponent -void SAL_CALL OBoundControlModel::addUpdateListener(const Reference& _rxListener) throw(RuntimeException) +void SAL_CALL OBoundControlModel::addUpdateListener(const Reference& _rxListener) throw(RuntimeException, std::exception) { m_aUpdateListeners.addInterface(_rxListener); } -void SAL_CALL OBoundControlModel::removeUpdateListener(const Reference< XUpdateListener>& _rxListener) throw(RuntimeException) +void SAL_CALL OBoundControlModel::removeUpdateListener(const Reference< XUpdateListener>& _rxListener) throw(RuntimeException, std::exception) { m_aUpdateListeners.removeInterface(_rxListener); } -sal_Bool SAL_CALL OBoundControlModel::commit() throw(RuntimeException) +sal_Bool SAL_CALL OBoundControlModel::commit() throw(RuntimeException, std::exception) { ControlModelLock aLock( *this ); OSL_PRECOND( m_bCommitable, "OBoundControlModel::commit: invalid call (I'm not commitable !) " ); @@ -2064,7 +2064,7 @@ void OBoundControlModel::impl_disconnectDatabaseColumn_noNotify() } // XLoadListener -void SAL_CALL OBoundControlModel::loaded( const EventObject& _rEvent ) throw(RuntimeException) +void SAL_CALL OBoundControlModel::loaded( const EventObject& _rEvent ) throw(RuntimeException, std::exception) { ControlModelLock aLock( *this ); FieldChangeNotifier aBoundFieldNotifier( aLock ); @@ -2076,12 +2076,12 @@ void SAL_CALL OBoundControlModel::loaded( const EventObject& _rEvent ) throw(Run impl_connectDatabaseColumn_noNotify( false ); } -void SAL_CALL OBoundControlModel::unloaded( const com::sun::star::lang::EventObject& /*aEvent*/ ) throw(RuntimeException) +void SAL_CALL OBoundControlModel::unloaded( const com::sun::star::lang::EventObject& /*aEvent*/ ) throw(RuntimeException, std::exception) { OSL_PRECOND( !hasExternalValueBinding(), "OBoundControlModel::unloaded: we should never reach this with an external value binding!" ); } -void SAL_CALL OBoundControlModel::reloading( const com::sun::star::lang::EventObject& /*aEvent*/ ) throw(RuntimeException) +void SAL_CALL OBoundControlModel::reloading( const com::sun::star::lang::EventObject& /*aEvent*/ ) throw(RuntimeException, std::exception) { OSL_PRECOND( !hasExternalValueBinding(), "OBoundControlModel::reloading: we should never reach this with an external value binding!" ); if ( hasExternalValueBinding() ) @@ -2090,7 +2090,7 @@ void SAL_CALL OBoundControlModel::reloading( const com::sun::star::lang::EventOb m_bForwardValueChanges = sal_False; } -void SAL_CALL OBoundControlModel::unloading(const com::sun::star::lang::EventObject& /*aEvent*/) throw(RuntimeException) +void SAL_CALL OBoundControlModel::unloading(const com::sun::star::lang::EventObject& /*aEvent*/) throw(RuntimeException, std::exception) { ControlModelLock aLock( *this ); FieldChangeNotifier aBoundFieldNotifier( aLock ); @@ -2100,7 +2100,7 @@ void SAL_CALL OBoundControlModel::unloading(const com::sun::star::lang::EventObj impl_disconnectDatabaseColumn_noNotify(); } -void SAL_CALL OBoundControlModel::reloaded( const EventObject& _rEvent ) throw(RuntimeException) +void SAL_CALL OBoundControlModel::reloaded( const EventObject& _rEvent ) throw(RuntimeException, std::exception) { ControlModelLock aLock( *this ); FieldChangeNotifier aBoundFieldNotifier( aLock ); @@ -2223,17 +2223,17 @@ void OBoundControlModel::resetNoBroadcast() setControlValue( getDefaultForReset(), eOther ); } -void OBoundControlModel::addResetListener(const Reference& l) throw (RuntimeException) +void OBoundControlModel::addResetListener(const Reference& l) throw (RuntimeException, std::exception) { m_aResetHelper.addResetListener( l ); } -void OBoundControlModel::removeResetListener(const Reference& l) throw (RuntimeException) +void OBoundControlModel::removeResetListener(const Reference& l) throw (RuntimeException, std::exception) { m_aResetHelper.removeResetListener( l ); } -void OBoundControlModel::reset() throw (RuntimeException) +void OBoundControlModel::reset() throw (RuntimeException, std::exception) { if ( !m_aResetHelper.approveReset() ) return; @@ -2486,7 +2486,7 @@ void OBoundControlModel::disconnectExternalValueBinding( ) onDisconnectedExternalValue(); } -void SAL_CALL OBoundControlModel::setValueBinding( const Reference< XValueBinding >& _rxBinding ) throw (IncompatibleTypesException, RuntimeException) +void SAL_CALL OBoundControlModel::setValueBinding( const Reference< XValueBinding >& _rxBinding ) throw (IncompatibleTypesException, RuntimeException, std::exception) { 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 @@ -2512,7 +2512,7 @@ void SAL_CALL OBoundControlModel::setValueBinding( const Reference< XValueBindin connectExternalValueBinding( _rxBinding, aLock ); } -Reference< XValueBinding > SAL_CALL OBoundControlModel::getValueBinding( ) throw (RuntimeException) +Reference< XValueBinding > SAL_CALL OBoundControlModel::getValueBinding( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); OSL_PRECOND( m_bSupportsExternalBinding, "OBoundControlModel::getValueBinding: How did you reach this method?" ); @@ -2521,7 +2521,7 @@ Reference< XValueBinding > SAL_CALL OBoundControlModel::getValueBinding( ) thro return m_xExternalBinding; } -void SAL_CALL OBoundControlModel::modified( const EventObject& _rEvent ) throw ( RuntimeException ) +void SAL_CALL OBoundControlModel::modified( const EventObject& _rEvent ) throw ( RuntimeException, std::exception ) { ControlModelLock aLock( *this ); OSL_PRECOND( hasExternalValueBinding(), "OBoundControlModel::modified: Where did this come from?" ); @@ -2704,7 +2704,7 @@ void OBoundControlModel::disconnectValidator( ) onDisconnectedValidator( ); } -void SAL_CALL OBoundControlModel::setValidator( const Reference< XValidator >& _rxValidator ) throw (VetoException,RuntimeException) +void SAL_CALL OBoundControlModel::setValidator( const Reference< XValidator >& _rxValidator ) throw (VetoException,RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); OSL_PRECOND( m_bSupportsValidation, "OBoundControlModel::setValidator: How did you reach this method?" ); @@ -2730,7 +2730,7 @@ void SAL_CALL OBoundControlModel::setValidator( const Reference< XValidator >& _ connectValidator( _rxValidator ); } -Reference< XValidator > SAL_CALL OBoundControlModel::getValidator( ) throw (RuntimeException) +Reference< XValidator > SAL_CALL OBoundControlModel::getValidator( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); OSL_PRECOND( m_bSupportsValidation, "OBoundControlModel::getValidator: How did you reach this method?" ); @@ -2740,7 +2740,7 @@ Reference< XValidator > SAL_CALL OBoundControlModel::getValidator( ) throw (Run return m_xValidator; } -void SAL_CALL OBoundControlModel::validityConstraintChanged( const EventObject& /*Source*/ ) throw (RuntimeException) +void SAL_CALL OBoundControlModel::validityConstraintChanged( const EventObject& /*Source*/ ) throw (RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); OSL_PRECOND( m_bSupportsValidation, "OBoundControlModel::validityConstraintChanged: How did you reach this method?" ); @@ -2750,7 +2750,7 @@ void SAL_CALL OBoundControlModel::validityConstraintChanged( const EventObject& recheckValidity( false ); } -sal_Bool SAL_CALL OBoundControlModel::isValid( ) throw (RuntimeException) +sal_Bool SAL_CALL OBoundControlModel::isValid( ) throw (RuntimeException, std::exception) { return m_bIsCurrentValueValid; } @@ -2762,19 +2762,19 @@ sal_Bool SAL_CALL OBoundControlModel::isValid( ) throw (RuntimeException) return getControlValue(); } -Any SAL_CALL OBoundControlModel::getCurrentValue( ) throw (RuntimeException) +Any SAL_CALL OBoundControlModel::getCurrentValue( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return getCurrentFormComponentValue(); } -void SAL_CALL OBoundControlModel::addFormComponentValidityListener( const Reference< validation::XFormComponentValidityListener >& Listener ) throw (NullPointerException, RuntimeException) +void SAL_CALL OBoundControlModel::addFormComponentValidityListener( const Reference< validation::XFormComponentValidityListener >& Listener ) throw (NullPointerException, RuntimeException, std::exception) { if ( Listener.is() ) m_aFormComponentListeners.addInterface( Listener ); } -void SAL_CALL OBoundControlModel::removeFormComponentValidityListener( const Reference< validation::XFormComponentValidityListener >& Listener ) throw (NullPointerException, RuntimeException) +void SAL_CALL OBoundControlModel::removeFormComponentValidityListener( const Reference< validation::XFormComponentValidityListener >& Listener ) throw (NullPointerException, RuntimeException, std::exception) { if ( Listener.is() ) m_aFormComponentListeners.removeInterface( Listener ); diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index eb850260b2d0..ec4c7cd55b04 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -155,7 +155,7 @@ Sequence OFormattedControl::_getTypes() OBoundControl::_getTypes() ); } -Any SAL_CALL OFormattedControl::queryAggregation(const Type& _rType) throw (RuntimeException) +Any SAL_CALL OFormattedControl::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception) { Any aReturn = OBoundControl::queryAggregation(_rType); if (!aReturn.hasValue()) @@ -188,11 +188,11 @@ OFormattedControl::~OFormattedControl() } // XKeyListener -void OFormattedControl::disposing(const EventObject& _rSource) throw(RuntimeException) +void OFormattedControl::disposing(const EventObject& _rSource) throw(RuntimeException, std::exception) { OBoundControl::disposing(_rSource); } -void OFormattedControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) throw ( ::com::sun::star::uno::RuntimeException) +void OFormattedControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) throw ( ::com::sun::star::uno::RuntimeException, std::exception) { if( e.KeyCode != KEY_RETURN || e.Modifiers != 0 ) return; @@ -236,7 +236,7 @@ void OFormattedControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) thr OnKeyPressed) ); } -void OFormattedControl::keyReleased(const ::com::sun::star::awt::KeyEvent& /*e*/) throw ( ::com::sun::star::uno::RuntimeException) +void OFormattedControl::keyReleased(const ::com::sun::star::awt::KeyEvent& /*e*/) throw ( ::com::sun::star::uno::RuntimeException, std::exception) { } @@ -251,7 +251,7 @@ IMPL_LINK(OFormattedControl, OnKeyPressed, void*, /*EMPTYARG*/) return 0L; } -StringSequence OFormattedControl::getSupportedServiceNames() throw() +StringSequence OFormattedControl::getSupportedServiceNames() throw(std::exception) { StringSequence aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); @@ -260,7 +260,7 @@ StringSequence OFormattedControl::getSupportedServiceNames() throw() return aSupported; } -void OFormattedControl::setDesignMode(sal_Bool bOn) throw ( ::com::sun::star::uno::RuntimeException) +void OFormattedControl::setDesignMode(sal_Bool bOn) throw ( ::com::sun::star::uno::RuntimeException, std::exception) { OBoundControl::setDesignMode(bOn); } @@ -311,7 +311,7 @@ void SAL_CALL OFormattedModel::disposing() } // XServiceInfo -StringSequence OFormattedModel::getSupportedServiceNames() throw() +StringSequence OFormattedModel::getSupportedServiceNames() throw(std::exception) { StringSequence aSupported = OEditBaseModel::getSupportedServiceNames(); sal_Int32 nOldLen = aSupported.getLength(); @@ -329,7 +329,7 @@ StringSequence OFormattedModel::getSupportedServiceNames() throw() } // XAggregation -Any SAL_CALL OFormattedModel::queryAggregation(const Type& _rType) throw(RuntimeException) +Any SAL_CALL OFormattedModel::queryAggregation(const Type& _rType) throw(RuntimeException, std::exception) { Any aReturn = OEditBaseModel::queryAggregation( _rType ); return aReturn.hasValue() ? aReturn : OErrorBroadcaster::queryInterface( _rType ); @@ -345,7 +345,7 @@ Sequence< Type > OFormattedModel::_getTypes() } // XPersistObject -OUString SAL_CALL OFormattedModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OFormattedModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) { return OUString(FRM_COMPONENT_EDIT); } @@ -381,7 +381,7 @@ void OFormattedModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle) const OEditBaseModel::getFastPropertyValue(rValue, nHandle); } -void OFormattedModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) throw ( ::com::sun::star::uno::Exception) +void OFormattedModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) throw ( ::com::sun::star::uno::Exception, std::exception) { OEditBaseModel::setFastPropertyValue_NoBroadcast(nHandle, rValue); } @@ -405,7 +405,7 @@ void OFormattedModel::setPropertyToDefaultByHandle(sal_Int32 nHandle) OEditBaseModel::setPropertyToDefaultByHandle(nHandle); } -void OFormattedModel::setPropertyToDefault(const OUString& aPropertyName) throw( com::sun::star::beans::UnknownPropertyException, RuntimeException ) +void OFormattedModel::setPropertyToDefault(const OUString& aPropertyName) throw( com::sun::star::beans::UnknownPropertyException, RuntimeException, std::exception ) { OPropertyArrayAggregationHelper& rPH = m_aPropertyBagHelper.getInfoHelper(); sal_Int32 nHandle = rPH.getHandleByName( aPropertyName ); @@ -426,7 +426,7 @@ Any OFormattedModel::getPropertyDefaultByHandle( sal_Int32 nHandle ) const return OEditBaseModel::getPropertyDefaultByHandle(nHandle); } -Any SAL_CALL OFormattedModel::getPropertyDefault( const OUString& aPropertyName ) throw( com::sun::star::beans::UnknownPropertyException, RuntimeException ) +Any SAL_CALL OFormattedModel::getPropertyDefault( const OUString& aPropertyName ) throw( com::sun::star::beans::UnknownPropertyException, RuntimeException, std::exception ) { OPropertyArrayAggregationHelper& rPH = m_aPropertyBagHelper.getInfoHelper(); sal_Int32 nHandle = rPH.getHandleByName( aPropertyName ); @@ -539,7 +539,7 @@ Reference< XNumberFormatsSupplier > OFormattedModel::calcDefaultFormatsSupplier( } // XBoundComponent -void OFormattedModel::loaded(const EventObject& rEvent) throw ( ::com::sun::star::uno::RuntimeException) +void OFormattedModel::loaded(const EventObject& rEvent) throw ( ::com::sun::star::uno::RuntimeException, std::exception) { // 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 @@ -652,7 +652,7 @@ void OFormattedModel::onDisconnectedDbColumn() m_aNullDate = DBTypeConversion::getStandardDate(); } -void OFormattedModel::write(const Reference& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) +void OFormattedModel::write(const Reference& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { OEditBaseModel::write(_rxOutStream); _rxOutStream->writeShort(0x0003); @@ -738,7 +738,7 @@ void OFormattedModel::write(const Reference& _rxOutStream) } } -void OFormattedModel::read(const Reference& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) +void OFormattedModel::read(const Reference& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { OEditBaseModel::read(_rxInStream); sal_uInt16 nVersion = _rxInStream->readShort(); diff --git a/forms/source/component/FormattedField.hxx b/forms/source/component/FormattedField.hxx index eb274242cf46..3ae0df849404 100644 --- a/forms/source/component/FormattedField.hxx +++ b/forms/source/component/FormattedField.hxx @@ -62,36 +62,36 @@ class OFormattedModel virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes(); // XAggregation - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception); // OComponentHelper virtual void SAL_CALL disposing(); // XServiceInfo IMPLEMENTATION_NAME(OFormattedModel); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception); // XPersistObject - virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception); // XPropertySet virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const; virtual sal_Bool SAL_CALL convertFastPropertyValue(::com::sun::star::uno::Any& rConvertedValue, ::com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::lang::IllegalArgumentException); - virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue) throw ( ::com::sun::star::uno::Exception); + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue) throw ( ::com::sun::star::uno::Exception, std::exception); // XLoadListener - virtual void SAL_CALL loaded(const ::com::sun::star::lang::EventObject& rEvent) throw ( ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL loaded(const ::com::sun::star::lang::EventObject& rEvent) throw ( ::com::sun::star::uno::RuntimeException, std::exception); // XPropertyState void setPropertyToDefaultByHandle(sal_Int32 nHandle); ::com::sun::star::uno::Any getPropertyDefaultByHandle(sal_Int32 nHandle) const; - void SAL_CALL setPropertyToDefault(const OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + void SAL_CALL setPropertyToDefault(const OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); // OControlModel's property handling virtual void describeFixedProperties( @@ -152,23 +152,23 @@ class OFormattedModel virtual ~OFormattedControl(); DECLARE_UNO3_AGG_DEFAULTS(OFormattedControl, OBoundControl); - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes(); // ::com::sun::star::lang::XServiceInfo IMPLEMENTATION_NAME(OFormattedControl); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception); // ::com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::awt::XKeyListener - virtual void SAL_CALL keyPressed(const ::com::sun::star::awt::KeyEvent& e) throw ( ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL keyReleased(const ::com::sun::star::awt::KeyEvent& e) throw ( ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL keyPressed(const ::com::sun::star::awt::KeyEvent& e) throw ( ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL keyReleased(const ::com::sun::star::awt::KeyEvent& e) throw ( ::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::awt::XControl - virtual void SAL_CALL setDesignMode(sal_Bool bOn) throw ( ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setDesignMode(sal_Bool bOn) throw ( ::com::sun::star::uno::RuntimeException, std::exception); // disambiguation using OBoundControl::disposing; diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx index b48002f59c11..b30c53ec86c0 100644 --- a/forms/source/component/FormattedFieldWrapper.cxx +++ b/forms/source/component/FormattedFieldWrapper.cxx @@ -93,7 +93,7 @@ InterfaceRef OFormattedFieldWrapper::createFormattedFieldWrapper(const ::com::su return xRef; } -Reference< XCloneable > SAL_CALL OFormattedFieldWrapper::createClone() throw (RuntimeException) +Reference< XCloneable > SAL_CALL OFormattedFieldWrapper::createClone() throw (RuntimeException, std::exception) { ensureAggregate(); @@ -136,7 +136,7 @@ OFormattedFieldWrapper::~OFormattedFieldWrapper() } -Any SAL_CALL OFormattedFieldWrapper::queryAggregation(const Type& _rType) throw (RuntimeException) +Any SAL_CALL OFormattedFieldWrapper::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception) { Any aReturn; @@ -180,23 +180,23 @@ Any SAL_CALL OFormattedFieldWrapper::queryAggregation(const Type& _rType) throw return aReturn; } -OUString SAL_CALL OFormattedFieldWrapper::getServiceName() throw(RuntimeException) +OUString SAL_CALL OFormattedFieldWrapper::getServiceName() throw(RuntimeException, std::exception) { // return the old compatibility name for an EditModel return OUString(FRM_COMPONENT_EDIT); } -OUString SAL_CALL OFormattedFieldWrapper::getImplementationName( ) throw (RuntimeException) +OUString SAL_CALL OFormattedFieldWrapper::getImplementationName( ) throw (RuntimeException, std::exception) { return OUString("com.sun.star.comp.forms.OFormattedFieldWrapper"); } -sal_Bool SAL_CALL OFormattedFieldWrapper::supportsService( const OUString& _rServiceName ) throw (RuntimeException) +sal_Bool SAL_CALL OFormattedFieldWrapper::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > SAL_CALL OFormattedFieldWrapper::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > SAL_CALL OFormattedFieldWrapper::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { DBG_ASSERT(m_xAggregate.is(), "OFormattedFieldWrapper::getSupportedServiceNames: should never have made it 'til here without an aggregate!"); Reference< XServiceInfo > xSI; @@ -204,7 +204,7 @@ Sequence< OUString > SAL_CALL OFormattedFieldWrapper::getSupportedServiceNames( return xSI->getSupportedServiceNames(); } -void SAL_CALL OFormattedFieldWrapper::write(const Reference& _rxOutStream) throw( IOException, RuntimeException ) +void SAL_CALL OFormattedFieldWrapper::write(const Reference& _rxOutStream) throw( IOException, RuntimeException, std::exception ) { // can't write myself ensureAggregate(); @@ -243,7 +243,7 @@ void SAL_CALL OFormattedFieldWrapper::write(const Reference m_xFormattedPart->write(_rxOutStream); } -void SAL_CALL OFormattedFieldWrapper::read(const Reference& _rxInStream) throw( IOException, RuntimeException ) +void SAL_CALL OFormattedFieldWrapper::read(const Reference& _rxInStream) throw( IOException, RuntimeException, std::exception ) { SolarMutexGuard g; if (m_xAggregate.is()) diff --git a/forms/source/component/FormattedFieldWrapper.hxx b/forms/source/component/FormattedFieldWrapper.hxx index 7158b966c37c..f23a3e515304 100644 --- a/forms/source/component/FormattedFieldWrapper.hxx +++ b/forms/source/component/FormattedFieldWrapper.hxx @@ -66,20 +66,20 @@ protected: public: // UNO DECLARE_UNO3_AGG_DEFAULTS(OFormattedFieldWrapper, OWeakAggObject); - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XPersistObject - virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); // XCloneable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception); 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 d0c0ec648c6b..e91d68789f00 100644 --- a/forms/source/component/FormsCollection.cxx +++ b/forms/source/component/FormsCollection.cxx @@ -44,19 +44,19 @@ InterfaceRef SAL_CALL OFormsCollection_CreateInstance(const Reference SAL_CALL OFormsCollection::getImplementationId( ) throw(RuntimeException) +Sequence< sal_Int8 > SAL_CALL OFormsCollection::getImplementationId( ) throw(RuntimeException, std::exception) { return OImplementationIds::getImplementationId(getTypes()); } -Sequence SAL_CALL OFormsCollection::getTypes() throw(RuntimeException) +Sequence SAL_CALL OFormsCollection::getTypes() throw(RuntimeException, std::exception) { return concatSequences(OInterfaceContainer::getTypes(), FormsCollectionComponentBase::getTypes(), OFormsCollection_BASE::getTypes()); } @@ -88,7 +88,7 @@ OFormsCollection::~OFormsCollection() } -Any SAL_CALL OFormsCollection::queryAggregation(const Type& _rType) throw(RuntimeException) +Any SAL_CALL OFormsCollection::queryAggregation(const Type& _rType) throw(RuntimeException, std::exception) { Any aReturn = OFormsCollection_BASE::queryInterface(_rType); if (!aReturn.hasValue()) @@ -102,17 +102,17 @@ Any SAL_CALL OFormsCollection::queryAggregation(const Type& _rType) throw(Runtim return aReturn; } -OUString SAL_CALL OFormsCollection::getImplementationName() throw(RuntimeException) +OUString SAL_CALL OFormsCollection::getImplementationName() throw(RuntimeException, std::exception) { return OUString("com.sun.star.comp.forms.OFormsCollection"); } -sal_Bool SAL_CALL OFormsCollection::supportsService( const OUString& _rServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL OFormsCollection::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } -StringSequence SAL_CALL OFormsCollection::getSupportedServiceNames() throw(RuntimeException) +StringSequence SAL_CALL OFormsCollection::getSupportedServiceNames() throw(RuntimeException, std::exception) { StringSequence aReturn(2); @@ -123,7 +123,7 @@ StringSequence SAL_CALL OFormsCollection::getSupportedServiceNames() throw(Runti } // XCloneable -Reference< XCloneable > SAL_CALL OFormsCollection::createClone( ) throw (RuntimeException) +Reference< XCloneable > SAL_CALL OFormsCollection::createClone( ) throw (RuntimeException, std::exception) { OFormsCollection* pClone = new OFormsCollection( *this ); osl_atomic_increment( &pClone->m_refCount ); @@ -146,14 +146,14 @@ void OFormsCollection::disposing() //XChild -void OFormsCollection::setParent(const InterfaceRef& Parent) throw( NoSupportException, RuntimeException ) +void OFormsCollection::setParent(const InterfaceRef& Parent) throw( NoSupportException, RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); m_xParent = Parent; } -InterfaceRef OFormsCollection::getParent() throw( RuntimeException ) +InterfaceRef OFormsCollection::getParent() throw( RuntimeException, std::exception ) { return m_xParent; } diff --git a/forms/source/component/FormsCollection.hxx b/forms/source/component/FormsCollection.hxx index 9da3f3e22d15..6698ec61897d 100644 --- a/forms/source/component/FormsCollection.hxx +++ b/forms/source/component/FormsCollection.hxx @@ -59,126 +59,126 @@ public: public: DECLARE_UNO3_AGG_DEFAULTS(OFormsCollection, FormsCollectionComponentBase); - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception); // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XPersistObject - virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual StringSequence SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual StringSequence SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XCloneable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // OComponentHelper virtual void SAL_CALL disposing(); // ::com::sun::star::container::XChild - virtual ::comphelper::InterfaceRef SAL_CALL getParent() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setParent(const ::comphelper::InterfaceRef& Parent) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + virtual ::comphelper::InterfaceRef SAL_CALL getParent() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setParent(const ::comphelper::InterfaceRef& Parent) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception); // prevent method hiding using OInterfaceContainer::disposing; // inheritance ambiguity - virtual com::sun::star::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) + virtual com::sun::star::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) { return OInterfaceContainer::getElementType(); } - virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException) + virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) { return OInterfaceContainer::hasElements(); } virtual com::sun::star::uno::Any SAL_CALL getByName(const rtl::OUString& p1) throw (css::container::NoSuchElementException, - css::lang::WrappedTargetException, css::uno::RuntimeException) + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { return OInterfaceContainer::getByName(p1); } - virtual com::sun::star::uno::Sequence SAL_CALL getElementNames() throw (css::uno::RuntimeException) + virtual com::sun::star::uno::Sequence SAL_CALL getElementNames() throw (css::uno::RuntimeException, std::exception) { return OInterfaceContainer::getElementNames(); } - virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& p1) throw (css::uno::RuntimeException) + virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& p1) throw (css::uno::RuntimeException, std::exception) { return OInterfaceContainer::hasByName(p1); } virtual void SAL_CALL replaceByName(const rtl::OUString& p1, const com::sun::star::uno::Any& p2) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, - css::lang::WrappedTargetException, css::uno::RuntimeException) + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { OInterfaceContainer::replaceByName(p1, p2); } virtual void SAL_CALL insertByName(const rtl::OUString& p1, const com::sun::star::uno::Any& p2) throw (css::lang::IllegalArgumentException, css::container::ElementExistException, - css::lang::WrappedTargetException, css::uno::RuntimeException) + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { OInterfaceContainer::insertByName(p1, p2); } virtual void SAL_CALL removeByName(const rtl::OUString& p1) throw (css::container::NoSuchElementException, - css::lang::WrappedTargetException, css::uno::RuntimeException) + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { OInterfaceContainer::removeByName(p1); } - virtual sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) + virtual sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) { return OInterfaceContainer::getCount(); } virtual com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 p1) throw (css::lang::IndexOutOfBoundsException, - css::lang::WrappedTargetException, css::uno::RuntimeException) + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { return OInterfaceContainer::getByIndex(p1); } virtual void SAL_CALL replaceByIndex(sal_Int32 p1, const com::sun::star::uno::Any& p2) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, - css::lang::WrappedTargetException, css::uno::RuntimeException) + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { return OInterfaceContainer::replaceByIndex(p1, p2); } virtual void SAL_CALL insertByIndex(sal_Int32 p1, const com::sun::star::uno::Any& p2) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, - css::lang::WrappedTargetException, css::uno::RuntimeException) + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { return OInterfaceContainer::insertByIndex(p1, p2); } virtual void SAL_CALL removeByIndex(sal_Int32 p1) throw (css::lang::IndexOutOfBoundsException, - css::lang::WrappedTargetException, css::uno::RuntimeException) + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { return OInterfaceContainer::removeByIndex(p1); } - virtual com::sun::star::uno::Reference SAL_CALL createEnumeration() throw (css::uno::RuntimeException) + virtual com::sun::star::uno::Reference SAL_CALL createEnumeration() throw (css::uno::RuntimeException, std::exception) { return OInterfaceContainer::createEnumeration(); } virtual void SAL_CALL registerScriptEvent(sal_Int32 p1, const com::sun::star::script::ScriptEventDescriptor& p2) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { OInterfaceContainer::registerScriptEvent(p1, p2); } virtual void SAL_CALL registerScriptEvents(sal_Int32 p1, const com::sun::star::uno::Sequence& p2) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { 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) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { OInterfaceContainer::revokeScriptEvent(p1, p2, p3, p4); } virtual void SAL_CALL revokeScriptEvents(sal_Int32 p1) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { OInterfaceContainer::revokeScriptEvents(p1); } virtual void SAL_CALL insertEntry(sal_Int32 p1) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { OInterfaceContainer::insertEntry(p1); } virtual void SAL_CALL removeEntry(sal_Int32 p1) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { OInterfaceContainer::removeEntry(p1); } virtual com::sun::star::uno::Sequence SAL_CALL getScriptEvents(sal_Int32 p1) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { return OInterfaceContainer::getScriptEvents(p1); } virtual void SAL_CALL attach(sal_Int32 p1, const com::sun::star::uno::Reference& p2, const com::sun::star::uno::Any& p3) throw (css::lang::IllegalArgumentException, css::lang::ServiceNotRegisteredException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { OInterfaceContainer::attach(p1, p2, p3); } virtual void SAL_CALL detach(sal_Int32 p1, const com::sun::star::uno::Reference& p2) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { OInterfaceContainer::detach(p1, p2); } virtual void SAL_CALL addScriptListener(const com::sun::star::uno::Reference& p1) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { OInterfaceContainer::addScriptListener(p1); } virtual void SAL_CALL removeScriptListener(const com::sun::star::uno::Reference& p1) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { OInterfaceContainer::removeScriptListener(p1); } - virtual void SAL_CALL dispose() throw (css::uno::RuntimeException) + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) { FormsCollectionComponentBase::dispose(); } - virtual void SAL_CALL addEventListener(const com::sun::star::uno::Reference& p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL addEventListener(const com::sun::star::uno::Reference& p1) throw (css::uno::RuntimeException, std::exception) { FormsCollectionComponentBase::addEventListener(p1); } - virtual void SAL_CALL removeEventListener(const com::sun::star::uno::Reference& p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL removeEventListener(const com::sun::star::uno::Reference& p1) throw (css::uno::RuntimeException, std::exception) { FormsCollectionComponentBase::removeEventListener(p1); } - virtual void SAL_CALL addContainerListener(const com::sun::star::uno::Reference& p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL addContainerListener(const com::sun::star::uno::Reference& p1) throw (css::uno::RuntimeException, std::exception) { OInterfaceContainer::addContainerListener(p1); } - virtual void SAL_CALL removeContainerListener(const com::sun::star::uno::Reference& p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL removeContainerListener(const com::sun::star::uno::Reference& p1) throw (css::uno::RuntimeException, std::exception) { OInterfaceContainer::removeContainerListener(p1); } }; diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx index 4275ef5a02fc..7d4abec36133 100644 --- a/forms/source/component/Grid.cxx +++ b/forms/source/component/Grid.cxx @@ -120,7 +120,7 @@ OGridControlModel::~OGridControlModel() } // XCloneable -Reference< XCloneable > SAL_CALL OGridControlModel::createClone( ) throw (RuntimeException) +Reference< XCloneable > SAL_CALL OGridControlModel::createClone( ) throw (RuntimeException, std::exception) { OGridControlModel* pClone = new OGridControlModel( this, getContext() ); osl_atomic_increment( &pClone->m_refCount ); @@ -164,7 +164,7 @@ void OGridControlModel::cloneColumns( const OGridControlModel* _pOriginalContain } // XServiceInfo -StringSequence OGridControlModel::getSupportedServiceNames() throw(RuntimeException) +StringSequence OGridControlModel::getSupportedServiceNames() throw(RuntimeException, std::exception) { StringSequence aSupported = OControlModel::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); @@ -172,7 +172,7 @@ StringSequence OGridControlModel::getSupportedServiceNames() throw(RuntimeExcept aSupported[aSupported.getLength()-1] = FRM_SUN_COMPONENT_GRIDCONTROL; return aSupported; } -Any SAL_CALL OGridControlModel::queryAggregation( const Type& _rType ) throw (RuntimeException) +Any SAL_CALL OGridControlModel::queryAggregation( const Type& _rType ) throw (RuntimeException, std::exception) { Any aReturn = OGridControlModel_BASE::queryInterface(_rType); if ( !aReturn.hasValue() ) @@ -189,36 +189,36 @@ Any SAL_CALL OGridControlModel::queryAggregation( const Type& _rType ) throw (Ru } // XSQLErrorListener -void SAL_CALL OGridControlModel::errorOccured( const SQLErrorEvent& _rEvent ) throw (RuntimeException) +void SAL_CALL OGridControlModel::errorOccured( const SQLErrorEvent& _rEvent ) throw (RuntimeException, std::exception) { // forward the errors which happened to my columns to my own listeners onError( _rEvent ); } // XRowSetSupplier -Reference< XRowSet > SAL_CALL OGridControlModel::getRowSet( ) throw (RuntimeException) +Reference< XRowSet > SAL_CALL OGridControlModel::getRowSet( ) throw (RuntimeException, std::exception) { return Reference< XRowSet >( getParent(), UNO_QUERY ); } -void SAL_CALL OGridControlModel::setRowSet( const Reference< XRowSet >& /*_rxDataSource*/ ) throw (RuntimeException) +void SAL_CALL OGridControlModel::setRowSet( const Reference< XRowSet >& /*_rxDataSource*/ ) throw (RuntimeException, std::exception) { OSL_FAIL( "OGridControlModel::setRowSet: not supported!" ); } -void SAL_CALL OGridControlModel::addRowSetChangeListener( const Reference< XRowSetChangeListener >& i_Listener ) throw (RuntimeException) +void SAL_CALL OGridControlModel::addRowSetChangeListener( const Reference< XRowSetChangeListener >& i_Listener ) throw (RuntimeException, std::exception) { if ( i_Listener.is() ) m_aRowSetChangeListeners.addInterface( i_Listener ); } -void SAL_CALL OGridControlModel::removeRowSetChangeListener( const Reference< XRowSetChangeListener >& i_Listener ) throw (RuntimeException) +void SAL_CALL OGridControlModel::removeRowSetChangeListener( const Reference< XRowSetChangeListener >& i_Listener ) throw (RuntimeException, std::exception) { m_aRowSetChangeListeners.removeInterface( i_Listener ); } // XChild -void SAL_CALL OGridControlModel::setParent( const InterfaceRef& i_Parent ) throw(NoSupportException, RuntimeException) +void SAL_CALL OGridControlModel::setParent( const InterfaceRef& i_Parent ) throw(NoSupportException, RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); if ( i_Parent == getParent() ) @@ -228,7 +228,7 @@ void SAL_CALL OGridControlModel::setParent( const InterfaceRef& i_Parent ) throw aGuard.clear(); m_aRowSetChangeListeners.notifyEach( &XRowSetChangeListener::onRowSetChanged, aEvent ); } -Sequence< Type > SAL_CALL OGridControlModel::getTypes( ) throw(RuntimeException) +Sequence< Type > SAL_CALL OGridControlModel::getTypes( ) throw(RuntimeException, std::exception) { return concatSequences( concatSequences( @@ -254,14 +254,14 @@ void OGridControlModel::disposing() } // XEventListener -void OGridControlModel::disposing(const EventObject& _rEvent) throw( RuntimeException ) +void OGridControlModel::disposing(const EventObject& _rEvent) throw( RuntimeException, std::exception ) { OControlModel::disposing( _rEvent ); OInterfaceContainer::disposing( _rEvent ); } // XSelectionSupplier -sal_Bool SAL_CALL OGridControlModel::select(const Any& rElement) throw(IllegalArgumentException, RuntimeException) +sal_Bool SAL_CALL OGridControlModel::select(const Any& rElement) throw(IllegalArgumentException, RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); Reference xSel; @@ -291,23 +291,23 @@ sal_Bool SAL_CALL OGridControlModel::select(const Any& rElement) throw(IllegalAr } return sal_False; } -Any SAL_CALL OGridControlModel::getSelection() throw(RuntimeException) +Any SAL_CALL OGridControlModel::getSelection() throw(RuntimeException, std::exception) { return makeAny(m_xSelection); } -void OGridControlModel::addSelectionChangeListener(const Reference< XSelectionChangeListener >& _rxListener) throw( RuntimeException ) +void OGridControlModel::addSelectionChangeListener(const Reference< XSelectionChangeListener >& _rxListener) throw( RuntimeException, std::exception ) { m_aSelectListeners.addInterface(_rxListener); } -void OGridControlModel::removeSelectionChangeListener(const Reference< XSelectionChangeListener >& _rxListener) throw( RuntimeException ) +void OGridControlModel::removeSelectionChangeListener(const Reference< XSelectionChangeListener >& _rxListener) throw( RuntimeException, std::exception ) { m_aSelectListeners.removeInterface(_rxListener); } // XGridColumnFactory -Reference SAL_CALL OGridControlModel::createColumn(const OUString& ColumnType) throw ( :: com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +Reference SAL_CALL OGridControlModel::createColumn(const OUString& ColumnType) throw ( :: com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard g; const Sequence< OUString >& rColumnTypes = frm::getColumnTypes(); @@ -334,13 +334,13 @@ Reference OGridControlModel::createColumn(sal_Int32 nTypeId) cons } return xReturn; } -StringSequence SAL_CALL OGridControlModel::getColumnTypes() throw ( ::com::sun::star::uno::RuntimeException) +StringSequence SAL_CALL OGridControlModel::getColumnTypes() throw ( ::com::sun::star::uno::RuntimeException, std::exception) { return frm::getColumnTypes(); } // XReset -void SAL_CALL OGridControlModel::reset() throw ( ::com::sun::star::uno::RuntimeException) +void SAL_CALL OGridControlModel::reset() throw ( ::com::sun::star::uno::RuntimeException, std::exception) { ::cppu::OInterfaceIteratorHelper aIter(m_aResetListeners); EventObject aEvt(static_cast(this)); @@ -353,11 +353,11 @@ void SAL_CALL OGridControlModel::reset() throw ( ::com::sun::star::uno::RuntimeE m_aResetListeners.notifyEach( &XResetListener::resetted, aEvt ); } } -void SAL_CALL OGridControlModel::addResetListener(const Reference& _rxListener) throw ( ::com::sun::star::uno::RuntimeException) +void SAL_CALL OGridControlModel::addResetListener(const Reference& _rxListener) throw ( ::com::sun::star::uno::RuntimeException, std::exception) { m_aResetListeners.addInterface(_rxListener); } -void SAL_CALL OGridControlModel::removeResetListener(const Reference& _rxListener) throw ( ::com::sun::star::uno::RuntimeException) +void SAL_CALL OGridControlModel::removeResetListener(const Reference& _rxListener) throw ( ::com::sun::star::uno::RuntimeException, std::exception) { m_aResetListeners.removeInterface(_rxListener); } @@ -568,7 +568,7 @@ sal_Bool OGridControlModel::convertFastPropertyValue( Any& rConvertedValue, Any& } return bModified; } -void OGridControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw ( ::com::sun::star::uno::Exception) +void OGridControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw ( ::com::sun::star::uno::Exception, std::exception) { switch (nHandle) { @@ -760,12 +760,12 @@ void OGridControlModel::approveNewElement( const Reference< XPropertySet >& _rxO } // XPersistObject -OUString SAL_CALL OGridControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OGridControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) { return OUString(FRM_COMPONENT_GRID); // old (non-sun) name for compatibility! } -void OGridControlModel::write(const Reference& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) +void OGridControlModel::write(const Reference& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { OControlModel::write(_rxOutStream); Reference xMark(_rxOutStream, UNO_QUERY); @@ -858,7 +858,7 @@ void OGridControlModel::write(const Reference& _rxOutStream _rxOutStream->writeLong(getINT32(m_aBackgroundColor)); } -void OGridControlModel::read(const Reference& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) +void OGridControlModel::read(const Reference& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard g; OControlModel::read(_rxInStream); diff --git a/forms/source/component/Grid.hxx b/forms/source/component/Grid.hxx index a5b963394571..90ab975690f8 100644 --- a/forms/source/component/Grid.hxx +++ b/forms/source/component/Grid.hxx @@ -104,64 +104,64 @@ public: // UNO Anbindung DECLARE_UNO3_AGG_DEFAULTS(OGridControlModel, OControlModel); - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XChild - virtual void SAL_CALL setParent(const InterfaceRef& Parent) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setParent(const InterfaceRef& Parent) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo IMPLEMENTATION_NAME(OGridControlModel); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // OComponentHelper virtual void SAL_CALL disposing(); // XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException, std::exception); // XReset - virtual void SAL_CALL reset() throw ( ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addResetListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener>& _rxListener) throw ( ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeResetListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener>& _rxListener) throw ( ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL reset() throw ( ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addResetListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener>& _rxListener) throw ( ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeResetListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener>& _rxListener) throw ( ::com::sun::star::uno::RuntimeException, std::exception); // XSelectionSupplier - virtual sal_Bool SAL_CALL select(const ::com::sun::star::uno::Any& aElement) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getSelection() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addSelectionChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeSelectionChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL select(const ::com::sun::star::uno::Any& aElement) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getSelection() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addSelectionChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeSelectionChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener) throw(::com::sun::star::uno::RuntimeException, std::exception); // XGridColumnFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> SAL_CALL createColumn(const OUString& ColumnType) throw ( :: com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual StringSequence SAL_CALL getColumnTypes() throw ( ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> SAL_CALL createColumn(const OUString& ColumnType) throw ( :: com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual StringSequence SAL_CALL getColumnTypes() throw ( ::com::sun::star::uno::RuntimeException, std::exception); // XPersistObject - virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); // XPropertySet virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const; virtual sal_Bool SAL_CALL convertFastPropertyValue(::com::sun::star::uno::Any& rConvertedValue, ::com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::lang::IllegalArgumentException); - virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue) throw ( ::com::sun::star::uno::Exception); + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue) throw ( ::com::sun::star::uno::Exception, std::exception); // XPropertyState virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const; // XSQLErrorListener - virtual void SAL_CALL errorOccured( const ::com::sun::star::sdb::SQLErrorEvent& _rEvent ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL errorOccured( const ::com::sun::star::sdb::SQLErrorEvent& _rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XRowSetSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > SAL_CALL getRowSet( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setRowSet( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xDataSource ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > SAL_CALL getRowSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setRowSet( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xDataSource ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XRowSetChangeBroadcaster - virtual void SAL_CALL addRowSetChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XRowSetChangeListener >& i_Listener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeRowSetChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XRowSetChangeListener >& i_Listener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addRowSetChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XRowSetChangeListener >& i_Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeRowSetChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XRowSetChangeListener >& i_Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception); // OControlModel's property handling virtual void describeFixedProperties( diff --git a/forms/source/component/GroupBox.cxx b/forms/source/component/GroupBox.cxx index e5afd4154c48..7bd8cd023a8d 100644 --- a/forms/source/component/GroupBox.cxx +++ b/forms/source/component/GroupBox.cxx @@ -65,7 +65,7 @@ OGroupBoxModel::OGroupBoxModel( const OGroupBoxModel* _pOriginal, const Referenc // XServiceInfo -StringSequence SAL_CALL OGroupBoxModel::getSupportedServiceNames() throw(RuntimeException) +StringSequence SAL_CALL OGroupBoxModel::getSupportedServiceNames() throw(RuntimeException, std::exception) { StringSequence aSupported = OControlModel::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); @@ -92,14 +92,14 @@ void OGroupBoxModel::describeAggregateProperties( Sequence< Property >& _rAggreg } -OUString SAL_CALL OGroupBoxModel::getServiceName() throw(RuntimeException) +OUString SAL_CALL OGroupBoxModel::getServiceName() throw(RuntimeException, std::exception) { return OUString(FRM_COMPONENT_GROUPBOX); // old (non-sun) name for compatibility ! } void SAL_CALL OGroupBoxModel::write(const Reference< XObjectOutputStream>& _rxOutStream) - throw(IOException, RuntimeException) + throw(IOException, RuntimeException, std::exception) { OControlModel::write(_rxOutStream); @@ -109,7 +109,7 @@ void SAL_CALL OGroupBoxModel::write(const Reference< XObjectOutputStream>& _rxOu } -void SAL_CALL OGroupBoxModel::read(const Reference< XObjectInputStream>& _rxInStream) throw(IOException, RuntimeException) +void SAL_CALL OGroupBoxModel::read(const Reference< XObjectInputStream>& _rxInStream) throw(IOException, RuntimeException, std::exception) { OControlModel::read( _rxInStream ); @@ -144,7 +144,7 @@ OGroupBoxControl::OGroupBoxControl(const Reference& _rxFactor } -StringSequence SAL_CALL OGroupBoxControl::getSupportedServiceNames() throw(RuntimeException) +StringSequence SAL_CALL OGroupBoxControl::getSupportedServiceNames() throw(RuntimeException, std::exception) { StringSequence aSupported = OControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); diff --git a/forms/source/component/GroupBox.hxx b/forms/source/component/GroupBox.hxx index d5f9f88f431e..7c97e931bad4 100644 --- a/forms/source/component/GroupBox.hxx +++ b/forms/source/component/GroupBox.hxx @@ -37,14 +37,14 @@ public: // XServiceInfo IMPLEMENTATION_NAME(OGroupBoxModel); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); // XPersistObject - virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL - write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL - read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); // OControlModel's property handling virtual void describeAggregateProperties( @@ -65,7 +65,7 @@ public: // XServiceInfo IMPLEMENTATION_NAME(OGroupBoxControl); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); }; //......................................................................... diff --git a/forms/source/component/GroupManager.cxx b/forms/source/component/GroupManager.cxx index 7a90ed5804b8..1f7c5a3e9ff2 100644 --- a/forms/source/component/GroupManager.cxx +++ b/forms/source/component/GroupManager.cxx @@ -236,7 +236,7 @@ OGroupManager::~OGroupManager() } // XPropertyChangeListener -void OGroupManager::disposing(const EventObject& evt) throw( RuntimeException ) +void OGroupManager::disposing(const EventObject& evt) throw( RuntimeException, std::exception ) { Reference xContainer(evt.Source, UNO_QUERY); if (xContainer.get() == m_xContainer.get()) @@ -289,7 +289,7 @@ void OGroupManager::removeFromGroupMap(const OUString& _sGroupName,const Referen _xSet->removePropertyChangeListener( PROPERTY_TABINDEX, this ); } -void SAL_CALL OGroupManager::propertyChange(const PropertyChangeEvent& evt) throw ( ::com::sun::star::uno::RuntimeException) +void SAL_CALL OGroupManager::propertyChange(const PropertyChangeEvent& evt) throw ( ::com::sun::star::uno::RuntimeException, std::exception) { Reference xSet(evt.Source, UNO_QUERY); @@ -320,7 +320,7 @@ void SAL_CALL OGroupManager::propertyChange(const PropertyChangeEvent& evt) thro } // XContainerListener -void SAL_CALL OGroupManager::elementInserted(const ContainerEvent& Event) throw ( ::com::sun::star::uno::RuntimeException) +void SAL_CALL OGroupManager::elementInserted(const ContainerEvent& Event) throw ( ::com::sun::star::uno::RuntimeException, std::exception) { Reference< XPropertySet > xProps; Event.Element >>= xProps; @@ -328,7 +328,7 @@ void SAL_CALL OGroupManager::elementInserted(const ContainerEvent& Event) throw InsertElement( xProps ); } -void SAL_CALL OGroupManager::elementRemoved(const ContainerEvent& Event) throw ( ::com::sun::star::uno::RuntimeException) +void SAL_CALL OGroupManager::elementRemoved(const ContainerEvent& Event) throw ( ::com::sun::star::uno::RuntimeException, std::exception) { Reference xProps; Event.Element >>= xProps; @@ -336,7 +336,7 @@ void SAL_CALL OGroupManager::elementRemoved(const ContainerEvent& Event) throw ( RemoveElement( xProps ); } -void SAL_CALL OGroupManager::elementReplaced(const ContainerEvent& Event) throw ( ::com::sun::star::uno::RuntimeException) +void SAL_CALL OGroupManager::elementReplaced(const ContainerEvent& Event) throw ( ::com::sun::star::uno::RuntimeException, std::exception) { Reference xProps; Event.ReplacedElement >>= xProps; diff --git a/forms/source/component/GroupManager.hxx b/forms/source/component/GroupManager.hxx index e682194c208b..dc0e24ba32ab 100644 --- a/forms/source/component/GroupManager.hxx +++ b/forms/source/component/GroupManager.hxx @@ -194,15 +194,15 @@ public: virtual ~OGroupManager(); // ::com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::beans::XPropertyChangeListener - virtual void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw ( ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw ( ::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::container::XContainerListener - virtual void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& _rEvent) throw ( ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& _rEvent) throw ( ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& _rEvent) throw ( ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& _rEvent) throw ( ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& _rEvent) throw ( ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& _rEvent) throw ( ::com::sun::star::uno::RuntimeException, std::exception); // Other functions sal_Int32 getGroupCount(); diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx index 31d506ee057c..b5be554449a7 100644 --- a/forms/source/component/Hidden.cxx +++ b/forms/source/component/Hidden.cxx @@ -81,7 +81,7 @@ void OHiddenModel::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) const } -void OHiddenModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw (com::sun::star::uno::Exception) +void OHiddenModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw (com::sun::star::uno::Exception, std::exception) { switch (_nHandle) { @@ -125,7 +125,7 @@ void OHiddenModel::describeFixedProperties( Sequence< Property >& _rProps ) cons // XServiceInfo -StringSequence SAL_CALL OHiddenModel::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) +StringSequence SAL_CALL OHiddenModel::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) { StringSequence aSupported( 2 ); aSupported[ 0 ] = FRM_SUN_COMPONENT_HIDDENCONTROL; @@ -134,14 +134,14 @@ StringSequence SAL_CALL OHiddenModel::getSupportedServiceNames() throw(::com::su } -OUString SAL_CALL OHiddenModel::getServiceName() throw(RuntimeException) +OUString SAL_CALL OHiddenModel::getServiceName() throw(RuntimeException, std::exception) { return OUString(FRM_COMPONENT_HIDDEN); // old (non-sun) name for compatibility ! } void SAL_CALL OHiddenModel::write(const Reference& _rxOutStream) - throw(IOException, RuntimeException) + throw(IOException, RuntimeException, std::exception) { // Version _rxOutStream->writeShort(0x0002); @@ -153,7 +153,7 @@ void SAL_CALL OHiddenModel::write(const Reference& _rxOutSt } -void SAL_CALL OHiddenModel::read(const Reference& _rxInStream) throw(IOException, RuntimeException) +void SAL_CALL OHiddenModel::read(const Reference& _rxInStream) throw(IOException, RuntimeException, std::exception) { // Version sal_uInt16 nVersion = _rxInStream->readShort(); diff --git a/forms/source/component/Hidden.hxx b/forms/source/component/Hidden.hxx index 5452ece3565c..5930412a972a 100644 --- a/forms/source/component/Hidden.hxx +++ b/forms/source/component/Hidden.hxx @@ -40,21 +40,21 @@ public: // OPropertySetHelper virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception); + throw (::com::sun::star::uno::Exception, std::exception); virtual sal_Bool SAL_CALL convertFastPropertyValue( ::com::sun::star::uno::Any& _rConvertedValue, ::com::sun::star::uno::Any& _rOldValue, sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::lang::IllegalArgumentException); // XServiceInfo IMPLEMENTATION_NAME(OHiddenModel); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); // XPersistObject - virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL - write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL - read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); // OControlModel's property handling virtual void describeFixedProperties( diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx index 3c60460c7e71..120d3dac5506 100644 --- a/forms/source/component/ImageButton.cxx +++ b/forms/source/component/ImageButton.cxx @@ -66,7 +66,7 @@ OImageButtonModel::~OImageButtonModel() } // XServiceInfo -StringSequence OImageButtonModel::getSupportedServiceNames() throw() +StringSequence OImageButtonModel::getSupportedServiceNames() throw(std::exception) { StringSequence aSupported = OClickableImageBaseModel::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); @@ -87,12 +87,12 @@ void OImageButtonModel::describeFixedProperties( Sequence< Property >& _rProps ) END_DESCRIBE_PROPERTIES(); } -OUString OImageButtonModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) +OUString OImageButtonModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) { return OUString(FRM_COMPONENT_IMAGEBUTTON); // old (non-sun) name for compatibility ! } -void OImageButtonModel::write(const Reference& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) +void OImageButtonModel::write(const Reference& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { OControlModel::write(_rxOutStream); @@ -106,7 +106,7 @@ void OImageButtonModel::write(const Reference& _rxOutStream writeHelpTextCompatibly(_rxOutStream); } -void OImageButtonModel::read(const Reference& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) +void OImageButtonModel::read(const Reference& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { OControlModel::read(_rxInStream); @@ -159,7 +159,7 @@ Sequence OImageButtonControl::_getTypes() return aTypes; } -StringSequence OImageButtonControl::getSupportedServiceNames() throw() +StringSequence OImageButtonControl::getSupportedServiceNames() throw(std::exception) { StringSequence aSupported = OClickableImageBaseControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); @@ -184,7 +184,7 @@ OImageButtonControl::OImageButtonControl(const Reference& _rx } // UNO Anbindung -Any SAL_CALL OImageButtonControl::queryAggregation(const Type& _rType) throw (RuntimeException) +Any SAL_CALL OImageButtonControl::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception) { Any aReturn = OClickableImageBaseControl::queryAggregation(_rType); if (!aReturn.hasValue()) @@ -193,7 +193,7 @@ Any SAL_CALL OImageButtonControl::queryAggregation(const Type& _rType) throw (Ru return aReturn; } -void OImageButtonControl::mousePressed(const awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException) +void OImageButtonControl::mousePressed(const awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -216,15 +216,15 @@ void OImageButtonControl::mousePressed(const awt::MouseEvent& e) throw ( ::com:: } } -void SAL_CALL OImageButtonControl::mouseReleased(const awt::MouseEvent& /*e*/) throw ( RuntimeException) +void SAL_CALL OImageButtonControl::mouseReleased(const awt::MouseEvent& /*e*/) throw ( RuntimeException, std::exception) { } -void SAL_CALL OImageButtonControl::mouseEntered(const awt::MouseEvent& /*e*/) throw ( RuntimeException) +void SAL_CALL OImageButtonControl::mouseEntered(const awt::MouseEvent& /*e*/) throw ( RuntimeException, std::exception) { } -void SAL_CALL OImageButtonControl::mouseExited(const awt::MouseEvent& /*e*/) throw ( RuntimeException) +void SAL_CALL OImageButtonControl::mouseExited(const awt::MouseEvent& /*e*/) throw ( RuntimeException, std::exception) { } diff --git a/forms/source/component/ImageButton.hxx b/forms/source/component/ImageButton.hxx index 32467b4dba13..ad114e7a368c 100644 --- a/forms/source/component/ImageButton.hxx +++ b/forms/source/component/ImageButton.hxx @@ -39,12 +39,12 @@ public: // ::com::sun::star::lang::XServiceInfo IMPLEMENTATION_NAME(OImageButtonModel); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception); // ::com::sun::star::io::XPersistObject - virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); // OControlModel's property handling virtual void describeFixedProperties( @@ -71,21 +71,21 @@ public: // XServiceInfo IMPLEMENTATION_NAME(OImageButtonControl); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception); // UNO Anbindung DECLARE_UNO3_AGG_DEFAULTS(OImageButtonControl, OClickableImageBaseControl); - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception); // XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException, std::exception) { OControl::disposing(_rSource); } // XMouseListener - virtual void SAL_CALL mousePressed(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL mouseReleased(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL mouseEntered(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL mouseExited(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL mousePressed(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL mouseReleased(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL mouseEntered(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL mouseExited(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException, std::exception); // prevent method hiding using OClickableImageBaseControl::disposing; diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index 3df259e1dc76..58a47d9c9ccb 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -198,7 +198,7 @@ IMPLEMENT_DEFAULT_CLONING( OImageControlModel ) // XServiceInfo -StringSequence OImageControlModel::getSupportedServiceNames() throw() +StringSequence OImageControlModel::getSupportedServiceNames() throw(std::exception) { StringSequence aSupported = OBoundControlModel::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); @@ -209,7 +209,7 @@ StringSequence OImageControlModel::getSupportedServiceNames() throw() } -Any SAL_CALL OImageControlModel::queryAggregation(const Type& _rType) throw (RuntimeException) +Any SAL_CALL OImageControlModel::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception) { // Order matters: we want to "override" the XImageProducer interface of the aggregate without // own XImageProducer interface, thus we need to query OImageControlModel_Base first @@ -251,7 +251,7 @@ void OImageControlModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle) co } -void OImageControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) throw ( ::com::sun::star::uno::Exception) +void OImageControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) throw ( ::com::sun::star::uno::Exception, std::exception) { switch (nHandle) { @@ -353,13 +353,13 @@ void OImageControlModel::describeAggregateProperties( Sequence< Property >& /* [ } -OUString OImageControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) +OUString OImageControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) { return OUString(FRM_COMPONENT_IMAGECONTROL); // old (non-sun) name for compatibility ! } -void OImageControlModel::write(const Reference& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) +void OImageControlModel::write(const Reference& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { // Base class OBoundControlModel::write(_rxOutStream); @@ -373,7 +373,7 @@ void OImageControlModel::write(const Reference& _rxOutStrea } -void OImageControlModel::read(const Reference& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) +void OImageControlModel::read(const Reference& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { OBoundControlModel::read(_rxInStream); @@ -650,25 +650,25 @@ void OImageControlModel::resetNoBroadcast() } -Reference< XImageProducer > SAL_CALL OImageControlModel::getImageProducer() throw ( RuntimeException) +Reference< XImageProducer > SAL_CALL OImageControlModel::getImageProducer() throw ( RuntimeException, std::exception) { return this; } -void SAL_CALL OImageControlModel::addConsumer( const Reference< XImageConsumer >& _rxConsumer ) throw (RuntimeException) +void SAL_CALL OImageControlModel::addConsumer( const Reference< XImageConsumer >& _rxConsumer ) throw (RuntimeException, std::exception) { GetImageProducer()->addConsumer( _rxConsumer ); } -void SAL_CALL OImageControlModel::removeConsumer( const Reference< XImageConsumer >& _rxConsumer ) throw (RuntimeException) +void SAL_CALL OImageControlModel::removeConsumer( const Reference< XImageConsumer >& _rxConsumer ) throw (RuntimeException, std::exception) { GetImageProducer()->removeConsumer( _rxConsumer ); } -void SAL_CALL OImageControlModel::startProduction( ) throw (RuntimeException) +void SAL_CALL OImageControlModel::startProduction( ) throw (RuntimeException, std::exception) { GetImageProducer()->startProduction(); } @@ -726,7 +726,7 @@ OImageControlControl::OImageControlControl(const Reference& _ } -Any SAL_CALL OImageControlControl::queryAggregation(const Type& _rType) throw (RuntimeException) +Any SAL_CALL OImageControlControl::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception) { Any aReturn = OBoundControl::queryAggregation( _rType ); if ( !aReturn.hasValue() ) @@ -740,7 +740,7 @@ Any SAL_CALL OImageControlControl::queryAggregation(const Type& _rType) throw (R } -StringSequence OImageControlControl::getSupportedServiceNames() throw() +StringSequence OImageControlControl::getSupportedServiceNames() throw(std::exception) { StringSequence aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); @@ -751,13 +751,13 @@ StringSequence OImageControlControl::getSupportedServiceNames() throw() } -void SAL_CALL OImageControlControl::addModifyListener( const Reference< XModifyListener >& _Listener ) throw (RuntimeException) +void SAL_CALL OImageControlControl::addModifyListener( const Reference< XModifyListener >& _Listener ) throw (RuntimeException, std::exception) { m_aModifyListeners.addInterface( _Listener ); } -void SAL_CALL OImageControlControl::removeModifyListener( const Reference< XModifyListener >& _Listener ) throw (RuntimeException) +void SAL_CALL OImageControlControl::removeModifyListener( const Reference< XModifyListener >& _Listener ) throw (RuntimeException, std::exception) { m_aModifyListeners.removeInterface( _Listener ); } @@ -772,7 +772,7 @@ void SAL_CALL OImageControlControl::disposing() } -void SAL_CALL OImageControlControl::disposing( const EventObject& _Event ) throw(RuntimeException) +void SAL_CALL OImageControlControl::disposing( const EventObject& _Event ) throw(RuntimeException, std::exception) { OBoundControl::disposing( _Event ); } @@ -888,7 +888,7 @@ bool OImageControlControl::impl_isEmptyGraphics_nothrow() const // MouseListener -void OImageControlControl::mousePressed(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException) +void OImageControlControl::mousePressed(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -987,17 +987,17 @@ void OImageControlControl::mousePressed(const ::com::sun::star::awt::MouseEvent& } -void SAL_CALL OImageControlControl::mouseReleased(const awt::MouseEvent& /*e*/) throw ( RuntimeException ) +void SAL_CALL OImageControlControl::mouseReleased(const awt::MouseEvent& /*e*/) throw ( RuntimeException, std::exception ) { } -void SAL_CALL OImageControlControl::mouseEntered(const awt::MouseEvent& /*e*/) throw ( RuntimeException ) +void SAL_CALL OImageControlControl::mouseEntered(const awt::MouseEvent& /*e*/) throw ( RuntimeException, std::exception ) { } -void SAL_CALL OImageControlControl::mouseExited(const awt::MouseEvent& /*e*/) throw ( RuntimeException ) +void SAL_CALL OImageControlControl::mouseExited(const awt::MouseEvent& /*e*/) throw ( RuntimeException, std::exception ) { } diff --git a/forms/source/component/ImageControl.hxx b/forms/source/component/ImageControl.hxx index 6836a737705f..b7f3159a0742 100644 --- a/forms/source/component/ImageControl.hxx +++ b/forms/source/component/ImageControl.hxx @@ -67,34 +67,34 @@ public: DECLARE_DEFAULT_LEAF_XTOR( OImageControlModel ); virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue) throw ( ::com::sun::star::uno::Exception); + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue) throw ( ::com::sun::star::uno::Exception, std::exception); virtual sal_Bool SAL_CALL convertFastPropertyValue(::com::sun::star::uno::Any& rConvertedValue, ::com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::lang::IllegalArgumentException); // UNO Anbindung DECLARE_UNO3_AGG_DEFAULTS(OImageControlModel, OBoundControlModel); - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo IMPLEMENTATION_NAME(OImageControlModel); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception); // OComponentHelper virtual void SAL_CALL disposing(); // XPersistObject - virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); // XImageProducerSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageProducer> SAL_CALL getImageProducer() throw ( ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageProducer> SAL_CALL getImageProducer() throw ( ::com::sun::star::uno::RuntimeException, std::exception); // XImageProducer - virtual void SAL_CALL addConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& xConsumer ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& xConsumer ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL startProduction( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& xConsumer ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& xConsumer ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL startProduction( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // OControlModel's property handling virtual void describeAggregateProperties( @@ -163,24 +163,24 @@ public: // UNO DECLARE_UNO3_AGG_DEFAULTS( OImageControlControl, OBoundControl ); - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo IMPLEMENTATION_NAME(OImageControlControl); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception); // XMouseListener - virtual void SAL_CALL mousePressed(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL mouseReleased(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL mouseEntered(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL mouseExited(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL mousePressed(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL mouseReleased(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL mouseEntered(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL mouseExited(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException, std::exception); // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); // OComponentHelper virtual void SAL_CALL disposing(); diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index 45193db61d17..14685b611dc5 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -209,7 +209,7 @@ namespace frm // XServiceInfo - StringSequence SAL_CALL OListBoxModel::getSupportedServiceNames() throw(RuntimeException) + StringSequence SAL_CALL OListBoxModel::getSupportedServiceNames() throw(RuntimeException, std::exception) { StringSequence aSupported = OBoundControlModel::getSupportedServiceNames(); @@ -232,7 +232,7 @@ namespace frm } - Any SAL_CALL OListBoxModel::queryAggregation(const Type& _rType) throw (RuntimeException) + Any SAL_CALL OListBoxModel::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception) { Any aReturn = OBoundControlModel::queryAggregation( _rType ); if ( !aReturn.hasValue() ) @@ -294,7 +294,7 @@ namespace frm } - void OListBoxModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw (com::sun::star::uno::Exception) + void OListBoxModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw (com::sun::star::uno::Exception, std::exception) { switch (_nHandle) { @@ -435,7 +435,7 @@ namespace frm } - void SAL_CALL OListBoxModel::setPropertyValues( const Sequence< OUString >& _rPropertyNames, const Sequence< Any >& _rValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) + void SAL_CALL OListBoxModel::setPropertyValues( const Sequence< OUString >& _rPropertyNames, const Sequence< Any >& _rValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { // if both SelectedItems and StringItemList are set, care for this // #i27024# @@ -512,14 +512,14 @@ namespace frm } - OUString SAL_CALL OListBoxModel::getServiceName() throw(RuntimeException) + OUString SAL_CALL OListBoxModel::getServiceName() throw(RuntimeException, std::exception) { return OUString(FRM_COMPONENT_LISTBOX); // old (non-sun) name for compatibility ! } void SAL_CALL OListBoxModel::write(const Reference& _rxOutStream) - throw(IOException, RuntimeException) + throw(IOException, RuntimeException, std::exception) { OBoundControlModel::write(_rxOutStream); @@ -555,7 +555,7 @@ namespace frm } - void SAL_CALL OListBoxModel::read(const Reference& _rxInStream) throw(IOException, RuntimeException) + void SAL_CALL OListBoxModel::read(const Reference& _rxInStream) throw(IOException, RuntimeException, std::exception) { // We need to respect dependencies for certain variables. // Therefore, we need to set them explicitly via setPropertyValue(). @@ -1255,7 +1255,7 @@ namespace frm } - void SAL_CALL OListBoxModel::disposing( const EventObject& _rSource ) throw ( RuntimeException ) + void SAL_CALL OListBoxModel::disposing( const EventObject& _rSource ) throw ( RuntimeException, std::exception ) { if ( !OEntryListHelper::handleDisposing( _rSource ) ) OBoundControlModel::disposing( _rSource ); @@ -1742,7 +1742,7 @@ namespace frm } - Any SAL_CALL OListBoxControl::queryAggregation(const Type& _rType) throw (RuntimeException) + Any SAL_CALL OListBoxControl::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception) { Any aReturn = OListBoxControl_BASE::queryInterface( _rType ); @@ -1796,7 +1796,7 @@ namespace frm } - StringSequence SAL_CALL OListBoxControl::getSupportedServiceNames() throw(RuntimeException) + StringSequence SAL_CALL OListBoxControl::getSupportedServiceNames() throw(RuntimeException, std::exception) { StringSequence aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); @@ -1809,7 +1809,7 @@ namespace frm // XFocusListener - void SAL_CALL OListBoxControl::focusGained(const FocusEvent& /*_rEvent*/) throw(RuntimeException) + void SAL_CALL OListBoxControl::focusGained(const FocusEvent& /*_rEvent*/) throw(RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); if ( m_aChangeListeners.getLength() ) // only if there are listeners @@ -1824,14 +1824,14 @@ namespace frm } - void SAL_CALL OListBoxControl::focusLost(const FocusEvent& /*_rEvent*/) throw(RuntimeException) + void SAL_CALL OListBoxControl::focusLost(const FocusEvent& /*_rEvent*/) throw(RuntimeException, std::exception) { m_aCurrentSelection.clear(); } // XItemListener - void SAL_CALL OListBoxControl::itemStateChanged(const ItemEvent& _rEvent) throw(RuntimeException) + void SAL_CALL OListBoxControl::itemStateChanged(const ItemEvent& _rEvent) throw(RuntimeException, std::exception) { // forward this to our listeners Reference< XChild > xChild( getModel(), UNO_QUERY ); @@ -1901,20 +1901,20 @@ namespace frm // XEventListener - void SAL_CALL OListBoxControl::disposing(const EventObject& _rSource) throw (RuntimeException) + void SAL_CALL OListBoxControl::disposing(const EventObject& _rSource) throw (RuntimeException, std::exception) { OBoundControl::disposing(_rSource); } // XChangeBroadcaster - void SAL_CALL OListBoxControl::addChangeListener(const Reference& _rxListener) throw(RuntimeException) + void SAL_CALL OListBoxControl::addChangeListener(const Reference& _rxListener) throw(RuntimeException, std::exception) { m_aChangeListeners.addInterface( _rxListener ); } - void SAL_CALL OListBoxControl::removeChangeListener(const Reference& _rxListener) throw(RuntimeException) + void SAL_CALL OListBoxControl::removeChangeListener(const Reference& _rxListener) throw(RuntimeException, std::exception) { m_aChangeListeners.removeInterface( _rxListener ); } @@ -1969,54 +1969,54 @@ namespace frm } - void SAL_CALL OListBoxControl::addItemListener( const Reference< XItemListener >& l ) throw (RuntimeException) + void SAL_CALL OListBoxControl::addItemListener( const Reference< XItemListener >& l ) throw (RuntimeException, std::exception) { m_aItemListeners.addInterface( l ); } - void SAL_CALL OListBoxControl::removeItemListener( const Reference< XItemListener >& l ) throw (RuntimeException) + void SAL_CALL OListBoxControl::removeItemListener( const Reference< XItemListener >& l ) throw (RuntimeException, std::exception) { m_aItemListeners.removeInterface( l ); } - void SAL_CALL OListBoxControl::addActionListener( const Reference< XActionListener >& l ) throw (RuntimeException) + void SAL_CALL OListBoxControl::addActionListener( const Reference< XActionListener >& l ) throw (RuntimeException, std::exception) { if ( m_xAggregateListBox.is() ) m_xAggregateListBox->addActionListener( l ); } - void SAL_CALL OListBoxControl::removeActionListener( const Reference< XActionListener >& l ) throw (RuntimeException) + void SAL_CALL OListBoxControl::removeActionListener( const Reference< XActionListener >& l ) throw (RuntimeException, std::exception) { if ( m_xAggregateListBox.is() ) m_xAggregateListBox->removeActionListener( l ); } - void SAL_CALL OListBoxControl::addItem( const OUString& aItem, ::sal_Int16 nPos ) throw (RuntimeException) + void SAL_CALL OListBoxControl::addItem( const OUString& aItem, ::sal_Int16 nPos ) throw (RuntimeException, std::exception) { if ( m_xAggregateListBox.is() ) m_xAggregateListBox->addItem( aItem, nPos ); } - void SAL_CALL OListBoxControl::addItems( const Sequence< OUString >& aItems, ::sal_Int16 nPos ) throw (RuntimeException) + void SAL_CALL OListBoxControl::addItems( const Sequence< OUString >& aItems, ::sal_Int16 nPos ) throw (RuntimeException, std::exception) { if ( m_xAggregateListBox.is() ) m_xAggregateListBox->addItems( aItems, nPos ); } - void SAL_CALL OListBoxControl::removeItems( ::sal_Int16 nPos, ::sal_Int16 nCount ) throw (RuntimeException) + void SAL_CALL OListBoxControl::removeItems( ::sal_Int16 nPos, ::sal_Int16 nCount ) throw (RuntimeException, std::exception) { if ( m_xAggregateListBox.is() ) m_xAggregateListBox->removeItems( nPos, nCount ); } - ::sal_Int16 SAL_CALL OListBoxControl::getItemCount( ) throw (RuntimeException) + ::sal_Int16 SAL_CALL OListBoxControl::getItemCount( ) throw (RuntimeException, std::exception) { if ( m_xAggregateListBox.is() ) return m_xAggregateListBox->getItemCount(); @@ -2024,7 +2024,7 @@ namespace frm } - OUString SAL_CALL OListBoxControl::getItem( ::sal_Int16 nPos ) throw (RuntimeException) + OUString SAL_CALL OListBoxControl::getItem( ::sal_Int16 nPos ) throw (RuntimeException, std::exception) { if ( m_xAggregateListBox.is() ) return m_xAggregateListBox->getItem( nPos ); @@ -2032,7 +2032,7 @@ namespace frm } - Sequence< OUString > SAL_CALL OListBoxControl::getItems( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL OListBoxControl::getItems( ) throw (RuntimeException, std::exception) { if ( m_xAggregateListBox.is() ) return m_xAggregateListBox->getItems(); @@ -2040,7 +2040,7 @@ namespace frm } - ::sal_Int16 SAL_CALL OListBoxControl::getSelectedItemPos( ) throw (RuntimeException) + ::sal_Int16 SAL_CALL OListBoxControl::getSelectedItemPos( ) throw (RuntimeException, std::exception) { if ( m_xAggregateListBox.is() ) return m_xAggregateListBox->getSelectedItemPos(); @@ -2048,7 +2048,7 @@ namespace frm } - Sequence< ::sal_Int16 > SAL_CALL OListBoxControl::getSelectedItemsPos( ) throw (RuntimeException) + Sequence< ::sal_Int16 > SAL_CALL OListBoxControl::getSelectedItemsPos( ) throw (RuntimeException, std::exception) { if ( m_xAggregateListBox.is() ) return m_xAggregateListBox->getSelectedItemsPos(); @@ -2056,7 +2056,7 @@ namespace frm } - OUString SAL_CALL OListBoxControl::getSelectedItem( ) throw (RuntimeException) + OUString SAL_CALL OListBoxControl::getSelectedItem( ) throw (RuntimeException, std::exception) { if ( m_xAggregateListBox.is() ) return m_xAggregateListBox->getSelectedItem(); @@ -2064,7 +2064,7 @@ namespace frm } - Sequence< OUString > SAL_CALL OListBoxControl::getSelectedItems( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL OListBoxControl::getSelectedItems( ) throw (RuntimeException, std::exception) { if ( m_xAggregateListBox.is() ) return m_xAggregateListBox->getSelectedItems(); @@ -2072,28 +2072,28 @@ namespace frm } - void SAL_CALL OListBoxControl::selectItemPos( ::sal_Int16 nPos, ::sal_Bool bSelect ) throw (RuntimeException) + void SAL_CALL OListBoxControl::selectItemPos( ::sal_Int16 nPos, ::sal_Bool bSelect ) throw (RuntimeException, std::exception) { if ( m_xAggregateListBox.is() ) m_xAggregateListBox->selectItemPos( nPos, bSelect ); } - void SAL_CALL OListBoxControl::selectItemsPos( const Sequence< ::sal_Int16 >& aPositions, ::sal_Bool bSelect ) throw (RuntimeException) + void SAL_CALL OListBoxControl::selectItemsPos( const Sequence< ::sal_Int16 >& aPositions, ::sal_Bool bSelect ) throw (RuntimeException, std::exception) { if ( m_xAggregateListBox.is() ) m_xAggregateListBox->selectItemsPos( aPositions, bSelect ); } - void SAL_CALL OListBoxControl::selectItem( const OUString& aItem, ::sal_Bool bSelect ) throw (RuntimeException) + void SAL_CALL OListBoxControl::selectItem( const OUString& aItem, ::sal_Bool bSelect ) throw (RuntimeException, std::exception) { if ( m_xAggregateListBox.is() ) m_xAggregateListBox->selectItem( aItem, bSelect ); } - ::sal_Bool SAL_CALL OListBoxControl::isMutipleMode( ) throw (RuntimeException) + ::sal_Bool SAL_CALL OListBoxControl::isMutipleMode( ) throw (RuntimeException, std::exception) { if ( m_xAggregateListBox.is() ) return m_xAggregateListBox->isMutipleMode(); @@ -2101,14 +2101,14 @@ namespace frm } - void SAL_CALL OListBoxControl::setMultipleMode( ::sal_Bool bMulti ) throw (RuntimeException) + void SAL_CALL OListBoxControl::setMultipleMode( ::sal_Bool bMulti ) throw (RuntimeException, std::exception) { if ( m_xAggregateListBox.is() ) m_xAggregateListBox->setMultipleMode( bMulti ); } - ::sal_Int16 SAL_CALL OListBoxControl::getDropDownLineCount( ) throw (RuntimeException) + ::sal_Int16 SAL_CALL OListBoxControl::getDropDownLineCount( ) throw (RuntimeException, std::exception) { if ( m_xAggregateListBox.is() ) return m_xAggregateListBox->getDropDownLineCount(); @@ -2116,14 +2116,14 @@ namespace frm } - void SAL_CALL OListBoxControl::setDropDownLineCount( ::sal_Int16 nLines ) throw (RuntimeException) + void SAL_CALL OListBoxControl::setDropDownLineCount( ::sal_Int16 nLines ) throw (RuntimeException, std::exception) { if ( m_xAggregateListBox.is() ) m_xAggregateListBox->setDropDownLineCount( nLines ); } - void SAL_CALL OListBoxControl::makeVisible( ::sal_Int16 nEntry ) throw (RuntimeException) + void SAL_CALL OListBoxControl::makeVisible( ::sal_Int16 nEntry ) throw (RuntimeException, std::exception) { if ( m_xAggregateListBox.is() ) m_xAggregateListBox->makeVisible( nEntry ); diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx index 4cd42229a88f..4cfde90fa28a 100644 --- a/forms/source/component/ListBox.hxx +++ b/forms/source/component/ListBox.hxx @@ -130,11 +130,11 @@ public: // XServiceInfo IMPLEMENTATION_NAME(OListBoxModel); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); // UNO Anbindung DECLARE_UNO3_AGG_DEFAULTS(OListBoxModel, OBoundControlModel); - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception); // OComponentHelper virtual void SAL_CALL disposing(); @@ -142,21 +142,21 @@ public: // OPropertySetHelper virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception); + throw (::com::sun::star::uno::Exception, std::exception); virtual sal_Bool SAL_CALL convertFastPropertyValue( ::com::sun::star::uno::Any& _rConvertedValue, ::com::sun::star::uno::Any& _rOldValue, sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::lang::IllegalArgumentException); protected: // XMultiPropertySet - virtual void SAL_CALL setPropertyValues(const ::com::sun::star::uno::Sequence< OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues(const ::com::sun::star::uno::Sequence< OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // XPersistObject - virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL - write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL - read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); // OControlModel's property handling virtual void describeFixedProperties( @@ -167,7 +167,7 @@ protected: ) const; // XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException, std::exception); // OPropertyChangeListener virtual void _propertyChanged( const ::com::sun::star::beans::PropertyChangeEvent& _rEvt ) throw ( ::com::sun::star::uno::RuntimeException ); @@ -276,52 +276,52 @@ public: // UNO Anbindung DECLARE_UNO3_AGG_DEFAULTS(OListBoxControl, OBoundControl); - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo IMPLEMENTATION_NAME(OListBoxControl); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); // XChangeBroadcaster - virtual void SAL_CALL addChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XChangeListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XChangeListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XChangeListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XChangeListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception); // XFocusListener - virtual void SAL_CALL focusGained(const ::com::sun::star::awt::FocusEvent& _rEvent) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL focusLost(const ::com::sun::star::awt::FocusEvent& _rEvent) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL focusGained(const ::com::sun::star::awt::FocusEvent& _rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL focusLost(const ::com::sun::star::awt::FocusEvent& _rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception); // XItemListener - virtual void SAL_CALL itemStateChanged(const ::com::sun::star::awt::ItemEvent& _rEvent) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL itemStateChanged(const ::com::sun::star::awt::ItemEvent& _rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception); // XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException, std::exception); // OComponentHelper virtual void SAL_CALL disposing(); // XListBox - virtual void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addItem( const OUString& aItem, ::sal_Int16 nPos ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addItems( const ::com::sun::star::uno::Sequence< OUString >& aItems, ::sal_Int16 nPos ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeItems( ::sal_Int16 nPos, ::sal_Int16 nCount ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int16 SAL_CALL getItemCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getItem( ::sal_Int16 nPos ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getItems( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int16 SAL_CALL getSelectedItemPos( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::sal_Int16 > SAL_CALL getSelectedItemsPos( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getSelectedItem( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedItems( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL selectItemPos( ::sal_Int16 nPos, ::sal_Bool bSelect ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL selectItemsPos( const ::com::sun::star::uno::Sequence< ::sal_Int16 >& aPositions, ::sal_Bool bSelect ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL selectItem( const OUString& aItem, ::sal_Bool bSelect ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isMutipleMode( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setMultipleMode( ::sal_Bool bMulti ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int16 SAL_CALL getDropDownLineCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDropDownLineCount( ::sal_Int16 nLines ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL makeVisible( ::sal_Int16 nEntry ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addItem( const OUString& aItem, ::sal_Int16 nPos ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addItems( const ::com::sun::star::uno::Sequence< OUString >& aItems, ::sal_Int16 nPos ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeItems( ::sal_Int16 nPos, ::sal_Int16 nCount ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int16 SAL_CALL getItemCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getItem( ::sal_Int16 nPos ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getItems( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int16 SAL_CALL getSelectedItemPos( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::sal_Int16 > SAL_CALL getSelectedItemsPos( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSelectedItem( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedItems( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL selectItemPos( ::sal_Int16 nPos, ::sal_Bool bSelect ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL selectItemsPos( const ::com::sun::star::uno::Sequence< ::sal_Int16 >& aPositions, ::sal_Bool bSelect ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL selectItem( const OUString& aItem, ::sal_Bool bSelect ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL isMutipleMode( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setMultipleMode( ::sal_Bool bMulti ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int16 SAL_CALL getDropDownLineCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDropDownLineCount( ::sal_Int16 nLines ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL makeVisible( ::sal_Int16 nEntry ) throw (::com::sun::star::uno::RuntimeException, std::exception); protected: // IEventProcessor diff --git a/forms/source/component/Numeric.cxx b/forms/source/component/Numeric.cxx index 22c58f223efe..220a584b4bec 100644 --- a/forms/source/component/Numeric.cxx +++ b/forms/source/component/Numeric.cxx @@ -49,7 +49,7 @@ ONumericControl::ONumericControl(const Reference& _rxFactory) } -StringSequence ONumericControl::getSupportedServiceNames() throw() +StringSequence ONumericControl::getSupportedServiceNames() throw(std::exception) { StringSequence aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); @@ -115,7 +115,7 @@ IMPLEMENT_DEFAULT_CLONING( ONumericModel ) // XServiceInfo -StringSequence ONumericModel::getSupportedServiceNames() throw() +StringSequence ONumericModel::getSupportedServiceNames() throw(std::exception) { StringSequence aSupported = OBoundControlModel::getSupportedServiceNames(); @@ -147,7 +147,7 @@ void ONumericModel::describeFixedProperties( Sequence< Property >& _rProps ) con } -OUString SAL_CALL ONumericModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) +OUString SAL_CALL ONumericModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) { 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 fa7284a8008b..f6e1cfe555e8 100644 --- a/forms/source/component/Numeric.hxx +++ b/forms/source/component/Numeric.hxx @@ -43,10 +43,10 @@ public: // ::com::sun::star::lang::XServiceInfo IMPLEMENTATION_NAME(ONumericModel); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception); // ::com::sun::star::io::XPersistObject - virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception); // OControlModel's property handling virtual void describeFixedProperties( @@ -80,7 +80,7 @@ public: // ::com::sun::star::lang::XServiceInfo IMPLEMENTATION_NAME(ONumericControl); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception); }; //......................................................................... diff --git a/forms/source/component/Pattern.cxx b/forms/source/component/Pattern.cxx index fe6de45bdd40..9e06c78d93ee 100644 --- a/forms/source/component/Pattern.cxx +++ b/forms/source/component/Pattern.cxx @@ -62,7 +62,7 @@ Sequence OPatternControl::_getTypes() } -StringSequence OPatternControl::getSupportedServiceNames() throw() +StringSequence OPatternControl::getSupportedServiceNames() throw(std::exception) { StringSequence aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); @@ -115,7 +115,7 @@ IMPLEMENT_DEFAULT_CLONING( OPatternModel ) // XServiceInfo -StringSequence SAL_CALL OPatternModel::getSupportedServiceNames() throw() +StringSequence SAL_CALL OPatternModel::getSupportedServiceNames() throw(std::exception) { StringSequence aSupported = OBoundControlModel::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); @@ -139,7 +139,7 @@ void OPatternModel::describeFixedProperties( Sequence< Property >& _rProps ) con } -OUString SAL_CALL OPatternModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OPatternModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) { 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 8de1e00a8b89..3ab7f2987438 100644 --- a/forms/source/component/Pattern.hxx +++ b/forms/source/component/Pattern.hxx @@ -50,10 +50,10 @@ public: // ::com::sun::star::lang::XServiceInfo IMPLEMENTATION_NAME(OPatternModel); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception); // ::com::sun::star::io::XPersistObject - virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception); // OControlModel's property handling virtual void describeFixedProperties( @@ -89,7 +89,7 @@ public: // ::com::sun::star::lang::XServiceInfo IMPLEMENTATION_NAME(OPatternControl); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception); }; //......................................................................... diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx index e649403305ec..23e98251535b 100644 --- a/forms/source/component/RadioButton.cxx +++ b/forms/source/component/RadioButton.cxx @@ -52,7 +52,7 @@ InterfaceRef SAL_CALL ORadioButtonControl_CreateInstance(const Reference& _rx } -void SAL_CALL ORadioButtonControl::createPeer(const Reference& _rxToolkit, const Reference& _rxParent) throw (RuntimeException) +void SAL_CALL ORadioButtonControl::createPeer(const Reference& _rxToolkit, const Reference& _rxParent) throw (RuntimeException, std::exception) { OBoundControl::createPeer(_rxToolkit, _rxParent); @@ -126,7 +126,7 @@ IMPLEMENT_DEFAULT_CLONING( ORadioButtonModel ) // XServiceInfo -StringSequence SAL_CALL ORadioButtonModel::getSupportedServiceNames() throw(RuntimeException) +StringSequence SAL_CALL ORadioButtonModel::getSupportedServiceNames() throw(RuntimeException, std::exception) { StringSequence aSupported = OReferenceValueComponent::getSupportedServiceNames(); @@ -191,7 +191,7 @@ void ORadioButtonModel::SetSiblingPropsTo(const OUString& rPropName, const Any& } -void ORadioButtonModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) throw (Exception) +void ORadioButtonModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) throw (Exception, std::exception) { OReferenceValueComponent::setFastPropertyValue_NoBroadcast( nHandle, rValue ); @@ -283,14 +283,14 @@ void ORadioButtonModel::describeFixedProperties( Sequence< Property >& _rProps ) } -OUString SAL_CALL ORadioButtonModel::getServiceName() throw(RuntimeException) +OUString SAL_CALL ORadioButtonModel::getServiceName() throw(RuntimeException, std::exception) { return OUString(FRM_COMPONENT_RADIOBUTTON); // old (non-sun) name for compatibility ! } void SAL_CALL ORadioButtonModel::write(const Reference& _rxOutStream) - throw(IOException, RuntimeException) + throw(IOException, RuntimeException, std::exception) { OReferenceValueComponent::write(_rxOutStream); @@ -307,7 +307,7 @@ void SAL_CALL ORadioButtonModel::write(const Reference& _rx } -void SAL_CALL ORadioButtonModel::read(const Reference& _rxInStream) throw(IOException, RuntimeException) +void SAL_CALL ORadioButtonModel::read(const Reference& _rxInStream) throw(IOException, RuntimeException, std::exception) { OReferenceValueComponent::read(_rxInStream); ::osl::MutexGuard aGuard(m_aMutex); diff --git a/forms/source/component/RadioButton.hxx b/forms/source/component/RadioButton.hxx index 1279173af694..470c2910aeb9 100644 --- a/forms/source/component/RadioButton.hxx +++ b/forms/source/component/RadioButton.hxx @@ -36,18 +36,18 @@ public: // XServiceInfo IMPLEMENTATION_NAME(ORadioButtonModel); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); // OPropertySetHelper virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception); + throw (::com::sun::star::uno::Exception, std::exception); // XPersistObject - virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL - write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL - read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); // OPropertyChangeListener virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException); @@ -90,11 +90,11 @@ public: // XServiceInfo IMPLEMENTATION_NAME(ORadioButtonControl); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); protected: // XControl - virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference& Toolkit, const ::com::sun::star::uno::Reference& Parent) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference& Toolkit, const ::com::sun::star::uno::Reference& Parent) throw (::com::sun::star::uno::RuntimeException, std::exception); }; //......................................................................... diff --git a/forms/source/component/Time.cxx b/forms/source/component/Time.cxx index ab9b9bbef4fc..a78268f14aff 100644 --- a/forms/source/component/Time.cxx +++ b/forms/source/component/Time.cxx @@ -70,7 +70,7 @@ Sequence OTimeControl::_getTypes() } -StringSequence SAL_CALL OTimeControl::getSupportedServiceNames() throw() +StringSequence SAL_CALL OTimeControl::getSupportedServiceNames() throw(std::exception) { StringSequence aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); @@ -91,7 +91,7 @@ InterfaceRef SAL_CALL OTimeModel_CreateInstance(const Reference& l) throw( RuntimeException ) + const Reference& l) throw( RuntimeException, std::exception ) { m_aApproveActionListeners.addInterface(l); } void OClickableImageBaseControl::removeApproveActionListener( - const Reference& l) throw( RuntimeException ) + const Reference& l) throw( RuntimeException, std::exception ) { m_aApproveActionListeners.removeInterface(l); } - void SAL_CALL OClickableImageBaseControl::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException) + void SAL_CALL OClickableImageBaseControl::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException, std::exception) { m_pFeatureInterception->registerDispatchProviderInterceptor( _rxInterceptor ); } - void SAL_CALL OClickableImageBaseControl::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException) + void SAL_CALL OClickableImageBaseControl::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException, std::exception) { m_pFeatureInterception->releaseDispatchProviderInterceptor( _rxInterceptor ); } @@ -345,31 +345,31 @@ namespace frm - void SAL_CALL OClickableImageBaseControl::addSubmissionVetoListener( const Reference< submission::XSubmissionVetoListener >& listener ) throw (NoSupportException, RuntimeException) + void SAL_CALL OClickableImageBaseControl::addSubmissionVetoListener( const Reference< submission::XSubmissionVetoListener >& listener ) throw (NoSupportException, RuntimeException, std::exception) { m_aSubmissionVetoListeners.addInterface( listener ); } - void SAL_CALL OClickableImageBaseControl::removeSubmissionVetoListener( const Reference< submission::XSubmissionVetoListener >& listener ) throw (NoSupportException, RuntimeException) + void SAL_CALL OClickableImageBaseControl::removeSubmissionVetoListener( const Reference< submission::XSubmissionVetoListener >& listener ) throw (NoSupportException, RuntimeException, std::exception) { m_aSubmissionVetoListeners.removeInterface( listener ); } - void SAL_CALL OClickableImageBaseControl::submitWithInteraction( const Reference< XInteractionHandler >& _rxHandler ) throw (VetoException, WrappedTargetException, RuntimeException) + void SAL_CALL OClickableImageBaseControl::submitWithInteraction( const Reference< XInteractionHandler >& _rxHandler ) throw (VetoException, WrappedTargetException, RuntimeException, std::exception) { implSubmit( MouseEvent(), _rxHandler ); } - void SAL_CALL OClickableImageBaseControl::submit( ) throw (VetoException, WrappedTargetException, RuntimeException) + void SAL_CALL OClickableImageBaseControl::submit( ) throw (VetoException, WrappedTargetException, RuntimeException, std::exception) { implSubmit( MouseEvent(), NULL ); } - Sequence< OUString > SAL_CALL OClickableImageBaseControl::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL OClickableImageBaseControl::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { Sequence< OUString > aSupported = OControl::getSupportedServiceNames(); aSupported.realloc( aSupported.getLength() + 1 ); @@ -526,40 +526,40 @@ namespace frm // XImageProducer - void SAL_CALL OClickableImageBaseModel::addConsumer( const Reference< XImageConsumer >& _rxConsumer ) throw (RuntimeException) + void SAL_CALL OClickableImageBaseModel::addConsumer( const Reference< XImageConsumer >& _rxConsumer ) throw (RuntimeException, std::exception) { ImageModelMethodGuard aGuard( *this ); GetImageProducer()->addConsumer( _rxConsumer ); } - void SAL_CALL OClickableImageBaseModel::removeConsumer( const Reference< XImageConsumer >& _rxConsumer ) throw (RuntimeException) + void SAL_CALL OClickableImageBaseModel::removeConsumer( const Reference< XImageConsumer >& _rxConsumer ) throw (RuntimeException, std::exception) { ImageModelMethodGuard aGuard( *this ); GetImageProducer()->removeConsumer( _rxConsumer ); } - void SAL_CALL OClickableImageBaseModel::startProduction( ) throw (RuntimeException) + void SAL_CALL OClickableImageBaseModel::startProduction( ) throw (RuntimeException, std::exception) { ImageModelMethodGuard aGuard( *this ); GetImageProducer()->startProduction(); } - Reference< submission::XSubmission > SAL_CALL OClickableImageBaseModel::getSubmission() throw (RuntimeException) + Reference< submission::XSubmission > SAL_CALL OClickableImageBaseModel::getSubmission() throw (RuntimeException, std::exception) { return m_xSubmissionDelegate; } - void SAL_CALL OClickableImageBaseModel::setSubmission( const Reference< submission::XSubmission >& _submission ) throw (RuntimeException) + void SAL_CALL OClickableImageBaseModel::setSubmission( const Reference< submission::XSubmission >& _submission ) throw (RuntimeException, std::exception) { m_xSubmissionDelegate = _submission; } - Sequence< OUString > SAL_CALL OClickableImageBaseModel::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL OClickableImageBaseModel::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { Sequence< OUString > aSupported = OControlModel::getSupportedServiceNames(); aSupported.realloc( aSupported.getLength() + 1 ); @@ -586,7 +586,7 @@ namespace frm } - Any SAL_CALL OClickableImageBaseModel::queryAggregation(const Type& _rType) throw (RuntimeException) + Any SAL_CALL OClickableImageBaseModel::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception) { // order matters: // we definitely want to "overload" the XImageProducer interface of our aggregate, @@ -618,7 +618,7 @@ namespace frm } - void OClickableImageBaseModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) throw ( Exception) + void OClickableImageBaseModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) throw ( Exception, std::exception) { switch (nHandle) { diff --git a/forms/source/component/clickableimage.hxx b/forms/source/component/clickableimage.hxx index ab16ab791245..83dcc9fae04f 100644 --- a/forms/source/component/clickableimage.hxx +++ b/forms/source/component/clickableimage.hxx @@ -92,18 +92,18 @@ namespace frm // UNO Anbindung DECLARE_UNO3_AGG_DEFAULTS(OClickableImageBaseModel, OControlModel); - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception); protected: // OComponentHelper virtual void SAL_CALL disposing(); // ::com::sun::star::form::XImageProducerSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageProducer> SAL_CALL getImageProducer() throw (::com::sun::star::uno::RuntimeException) { return m_xProducer; } + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageProducer> SAL_CALL getImageProducer() throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_xProducer; } // OPropertySetHelper virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::uno::Exception); + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::uno::Exception, std::exception); virtual sal_Bool SAL_CALL convertFastPropertyValue(::com::sun::star::uno::Any& rConvertedValue, ::com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::lang::IllegalArgumentException); @@ -117,16 +117,16 @@ namespace frm virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const; // XImageProducer - virtual void SAL_CALL addConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& xConsumer ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& xConsumer ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL startProduction( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& xConsumer ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& xConsumer ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL startProduction( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XSubmissionSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::submission::XSubmission > SAL_CALL getSubmission() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setSubmission( const ::com::sun::star::uno::Reference< ::com::sun::star::form::submission::XSubmission >& _submission ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::submission::XSubmission > SAL_CALL getSubmission() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setSubmission( const ::com::sun::star::uno::Reference< ::com::sun::star::form::submission::XSubmission >& _submission ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XEventListener using OControlModel::disposing; @@ -190,13 +190,13 @@ namespace frm OUString m_aActionCommand; // XSubmission - virtual void SAL_CALL submit( ) throw (::com::sun::star::util::VetoException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL submitWithInteraction( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& aHandler ) throw (::com::sun::star::util::VetoException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addSubmissionVetoListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::submission::XSubmissionVetoListener >& listener ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeSubmissionVetoListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::submission::XSubmissionVetoListener >& listener ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL submit( ) throw (::com::sun::star::util::VetoException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL submitWithInteraction( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& aHandler ) throw (::com::sun::star::util::VetoException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addSubmissionVetoListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::submission::XSubmissionVetoListener >& listener ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeSubmissionVetoListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::submission::XSubmissionVetoListener >& listener ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XEventListener using OControl::disposing; @@ -210,20 +210,20 @@ namespace frm protected: // UNO Anbindung DECLARE_UNO3_AGG_DEFAULTS(OClickableImageBaseControl, OControl); - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception); // OComponentHelper virtual void SAL_CALL disposing(); // ::com::sun::star::form::XApproveActionBroadcaster virtual void SAL_CALL addApproveActionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XApproveActionListener>& _rxListener) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeApproveActionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XApproveActionListener>& _rxListener) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); // XDispatchProviderInterception - virtual void SAL_CALL registerDispatchProviderInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& Interceptor ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL releaseDispatchProviderInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& Interceptor ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL registerDispatchProviderInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& Interceptor ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL releaseDispatchProviderInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& Interceptor ) throw (::com::sun::star::uno::RuntimeException, std::exception); protected: virtual void actionPerformed_Impl( sal_Bool bNotifyListener, const ::com::sun::star::awt::MouseEvent& rEvt ); diff --git a/forms/source/component/entrylisthelper.cxx b/forms/source/component/entrylisthelper.cxx index aa2a61d717a8..32b32e7ecbc1 100644 --- a/forms/source/component/entrylisthelper.cxx +++ b/forms/source/component/entrylisthelper.cxx @@ -60,7 +60,7 @@ namespace frm } - void SAL_CALL OEntryListHelper::setListEntrySource( const Reference< XListEntrySource >& _rxSource ) throw (RuntimeException) + void SAL_CALL OEntryListHelper::setListEntrySource( const Reference< XListEntrySource >& _rxSource ) throw (RuntimeException, std::exception) { ControlModelLock aLock( m_rControlModel ); @@ -73,14 +73,14 @@ namespace frm } - Reference< XListEntrySource > SAL_CALL OEntryListHelper::getListEntrySource( ) throw (RuntimeException) + Reference< XListEntrySource > SAL_CALL OEntryListHelper::getListEntrySource( ) throw (RuntimeException, std::exception) { return m_xListSource; } - void SAL_CALL OEntryListHelper::entryChanged( const ListEntryEvent& _rEvent ) throw (RuntimeException) + void SAL_CALL OEntryListHelper::entryChanged( const ListEntryEvent& _rEvent ) throw (RuntimeException, std::exception) { ControlModelLock aLock( m_rControlModel ); @@ -102,7 +102,7 @@ namespace frm } - void SAL_CALL OEntryListHelper::entryRangeInserted( const ListEntryEvent& _rEvent ) throw (RuntimeException) + void SAL_CALL OEntryListHelper::entryRangeInserted( const ListEntryEvent& _rEvent ) throw (RuntimeException, std::exception) { ControlModelLock aLock( m_rControlModel ); @@ -139,7 +139,7 @@ namespace frm } - void SAL_CALL OEntryListHelper::entryRangeRemoved( const ListEntryEvent& _rEvent ) throw (RuntimeException) + void SAL_CALL OEntryListHelper::entryRangeRemoved( const ListEntryEvent& _rEvent ) throw (RuntimeException, std::exception) { ControlModelLock aLock( m_rControlModel ); @@ -167,7 +167,7 @@ namespace frm } - void SAL_CALL OEntryListHelper::allEntriesChanged( const EventObject& _rEvent ) throw (RuntimeException) + void SAL_CALL OEntryListHelper::allEntriesChanged( const EventObject& _rEvent ) throw (RuntimeException, std::exception) { ControlModelLock aLock( m_rControlModel ); @@ -183,21 +183,21 @@ namespace frm // XRefreshable - void SAL_CALL OEntryListHelper::addRefreshListener(const Reference& _rxListener) throw(RuntimeException) + void SAL_CALL OEntryListHelper::addRefreshListener(const Reference& _rxListener) throw(RuntimeException, std::exception) { if ( _rxListener.is() ) m_aRefreshListeners.addInterface( _rxListener ); } - void SAL_CALL OEntryListHelper::removeRefreshListener(const Reference& _rxListener) throw(RuntimeException) + void SAL_CALL OEntryListHelper::removeRefreshListener(const Reference& _rxListener) throw(RuntimeException, std::exception) { if ( _rxListener.is() ) m_aRefreshListeners.removeInterface( _rxListener ); } - void SAL_CALL OEntryListHelper::refresh() throw(RuntimeException) + void SAL_CALL OEntryListHelper::refresh() throw(RuntimeException, std::exception) { { ControlModelLock aLock( m_rControlModel ); diff --git a/forms/source/component/entrylisthelper.hxx b/forms/source/component/entrylisthelper.hxx index 183e4816f8d7..e08f57dbbc01 100644 --- a/forms/source/component/entrylisthelper.hxx +++ b/forms/source/component/entrylisthelper.hxx @@ -84,7 +84,7 @@ namespace frm void disposing( ); // prevent method hiding - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException) = 0; + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) = 0; /** helper for implementing convertFastPropertyValue( StringItemList ) @@ -134,19 +134,19 @@ namespace frm private: // XListEntrySink - virtual void SAL_CALL setListEntrySource( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource >& _rxSource ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource > SAL_CALL getListEntrySource( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setListEntrySource( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource >& _rxSource ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource > SAL_CALL getListEntrySource( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XListEntryListener - virtual void SAL_CALL entryChanged( const ::com::sun::star::form::binding::ListEntryEvent& _rSource ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL entryRangeInserted( const ::com::sun::star::form::binding::ListEntryEvent& _rSource ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL entryRangeRemoved( const ::com::sun::star::form::binding::ListEntryEvent& _rSource ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL allEntriesChanged( const ::com::sun::star::lang::EventObject& _rSource ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL entryChanged( const ::com::sun::star::form::binding::ListEntryEvent& _rSource ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL entryRangeInserted( const ::com::sun::star::form::binding::ListEntryEvent& _rSource ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL entryRangeRemoved( const ::com::sun::star::form::binding::ListEntryEvent& _rSource ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL allEntriesChanged( const ::com::sun::star::lang::EventObject& _rSource ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XRefreshable - virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addRefreshListener(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeRefreshListener(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addRefreshListener(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeRefreshListener(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception); 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 d90646f5f806..ad381cb70358 100644 --- a/forms/source/component/errorbroadcaster.cxx +++ b/forms/source/component/errorbroadcaster.cxx @@ -86,13 +86,13 @@ namespace frm } - void SAL_CALL OErrorBroadcaster::addSQLErrorListener( const Reference< XSQLErrorListener >& _rxListener ) throw( RuntimeException ) + void SAL_CALL OErrorBroadcaster::addSQLErrorListener( const Reference< XSQLErrorListener >& _rxListener ) throw( RuntimeException, std::exception ) { m_aErrorListeners.addInterface( _rxListener ); } - void SAL_CALL OErrorBroadcaster::removeSQLErrorListener( const Reference< XSQLErrorListener >& _rxListener ) throw( RuntimeException ) + void SAL_CALL OErrorBroadcaster::removeSQLErrorListener( const Reference< XSQLErrorListener >& _rxListener ) throw( RuntimeException, std::exception ) { m_aErrorListeners.removeInterface( _rxListener ); } diff --git a/forms/source/component/errorbroadcaster.hxx b/forms/source/component/errorbroadcaster.hxx index 85fb9d514d3a..022a8cc156a3 100644 --- a/forms/source/component/errorbroadcaster.hxx +++ b/forms/source/component/errorbroadcaster.hxx @@ -54,8 +54,8 @@ namespace frm protected: // XSQLErrorBroadcaster - virtual void SAL_CALL addSQLErrorListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLErrorListener >& _rListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeSQLErrorListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLErrorListener >& _rListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addSQLErrorListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLErrorListener >& _rListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeSQLErrorListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLErrorListener >& _rListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; //......................................................................... diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx index d374b6707acb..bf28b7ba4683 100644 --- a/forms/source/component/imgprod.cxx +++ b/forms/source/component/imgprod.cxx @@ -197,7 +197,7 @@ ImageProducer::~ImageProducer() // ::com::sun::star::uno::XInterface -::com::sun::star::uno::Any ImageProducer::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any ImageProducer::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< ::com::sun::star::lang::XInitialization* >(this)), @@ -218,7 +218,7 @@ void ImageProducer::addConsumer( const ::com::sun::star::uno::Reference< ::com:: -void ImageProducer::removeConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& rxConsumer ) throw(::com::sun::star::uno::RuntimeException) +void ImageProducer::removeConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& rxConsumer ) throw(::com::sun::star::uno::RuntimeException, std::exception) { ConsumerList_t::reverse_iterator riter = std::find(maConsList.rbegin(),maConsList.rend(),rxConsumer); @@ -285,7 +285,7 @@ void ImageProducer::NewDataAvailable() -void ImageProducer::startProduction() throw(::com::sun::star::uno::RuntimeException) +void ImageProducer::startProduction() throw(::com::sun::star::uno::RuntimeException, std::exception) { if( !maConsList.empty() || maDoneHdl.IsSet() ) { @@ -548,7 +548,7 @@ void ImageProducer::ImplUpdateConsumer( const Graphic& rGraphic ) } } -void ImageProducer::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) +void ImageProducer::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) { if ( aArguments.getLength() == 1 ) { diff --git a/forms/source/component/imgprod.hxx b/forms/source/component/imgprod.hxx index 8e88ccb36118..24e2407ad3aa 100644 --- a/forms/source/component/imgprod.hxx +++ b/forms/source/component/imgprod.hxx @@ -79,7 +79,7 @@ public: const Link& GetDoneHdl() const { return maDoneHdl; } // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL acquire() throw() { OWeakObject::acquire(); } void SAL_CALL release() throw() { OWeakObject::release(); } @@ -90,11 +90,11 @@ public: void SAL_CALL addConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& rxConsumer ) throw(::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL removeConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& rxConsumer ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL startProduction( ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL removeConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& rxConsumer ) throw(::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL startProduction( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::lang::XInitialization - void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/forms/source/component/navigationbar.cxx b/forms/source/component/navigationbar.cxx index f70aec47debb..b9739f3fec72 100644 --- a/forms/source/component/navigationbar.cxx +++ b/forms/source/component/navigationbar.cxx @@ -139,7 +139,7 @@ namespace frm } - Any SAL_CALL ONavigationBarModel::queryAggregation( const Type& _rType ) throw ( RuntimeException ) + Any SAL_CALL ONavigationBarModel::queryAggregation( const Type& _rType ) throw ( RuntimeException, std::exception ) { Any aReturn = ONavigationBarModel_BASE::queryInterface( _rType ); @@ -156,13 +156,13 @@ namespace frm IMPLEMENT_DEFAULT_CLONING( ONavigationBarModel ) - OUString SAL_CALL ONavigationBarModel::getImplementationName() throw(RuntimeException) + OUString SAL_CALL ONavigationBarModel::getImplementationName() throw(RuntimeException, std::exception) { return getImplementationName_Static(); } - Sequence< OUString > SAL_CALL ONavigationBarModel::getSupportedServiceNames() throw(RuntimeException) + Sequence< OUString > SAL_CALL ONavigationBarModel::getSupportedServiceNames() throw(RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } @@ -198,7 +198,7 @@ namespace frm } - OUString SAL_CALL ONavigationBarModel::getServiceName() throw ( RuntimeException ) + OUString SAL_CALL ONavigationBarModel::getServiceName() throw ( RuntimeException, std::exception ) { return OUString(FRM_SUN_COMPONENT_NAVTOOLBAR); } @@ -218,7 +218,7 @@ namespace frm #define PERSIST_SHOW_FILTERSORT 0x0040 - void SAL_CALL ONavigationBarModel::write( const Reference< XObjectOutputStream >& _rxOutStream ) throw ( IOException, RuntimeException ) + void SAL_CALL ONavigationBarModel::write( const Reference< XObjectOutputStream >& _rxOutStream ) throw ( IOException, RuntimeException, std::exception ) { // open a section for compatibility - if we later on write additional members, // then older versions can skip them @@ -291,7 +291,7 @@ namespace frm } - void SAL_CALL ONavigationBarModel::read( const Reference< XObjectInputStream >& _rxInStream ) throw ( IOException, RuntimeException ) + void SAL_CALL ONavigationBarModel::read( const Reference< XObjectInputStream >& _rxInStream ) throw ( IOException, RuntimeException, std::exception ) { OStreamSection aEnsureBlockCompat( _rxInStream ); @@ -391,7 +391,7 @@ namespace frm } - void SAL_CALL ONavigationBarModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception ) + void SAL_CALL ONavigationBarModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception, std::exception ) { if ( isRegisteredProperty( _nHandle ) ) { diff --git a/forms/source/component/navigationbar.hxx b/forms/source/component/navigationbar.hxx index a8da8d876fea..a5c7354f9a20 100644 --- a/forms/source/component/navigationbar.hxx +++ b/forms/source/component/navigationbar.hxx @@ -79,11 +79,11 @@ namespace frm protected: // UNO DECLARE_UNO3_AGG_DEFAULTS( ONavigationBarModel, OControlModel ); - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); // XTypeProvider DECLARE_XTYPEPROVIDER() @@ -92,16 +92,16 @@ namespace frm virtual void SAL_CALL disposing(); // XPersistObject - virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); // XPropertySet virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const; virtual sal_Bool SAL_CALL convertFastPropertyValue(::com::sun::star::uno::Any& rConvertedValue, ::com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::lang::IllegalArgumentException); - virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue) throw ( ::com::sun::star::uno::Exception); + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue) throw ( ::com::sun::star::uno::Exception, std::exception); // XPropertyState virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const; diff --git a/forms/source/component/refvaluecomponent.cxx b/forms/source/component/refvaluecomponent.cxx index 38ebd2cfc308..af996f8c7b08 100644 --- a/forms/source/component/refvaluecomponent.cxx +++ b/forms/source/component/refvaluecomponent.cxx @@ -87,7 +87,7 @@ namespace frm } - void SAL_CALL OReferenceValueComponent::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw (Exception) + void SAL_CALL OReferenceValueComponent::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw (Exception, std::exception) { switch ( _nHandle ) { diff --git a/forms/source/component/refvaluecomponent.hxx b/forms/source/component/refvaluecomponent.hxx index 5b038a73e70a..bee7af2f0ce8 100644 --- a/forms/source/component/refvaluecomponent.hxx +++ b/forms/source/component/refvaluecomponent.hxx @@ -66,7 +66,7 @@ namespace frm // OPropertySet and friends virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception); + throw (::com::sun::star::uno::Exception, std::exception); virtual sal_Bool SAL_CALL convertFastPropertyValue( ::com::sun::star::uno::Any& _rConvertedValue, ::com::sun::star::uno::Any& _rOldValue, sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::lang::IllegalArgumentException); diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx index ca2b75e8f56e..839d95bfaca4 100644 --- a/forms/source/component/scrollbar.cxx +++ b/forms/source/component/scrollbar.cxx @@ -161,7 +161,7 @@ namespace frm } - void OScrollBarModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception ) + void OScrollBarModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception, std::exception ) { switch ( _nHandle ) { @@ -234,14 +234,14 @@ namespace frm } - OUString SAL_CALL OScrollBarModel::getServiceName() throw( RuntimeException ) + OUString SAL_CALL OScrollBarModel::getServiceName() throw( RuntimeException, std::exception ) { return OUString(FRM_SUN_COMPONENT_SCROLLBAR); } void SAL_CALL OScrollBarModel::write( const Reference< XObjectOutputStream >& _rxOutStream ) - throw( IOException, RuntimeException ) + throw( IOException, RuntimeException, std::exception ) { OBoundControlModel::write( _rxOutStream ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -257,7 +257,7 @@ namespace frm } - void SAL_CALL OScrollBarModel::read( const Reference< XObjectInputStream>& _rxInStream ) throw( IOException, RuntimeException ) + void SAL_CALL OScrollBarModel::read( const Reference< XObjectInputStream>& _rxInStream ) throw( IOException, RuntimeException, std::exception ) { OBoundControlModel::read( _rxInStream ); ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/forms/source/component/scrollbar.hxx b/forms/source/component/scrollbar.hxx index ac14d0ab171f..948c46a8e79a 100644 --- a/forms/source/component/scrollbar.hxx +++ b/forms/source/component/scrollbar.hxx @@ -60,7 +60,7 @@ namespace frm // OPropertySetHelper virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& _rValue, sal_Int32 _nHandle ) const; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) - throw ( ::com::sun::star::uno::Exception ); + throw ( ::com::sun::star::uno::Exception, std::exception ); virtual sal_Bool SAL_CALL convertFastPropertyValue( ::com::sun::star::uno::Any& _rConvertedValue, ::com::sun::star::uno::Any& _rOldValue, sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) throw ( ::com::sun::star::lang::IllegalArgumentException ); diff --git a/forms/source/component/spinbutton.cxx b/forms/source/component/spinbutton.cxx index 82429b0cd410..c5a21b811259 100644 --- a/forms/source/component/spinbutton.cxx +++ b/forms/source/component/spinbutton.cxx @@ -117,7 +117,7 @@ namespace frm } - void OSpinButtonModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception ) + void OSpinButtonModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception, std::exception ) { switch ( _nHandle ) { @@ -190,14 +190,14 @@ namespace frm } - OUString SAL_CALL OSpinButtonModel::getServiceName() throw( RuntimeException ) + OUString SAL_CALL OSpinButtonModel::getServiceName() throw( RuntimeException, std::exception ) { return OUString(FRM_SUN_COMPONENT_SPINBUTTON); } void SAL_CALL OSpinButtonModel::write( const Reference< XObjectOutputStream >& _rxOutStream ) - throw( IOException, RuntimeException ) + throw( IOException, RuntimeException, std::exception ) { OBoundControlModel::write( _rxOutStream ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -213,7 +213,7 @@ namespace frm } - void SAL_CALL OSpinButtonModel::read( const Reference< XObjectInputStream>& _rxInStream ) throw( IOException, RuntimeException ) + void SAL_CALL OSpinButtonModel::read( const Reference< XObjectInputStream>& _rxInStream ) throw( IOException, RuntimeException, std::exception ) { OBoundControlModel::read( _rxInStream ); ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/forms/source/component/spinbutton.hxx b/forms/source/component/spinbutton.hxx index dfbff0528623..88b5ad48a3f5 100644 --- a/forms/source/component/spinbutton.hxx +++ b/forms/source/component/spinbutton.hxx @@ -60,7 +60,7 @@ namespace frm // OPropertySetHelper virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& _rValue, sal_Int32 _nHandle ) const; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) - throw ( ::com::sun::star::uno::Exception ); + throw ( ::com::sun::star::uno::Exception, std::exception ); virtual sal_Bool SAL_CALL convertFastPropertyValue( ::com::sun::star::uno::Any& _rConvertedValue, ::com::sun::star::uno::Any& _rOldValue, sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) throw ( ::com::sun::star::lang::IllegalArgumentException ); diff --git a/forms/source/helper/formnavigation.cxx b/forms/source/helper/formnavigation.cxx index 07ad13e279ef..9670ca62d2f7 100644 --- a/forms/source/helper/formnavigation.cxx +++ b/forms/source/helper/formnavigation.cxx @@ -81,21 +81,21 @@ namespace frm } - void SAL_CALL OFormNavigationHelper::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException) + void SAL_CALL OFormNavigationHelper::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException, std::exception) { m_pFeatureInterception->registerDispatchProviderInterceptor( _rxInterceptor ); interceptorsChanged(); } - void SAL_CALL OFormNavigationHelper::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException) + void SAL_CALL OFormNavigationHelper::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException, std::exception) { m_pFeatureInterception->releaseDispatchProviderInterceptor( _rxInterceptor ); interceptorsChanged(); } - void SAL_CALL OFormNavigationHelper::statusChanged( const FeatureStateEvent& _rState ) throw (RuntimeException) + void SAL_CALL OFormNavigationHelper::statusChanged( const FeatureStateEvent& _rState ) throw (RuntimeException, std::exception) { for ( FeatureMap::iterator aFeature = m_aSupportedFeatures.begin(); aFeature != m_aSupportedFeatures.end(); @@ -123,7 +123,7 @@ namespace frm } - void SAL_CALL OFormNavigationHelper::disposing( const EventObject& _rSource ) throw (RuntimeException) + void SAL_CALL OFormNavigationHelper::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception) { // 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 009fbd4f55c1..b970069419f2 100644 --- a/forms/source/helper/windowstateguard.cxx +++ b/forms/source/helper/windowstateguard.cxx @@ -66,17 +66,17 @@ namespace frm protected: // XWindowListener2 - virtual void SAL_CALL windowEnabled( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL windowDisabled( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL windowEnabled( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL windowDisabled( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XWindowListener - virtual void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL windowHidden( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL windowHidden( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); private: /** ensures that the window's Enabled state matches what is described at the model @@ -143,43 +143,43 @@ namespace frm } - void SAL_CALL WindowStateGuard_Impl::windowEnabled( const EventObject& /*e*/ ) throw (RuntimeException) + void SAL_CALL WindowStateGuard_Impl::windowEnabled( const EventObject& /*e*/ ) throw (RuntimeException, std::exception) { impl_ensureEnabledState_nothrow_nolck(); } - void SAL_CALL WindowStateGuard_Impl::windowDisabled( const EventObject& /*e*/ ) throw (RuntimeException) + void SAL_CALL WindowStateGuard_Impl::windowDisabled( const EventObject& /*e*/ ) throw (RuntimeException, std::exception) { impl_ensureEnabledState_nothrow_nolck(); } - void SAL_CALL WindowStateGuard_Impl::windowResized( const WindowEvent& /*e*/ ) throw (RuntimeException) + void SAL_CALL WindowStateGuard_Impl::windowResized( const WindowEvent& /*e*/ ) throw (RuntimeException, std::exception) { // not interested in } - void SAL_CALL WindowStateGuard_Impl::windowMoved( const WindowEvent& /*e*/ ) throw (RuntimeException) + void SAL_CALL WindowStateGuard_Impl::windowMoved( const WindowEvent& /*e*/ ) throw (RuntimeException, std::exception) { // not interested in } - void SAL_CALL WindowStateGuard_Impl::windowShown( const EventObject& /*e*/ ) throw (RuntimeException) + void SAL_CALL WindowStateGuard_Impl::windowShown( const EventObject& /*e*/ ) throw (RuntimeException, std::exception) { // not interested in } - void SAL_CALL WindowStateGuard_Impl::windowHidden( const EventObject& /*e*/ ) throw (RuntimeException) + void SAL_CALL WindowStateGuard_Impl::windowHidden( const EventObject& /*e*/ ) throw (RuntimeException, std::exception) { // not interested in } - void SAL_CALL WindowStateGuard_Impl::disposing( const EventObject& Source ) throw (RuntimeException) + void SAL_CALL WindowStateGuard_Impl::disposing( const EventObject& Source ) throw (RuntimeException, std::exception) { 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 55294fa2a7bb..2568b782e6dd 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -83,13 +83,13 @@ namespace frm // macros for quickly declaring/implementing XServiceInfo #define DECLARE_XPERSISTOBJECT() \ - virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); \ - virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); \ - virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); \ + virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception); \ + virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); \ + virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); \ // old macro for quickly implementing XServiceInfo::getImplementationName #define IMPLEMENTATION_NAME(ImplName) \ - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) \ + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) \ { return OUString("com.sun.star.comp.forms.") + OUString(#ImplName); } class OControlModel; @@ -224,45 +224,45 @@ protected: // UNO DECLARE_UNO3_AGG_DEFAULTS(OControl, OComponentHelper); - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XTypeProvider - virtual ::com::sun::star::uno::Sequence SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); // OComponentHelper virtual void SAL_CALL disposing(); // XComponent (as base of XControl) - virtual void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { OComponentHelper::dispose(); } - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) { OComponentHelper::addEventListener(_rxListener); } - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) { OComponentHelper::removeEventListener(_rxListener); } // XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException) = 0; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) = 0; // XServiceInfo - static version static StringSequence SAL_CALL getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException); // XControl - virtual void SAL_CALL setContext(const InterfaceRef& Context) throw (::com::sun::star::uno::RuntimeException); - virtual InterfaceRef SAL_CALL getContext() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference& Toolkit, const ::com::sun::star::uno::Reference& Parent) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference SAL_CALL getPeer() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference& Model) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference SAL_CALL getModel() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference SAL_CALL getView() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDesignMode(sal_Bool bOn) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isDesignMode() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isTransparent() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setContext(const InterfaceRef& Context) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual InterfaceRef SAL_CALL getContext() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference& Toolkit, const ::com::sun::star::uno::Reference& Parent) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference SAL_CALL getPeer() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference& Model) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference SAL_CALL getModel() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference SAL_CALL getView() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDesignMode(sal_Bool bOn) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isDesignMode() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isTransparent() throw (::com::sun::star::uno::RuntimeException, std::exception); protected: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes(); @@ -301,18 +301,18 @@ public: virtual ~OBoundControl(); DECLARE_UNO3_AGG_DEFAULTS(OBoundControl, OControl); - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XBoundControl - virtual sal_Bool SAL_CALL getLock() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setLock(sal_Bool _bLock) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL getLock() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setLock(sal_Bool _bLock) throw(::com::sun::star::uno::RuntimeException, std::exception); // default implementation just disables the controls, overwrite _setLock to change this behaviour // XControl - virtual sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model) throw (::com::sun::star::uno::RuntimeException, std::exception); // XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException, std::exception); // OComponentHelper virtual void SAL_CALL disposing(); @@ -409,40 +409,40 @@ protected: public: DECLARE_UNO3_AGG_DEFAULTS(OControl, OComponentHelper); - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XTypeProvider - virtual ::com::sun::star::uno::Sequence SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception); // OComponentHelper virtual void SAL_CALL disposing(); // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName(const OUString& aName) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setName(const OUString& aName) throw(::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException) = 0; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) = 0; // XSericeInfo - static version(s) static StringSequence SAL_CALL getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException); // XPersistObject - virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException) = 0; + virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) = 0; virtual void SAL_CALL - write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL - read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); // XChild (base of XFormComponent) - virtual InterfaceRef SAL_CALL getParent() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setParent(const InterfaceRef& Parent) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + virtual InterfaceRef SAL_CALL getParent() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setParent(const InterfaceRef& Parent) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception); // XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException, std::exception); // XPropertySet virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const; @@ -450,7 +450,7 @@ public: ::com::sun::star::uno::Any& _rConvertedValue, ::com::sun::star::uno::Any& _rOldValue, sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::lang::IllegalArgumentException); virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception); + throw (::com::sun::star::uno::Exception, std::exception); using ::cppu::OPropertySetHelper::getFastPropertyValue; // ::com::sun::star::beans::XPropertyState @@ -459,15 +459,15 @@ public: virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const; // XCloneable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException) = 0; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception) = 0; // XPropertyContainer - virtual void SAL_CALL addProperty( const OUString& Name, ::sal_Int16 Attributes, const ::com::sun::star::uno::Any& DefaultValue ) throw (::com::sun::star::beans::PropertyExistException, ::com::sun::star::beans::IllegalTypeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeProperty( const OUString& Name ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::NotRemoveableException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addProperty( const OUString& Name, ::sal_Int16 Attributes, const ::com::sun::star::uno::Any& DefaultValue ) throw (::com::sun::star::beans::PropertyExistException, ::com::sun::star::beans::IllegalTypeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeProperty( const OUString& Name ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::NotRemoveableException, ::com::sun::star::uno::RuntimeException, std::exception); // XPropertyAccess - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); protected: using OPropertySetAggregationHelper::setPropertyValues; @@ -479,7 +479,7 @@ protected: protected: // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException, std::exception); // OPropertySetHelper virtual cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); @@ -577,10 +577,10 @@ public: //================================================================== // XCloneable #define DECLARE_XCLONEABLE( ) \ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException) + virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception) #define IMPLEMENT_DEFAULT_CLONING( classname ) \ - ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL classname::createClone( ) throw (::com::sun::star::uno::RuntimeException) \ + ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL classname::createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception) \ { \ classname* pClone = new classname( this, getContext() ); \ pClone->clonedFrom( this ); \ @@ -1026,35 +1026,35 @@ public: public: // UNO Anbindung DECLARE_UNO3_AGG_DEFAULTS(OBoundControlModel, OControlModel); - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception); // OComponentHelper virtual void SAL_CALL disposing(); // XReset - virtual void SAL_CALL reset( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addResetListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeResetListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL reset( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addResetListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeResetListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual StringSequence SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual StringSequence SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - static version static StringSequence SAL_CALL getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException); // XChild - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception); // XPersistObject - virtual void SAL_CALL write( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& OutStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL read( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream >& InStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL write( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& OutStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL read( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream >& InStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); // XBoundComponent - virtual sal_Bool SAL_CALL commit() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL commit() throw(::com::sun::star::uno::RuntimeException, std::exception); // XUpdateBroadcaster (base of XBoundComponent) - virtual void SAL_CALL addUpdateListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeUpdateListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addUpdateListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeUpdateListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XPropertySet virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const; @@ -1062,48 +1062,48 @@ public: ::com::sun::star::uno::Any& _rConvertedValue, ::com::sun::star::uno::Any& _rOldValue, sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::lang::IllegalArgumentException); virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception); + throw (::com::sun::star::uno::Exception, std::exception); using ::cppu::OPropertySetHelper::getFastPropertyValue; // ::com::sun::star::beans::XPropertyState virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const; // XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException, std::exception); // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XRowSetChangeListener - virtual void SAL_CALL onRowSetChanged( const ::com::sun::star::lang::EventObject& i_Event ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL onRowSetChanged( const ::com::sun::star::lang::EventObject& i_Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XLoadListener - virtual void SAL_CALL loaded( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL unloading( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL unloaded( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL reloading( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL reloaded( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL loaded( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL unloading( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL unloaded( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL reloading( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL reloaded( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); protected: // XBindableValue - virtual void SAL_CALL setValueBinding( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding ) throw (::com::sun::star::form::binding::IncompatibleTypesException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding > SAL_CALL getValueBinding( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setValueBinding( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding ) throw (::com::sun::star::form::binding::IncompatibleTypesException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding > SAL_CALL getValueBinding( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XModifyListener - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& _rEvent ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& _rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XValidatable - virtual void SAL_CALL setValidator( const ::com::sun::star::uno::Reference< ::com::sun::star::form::validation::XValidator >& Validator ) throw (::com::sun::star::util::VetoException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::validation::XValidator > SAL_CALL getValidator( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setValidator( const ::com::sun::star::uno::Reference< ::com::sun::star::form::validation::XValidator >& Validator ) throw (::com::sun::star::util::VetoException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::validation::XValidator > SAL_CALL getValidator( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XValidityConstraintListener - virtual void SAL_CALL validityConstraintChanged( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL validityConstraintChanged( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XValidatableFormComponent - virtual sal_Bool SAL_CALL isValid( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addFormComponentValidityListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::validation::XFormComponentValidityListener >& Listener ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeFormComponentValidityListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::validation::XFormComponentValidityListener >& Listener ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL isValid( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addFormComponentValidityListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::validation::XFormComponentValidityListener >& Listener ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeFormComponentValidityListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::validation::XFormComponentValidityListener >& Listener ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception); protected: // OPropertyChangeListener diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx index 79a089a62781..faec5ea32e64 100644 --- a/forms/source/inc/InterfaceContainer.hxx +++ b/forms/source/inc/InterfaceContainer.hxx @@ -126,62 +126,62 @@ protected: public: // ::com::sun::star::io::XPersistObject - virtual OUString SAL_CALL getServiceName( ) throw(::com::sun::star::uno::RuntimeException) = 0; - virtual void SAL_CALL write( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& OutStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL read( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream >& InStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) = 0; + virtual void SAL_CALL write( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& OutStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL read( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream >& InStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::beans::XPropertyChangeListener - virtual void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::container::XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException) ; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) ; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::container::XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration> SAL_CALL createEnumeration() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration> SAL_CALL createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::container::XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual StringSequence SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual StringSequence SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::container::XNameReplace - virtual void SAL_CALL replaceByName(const OUString& Name, const ::com::sun::star::uno::Any& _rElement) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceByName(const OUString& Name, const ::com::sun::star::uno::Any& _rElement) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::container::XNameContainer - virtual void SAL_CALL insertByName(const OUString& Name, const ::com::sun::star::uno::Any& _rElement) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName(const OUString& Name) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertByName(const OUString& Name, const ::com::sun::star::uno::Any& _rElement) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeByName(const OUString& Name) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::container::XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 _nIndex) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 _nIndex) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::container::XIndexReplace - virtual void SAL_CALL replaceByIndex(sal_Int32 _nIndex, const ::com::sun::star::uno::Any& _rElement) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceByIndex(sal_Int32 _nIndex, const ::com::sun::star::uno::Any& _rElement) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::container::XIndexContainer - virtual void SAL_CALL insertByIndex(sal_Int32 _nIndex, const ::com::sun::star::uno::Any& Element) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByIndex(sal_Int32 _nIndex) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertByIndex(sal_Int32 _nIndex, const ::com::sun::star::uno::Any& Element) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeByIndex(sal_Int32 _nIndex) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::container::XContainer - virtual void SAL_CALL addContainerListener(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeContainerListener(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addContainerListener(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeContainerListener(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::script::XEventAttacherManager - virtual void SAL_CALL registerScriptEvent( sal_Int32 nIndex, const ::com::sun::star::script::ScriptEventDescriptor& aScriptEvent ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL registerScriptEvents( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& aScriptEvents ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL revokeScriptEvent( sal_Int32 nIndex, const OUString& aListenerType, const OUString& aEventMethod, const OUString& aRemoveListenerParam ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL revokeScriptEvents( sal_Int32 nIndex ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertEntry( sal_Int32 nIndex ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEntry( sal_Int32 nIndex ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor > SAL_CALL getScriptEvents( sal_Int32 Index ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL attach( sal_Int32 nIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xObject, const ::com::sun::star::uno::Any& aHelper ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::ServiceNotRegisteredException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL detach( sal_Int32 nIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xObject ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addScriptListener( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener >& xListener ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeScriptListener( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener >& Listener ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL registerScriptEvent( sal_Int32 nIndex, const ::com::sun::star::script::ScriptEventDescriptor& aScriptEvent ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL registerScriptEvents( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& aScriptEvents ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL revokeScriptEvent( sal_Int32 nIndex, const OUString& aListenerType, const OUString& aEventMethod, const OUString& aRemoveListenerParam ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL revokeScriptEvents( sal_Int32 nIndex ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL insertEntry( sal_Int32 nIndex ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeEntry( sal_Int32 nIndex ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor > SAL_CALL getScriptEvents( sal_Int32 Index ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL attach( sal_Int32 nIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xObject, const ::com::sun::star::uno::Any& aHelper ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::ServiceNotRegisteredException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL detach( sal_Int32 nIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xObject ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addScriptListener( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener >& xListener ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeScriptListener( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptListener >& Listener ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); protected: // helper @@ -301,15 +301,15 @@ public: DECLARE_UNO3_AGG_DEFAULTS(OFormComponents, FormComponentsBase); - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // OComponentHelper virtual void SAL_CALL disposing(); // ::com::sun::star::form::XFormComponent - virtual ::comphelper::InterfaceRef SAL_CALL getParent() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setParent(const ::comphelper::InterfaceRef& Parent) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + virtual ::comphelper::InterfaceRef SAL_CALL getParent() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setParent(const ::comphelper::InterfaceRef& Parent) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception); // XEventListener using OInterfaceContainer::disposing; diff --git a/forms/source/inc/formnavigation.hxx b/forms/source/inc/formnavigation.hxx index d383b0d1eb29..fd05cf8de86f 100644 --- a/forms/source/inc/formnavigation.hxx +++ b/forms/source/inc/formnavigation.hxx @@ -88,14 +88,14 @@ namespace frm void SAL_CALL dispose( ) throw( ::com::sun::star::uno::RuntimeException ); // XDispatchProviderInterception - virtual void SAL_CALL registerDispatchProviderInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& Interceptor ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL releaseDispatchProviderInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& Interceptor ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL registerDispatchProviderInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& Interceptor ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL releaseDispatchProviderInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& Interceptor ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& State ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& State ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); // IFeatureDispatcher virtual void dispatch( sal_Int16 _nFeatureId ) const; diff --git a/forms/source/inc/forms_module.hxx b/forms/source/inc/forms_module.hxx index af987c9b4841..655a78adb9a5 100644 --- a/forms/source/inc/forms_module.hxx +++ b/forms/source/inc/forms_module.hxx @@ -205,8 +205,8 @@ namespace FORMS_MODULE_NAMESPACE //= OMultiInstanceAutoRegistration or OOneInstanceAutoRegistration //========================================================================== #define DECLARE_SERVICE_REGISTRATION( classname ) \ - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); \ - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); \ + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); \ + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); \ \ static OUString SAL_CALL getImplementationName_Static(); \ static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(); \ @@ -217,10 +217,10 @@ namespace FORMS_MODULE_NAMESPACE #define IMPLEMENT_SERVICE_REGISTRATION_BASE( classname, baseclass ) \ \ - OUString SAL_CALL classname::getImplementationName( ) throw ( RuntimeException ) \ + OUString SAL_CALL classname::getImplementationName( ) throw ( RuntimeException, std::exception ) \ { return getImplementationName_Static(); } \ \ - Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) throw (RuntimeException) \ + Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) throw (RuntimeException, std::exception) \ { \ return ::comphelper::concatSequences( \ getAggregateServiceNames(), \ diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx index dd6829d6beab..24e80a146b09 100644 --- a/forms/source/misc/InterfaceContainer.cxx +++ b/forms/source/misc/InterfaceContainer.cxx @@ -474,7 +474,7 @@ void SAL_CALL OInterfaceContainer::readEvents(const Reference& _rxOutStream ) throw(IOException, RuntimeException) +void SAL_CALL OInterfaceContainer::write( const Reference< XObjectOutputStream >& _rxOutStream ) throw(IOException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_rMutex ); sal_Int32 nLen = m_aItems.size(); @@ -532,7 +532,7 @@ namespace } -void SAL_CALL OInterfaceContainer::read( const Reference< XObjectInputStream >& _rxInStream ) throw(IOException, RuntimeException) +void SAL_CALL OInterfaceContainer::read( const Reference< XObjectInputStream >& _rxInStream ) throw(IOException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_rMutex ); @@ -621,20 +621,20 @@ void SAL_CALL OInterfaceContainer::read( const Reference< XObjectInputStream >& // XContainer -void SAL_CALL OInterfaceContainer::addContainerListener(const Reference& _rxListener) throw( RuntimeException ) +void SAL_CALL OInterfaceContainer::addContainerListener(const Reference& _rxListener) throw( RuntimeException, std::exception ) { m_aContainerListeners.addInterface(_rxListener); } -void SAL_CALL OInterfaceContainer::removeContainerListener(const Reference& _rxListener) throw( RuntimeException ) +void SAL_CALL OInterfaceContainer::removeContainerListener(const Reference& _rxListener) throw( RuntimeException, std::exception ) { m_aContainerListeners.removeInterface(_rxListener); } // XEventListener -void SAL_CALL OInterfaceContainer::disposing(const EventObject& _rSource) throw( RuntimeException ) +void SAL_CALL OInterfaceContainer::disposing(const EventObject& _rSource) throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutex ); @@ -680,7 +680,7 @@ void SAL_CALL OInterfaceContainer::disposing(const EventObject& _rSource) throw( // XPropertyChangeListener void OInterfaceContainer::propertyChange(const PropertyChangeEvent& evt) -throw (::com::sun::star::uno::RuntimeException) { +throw (::com::sun::star::uno::RuntimeException, std::exception) { if (evt.PropertyName == PROPERTY_NAME) { ::osl::MutexGuard aGuard( m_rMutex ); @@ -697,20 +697,20 @@ throw (::com::sun::star::uno::RuntimeException) { // XElementAccess -sal_Bool SAL_CALL OInterfaceContainer::hasElements() throw( RuntimeException ) +sal_Bool SAL_CALL OInterfaceContainer::hasElements() throw( RuntimeException, std::exception ) { return !m_aMap.empty(); } -Type SAL_CALL OInterfaceContainer::getElementType() throw(RuntimeException) +Type SAL_CALL OInterfaceContainer::getElementType() throw(RuntimeException, std::exception) { return m_aElementType; } // XEnumerationAccess -Reference SAL_CALL OInterfaceContainer::createEnumeration() throw( RuntimeException ) +Reference SAL_CALL OInterfaceContainer::createEnumeration() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutex ); return new ::comphelper::OEnumerationByIndex(static_cast(this)); @@ -718,7 +718,7 @@ Reference SAL_CALL OInterfaceContainer::createEnumeration() throw( // XNameAccess -Any SAL_CALL OInterfaceContainer::getByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) +Any SAL_CALL OInterfaceContainer::getByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { ::std::pair aPair = m_aMap.equal_range(_rName); @@ -730,7 +730,7 @@ Any SAL_CALL OInterfaceContainer::getByName( const OUString& _rName ) throw(NoSu } -StringSequence SAL_CALL OInterfaceContainer::getElementNames() throw(RuntimeException) +StringSequence SAL_CALL OInterfaceContainer::getElementNames() throw(RuntimeException, std::exception) { StringSequence aNameList(m_aItems.size()); OUString* pStringArray = aNameList.getArray(); @@ -743,7 +743,7 @@ StringSequence SAL_CALL OInterfaceContainer::getElementNames() throw(RuntimeExce } -sal_Bool SAL_CALL OInterfaceContainer::hasByName( const OUString& _rName ) throw(RuntimeException) +sal_Bool SAL_CALL OInterfaceContainer::hasByName( const OUString& _rName ) throw(RuntimeException, std::exception) { ::std::pair aPair = m_aMap.equal_range(_rName); @@ -752,13 +752,13 @@ sal_Bool SAL_CALL OInterfaceContainer::hasByName( const OUString& _rName ) throw // XIndexAccess -sal_Int32 OInterfaceContainer::getCount() throw( RuntimeException ) +sal_Int32 OInterfaceContainer::getCount() throw( RuntimeException, std::exception ) { return m_aItems.size(); } -Any OInterfaceContainer::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) +Any OInterfaceContainer::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { if (_nIndex < 0 || (_nIndex >= (sal_Int32)m_aItems.size())) throw IndexOutOfBoundsException(); @@ -944,7 +944,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) +void SAL_CALL OInterfaceContainer::insertByIndex( sal_Int32 _nIndex, const Any& _rElement ) throw(IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { Reference< XPropertySet > xElement; _rElement >>= xElement; @@ -1032,7 +1032,7 @@ void OInterfaceContainer::implCheckIndex( const sal_Int32 _nIndex ) SAL_THROW( ( } -void SAL_CALL OInterfaceContainer::replaceByIndex(sal_Int32 _nIndex, const Any& Element) throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) +void SAL_CALL OInterfaceContainer::replaceByIndex(sal_Int32 _nIndex, const Any& Element) throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { ::osl::ClearableMutexGuard aGuard( m_rMutex ); // check the index @@ -1085,7 +1085,7 @@ void OInterfaceContainer::implRemoveByIndex( const sal_Int32 _nIndex, ::osl::Cle } -void SAL_CALL OInterfaceContainer::removeByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) +void SAL_CALL OInterfaceContainer::removeByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { ::osl::ClearableMutexGuard aGuard( m_rMutex ); // check the index @@ -1101,7 +1101,7 @@ ElementDescription* OInterfaceContainer::createElementMetaData( ) } -void SAL_CALL OInterfaceContainer::insertByName(const OUString& _rName, const Any& _rElement) throw( IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException ) +void SAL_CALL OInterfaceContainer::insertByName(const OUString& _rName, const Any& _rElement) throw( IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception ) { Reference< XPropertySet > xElementProps; @@ -1132,7 +1132,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 ) +void SAL_CALL OInterfaceContainer::replaceByName(const OUString& Name, const Any& Element) throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) { ::osl::ClearableMutexGuard aGuard( m_rMutex ); ::std::pair & aScriptEvents ) throw(IllegalArgumentException, RuntimeException) +void SAL_CALL OInterfaceContainer::registerScriptEvents( sal_Int32 nIndex, const Sequence< ScriptEventDescriptor >& aScriptEvents ) throw(IllegalArgumentException, RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( m_rMutex ); if ( m_xEventAttacher.is() ) @@ -1199,35 +1199,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) +void SAL_CALL OInterfaceContainer::revokeScriptEvent( sal_Int32 nIndex, const OUString& aListenerType, const OUString& aEventMethod, const OUString& aRemoveListenerParam ) throw(IllegalArgumentException, RuntimeException, std::exception) { if ( m_xEventAttacher.is() ) m_xEventAttacher->revokeScriptEvent( nIndex, aListenerType, aEventMethod, aRemoveListenerParam ); } -void SAL_CALL OInterfaceContainer::revokeScriptEvents( sal_Int32 nIndex ) throw(IllegalArgumentException, RuntimeException) +void SAL_CALL OInterfaceContainer::revokeScriptEvents( sal_Int32 nIndex ) throw(IllegalArgumentException, RuntimeException, std::exception) { if ( m_xEventAttacher.is() ) m_xEventAttacher->revokeScriptEvents( nIndex ); } -void SAL_CALL OInterfaceContainer::insertEntry( sal_Int32 nIndex ) throw(IllegalArgumentException, RuntimeException) +void SAL_CALL OInterfaceContainer::insertEntry( sal_Int32 nIndex ) throw(IllegalArgumentException, RuntimeException, std::exception) { if ( m_xEventAttacher.is() ) m_xEventAttacher->insertEntry( nIndex ); } -void SAL_CALL OInterfaceContainer::removeEntry( sal_Int32 nIndex ) throw(IllegalArgumentException, RuntimeException) +void SAL_CALL OInterfaceContainer::removeEntry( sal_Int32 nIndex ) throw(IllegalArgumentException, RuntimeException, std::exception) { if ( m_xEventAttacher.is() ) m_xEventAttacher->removeEntry( nIndex ); } -Sequence< ScriptEventDescriptor > SAL_CALL OInterfaceContainer::getScriptEvents( sal_Int32 nIndex ) throw(IllegalArgumentException, RuntimeException) +Sequence< ScriptEventDescriptor > SAL_CALL OInterfaceContainer::getScriptEvents( sal_Int32 nIndex ) throw(IllegalArgumentException, RuntimeException, std::exception) { Sequence< ScriptEventDescriptor > aReturn; if ( m_xEventAttacher.is() ) @@ -1242,28 +1242,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) +void SAL_CALL OInterfaceContainer::attach( sal_Int32 nIndex, const Reference< XInterface >& xObject, const Any& aHelper ) throw(IllegalArgumentException, ServiceNotRegisteredException, RuntimeException, std::exception) { 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) +void SAL_CALL OInterfaceContainer::detach( sal_Int32 nIndex, const Reference< XInterface >& xObject ) throw(IllegalArgumentException, RuntimeException, std::exception) { if ( m_xEventAttacher.is() ) m_xEventAttacher->detach( nIndex, xObject ); } -void SAL_CALL OInterfaceContainer::addScriptListener( const Reference< XScriptListener >& xListener ) throw(IllegalArgumentException, RuntimeException) +void SAL_CALL OInterfaceContainer::addScriptListener( const Reference< XScriptListener >& xListener ) throw(IllegalArgumentException, RuntimeException, std::exception) { if ( m_xEventAttacher.is() ) m_xEventAttacher->addScriptListener( xListener ); } -void SAL_CALL OInterfaceContainer::removeScriptListener( const Reference< XScriptListener >& xListener ) throw(IllegalArgumentException, RuntimeException) +void SAL_CALL OInterfaceContainer::removeScriptListener( const Reference< XScriptListener >& xListener ) throw(IllegalArgumentException, RuntimeException, std::exception) { if ( m_xEventAttacher.is() ) m_xEventAttacher->removeScriptListener( xListener ); @@ -1273,7 +1273,7 @@ void SAL_CALL OInterfaceContainer::removeScriptListener( const Reference< XScrip //= OFormComponents //================================================================== -Any SAL_CALL OFormComponents::queryAggregation(const Type& _rType) throw(RuntimeException) +Any SAL_CALL OFormComponents::queryAggregation(const Type& _rType) throw(RuntimeException, std::exception) { Any aReturn = OFormComponents_BASE::queryInterface(_rType); if (!aReturn.hasValue()) @@ -1288,7 +1288,7 @@ Any SAL_CALL OFormComponents::queryAggregation(const Type& _rType) throw(Runtime } -Sequence SAL_CALL OFormComponents::getTypes() throw(RuntimeException) +Sequence SAL_CALL OFormComponents::getTypes() throw(RuntimeException, std::exception) { return ::comphelper::concatSequences(OInterfaceContainer::getTypes(), FormComponentsBase::getTypes(), OFormComponents_BASE::getTypes()); } @@ -1330,14 +1330,14 @@ void OFormComponents::disposing() //XChild -void OFormComponents::setParent(const InterfaceRef& Parent) throw( NoSupportException, RuntimeException ) +void OFormComponents::setParent(const InterfaceRef& Parent) throw( NoSupportException, RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); m_xParent = Parent; } -InterfaceRef OFormComponents::getParent() throw( RuntimeException ) +InterfaceRef OFormComponents::getParent() throw( RuntimeException, std::exception ) { return m_xParent; } diff --git a/forms/source/richtext/attributedispatcher.cxx b/forms/source/richtext/attributedispatcher.cxx index b6aaa4665758..ae170eb08aa5 100644 --- a/forms/source/richtext/attributedispatcher.cxx +++ b/forms/source/richtext/attributedispatcher.cxx @@ -84,7 +84,7 @@ namespace frm } - void SAL_CALL OAttributeDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArguments ) throw (RuntimeException) + void SAL_CALL OAttributeDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArguments ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/forms/source/richtext/attributedispatcher.hxx b/forms/source/richtext/attributedispatcher.hxx index 3e6c0d33de36..b4d9926bc115 100644 --- a/forms/source/richtext/attributedispatcher.hxx +++ b/forms/source/richtext/attributedispatcher.hxx @@ -66,7 +66,7 @@ namespace frm protected: // XDispatch - virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException, std::exception); // ITextAttributeListener virtual void onAttributeStateChanged( AttributeId _nAttributeId, const AttributeState& _rState ); diff --git a/forms/source/richtext/clipboarddispatcher.cxx b/forms/source/richtext/clipboarddispatcher.cxx index 31a3131659e5..3945f7735bd2 100644 --- a/forms/source/richtext/clipboarddispatcher.cxx +++ b/forms/source/richtext/clipboarddispatcher.cxx @@ -110,7 +110,7 @@ namespace frm } - void SAL_CALL OClipboardDispatcher::dispatch( const URL& /*_rURL*/, const Sequence< PropertyValue >& /*Arguments*/ ) throw (RuntimeException) + void SAL_CALL OClipboardDispatcher::dispatch( const URL& /*_rURL*/, const Sequence< PropertyValue >& /*Arguments*/ ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !getEditView() ) diff --git a/forms/source/richtext/clipboarddispatcher.hxx b/forms/source/richtext/clipboarddispatcher.hxx index b584b54fdb6a..ea77ba47d47f 100644 --- a/forms/source/richtext/clipboarddispatcher.hxx +++ b/forms/source/richtext/clipboarddispatcher.hxx @@ -52,7 +52,7 @@ namespace frm protected: // XDispatch - virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException, std::exception); // ORichTextFeatureDispatcher virtual void invalidateFeatureState_Broadcast(); diff --git a/forms/source/richtext/featuredispatcher.cxx b/forms/source/richtext/featuredispatcher.cxx index 47fc1375d2f2..31c901373181 100644 --- a/forms/source/richtext/featuredispatcher.cxx +++ b/forms/source/richtext/featuredispatcher.cxx @@ -69,7 +69,7 @@ namespace frm } - void SAL_CALL ORichTextFeatureDispatcher::addStatusListener( const Reference< XStatusListener >& _rxControl, const URL& _rURL ) throw (RuntimeException) + void SAL_CALL ORichTextFeatureDispatcher::addStatusListener( const Reference< XStatusListener >& _rxControl, const URL& _rURL ) throw (RuntimeException, std::exception) { OSL_ENSURE( !m_bDisposed, "ORichTextFeatureDispatcher::addStatusListener: already disposed!" ); if ( m_bDisposed ) @@ -85,7 +85,7 @@ namespace frm } - void SAL_CALL ORichTextFeatureDispatcher::removeStatusListener( const Reference< XStatusListener >& _rxControl, const URL& /*_rURL*/ ) throw (RuntimeException) + void SAL_CALL ORichTextFeatureDispatcher::removeStatusListener( const Reference< XStatusListener >& _rxControl, const URL& /*_rURL*/ ) throw (RuntimeException, std::exception) { m_aStatusListeners.removeInterface( _rxControl ); } diff --git a/forms/source/richtext/featuredispatcher.hxx b/forms/source/richtext/featuredispatcher.hxx index b355f58aa676..32d4389f33c0 100644 --- a/forms/source/richtext/featuredispatcher.hxx +++ b/forms/source/richtext/featuredispatcher.hxx @@ -85,8 +85,8 @@ namespace frm protected: // XDispatch - virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _rxControl, const ::com::sun::star::util::URL& _rURL ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _rxControl, const ::com::sun::star::util::URL& _rURL ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _rxControl, const ::com::sun::star::util::URL& _rURL ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _rxControl, const ::com::sun::star::util::URL& _rURL ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; //........................................................................ diff --git a/forms/source/richtext/parametrizedattributedispatcher.cxx b/forms/source/richtext/parametrizedattributedispatcher.cxx index fb90c2a0330b..774027286d5e 100644 --- a/forms/source/richtext/parametrizedattributedispatcher.cxx +++ b/forms/source/richtext/parametrizedattributedispatcher.cxx @@ -114,7 +114,7 @@ namespace frm } - void SAL_CALL OParametrizedAttributeDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArguments ) throw (RuntimeException) + void SAL_CALL OParametrizedAttributeDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArguments ) throw (RuntimeException, std::exception) { ::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 606ffc6cfcf7..ee4aafb091d5 100644 --- a/forms/source/richtext/parametrizedattributedispatcher.hxx +++ b/forms/source/richtext/parametrizedattributedispatcher.hxx @@ -45,7 +45,7 @@ namespace frm ~OParametrizedAttributeDispatcher(); // XDispatch - virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException, std::exception); // OAttributeDispatcher virtual void fillFeatureEventFromAttributeState( ::com::sun::star::frame::FeatureStateEvent& _rEvent, const AttributeState& _rState ) const; diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index c238cd635ee9..2cce4fb1f551 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -93,7 +93,7 @@ namespace frm IMPLEMENT_FORWARD_XTYPEPROVIDER2( ORichTextControl, UnoEditControl, ORichTextControl_Base ) - Any SAL_CALL ORichTextControl::queryAggregation( const Type& _rType ) throw ( RuntimeException ) + Any SAL_CALL ORichTextControl::queryAggregation( const Type& _rType ) throw ( RuntimeException, std::exception ) { Any aReturn = UnoEditControl::queryAggregation( _rType ); @@ -174,7 +174,7 @@ namespace frm } - void SAL_CALL ORichTextControl::createPeer( const Reference< XToolkit >& _rToolkit, const Reference< XWindowPeer >& _rParentPeer ) throw( RuntimeException ) + void SAL_CALL ORichTextControl::createPeer( const Reference< XToolkit >& _rToolkit, const Reference< XWindowPeer >& _rParentPeer ) throw( RuntimeException, std::exception ) { sal_Bool bReallyActAsRichText = sal_False; try @@ -249,13 +249,13 @@ namespace frm } - OUString SAL_CALL ORichTextControl::getImplementationName() throw( RuntimeException ) + OUString SAL_CALL ORichTextControl::getImplementationName() throw( RuntimeException, std::exception ) { return getImplementationName_Static(); } - Sequence< OUString > SAL_CALL ORichTextControl::getSupportedServiceNames() throw( RuntimeException ) + Sequence< OUString > SAL_CALL ORichTextControl::getSupportedServiceNames() throw( RuntimeException, std::exception ) { return getSupportedServiceNames_Static(); } @@ -283,13 +283,13 @@ namespace frm } - Reference< XDispatch > SAL_CALL ORichTextControl::queryDispatch( const ::com::sun::star::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _nSearchFlags ) throw (RuntimeException) + Reference< XDispatch > SAL_CALL ORichTextControl::queryDispatch( const ::com::sun::star::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _nSearchFlags ) throw (RuntimeException, std::exception) { FORWARD_TO_PEER_3_RET( Reference< XDispatch >, XDispatchProvider, queryDispatch, _rURL, _rTargetFrameName, _nSearchFlags ); } - Sequence< Reference< XDispatch > > SAL_CALL ORichTextControl::queryDispatches( const Sequence< DispatchDescriptor >& _rRequests ) throw (RuntimeException) + Sequence< Reference< XDispatch > > SAL_CALL ORichTextControl::queryDispatches( const Sequence< DispatchDescriptor >& _rRequests ) throw (RuntimeException, std::exception) { FORWARD_TO_PEER_1_RET( Sequence< Reference< XDispatch > >, XDispatchProvider, queryDispatches, _rRequests ); } @@ -339,7 +339,7 @@ namespace frm } - void ORichTextPeer::dispose( ) throw(RuntimeException) + void ORichTextPeer::dispose( ) throw(RuntimeException, std::exception) { { SolarMutexGuard aGuard; @@ -365,7 +365,7 @@ namespace frm } - void SAL_CALL ORichTextPeer::draw( sal_Int32 _nX, sal_Int32 _nY ) throw(::com::sun::star::uno::RuntimeException) + void SAL_CALL ORichTextPeer::draw( sal_Int32 _nX, sal_Int32 _nY ) throw(::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -665,7 +665,7 @@ namespace frm } - Reference< XDispatch > SAL_CALL ORichTextPeer::queryDispatch( const ::com::sun::star::util::URL& _rURL, const OUString& /*_rTargetFrameName*/, sal_Int32 /*_nSearchFlags*/ ) throw (RuntimeException) + Reference< XDispatch > SAL_CALL ORichTextPeer::queryDispatch( const ::com::sun::star::util::URL& _rURL, const OUString& /*_rTargetFrameName*/, sal_Int32 /*_nSearchFlags*/ ) throw (RuntimeException, std::exception) { Reference< XDispatch > xReturn; if ( !GetWindow() ) @@ -702,7 +702,7 @@ namespace frm } - Sequence< Reference< XDispatch > > SAL_CALL ORichTextPeer::queryDispatches( const Sequence< DispatchDescriptor >& _rRequests ) throw (RuntimeException) + Sequence< Reference< XDispatch > > SAL_CALL ORichTextPeer::queryDispatches( const Sequence< DispatchDescriptor >& _rRequests ) throw (RuntimeException, std::exception) { 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 6476d23700af..6ce25b768252 100644 --- a/forms/source/richtext/richtextcontrol.hxx +++ b/forms/source/richtext/richtextcontrol.hxx @@ -63,21 +63,21 @@ namespace frm protected: // UNO DECLARE_UNO3_AGG_DEFAULTS( ORichTextControl, UnoEditControl ); - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw ( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // XControl - virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& _rToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& _rParent ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& _rToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& _rParent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); // XTypeProvider DECLARE_XTYPEPROVIDER() // XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _rSearchFlags ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& Requests ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _rSearchFlags ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& Requests ) throw (::com::sun::star::uno::RuntimeException, std::exception); // UnoControl virtual bool requiresNewPeer( const OUString& _rPropertyName ) const; @@ -116,7 +116,7 @@ namespace frm ~ORichTextPeer(); // XView - void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XVclWindowPeer virtual void SAL_CALL setProperty( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) @@ -127,11 +127,11 @@ namespace frm DECLARE_XTYPEPROVIDER( ) // XComponent - virtual void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _rSearchFlags ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& Requests ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _rSearchFlags ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& Requests ) throw (::com::sun::star::uno::RuntimeException, std::exception); // ITextSelectionListener virtual void onSelectionChanged( const ESelection& _rSelection ); diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx index 50ccfa8ef0db..20cec279a2cb 100644 --- a/forms/source/richtext/richtextmodel.cxx +++ b/forms/source/richtext/richtextmodel.cxx @@ -222,7 +222,7 @@ namespace frm } - Any SAL_CALL ORichTextModel::queryAggregation( const Type& _rType ) throw ( RuntimeException ) + Any SAL_CALL ORichTextModel::queryAggregation( const Type& _rType ) throw ( RuntimeException, std::exception ) { Any aReturn = ORichTextModel_BASE::queryInterface( _rType ); @@ -348,7 +348,7 @@ namespace frm } - void SAL_CALL ORichTextModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception) + void SAL_CALL ORichTextModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception, std::exception) { if ( isRegisteredProperty( _nHandle ) ) { @@ -493,20 +493,20 @@ namespace frm } - OUString SAL_CALL ORichTextModel::getServiceName() throw ( RuntimeException) + OUString SAL_CALL ORichTextModel::getServiceName() throw ( RuntimeException, std::exception) { return OUString(FRM_SUN_COMPONENT_RICHTEXTCONTROL); } - void SAL_CALL ORichTextModel::write(const Reference< XObjectOutputStream >& _rxOutStream) throw ( IOException, RuntimeException) + void SAL_CALL ORichTextModel::write(const Reference< XObjectOutputStream >& _rxOutStream) throw ( IOException, RuntimeException, std::exception) { OControlModel::write( _rxOutStream ); // TODO: place your code here } - void SAL_CALL ORichTextModel::read(const Reference< XObjectInputStream >& _rxInStream) throw ( IOException, RuntimeException) + void SAL_CALL ORichTextModel::read(const Reference< XObjectInputStream >& _rxInStream) throw ( IOException, RuntimeException, std::exception) { OControlModel::read( _rxInStream ); // TODO: place your code here @@ -567,7 +567,7 @@ namespace frm } - sal_Int64 SAL_CALL ORichTextModel::getSomething( const Sequence< sal_Int8 >& _rId ) throw (RuntimeException) + sal_Int64 SAL_CALL ORichTextModel::getSomething( const Sequence< sal_Int8 >& _rId ) throw (RuntimeException, std::exception) { Sequence< sal_Int8 > aEditEngineAccessId( getEditEngineTunnelId() ); if ( ( _rId.getLength() == aEditEngineAccessId.getLength() ) @@ -583,13 +583,13 @@ namespace frm } - void SAL_CALL ORichTextModel::addModifyListener( const Reference< XModifyListener >& _rxListener ) throw (RuntimeException) + void SAL_CALL ORichTextModel::addModifyListener( const Reference< XModifyListener >& _rxListener ) throw (RuntimeException, std::exception) { m_aModifyListeners.addInterface( _rxListener ); } - void SAL_CALL ORichTextModel::removeModifyListener( const Reference< XModifyListener >& _rxListener ) throw (RuntimeException) + void SAL_CALL ORichTextModel::removeModifyListener( const Reference< XModifyListener >& _rxListener ) throw (RuntimeException, std::exception) { m_aModifyListeners.removeInterface( _rxListener ); } diff --git a/forms/source/richtext/richtextmodel.hxx b/forms/source/richtext/richtextmodel.hxx index a9c6500d9e2e..da004bc06f3a 100644 --- a/forms/source/richtext/richtextmodel.hxx +++ b/forms/source/richtext/richtextmodel.hxx @@ -104,7 +104,7 @@ namespace frm // UNO DECLARE_UNO3_AGG_DEFAULTS( ORichTextModel, OControlModel ); - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo DECLARE_SERVICE_REGISTRATION( ORichTextModel ) @@ -119,18 +119,18 @@ namespace frm DECLARE_XCLONEABLE(); // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XPropertySet and friends virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const; virtual sal_Bool SAL_CALL convertFastPropertyValue(::com::sun::star::uno::Any& rConvertedValue, ::com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::lang::IllegalArgumentException); - virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue) throw ( ::com::sun::star::uno::Exception); + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue) throw ( ::com::sun::star::uno::Exception, std::exception); virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const; // OControlModel's property handling diff --git a/forms/source/richtext/specialdispatchers.cxx b/forms/source/richtext/specialdispatchers.cxx index f9eaa1a64952..78832fc9197a 100644 --- a/forms/source/richtext/specialdispatchers.cxx +++ b/forms/source/richtext/specialdispatchers.cxx @@ -119,7 +119,7 @@ namespace frm } - void SAL_CALL OTextDirectionDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& /*_rArguments*/ ) throw (RuntimeException) + void SAL_CALL OTextDirectionDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& /*_rArguments*/ ) throw (RuntimeException, std::exception) { ::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 37c823abe4f3..57b87c5d0cfc 100644 --- a/forms/source/richtext/specialdispatchers.hxx +++ b/forms/source/richtext/specialdispatchers.hxx @@ -75,7 +75,7 @@ namespace frm protected: // XDispatch - virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException, std::exception); // ORichTextFeatureDispatcher virtual ::com::sun::star::frame::FeatureStateEvent buildStatusEvent() const; diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx index c9d03bf52d3a..cfef86646d27 100644 --- a/forms/source/runtime/formoperations.cxx +++ b/forms/source/runtime/formoperations.cxx @@ -163,7 +163,7 @@ namespace frm } - void SAL_CALL FormOperations::initialize( const Sequence< Any >& _arguments ) throw (Exception, RuntimeException) + void SAL_CALL FormOperations::initialize( const Sequence< Any >& _arguments ) throw (Exception, RuntimeException, std::exception) { if ( m_bConstructed ) throw AlreadyInitializedException(); @@ -184,56 +184,56 @@ namespace frm throw IllegalArgumentException( OUString(), *this, 0 ); } - OUString SAL_CALL FormOperations::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL FormOperations::getImplementationName( ) throw (RuntimeException, std::exception) { return getImplementationName_Static(); } - ::sal_Bool SAL_CALL FormOperations::supportsService( const OUString& _ServiceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL FormOperations::supportsService( const OUString& _ServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, _ServiceName); } - Sequence< OUString > SAL_CALL FormOperations::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL FormOperations::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } - Reference< XRowSet > SAL_CALL FormOperations::getCursor() throw (RuntimeException) + Reference< XRowSet > SAL_CALL FormOperations::getCursor() throw (RuntimeException, std::exception) { MethodGuard aGuard( *this ); return m_xCursor; } - Reference< XResultSetUpdate > SAL_CALL FormOperations::getUpdateCursor() throw (RuntimeException) + Reference< XResultSetUpdate > SAL_CALL FormOperations::getUpdateCursor() throw (RuntimeException, std::exception) { MethodGuard aGuard( *this ); return m_xUpdateCursor; } - Reference< XFormController > SAL_CALL FormOperations::getController() throw (RuntimeException) + Reference< XFormController > SAL_CALL FormOperations::getController() throw (RuntimeException, std::exception) { MethodGuard aGuard( *this ); return m_xController; } - Reference< XFeatureInvalidation > SAL_CALL FormOperations::getFeatureInvalidation() throw (RuntimeException) + Reference< XFeatureInvalidation > SAL_CALL FormOperations::getFeatureInvalidation() throw (RuntimeException, std::exception) { MethodGuard aGuard( *this ); return m_xFeatureInvalidation; } - void SAL_CALL FormOperations::setFeatureInvalidation( const Reference< XFeatureInvalidation > & _rxFeatureInvalidation ) throw (RuntimeException) + void SAL_CALL FormOperations::setFeatureInvalidation( const Reference< XFeatureInvalidation > & _rxFeatureInvalidation ) throw (RuntimeException, std::exception) { MethodGuard aGuard( *this ); m_xFeatureInvalidation = _rxFeatureInvalidation; } - FeatureState SAL_CALL FormOperations::getState( ::sal_Int16 _nFeature ) throw (RuntimeException) + FeatureState SAL_CALL FormOperations::getState( ::sal_Int16 _nFeature ) throw (RuntimeException, std::exception) { MethodGuard aGuard( *this ); @@ -416,7 +416,7 @@ namespace frm } - ::sal_Bool SAL_CALL FormOperations::isEnabled( ::sal_Int16 _nFeature ) throw (RuntimeException) + ::sal_Bool SAL_CALL FormOperations::isEnabled( ::sal_Int16 _nFeature ) throw (RuntimeException, std::exception) { MethodGuard aGuard( *this ); @@ -570,7 +570,7 @@ namespace frm } } - void SAL_CALL FormOperations::execute( ::sal_Int16 _nFeature ) throw (RuntimeException, IllegalArgumentException, SQLException, WrappedTargetException) + void SAL_CALL FormOperations::execute( ::sal_Int16 _nFeature ) throw (RuntimeException, IllegalArgumentException, SQLException, WrappedTargetException, std::exception) { SolarMutexGuard aSolarGuard; MethodGuard aGuard( *this ); @@ -829,7 +829,7 @@ namespace frm } - void SAL_CALL FormOperations::executeWithArguments( ::sal_Int16 _nFeature, const Sequence< NamedValue >& _rArguments ) throw (RuntimeException, IllegalArgumentException, SQLException, WrappedTargetException) + void SAL_CALL FormOperations::executeWithArguments( ::sal_Int16 _nFeature, const Sequence< NamedValue >& _rArguments ) throw (RuntimeException, IllegalArgumentException, SQLException, WrappedTargetException, std::exception) { if ( !lcl_requiresArguments( _nFeature ) ) { @@ -886,7 +886,7 @@ namespace frm } - ::sal_Bool SAL_CALL FormOperations::commitCurrentRecord( ::sal_Bool& _out_rRecordInserted ) throw (RuntimeException, SQLException) + ::sal_Bool SAL_CALL FormOperations::commitCurrentRecord( ::sal_Bool& _out_rRecordInserted ) throw (RuntimeException, SQLException, std::exception) { MethodGuard aGuard( *this ); _out_rRecordInserted = sal_False; @@ -921,7 +921,7 @@ namespace frm } - ::sal_Bool SAL_CALL FormOperations::commitCurrentControl() throw (RuntimeException, SQLException) + ::sal_Bool SAL_CALL FormOperations::commitCurrentControl() throw (RuntimeException, SQLException, std::exception) { MethodGuard aGuard( *this ); return impl_commitCurrentControl_throw(); @@ -970,7 +970,7 @@ namespace frm } - ::sal_Bool SAL_CALL FormOperations::isInsertionRow() throw (RuntimeException, WrappedTargetException) + ::sal_Bool SAL_CALL FormOperations::isInsertionRow() throw (RuntimeException, WrappedTargetException, std::exception) { sal_Bool bIs = sal_False; try @@ -986,7 +986,7 @@ namespace frm } - ::sal_Bool SAL_CALL FormOperations::isModifiedRow() throw (RuntimeException, WrappedTargetException) + ::sal_Bool SAL_CALL FormOperations::isModifiedRow() throw (RuntimeException, WrappedTargetException, std::exception) { sal_Bool bIs = sal_False; try @@ -1002,7 +1002,7 @@ namespace frm } - void SAL_CALL FormOperations::cursorMoved( const EventObject& /*_Event*/ ) throw (RuntimeException) + void SAL_CALL FormOperations::cursorMoved( const EventObject& /*_Event*/ ) throw (RuntimeException, std::exception) { MethodGuard aGuard( *this ); m_bActiveControlModified = false; @@ -1011,19 +1011,19 @@ namespace frm } - void SAL_CALL FormOperations::rowChanged( const EventObject& /*_Event*/ ) throw (RuntimeException) + void SAL_CALL FormOperations::rowChanged( const EventObject& /*_Event*/ ) throw (RuntimeException, std::exception) { // not interested in } - void SAL_CALL FormOperations::rowSetChanged( const EventObject& /*_Event*/ ) throw (RuntimeException) + void SAL_CALL FormOperations::rowSetChanged( const EventObject& /*_Event*/ ) throw (RuntimeException, std::exception) { // not interested in } - void SAL_CALL FormOperations::modified( const EventObject& /*_Source*/ ) throw( RuntimeException ) + void SAL_CALL FormOperations::modified( const EventObject& /*_Source*/ ) throw( RuntimeException, std::exception ) { MethodGuard aGuard( *this ); @@ -1036,7 +1036,7 @@ namespace frm } - void SAL_CALL FormOperations::propertyChange( const PropertyChangeEvent& _rEvent ) throw (RuntimeException) + void SAL_CALL FormOperations::propertyChange( const PropertyChangeEvent& _rEvent ) throw (RuntimeException, std::exception) { MethodGuard aGuard( *this ); @@ -1084,7 +1084,7 @@ namespace frm } - void SAL_CALL FormOperations::disposing( const EventObject& /*_Source*/ ) throw (RuntimeException) + void SAL_CALL FormOperations::disposing( const EventObject& /*_Source*/ ) throw (RuntimeException, std::exception) { // 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 f17646d43e5e..fefee016c5ec 100644 --- a/forms/source/runtime/formoperations.hxx +++ b/forms/source/runtime/formoperations.hxx @@ -109,41 +109,41 @@ namespace frm virtual ~FormOperations(); // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XFormOperations - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > SAL_CALL getCursor() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate > SAL_CALL getUpdateCursor() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > SAL_CALL getController() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFeatureInvalidation > SAL_CALL getFeatureInvalidation() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFeatureInvalidation(const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFeatureInvalidation > & the_value) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::form::runtime::FeatureState SAL_CALL getState(::sal_Int16 Feature) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isEnabled(::sal_Int16 Feature) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL execute(::sal_Int16 Feature) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::WrappedTargetException); - virtual void SAL_CALL executeWithArguments(::sal_Int16 Feature, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::WrappedTargetException); - virtual ::sal_Bool SAL_CALL commitCurrentRecord(::sal_Bool & RecordInserted) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::sdbc::SQLException); - virtual ::sal_Bool SAL_CALL commitCurrentControl() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::sdbc::SQLException); - virtual ::sal_Bool SAL_CALL isInsertionRow() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::WrappedTargetException); - virtual ::sal_Bool SAL_CALL isModifiedRow() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::WrappedTargetException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > SAL_CALL getCursor() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate > SAL_CALL getUpdateCursor() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > SAL_CALL getController() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFeatureInvalidation > SAL_CALL getFeatureInvalidation() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setFeatureInvalidation(const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFeatureInvalidation > & the_value) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::form::runtime::FeatureState SAL_CALL getState(::sal_Int16 Feature) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL isEnabled(::sal_Int16 Feature) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL execute(::sal_Int16 Feature) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::WrappedTargetException, std::exception); + virtual void SAL_CALL executeWithArguments(::sal_Int16 Feature, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::WrappedTargetException, std::exception); + virtual ::sal_Bool SAL_CALL commitCurrentRecord(::sal_Bool & RecordInserted) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::sdbc::SQLException, std::exception); + virtual ::sal_Bool SAL_CALL commitCurrentControl() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::sdbc::SQLException, std::exception); + virtual ::sal_Bool SAL_CALL isInsertionRow() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::WrappedTargetException, std::exception); + virtual ::sal_Bool SAL_CALL isModifiedRow() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::WrappedTargetException, std::exception); // XRowSetListener - virtual void SAL_CALL cursorMoved( const ::com::sun::star::lang::EventObject& event ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL rowChanged( const ::com::sun::star::lang::EventObject& event ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL rowSetChanged( const ::com::sun::star::lang::EventObject& event ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL cursorMoved( const ::com::sun::star::lang::EventObject& event ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL rowChanged( const ::com::sun::star::lang::EventObject& event ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL rowSetChanged( const ::com::sun::star::lang::EventObject& event ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XModifyListener - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& _rSource ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& _rSource ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XComponent/OComponentHelper virtual void SAL_CALL disposing(); diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx index c07ede67aa3d..cd29d5eb6bc3 100644 --- a/forms/source/solar/component/navbarcontrol.cxx +++ b/forms/source/solar/component/navbarcontrol.cxx @@ -83,7 +83,7 @@ namespace frm IMPLEMENT_FORWARD_XTYPEPROVIDER2( ONavigationBarControl, UnoControl, ONavigationBarControl_Base ) - Any SAL_CALL ONavigationBarControl::queryAggregation( const Type& _rType ) throw ( RuntimeException ) + Any SAL_CALL ONavigationBarControl::queryAggregation( const Type& _rType ) throw ( RuntimeException, std::exception ) { Any aReturn = UnoControl::queryAggregation( _rType ); @@ -124,7 +124,7 @@ namespace frm } - void SAL_CALL ONavigationBarControl::createPeer( const Reference< XToolkit >& /*_rToolkit*/, const Reference< XWindowPeer >& _rParentPeer ) throw( RuntimeException ) + void SAL_CALL ONavigationBarControl::createPeer( const Reference< XToolkit >& /*_rToolkit*/, const Reference< XWindowPeer >& _rParentPeer ) throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -178,13 +178,13 @@ namespace frm } - OUString SAL_CALL ONavigationBarControl::getImplementationName() throw( RuntimeException ) + OUString SAL_CALL ONavigationBarControl::getImplementationName() throw( RuntimeException, std::exception ) { return getImplementationName_Static(); } - Sequence< OUString > SAL_CALL ONavigationBarControl::getSupportedServiceNames() throw( RuntimeException ) + Sequence< OUString > SAL_CALL ONavigationBarControl::getSupportedServiceNames() throw( RuntimeException, std::exception ) { return getSupportedServiceNames_Static(); } @@ -211,19 +211,19 @@ namespace frm } - void SAL_CALL ONavigationBarControl::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException) + void SAL_CALL ONavigationBarControl::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException, std::exception) { FORWARD_TO_PEER_1( XDispatchProviderInterception, registerDispatchProviderInterceptor, _rxInterceptor ); } - void SAL_CALL ONavigationBarControl::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException) + void SAL_CALL ONavigationBarControl::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException, std::exception) { FORWARD_TO_PEER_1( XDispatchProviderInterception, releaseDispatchProviderInterceptor, _rxInterceptor ); } - void SAL_CALL ONavigationBarControl::setDesignMode( sal_Bool _bOn ) throw( RuntimeException ) + void SAL_CALL ONavigationBarControl::setDesignMode( sal_Bool _bOn ) throw( RuntimeException, std::exception ) { UnoControl::setDesignMode( _bOn ); FORWARD_TO_PEER_1( XVclWindowPeer, setDesignMode, _bOn ); @@ -285,14 +285,14 @@ namespace frm IMPLEMENT_FORWARD_XTYPEPROVIDER2( ONavigationBarPeer, VCLXWindow, OFormNavigationHelper ) - void SAL_CALL ONavigationBarPeer::dispose( ) throw( RuntimeException ) + void SAL_CALL ONavigationBarPeer::dispose( ) throw( RuntimeException, std::exception ) { VCLXWindow::dispose(); OFormNavigationHelper::dispose(); } - void SAL_CALL ONavigationBarPeer::setProperty( const OUString& _rPropertyName, const Any& _rValue ) throw( RuntimeException ) + void SAL_CALL ONavigationBarPeer::setProperty( const OUString& _rPropertyName, const Any& _rValue ) throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -372,7 +372,7 @@ namespace frm } - Any SAL_CALL ONavigationBarPeer::getProperty( const OUString& _rPropertyName ) throw( RuntimeException ) + Any SAL_CALL ONavigationBarPeer::getProperty( const OUString& _rPropertyName ) throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -475,7 +475,7 @@ namespace frm } - void SAL_CALL ONavigationBarPeer::setDesignMode( sal_Bool _bOn ) throw( RuntimeException ) + void SAL_CALL ONavigationBarPeer::setDesignMode( sal_Bool _bOn ) throw( RuntimeException, std::exception ) { VCLXWindow::setDesignMode( _bOn ); @@ -487,7 +487,7 @@ namespace frm } - void SAL_CALL ONavigationBarPeer::disposing( const EventObject& _rSource ) throw (RuntimeException) + void SAL_CALL ONavigationBarPeer::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception) { VCLXWindow::disposing( _rSource ); OFormNavigationHelper::disposing( _rSource ); diff --git a/forms/source/solar/component/navbarcontrol.hxx b/forms/source/solar/component/navbarcontrol.hxx index 6576902bf774..8e23dc1fcf77 100644 --- a/forms/source/solar/component/navbarcontrol.hxx +++ b/forms/source/solar/component/navbarcontrol.hxx @@ -64,24 +64,24 @@ namespace frm protected: // UNO DECLARE_UNO3_AGG_DEFAULTS( ONavigationBarControl, UnoControl ); - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw ( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // XControl - virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& _rToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& _rParent ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& _rToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& _rParent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); // XTypeProvider DECLARE_XTYPEPROVIDER() // XVclWindowPeer - virtual void SAL_CALL setDesignMode( sal_Bool _bOn ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setDesignMode( sal_Bool _bOn ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XDispatchProviderInterception - virtual void SAL_CALL registerDispatchProviderInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& Interceptor ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL releaseDispatchProviderInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& Interceptor ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL registerDispatchProviderInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& Interceptor ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL releaseDispatchProviderInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& Interceptor ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; //================================================================== @@ -113,7 +113,7 @@ namespace frm DECLARE_XINTERFACE( ) // XVclWindowPeer - virtual void SAL_CALL setDesignMode( sal_Bool _bOn ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setDesignMode( sal_Bool _bOn ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XWindow2 using VCLXWindow::isEnabled; @@ -123,14 +123,14 @@ namespace frm DECLARE_XTYPEPROVIDER( ) // XComponent - void SAL_CALL dispose( ) throw( ::com::sun::star::uno::RuntimeException ); + void SAL_CALL dispose( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XVclWindowPeer - void SAL_CALL setProperty( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw( ::com::sun::star::uno::RuntimeException ); - ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& _rPropertyName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& _rPropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); // OFormNavigationHelper overriables virtual void interceptorsChanged( ); diff --git a/forms/source/xforms/NameContainer.hxx b/forms/source/xforms/NameContainer.hxx index fd93acb12010..7484eeeb7bae 100644 --- a/forms/source/xforms/NameContainer.hxx +++ b/forms/source/xforms/NameContainer.hxx @@ -97,13 +97,13 @@ public: // virtual com::sun::star::uno::Type SAL_CALL getElementType() - throw( com::sun::star::uno::RuntimeException ) + throw( com::sun::star::uno::RuntimeException, std::exception ) { return getCppuType( static_cast( NULL ) ); } virtual sal_Bool SAL_CALL hasElements() - throw( com::sun::star::uno::RuntimeException ) + throw( com::sun::star::uno::RuntimeException, std::exception ) { return hasItems(); } @@ -117,7 +117,7 @@ public: const OUString& rName ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException ) + com::sun::star::uno::RuntimeException, std::exception ) { typename map_t::const_iterator aIter = findItem( rName ); if( aIter == maItems.end() ) @@ -127,7 +127,7 @@ public: } virtual com::sun::star::uno::Sequence SAL_CALL getElementNames() - throw( com::sun::star::uno::RuntimeException ) + throw( com::sun::star::uno::RuntimeException, std::exception ) { com::sun::star::uno::Sequence aSequence( maItems.size() ); typename map_t::const_iterator aIter = maItems.begin(); @@ -145,7 +145,7 @@ public: virtual sal_Bool SAL_CALL hasByName( const OUString& rName ) - throw( com::sun::star::uno::RuntimeException ) + throw( com::sun::star::uno::RuntimeException, std::exception ) { return hasItem( rName ); } @@ -161,7 +161,7 @@ public: throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException) + com::sun::star::uno::RuntimeException, std::exception) { T aItem; if( aElement >>= aItem ) @@ -184,7 +184,7 @@ public: throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException ) + com::sun::star::uno::RuntimeException, std::exception ) { T aItem; if( aElement >>= aItem ) @@ -200,7 +200,7 @@ public: const OUString& rName ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException) + com::sun::star::uno::RuntimeException, std::exception) { if( hasByName( rName ) ) remove( rName ); diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx index 1e5862a53b82..b0a6f845302e 100644 --- a/forms/source/xforms/binding.cxx +++ b/forms/source/xforms/binding.cxx @@ -1038,20 +1038,20 @@ void Binding::_checkBindingID() // Binding::Sequence_Type_t Binding::getSupportedValueTypes() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return Convert::get().getTypes(); } sal_Bool Binding::supportsType( const Type_t& rType ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return Convert::get().hasType( rType ); } Binding::Any_t Binding::getValue( const Type_t& rType ) throw( IncompatibleTypesException, - RuntimeException ) + RuntimeException, std::exception ) { // first, check for model checkLive(); @@ -1075,7 +1075,7 @@ void Binding::setValue( const Any_t& aValue ) throw( IncompatibleTypesException, InvalidBindingStateException, NoSupportException, - RuntimeException ) + RuntimeException, std::exception ) { // first, check for model checkLive(); @@ -1107,7 +1107,7 @@ void Binding::setValue( const Any_t& aValue ) // sal_Int32 Binding::getListEntryCount() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { // first, check for model checkLive(); @@ -1143,7 +1143,7 @@ static OUString lcl_getString( const Reference& xNode ) OUString Binding::getListEntry( sal_Int32 nPosition ) throw( IndexOutOfBoundsException, - RuntimeException ) + RuntimeException, std::exception ) { // first, check for model checkLive(); @@ -1156,7 +1156,7 @@ OUString Binding::getListEntry( sal_Int32 nPosition ) } Sequence Binding::getAllListEntries() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { // first, check for model checkLive(); @@ -1175,7 +1175,7 @@ Sequence Binding::getAllListEntries() void Binding::addListEntryListener( const XListEntryListener_t& xListener ) throw( NullPointerException, - RuntimeException ) + RuntimeException, std::exception ) { OSL_ENSURE( xListener.is(), "need listener!" ); if( ::std::find( maListEntryListeners.begin(), @@ -1187,7 +1187,7 @@ void Binding::addListEntryListener( const XListEntryListener_t& xListener ) void Binding::removeListEntryListener( const XListEntryListener_t& xListener ) throw( NullPointerException, - RuntimeException ) + RuntimeException, std::exception ) { XListEntryListeners_t::iterator aIter = ::std::find( maListEntryListeners.begin(), maListEntryListeners.end(), @@ -1202,7 +1202,7 @@ void Binding::removeListEntryListener( const XListEntryListener_t& xListener ) // sal_Bool Binding::isValid( const Any_t& ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { // first, check for model checkLive(); @@ -1213,7 +1213,7 @@ sal_Bool Binding::isValid( const Any_t& ) OUString Binding::explainInvalid( const Any_t& /*Value*/ ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { // first, check for model checkLive(); @@ -1225,7 +1225,7 @@ OUString Binding::explainInvalid( void Binding::addValidityConstraintListener( const XValidityConstraintListener_t& xListener ) throw( NullPointerException, - RuntimeException ) + RuntimeException, std::exception ) { OSL_ENSURE( xListener.is(), "need listener!" ); if( ::std::find(maValidityListeners.begin(), maValidityListeners.end(), xListener) @@ -1236,7 +1236,7 @@ void Binding::addValidityConstraintListener( void Binding::removeValidityConstraintListener( const XValidityConstraintListener_t& xListener ) throw( NullPointerException, - RuntimeException ) + RuntimeException, std::exception ) { XValidityConstraintListeners_t::iterator aIter = ::std::find( maValidityListeners.begin(), maValidityListeners.end(), @@ -1252,7 +1252,7 @@ void Binding::removeValidityConstraintListener( // void Binding::handleEvent( const XEvent_t& xEvent ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { OUString sType(xEvent->getType()); //OUString sEventMIPChanged("xforms-generic"); @@ -1285,7 +1285,7 @@ void Binding::handleEvent( const XEvent_t& xEvent ) // sal_Int64 Binding::getSomething( const IntSequence_t& xId ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return reinterpret_cast( ( xId == getUnoTunnelID() ) ? this : NULL ); } @@ -1295,7 +1295,7 @@ sal_Int64 Binding::getSomething( const IntSequence_t& xId ) // Binding::XCloneable_t SAL_CALL Binding::createClone() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Reference< XPropertySet > xClone; @@ -1351,7 +1351,7 @@ void Binding::initializePropertySet() void Binding::addModifyListener( const XModifyListener_t& xListener ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { OSL_ENSURE( xListener.is(), "need listener!" ); if( ::std::find( maModifyListeners.begin(), maModifyListeners.end(), xListener ) @@ -1366,7 +1366,7 @@ void Binding::addModifyListener( void Binding::removeModifyListener( const XModifyListener_t& xListener ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { ModifyListeners_t::iterator aIter = ::std::find( maModifyListeners.begin(), maModifyListeners.end(), xListener ); @@ -1378,13 +1378,13 @@ void Binding::removeModifyListener( OUString Binding::getName() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return getBindingID(); } void SAL_CALL Binding::setName( const OUString& rName ) - throw( RuntimeException ) + 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 7b2d0559a419..61ea981b65ba 100644 --- a/forms/source/xforms/binding.hxx +++ b/forms/source/xforms/binding.hxx @@ -386,20 +386,20 @@ public: public: virtual Sequence_Type_t SAL_CALL getSupportedValueTypes() - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual sal_Bool SAL_CALL supportsType( const Type_t& aType ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual Any_t SAL_CALL getValue( const Type_t& aType ) throw( IncompatibleTypesException_t, - RuntimeException_t ); + RuntimeException_t, std::exception ); virtual void SAL_CALL setValue( const Any_t& aValue ) throw( IncompatibleTypesException_t, InvalidBindingStateException_t, NoSupportException_t, - RuntimeException_t ); + RuntimeException_t, std::exception ); @@ -408,22 +408,22 @@ public: // virtual sal_Int32 SAL_CALL getListEntryCount() - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual OUString SAL_CALL getListEntry( sal_Int32 nPosition ) throw( IndexOutOfBoundsException_t, - RuntimeException_t ); + RuntimeException_t, std::exception ); virtual StringSequence_t SAL_CALL getAllListEntries() - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual void SAL_CALL addListEntryListener( const XListEntryListener_t& ) throw( NullPointerException_t, - RuntimeException_t ); + RuntimeException_t, std::exception ); virtual void SAL_CALL removeListEntryListener( const XListEntryListener_t&) throw( NullPointerException_t, - RuntimeException_t ); + RuntimeException_t, std::exception ); @@ -433,21 +433,21 @@ public: virtual sal_Bool SAL_CALL isValid( const Any_t& ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual OUString SAL_CALL explainInvalid( const Any_t& ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual void SAL_CALL addValidityConstraintListener( const XValidityConstraintListener_t& xListener ) throw( NullPointerException_t, - RuntimeException_t ); + RuntimeException_t, std::exception ); virtual void SAL_CALL removeValidityConstraintListener( const XValidityConstraintListener_t& xListener ) throw( NullPointerException_t, - RuntimeException_t ); + RuntimeException_t, std::exception ); // @@ -459,11 +459,11 @@ public: virtual void SAL_CALL addModifyListener( const XModifyListener_t& xListener ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual void SAL_CALL removeModifyListener( const XModifyListener_t& xListener ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); @@ -476,10 +476,10 @@ public: public: virtual OUString SAL_CALL getName() - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual void SAL_CALL setName( const OUString& ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); @@ -490,7 +490,7 @@ public: virtual void SAL_CALL handleEvent( const XEvent_t& xEvent ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); @@ -499,7 +499,7 @@ public: // virtual sal_Int64 SAL_CALL getSomething( const IntSequence_t& ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); // @@ -507,7 +507,7 @@ public: // virtual XCloneable_t SAL_CALL createClone() - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); }; diff --git a/forms/source/xforms/collection.hxx b/forms/source/xforms/collection.hxx index c923c2bdf873..cafb0ff1902f 100644 --- a/forms/source/xforms/collection.hxx +++ b/forms/source/xforms/collection.hxx @@ -158,20 +158,20 @@ public: // XElementAccess virtual Type_t SAL_CALL getElementType() - throw( RuntimeException_t ) + throw( RuntimeException_t, std::exception ) { return getCppuType( static_cast( NULL ) ); } virtual sal_Bool SAL_CALL hasElements() - throw( RuntimeException_t ) + throw( RuntimeException_t, std::exception ) { return hasItems(); } // XIndexAccess : XElementAccess virtual sal_Int32 SAL_CALL getCount() - throw( RuntimeException_t ) + throw( RuntimeException_t, std::exception ) { return countItems(); } @@ -179,7 +179,7 @@ public: virtual Any_t SAL_CALL getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsException_t, WrappedTargetException_t, - RuntimeException_t) + RuntimeException_t, std::exception) { if( isValidIndex( nIndex ) ) return com::sun::star::uno::makeAny( getItem( nIndex ) ); @@ -193,7 +193,7 @@ public: throw( IllegalArgumentException_t, IndexOutOfBoundsException_t, WrappedTargetException_t, - RuntimeException_t) + RuntimeException_t, std::exception) { T t; if( isValidIndex( nIndex) ) @@ -207,7 +207,7 @@ public: // XEnumerationAccess : XElementAccess virtual XEnumeration_t SAL_CALL createEnumeration() - throw( RuntimeException_t ) + throw( RuntimeException_t, std::exception ) { return new Enumeration( this ); } @@ -215,7 +215,7 @@ public: // XSet : XEnumerationAccess virtual sal_Bool SAL_CALL has( const Any_t& aElement ) - throw( RuntimeException_t ) + throw( RuntimeException_t, std::exception ) { T t; return ( aElement >>= t ) ? hasItem( t ) : sal_False; @@ -224,7 +224,7 @@ public: virtual void SAL_CALL insert( const Any_t& aElement ) throw( IllegalArgumentException_t, ElementExistException_t, - RuntimeException_t ) + RuntimeException_t, std::exception ) { T t; if( ( aElement >>= t ) && isValid( t ) ) @@ -239,7 +239,7 @@ public: virtual void SAL_CALL remove( const Any_t& aElement ) throw( IllegalArgumentException_t, NoSuchElementException_t, - RuntimeException_t ) + RuntimeException_t, std::exception ) { T t; if( aElement >>= t ) @@ -255,7 +255,7 @@ public: // XContainer virtual void SAL_CALL addContainerListener( const XContainerListener_t& xListener ) - throw( RuntimeException_t ) + throw( RuntimeException_t, std::exception ) { OSL_ENSURE( xListener.is(), "need listener!" ); if( std::find( maListeners.begin(), maListeners.end(), xListener) @@ -265,7 +265,7 @@ public: virtual void SAL_CALL removeContainerListener( const XContainerListener_t& xListener ) - throw( RuntimeException_t ) + throw( RuntimeException_t, std::exception ) { 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 94fa43cefaba..8f2b6bb5b118 100644 --- a/forms/source/xforms/datatyperepository.cxx +++ b/forms/source/xforms/datatyperepository.cxx @@ -112,7 +112,7 @@ namespace xforms } - Reference< XDataType > SAL_CALL ODataTypeRepository::getBasicDataType( sal_Int16 dataTypeClass ) throw (NoSuchElementException, RuntimeException) + Reference< XDataType > SAL_CALL ODataTypeRepository::getBasicDataType( sal_Int16 dataTypeClass ) throw (NoSuchElementException, RuntimeException, std::exception) { Reference< XDataType > xReturn; @@ -132,7 +132,7 @@ namespace xforms } - Reference< XDataType > SAL_CALL ODataTypeRepository::cloneDataType( const OUString& sourceName, const OUString& newName ) throw (NoSuchElementException, ElementExistException, RuntimeException) + Reference< XDataType > SAL_CALL ODataTypeRepository::cloneDataType( const OUString& sourceName, const OUString& newName ) throw (NoSuchElementException, ElementExistException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -148,7 +148,7 @@ namespace xforms } - void SAL_CALL ODataTypeRepository::revokeDataType( const OUString& typeName ) throw (NoSuchElementException, VetoException, RuntimeException) + void SAL_CALL ODataTypeRepository::revokeDataType( const OUString& typeName ) throw (NoSuchElementException, VetoException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -161,7 +161,7 @@ namespace xforms } - Reference< XDataType > SAL_CALL ODataTypeRepository::getDataType( const OUString& typeName ) throw (NoSuchElementException, RuntimeException) + Reference< XDataType > SAL_CALL ODataTypeRepository::getDataType( const OUString& typeName ) throw (NoSuchElementException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return implLocate( typeName, false )->second.get(); @@ -169,19 +169,19 @@ namespace xforms - Reference< XEnumeration > SAL_CALL ODataTypeRepository::createEnumeration( ) throw (RuntimeException) + Reference< XEnumeration > SAL_CALL ODataTypeRepository::createEnumeration( ) throw (RuntimeException, std::exception) { return new ::comphelper::OEnumerationByName( this ); } - Any SAL_CALL ODataTypeRepository::getByName( const OUString& aName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException) + Any SAL_CALL ODataTypeRepository::getByName( const OUString& aName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { return makeAny( getDataType( aName ) ); } - Sequence< OUString > SAL_CALL ODataTypeRepository::getElementNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL ODataTypeRepository::getElementNames( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -196,20 +196,20 @@ namespace xforms } - sal_Bool SAL_CALL ODataTypeRepository::hasByName( const OUString& aName ) throw (RuntimeException) + sal_Bool SAL_CALL ODataTypeRepository::hasByName( const OUString& aName ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return m_aRepository.find( aName ) != m_aRepository.end(); } - Type SAL_CALL ODataTypeRepository::getElementType( ) throw (RuntimeException) + Type SAL_CALL ODataTypeRepository::getElementType( ) throw (RuntimeException, std::exception) { return ::getCppuType( static_cast< Reference< XDataType >* >( NULL ) ); } - sal_Bool SAL_CALL ODataTypeRepository::hasElements( ) throw (RuntimeException) + sal_Bool SAL_CALL ODataTypeRepository::hasElements( ) throw (RuntimeException, std::exception) { return !m_aRepository.empty(); } diff --git a/forms/source/xforms/datatyperepository.hxx b/forms/source/xforms/datatyperepository.hxx index 71466717bdfb..1852e951e88b 100644 --- a/forms/source/xforms/datatyperepository.hxx +++ b/forms/source/xforms/datatyperepository.hxx @@ -53,22 +53,22 @@ namespace xforms ~ODataTypeRepository( ); // XDataTypeRepository - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xsd::XDataType > SAL_CALL getBasicDataType( sal_Int16 dataTypeClass ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xsd::XDataType > SAL_CALL cloneDataType( const OUString& sourceName, const OUString& newName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL revokeDataType( const OUString& typeName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::util::VetoException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xsd::XDataType > SAL_CALL getDataType( const OUString& typeName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::xsd::XDataType > SAL_CALL getBasicDataType( sal_Int16 dataTypeClass ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::xsd::XDataType > SAL_CALL cloneDataType( const OUString& sourceName, const OUString& newName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL revokeDataType( const OUString& typeName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::util::VetoException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::xsd::XDataType > SAL_CALL getDataType( const OUString& typeName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception); // XEnumerationAccess (base of XDataTypeRepository) - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XNameAccess (base of XDataTypeRepository) - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XElementAccess (base of XEnumerationAccess and XNameAccess) - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception); private: ODataTypeRepository( const ODataTypeRepository& ); // never implemented diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx index e44c3b88ce44..ada7062aff45 100644 --- a/forms/source/xforms/datatypes.cxx +++ b/forms/source/xforms/datatypes.cxx @@ -114,63 +114,63 @@ namespace xforms OSL_POSTCOND( member == value, "OXSDDataType::setFoo: inconsistency!" ); - OUString SAL_CALL OXSDDataType::getName( ) throw (RuntimeException) + OUString SAL_CALL OXSDDataType::getName( ) throw (RuntimeException, std::exception) { return m_sName; } - void SAL_CALL OXSDDataType::setName( const OUString& aName ) throw (RuntimeException, VetoException) + void SAL_CALL OXSDDataType::setName( const OUString& aName ) throw (RuntimeException, VetoException, std::exception) { // TODO: check the name for conflicts in the repository SET_PROPERTY( NAME, aName, m_sName ); } - OUString SAL_CALL OXSDDataType::getPattern() throw (RuntimeException) + OUString SAL_CALL OXSDDataType::getPattern() throw (RuntimeException, std::exception) { return m_sPattern; } - void SAL_CALL OXSDDataType::setPattern( const OUString& _pattern ) throw (RuntimeException) + void SAL_CALL OXSDDataType::setPattern( const OUString& _pattern ) throw (RuntimeException, std::exception) { SET_PROPERTY( XSD_PATTERN, _pattern, m_sPattern ); } - sal_Int16 SAL_CALL OXSDDataType::getWhiteSpaceTreatment() throw (RuntimeException) + sal_Int16 SAL_CALL OXSDDataType::getWhiteSpaceTreatment() throw (RuntimeException, std::exception) { return m_nWST; } - void SAL_CALL OXSDDataType::setWhiteSpaceTreatment( sal_Int16 _whitespacetreatment ) throw (RuntimeException, IllegalArgumentException) + void SAL_CALL OXSDDataType::setWhiteSpaceTreatment( sal_Int16 _whitespacetreatment ) throw (RuntimeException, IllegalArgumentException, std::exception) { SET_PROPERTY( XSD_WHITESPACE, _whitespacetreatment, m_nWST ); } - sal_Bool SAL_CALL OXSDDataType::getIsBasic() throw (RuntimeException) + sal_Bool SAL_CALL OXSDDataType::getIsBasic() throw (RuntimeException, std::exception) { return m_bIsBasic; } - sal_Int16 SAL_CALL OXSDDataType::getTypeClass() throw (RuntimeException) + sal_Int16 SAL_CALL OXSDDataType::getTypeClass() throw (RuntimeException, std::exception) { return m_nTypeClass; } - sal_Bool OXSDDataType::validate( const OUString& sValue ) throw( RuntimeException ) + sal_Bool OXSDDataType::validate( const OUString& sValue ) throw( RuntimeException, std::exception ) { return ( _validate( sValue ) == 0 ); } - OUString OXSDDataType::explainInvalid( const OUString& sValue ) throw( RuntimeException ) + OUString OXSDDataType::explainInvalid( const OUString& sValue ) throw( RuntimeException, std::exception ) { // get reason sal_uInt16 nReason = _validate( sValue ); @@ -266,7 +266,7 @@ namespace xforms } - void SAL_CALL OXSDDataType::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw (Exception) + void SAL_CALL OXSDDataType::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw (Exception, std::exception) { OXSDDataType_PBase::setFastPropertyValue_NoBroadcast( _nHandle, _rValue ); if ( _nHandle == PROPERTY_ID_XSD_PATTERN ) @@ -294,37 +294,37 @@ namespace xforms } - void SAL_CALL OXSDDataType::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) + void SAL_CALL OXSDDataType::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { OXSDDataType_PBase::setPropertyValue( aPropertyName, aValue ); } - Any SAL_CALL OXSDDataType::getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) + Any SAL_CALL OXSDDataType::getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { return OXSDDataType_PBase::getPropertyValue( PropertyName ); } - void SAL_CALL OXSDDataType::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) + void SAL_CALL OXSDDataType::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { OXSDDataType_PBase::addPropertyChangeListener( aPropertyName, xListener ); } - void SAL_CALL OXSDDataType::removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) + void SAL_CALL OXSDDataType::removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { OXSDDataType_PBase::removePropertyChangeListener( aPropertyName, aListener ); } - void SAL_CALL OXSDDataType::addVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) + void SAL_CALL OXSDDataType::addVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { OXSDDataType_PBase::addVetoableChangeListener( PropertyName, aListener ); } - void SAL_CALL OXSDDataType::removeVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) + void SAL_CALL OXSDDataType::removeVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { OXSDDataType_PBase::removeVetoableChangeListener( PropertyName, aListener ); } @@ -363,7 +363,7 @@ namespace xforms void SAL_CALL OValueLimitedType_Base::setFastPropertyValue_NoBroadcast( - sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::uno::Exception) + sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::uno::Exception, std::exception) { OXSDDataType::setFastPropertyValue_NoBroadcast( _nHandle, _rValue ); diff --git a/forms/source/xforms/datatypes.hxx b/forms/source/xforms/datatypes.hxx index eec962725d78..82cdd3c67b93 100644 --- a/forms/source/xforms/datatypes.hxx +++ b/forms/source/xforms/datatypes.hxx @@ -87,25 +87,25 @@ namespace xforms DECLARE_XINTERFACE() DECLARE_XTYPEPROVIDER() - virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::util::VetoException); - virtual OUString SAL_CALL getPattern() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPattern( const OUString& _pattern ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getWhiteSpaceTreatment() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setWhiteSpaceTreatment( sal_Int16 _whitespacetreatment ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException); - virtual sal_Bool SAL_CALL getIsBasic() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getTypeClass() throw (::com::sun::star::uno::RuntimeException); - - virtual sal_Bool SAL_CALL validate( const OUString& value ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL explainInvalid( const OUString& value ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::util::VetoException, std::exception); + virtual OUString SAL_CALL getPattern() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPattern( const OUString& _pattern ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getWhiteSpaceTreatment() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setWhiteSpaceTreatment( sal_Int16 _whitespacetreatment ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, std::exception); + virtual sal_Bool SAL_CALL getIsBasic() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getTypeClass() throw (::com::sun::star::uno::RuntimeException, std::exception); + + virtual sal_Bool SAL_CALL validate( const OUString& value ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL explainInvalid( const OUString& value ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XPropertySet - is a base of XDataType and needs to be disambiguated - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); public: OXSDDataType* clone( const OUString& _rNewName ) const; @@ -117,7 +117,7 @@ namespace xforms sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception); + throw (::com::sun::star::uno::Exception, std::exception); // --- own overridables --- // helper for implementing cloning of data types @@ -196,7 +196,7 @@ namespace xforms sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception); + throw (::com::sun::star::uno::Exception, std::exception); // OXSDDataType overridables virtual bool _getValue( const OUString& value, double& fValue ); diff --git a/forms/source/xforms/enumeration.cxx b/forms/source/xforms/enumeration.cxx index e0ee0dc2b8ff..2ae94088ca52 100644 --- a/forms/source/xforms/enumeration.cxx +++ b/forms/source/xforms/enumeration.cxx @@ -42,7 +42,7 @@ Enumeration::Enumeration( XIndexAccess* pContainer ) } sal_Bool Enumeration::hasMoreElements() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if( ! mxContainer.is() ) throw RuntimeException(); @@ -53,7 +53,7 @@ sal_Bool Enumeration::hasMoreElements() Any Enumeration::nextElement() throw( NoSuchElementException, WrappedTargetException, - RuntimeException ) + RuntimeException, std::exception ) { if( ! mxContainer.is() ) throw RuntimeException(); diff --git a/forms/source/xforms/enumeration.hxx b/forms/source/xforms/enumeration.hxx index e77c795dbf2e..afdf909b4c73 100644 --- a/forms/source/xforms/enumeration.hxx +++ b/forms/source/xforms/enumeration.hxx @@ -44,12 +44,12 @@ public: Enumeration( com::sun::star::container::XIndexAccess* ); virtual sal_Bool SAL_CALL hasMoreElements() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Any SAL_CALL nextElement() throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); }; #endif diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx index 8a27b2efe4fe..3d5b1a0b434d 100644 --- a/forms/source/xforms/model.cxx +++ b/forms/source/xforms/model.cxx @@ -453,21 +453,21 @@ bool Model::isValid() const // OUString Model::getID() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { DBG_INVARIANT(); return msID; } void Model::setID( const OUString& sID ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { DBG_INVARIANT(); msID = sID; } void Model::initialize() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { DBG_ASSERT( ! mbInitialized, "model already initialized" ); @@ -480,7 +480,7 @@ void Model::initialize() } void Model::rebuild() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if( ! mbInitialized ) initialize(); @@ -489,19 +489,19 @@ void Model::rebuild() } void Model::recalculate() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { rebind(); } void Model::revalidate() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { // do nothing. We don't validate anyways! } void Model::refresh() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { rebind(); } @@ -512,7 +512,7 @@ void SAL_CALL Model::submitWithInteraction( const XInteractionHandler_t& _rxHandler ) throw( VetoException, WrappedTargetException, - RuntimeException ) + RuntimeException, std::exception ) { DBG_INVARIANT(); @@ -530,13 +530,13 @@ void SAL_CALL Model::submitWithInteraction( } void Model::submit( const OUString& sID ) - throw( VetoException, WrappedTargetException, RuntimeException ) + throw( VetoException, WrappedTargetException, RuntimeException, std::exception ) { submitWithInteraction( sID, NULL ); } Model::XDataTypeRepository_t SAL_CALL Model::getDataTypeRepository( ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if ( !mxDataTypes.is() ) mxDataTypes = new ODataTypeRepository; @@ -549,13 +549,13 @@ Model::XDataTypeRepository_t SAL_CALL Model::getDataTypeRepository( ) // Model::XSet_t Model::getInstances() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return mxInstances; } Model::XDocument_t Model::getInstanceDocument( const OUString& rName ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { ensureAtLeastOneInstance(); Reference aInstance; @@ -567,7 +567,7 @@ Model::XDocument_t Model::getInstanceDocument( const OUString& rName ) } Model::XDocument_t SAL_CALL Model::getDefaultInstance() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { ensureAtLeastOneInstance(); DBG_ASSERT( mpInstances->countItems() > 0, "no instance?" ); @@ -583,14 +583,14 @@ Model::XDocument_t SAL_CALL Model::getDefaultInstance() // Model::XPropertySet_t SAL_CALL Model::createBinding() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { DBG_INVARIANT(); return new Binding(); } Model::XPropertySet_t Model::cloneBinding( const XPropertySet_t& xBinding ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { DBG_INVARIANT(); XPropertySet_t xNewBinding = createBinding(); @@ -599,14 +599,14 @@ Model::XPropertySet_t Model::cloneBinding( const XPropertySet_t& xBinding ) } Model::XPropertySet_t Model::getBinding( const OUString& sId ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { DBG_INVARIANT(); return mpBindings->hasItem( sId ) ? mpBindings->getItem( sId ) : NULL; } Model::XSet_t Model::getBindings() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { DBG_INVARIANT(); return mxBindings; @@ -619,14 +619,14 @@ Model::XSet_t Model::getBindings() // Model::XSubmission_t Model::createSubmission() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { DBG_INVARIANT(); return new Submission(); } Model::XSubmission_t Model::cloneSubmission(const XPropertySet_t& xSubmission) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { DBG_INVARIANT(); XSubmission_t xNewSubmission = createSubmission(); @@ -636,7 +636,7 @@ Model::XSubmission_t Model::cloneSubmission(const XPropertySet_t& xSubmission) } Model::XSubmission_t Model::getSubmission( const OUString& sId ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { DBG_INVARIANT(); XSubmission_t xSubmission; @@ -646,7 +646,7 @@ Model::XSubmission_t Model::getSubmission( const OUString& sId ) } Model::XSet_t Model::getSubmissions() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { DBG_INVARIANT(); return mxSubmissions; @@ -684,14 +684,14 @@ void Model::initializePropertySet() } void Model::update() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { rebuild(); } sal_Int64 Model::getSomething( const IntSequence_t& xId ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return reinterpret_cast( ( xId == getUnoTunnelID() ) ? this : NULL ); } diff --git a/forms/source/xforms/model.hxx b/forms/source/xforms/model.hxx index f16beb642ab2..9e5ec4284e4a 100644 --- a/forms/source/xforms/model.hxx +++ b/forms/source/xforms/model.hxx @@ -208,106 +208,106 @@ public: virtual OUString SAL_CALL getID() - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual void SAL_CALL setID( const OUString& sID ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual void SAL_CALL initialize() - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual void SAL_CALL rebuild() - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual void SAL_CALL recalculate() - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual void SAL_CALL revalidate() - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual void SAL_CALL refresh() - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual void SAL_CALL submit( const OUString& sID ) - throw( VetoException_t, WrappedTargetException_t, RuntimeException_t ); + throw( VetoException_t, WrappedTargetException_t, RuntimeException_t, std::exception ); virtual void SAL_CALL submitWithInteraction( const OUString& id, const XInteractionHandler_t& _rxHandler ) - throw( VetoException_t, WrappedTargetException_t, RuntimeException_t ); + throw( VetoException_t, WrappedTargetException_t, RuntimeException_t, std::exception ); virtual XDataTypeRepository_t SAL_CALL getDataTypeRepository( ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); // XModel: instance management virtual XSet_t SAL_CALL getInstances() - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual XDocument_t SAL_CALL getInstanceDocument( const OUString& ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual XDocument_t SAL_CALL getDefaultInstance() - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); // XModel: binding management virtual XPropertySet_t SAL_CALL createBinding() - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual XPropertySet_t SAL_CALL cloneBinding( const XPropertySet_t& ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual XPropertySet_t SAL_CALL getBinding( const OUString& ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual XSet_t SAL_CALL getBindings() - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); // XModel: submission management virtual XSubmission_t SAL_CALL createSubmission() - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual XSubmission_t SAL_CALL cloneSubmission( const XPropertySet_t& ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual XSubmission_t SAL_CALL getSubmission( const OUString& ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual XSet_t SAL_CALL getSubmissions() - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); // XPropertySet virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p) - throw( css::uno::RuntimeException ) + throw( css::uno::RuntimeException, std::exception ) { return PropertySetBase::getPropertyValue(p); } virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference& p2) - throw( css::uno::RuntimeException ) + throw( css::uno::RuntimeException, std::exception ) { PropertySetBase::addPropertyChangeListener(p1, p2); } virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference& p2) - throw( css::uno::RuntimeException ) + throw( css::uno::RuntimeException, std::exception ) { PropertySetBase::removePropertyChangeListener(p1, p2); } virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference& p2) - throw( css::uno::RuntimeException ) + throw( css::uno::RuntimeException, std::exception ) { PropertySetBase::addVetoableChangeListener(p1, p2); } virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference& p2) - throw( css::uno::RuntimeException ) + throw( css::uno::RuntimeException, std::exception ) { PropertySetBase::removeVetoableChangeListener(p1, p2); } virtual css::uno::Reference SAL_CALL getPropertySetInfo() - throw( css::uno::RuntimeException ) + throw( css::uno::RuntimeException, std::exception ) { return PropertySetBase::getPropertySetInfo(); } virtual void SAL_CALL setPropertyValue(const OUString& p1, const com::sun::star::uno::Any& p2) - throw( css::uno::RuntimeException ) + throw( css::uno::RuntimeException, std::exception ) { PropertySetBase::setPropertyValue(p1, p2); } // @@ -317,10 +317,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 (RuntimeException_t); + virtual OUString SAL_CALL getDefaultServiceNameForNode( const XNode_t& xNode ) throw (RuntimeException_t, std::exception); /// call getDefaultBindingExpressionForNode with default evaluation context - virtual OUString SAL_CALL getDefaultBindingExpressionForNode( const XNode_t& xNode ) throw (RuntimeException_t); + virtual OUString SAL_CALL getDefaultBindingExpressionForNode( const XNode_t& xNode ) throw (RuntimeException_t, std::exception); /// determine a reasonable default binding expression for a given node /// and a given evaluation context @@ -331,88 +331,88 @@ public: virtual OUString SAL_CALL getNodeDisplayName( const XNode_t&, sal_Bool bDetail ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual OUString SAL_CALL getNodeName( const XNode_t& ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual OUString SAL_CALL getBindingName( const XPropertySet_t&, sal_Bool bDetail ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual OUString SAL_CALL getSubmissionName( const XPropertySet_t&, sal_Bool bDetail ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual XPropertySet_t SAL_CALL cloneBindingAsGhost( const XPropertySet_t& ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual void SAL_CALL removeBindingIfUseless( const XPropertySet_t& ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual XDocument_t SAL_CALL newInstance( const OUString& sName, const OUString& sURL, sal_Bool bURLOnce ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual void SAL_CALL renameInstance( const OUString& sFrom, const OUString& sTo, const OUString& sURL, sal_Bool bURLOnce ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual void SAL_CALL removeInstance( const OUString& sName ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual XModel_t SAL_CALL newModel( const Frame_XModel_t& xComponent, const OUString& sName ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual void SAL_CALL renameModel( const Frame_XModel_t& xComponent, const OUString& sFrom, const OUString& sTo ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual void SAL_CALL removeModel( const Frame_XModel_t& xComponent, const OUString& sName ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual XNode_t SAL_CALL createElement( const XNode_t& xParent, const OUString& sName ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual XNode_t SAL_CALL createAttribute( const XNode_t& xParent, const OUString& sName ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual XNode_t SAL_CALL renameNode( const XNode_t& xNode, const OUString& sName ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual XPropertySet_t SAL_CALL getBindingForNode( const XNode_t&, sal_Bool bCreate ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual void SAL_CALL removeBindingForNode( const XNode_t& ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual OUString SAL_CALL getResultForExpression( const XPropertySet_t& xBinding, sal_Bool bIsBindingExpression, const OUString& sExpression ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual sal_Bool SAL_CALL isValidXMLName( const OUString& sName ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual sal_Bool SAL_CALL isValidPrefixName( const OUString& sName ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); virtual void SAL_CALL setNodeValue( const XNode_t& xNode, const OUString& sValue ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); // @@ -421,7 +421,7 @@ public: public: virtual void SAL_CALL update() - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); // // XUnoTunnel @@ -429,7 +429,7 @@ public: public: virtual sal_Int64 SAL_CALL getSomething( const IntSequence_t& ) - throw( RuntimeException_t ); + throw( RuntimeException_t, std::exception ); // // XTypeProvider::getImplementationId diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx index 5a1124e74989..2ee7a2d87098 100644 --- a/forms/source/xforms/model_ui.cxx +++ b/forms/source/xforms/model_ui.cxx @@ -74,7 +74,7 @@ using namespace com::sun::star::xml::xpath; // OUString Model::getDefaultServiceNameForNode( const XNode_t& xNode ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { // determine service for control. string/text field is default. OUString sService = "com.sun.star.form.component.TextField"; @@ -261,7 +261,7 @@ OUString Model::getDefaultBindingExpressionForNode( OUString Model::getDefaultBindingExpressionForNode( const XNode_t& xNode ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return getDefaultBindingExpressionForNode( xNode, getEvaluationContext() ); } @@ -285,7 +285,7 @@ static bool lcl_isWhitespace( const OUString& rString ) OUString Model::getNodeDisplayName( const XNode_t& xNode, sal_Bool bDetail ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { OUStringBuffer aBuffer; @@ -327,7 +327,7 @@ OUString Model::getNodeDisplayName( const XNode_t& xNode, } OUString Model::getNodeName( const XNode_t& xNode ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { OUStringBuffer aBuffer; @@ -351,7 +351,7 @@ OUString Model::getNodeName( const XNode_t& xNode ) OUString Model::getBindingName( const XPropertySet_t& xBinding, sal_Bool /*bDetail*/ ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { OUString sID; xBinding->getPropertyValue( "BindingID" ) >>= sID; @@ -371,7 +371,7 @@ OUString Model::getBindingName( const XPropertySet_t& xBinding, OUString Model::getSubmissionName( const XPropertySet_t& xSubmission, sal_Bool /*bDetail*/ ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { OUString sID; xSubmission->getPropertyValue( "ID" ) >>= sID; @@ -379,7 +379,7 @@ OUString Model::getSubmissionName( const XPropertySet_t& xSubmission, } Model::XPropertySet_t Model::cloneBindingAsGhost( const XPropertySet_t &xBinding ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { // Create a new binding instance first... Binding *pBinding = new Binding(); @@ -396,7 +396,7 @@ Model::XPropertySet_t Model::cloneBindingAsGhost( const XPropertySet_t &xBinding } void Model::removeBindingIfUseless( const XPropertySet_t& xBinding ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Binding* pBinding = Binding::getBinding( xBinding ); if( pBinding != NULL ) @@ -409,7 +409,7 @@ void Model::removeBindingIfUseless( const XPropertySet_t& xBinding ) Model::XDocument_t Model::newInstance( const OUString& sName, const OUString& sURL, sal_Bool bURLOnce ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { // create a default instance with element XDocument_t xInstance = getDocumentBuilder()->newDocument(); @@ -460,7 +460,7 @@ void Model::renameInstance( const OUString& sFrom, const OUString& sTo, const OUString& sURL, sal_Bool bURLOnce ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { sal_Int32 nPos = lcl_findInstance( mpInstances, sFrom ); if( nPos != -1 ) @@ -498,7 +498,7 @@ void Model::renameInstance( const OUString& sFrom, } void Model::removeInstance( const OUString& sName ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { sal_Int32 nPos = lcl_findInstance( mpInstances, sName ); if( nPos != -1 ) @@ -519,7 +519,7 @@ static Reference lcl_getModels( Model::XModel_t Model::newModel( const Reference& xCmp, const OUString& sName ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Model::XModel_t xModel; Reference xModels = lcl_getModels( xCmp ); @@ -541,7 +541,7 @@ Model::XModel_t Model::newModel( const Reference& void Model::renameModel( const Reference& xCmp, const OUString& sFrom, const OUString& sTo ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Reference xModels = lcl_getModels( xCmp ); if( xModels.is() @@ -557,7 +557,7 @@ void Model::renameModel( const Reference& xCmp, void Model::removeModel( const Reference& xCmp, const OUString& sName ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Reference xModels = lcl_getModels( xCmp ); if( xModels.is() @@ -569,7 +569,7 @@ void Model::removeModel( const Reference& xCmp, Model::XNode_t Model::createElement( const XNode_t& xParent, const OUString& sName ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Reference xNode; if( xParent.is() @@ -584,7 +584,7 @@ Model::XNode_t Model::createElement( const XNode_t& xParent, Model::XNode_t Model::createAttribute( const XNode_t& xParent, const OUString& sName ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Reference xNode; Reference xElement( xParent, UNO_QUERY ); @@ -610,7 +610,7 @@ Model::XNode_t Model::createAttribute( const XNode_t& xParent, Model::XNode_t Model::renameNode( const XNode_t& xNode, const OUString& sName ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { // early out if we don't have to change the name if( xNode->getNodeName() == sName ) @@ -694,7 +694,7 @@ Model::XNode_t Model::renameNode( const XNode_t& xNode, Model::XPropertySet_t Model::getBindingForNode( const XNode_t& xNode, sal_Bool bCreate ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { OSL_ENSURE( xNode.is(), "no node?" ); @@ -750,7 +750,7 @@ Model::XPropertySet_t Model::getBindingForNode( const XNode_t& xNode, } void Model::removeBindingForNode( const XNode_t& ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { // determine whether suitable binding is still used } @@ -902,7 +902,7 @@ OUString Model::getResultForExpression( const XPropertySet_t& xBinding, sal_Bool bIsBindingExpression, const OUString& sExpression ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Binding* pBinding = Binding::getBinding( xBinding ); if( pBinding == NULL ) @@ -936,13 +936,13 @@ OUString Model::getResultForExpression( } sal_Bool Model::isValidXMLName( const OUString& sName ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return isValidQName( sName, NULL ); } sal_Bool Model::isValidPrefixName( const OUString& sName ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return ::isValidPrefixName( sName, NULL ); } @@ -950,7 +950,7 @@ sal_Bool Model::isValidPrefixName( const OUString& sName ) void Model::setNodeValue( const XNode_t& xNode, const OUString& sValue ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { setSimpleContent( xNode, sValue ); } diff --git a/forms/source/xforms/propertysetbase.cxx b/forms/source/xforms/propertysetbase.cxx index e7045146d3ed..2f2a4e184259 100644 --- a/forms/source/xforms/propertysetbase.cxx +++ b/forms/source/xforms/propertysetbase.cxx @@ -79,7 +79,7 @@ cppu::IPropertyArrayHelper& SAL_CALL PropertySetBase::getInfoHelper() return *m_pProperties; } -Reference< XPropertySetInfo > SAL_CALL PropertySetBase::getPropertySetInfo( ) throw(RuntimeException) +Reference< XPropertySetInfo > SAL_CALL PropertySetBase::getPropertySetInfo( ) throw(RuntimeException, std::exception) { return cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() ); } @@ -173,7 +173,7 @@ sal_Bool SAL_CALL PropertySetBase::convertFastPropertyValue( Any& rConvertedValu } void SAL_CALL PropertySetBase::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) - throw (Exception) + 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 37067cf43c30..75a9edccbc63 100644 --- a/forms/source/xforms/propertysetbase.hxx +++ b/forms/source/xforms/propertysetbase.hxx @@ -263,11 +263,11 @@ protected: virtual sal_Bool SAL_CALL convertFastPropertyValue( Any_t& rConvertedValue, Any_t& rOldValue, sal_Int32 nHandle, const Any_t& rValue ) throw (::com::sun::star::lang::IllegalArgumentException); virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any_t& rValue ) - throw (::com::sun::star::uno::Exception); + throw (::com::sun::star::uno::Exception, std::exception); virtual void SAL_CALL getFastPropertyValue( Any_t& rValue, sal_Int32 nHandle ) const; virtual cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); 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 83ca748b5a56..a812646afcec 100644 --- a/forms/source/xforms/submission.cxx +++ b/forms/source/xforms/submission.cxx @@ -451,13 +451,13 @@ sal_Bool SAL_CALL Submission::convertFastPropertyValue( } OUString SAL_CALL Submission::getName() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return getID(); } void SAL_CALL Submission::setName( const OUString& sID ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { setID( sID ); } @@ -466,7 +466,7 @@ void SAL_CALL Submission::setName( const OUString& sID ) sal_Int64 SAL_CALL Submission::getSomething( const Sequence& aId ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return ( aId == getUnoTunnelID() ) ? reinterpret_cast(this) : 0; } @@ -482,7 +482,7 @@ void SAL_CALL Submission::submitWithInteraction( const Reference& _rxHandler ) throw ( VetoException, WrappedTargetException, - RuntimeException ) + RuntimeException, std::exception ) { // as long as this class is not really threadsafe, we need to copy // the members we're interested in @@ -571,18 +571,18 @@ void SAL_CALL Submission::submitWithInteraction( } } -void SAL_CALL Submission::submit( ) throw ( VetoException, WrappedTargetException, RuntimeException ) +void SAL_CALL Submission::submit( ) throw ( VetoException, WrappedTargetException, RuntimeException, std::exception ) { submitWithInteraction( NULL ); } -void SAL_CALL Submission::addSubmissionVetoListener( const Reference< XSubmissionVetoListener >& /*listener*/ ) throw (NoSupportException, RuntimeException) +void SAL_CALL Submission::addSubmissionVetoListener( const Reference< XSubmissionVetoListener >& /*listener*/ ) throw (NoSupportException, RuntimeException, std::exception) { // TODO throw NoSupportException(); } -void SAL_CALL Submission::removeSubmissionVetoListener( const Reference< XSubmissionVetoListener >& /*listener*/ ) throw (NoSupportException, RuntimeException) +void SAL_CALL Submission::removeSubmissionVetoListener( const Reference< XSubmissionVetoListener >& /*listener*/ ) throw (NoSupportException, RuntimeException, std::exception) { // TODO throw NoSupportException(); @@ -665,31 +665,31 @@ Reference< XDocumentFragment > Submission::createSubmissionDocument(const Refere // some forwarding: XPropertySet is implemented in our base class, // but also available as base of XSubmission -Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL Submission::getPropertySetInfo( ) throw(RuntimeException) +Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL Submission::getPropertySetInfo( ) throw(RuntimeException, std::exception) { return PropertySetBase::getPropertySetInfo(); } -void SAL_CALL Submission::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) +void SAL_CALL Submission::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { PropertySetBase::setPropertyValue( aPropertyName, aValue ); } -Any SAL_CALL Submission::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +Any SAL_CALL Submission::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { return PropertySetBase::getPropertyValue( PropertyName ); } -void SAL_CALL Submission::addPropertyChangeListener( const OUString& aPropertyName, const Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL Submission::addPropertyChangeListener( const OUString& aPropertyName, const Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { PropertySetBase::addPropertyChangeListener( aPropertyName, xListener ); } -void SAL_CALL Submission::removePropertyChangeListener( const OUString& aPropertyName, const Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL Submission::removePropertyChangeListener( const OUString& aPropertyName, const Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { PropertySetBase::removePropertyChangeListener( aPropertyName, aListener ); } -void SAL_CALL Submission::addVetoableChangeListener( const OUString& PropertyName, const Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL Submission::addVetoableChangeListener( const OUString& PropertyName, const Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { PropertySetBase::addVetoableChangeListener( PropertyName, aListener ); } -void SAL_CALL Submission::removeVetoableChangeListener( const OUString& PropertyName, const Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL Submission::removeVetoableChangeListener( const OUString& PropertyName, const Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { PropertySetBase::removeVetoableChangeListener( PropertyName, aListener ); } diff --git a/forms/source/xforms/submission.hxx b/forms/source/xforms/submission.hxx index 97c368554121..9ba4dda422f4 100644 --- a/forms/source/xforms/submission.hxx +++ b/forms/source/xforms/submission.hxx @@ -208,10 +208,10 @@ public: // virtual OUString SAL_CALL getName() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL setName( const OUString& ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); @@ -221,7 +221,7 @@ public: virtual sal_Int64 SAL_CALL getSomething( const com::sun::star::uno::Sequence& ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // @@ -231,30 +231,30 @@ public: virtual void SAL_CALL submit( ) throw ( com::sun::star::util::VetoException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL submitWithInteraction( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& aHandler ) throw ( com::sun::star::util::VetoException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL addSubmissionVetoListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::submission::XSubmissionVetoListener >& listener ) - throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeSubmissionVetoListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::submission::XSubmissionVetoListener >& listener ) - throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception); // // XPropertySet // (need to disambiguate this) - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/forms/source/xforms/submission/submission.hxx b/forms/source/xforms/submission/submission.hxx index b3b486e992ce..420b9ce14883 100644 --- a/forms/source/xforms/submission/submission.hxx +++ b/forms/source/xforms/submission/submission.hxx @@ -66,11 +66,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) + virtual CSS::uno::Reference< CSS::task::XInteractionHandler > SAL_CALL getInteractionHandler() throw (CSS::uno::RuntimeException, std::exception) { return m_aInteractionHandler; } - virtual CSS::uno::Reference< CSS::ucb::XProgressHandler > SAL_CALL getProgressHandler() throw (CSS::uno::RuntimeException) + virtual CSS::uno::Reference< CSS::ucb::XProgressHandler > SAL_CALL getProgressHandler() throw (CSS::uno::RuntimeException, std::exception) { return m_aProgressHandler; } @@ -89,16 +89,16 @@ public: CProgressHandlerHelper() : m_count(0) {} - virtual void SAL_CALL push( const com::sun::star::uno::Any& /*aStatus*/) throw(com::sun::star::uno::RuntimeException) + virtual void SAL_CALL push( const com::sun::star::uno::Any& /*aStatus*/) throw(com::sun::star::uno::RuntimeException, std::exception) { m_mLock.acquire(); m_count++; m_mLock.release(); } - virtual void SAL_CALL update(const com::sun::star::uno::Any& /*aStatus*/) throw(com::sun::star::uno::RuntimeException) + virtual void SAL_CALL update(const com::sun::star::uno::Any& /*aStatus*/) throw(com::sun::star::uno::RuntimeException, std::exception) { } - virtual void SAL_CALL pop() throw(com::sun::star::uno::RuntimeException) + virtual void SAL_CALL pop() throw(com::sun::star::uno::RuntimeException, std::exception) { m_mLock.acquire(); m_count--; diff --git a/forms/source/xforms/xformsevent.cxx b/forms/source/xforms/xformsevent.cxx index f4e101440646..6963a704c331 100644 --- a/forms/source/xforms/xformsevent.cxx +++ b/forms/source/xforms/xformsevent.cxx @@ -29,57 +29,57 @@ using com::sun::star::uno::RuntimeException; void SAL_CALL XFormsEventConcrete::initXFormsEvent(const OUString& typeArg, sal_Bool canBubbleArg, sal_Bool cancelableArg) - throw (RuntimeException) + throw (RuntimeException, std::exception) { initEvent(typeArg, canBubbleArg, cancelableArg); } -OUString SAL_CALL XFormsEventConcrete::getType() throw (RuntimeException) +OUString SAL_CALL XFormsEventConcrete::getType() throw (RuntimeException, std::exception) { return m_eventType; } -XFormsEventConcrete::XEventTarget_t SAL_CALL XFormsEventConcrete::getTarget() throw (RuntimeException) +XFormsEventConcrete::XEventTarget_t SAL_CALL XFormsEventConcrete::getTarget() throw (RuntimeException, std::exception) { return m_target; } -XFormsEventConcrete::XEventTarget_t SAL_CALL XFormsEventConcrete::getCurrentTarget() throw (RuntimeException) +XFormsEventConcrete::XEventTarget_t SAL_CALL XFormsEventConcrete::getCurrentTarget() throw (RuntimeException, std::exception) { return m_currentTarget; } -XFormsEventConcrete::PhaseType_t SAL_CALL XFormsEventConcrete::getEventPhase() throw (RuntimeException) +XFormsEventConcrete::PhaseType_t SAL_CALL XFormsEventConcrete::getEventPhase() throw (RuntimeException, std::exception) { return m_phase; } -sal_Bool SAL_CALL XFormsEventConcrete::getBubbles() throw (RuntimeException) +sal_Bool SAL_CALL XFormsEventConcrete::getBubbles() throw (RuntimeException, std::exception) { return m_bubbles; } -sal_Bool SAL_CALL XFormsEventConcrete::getCancelable() throw (RuntimeException) +sal_Bool SAL_CALL XFormsEventConcrete::getCancelable() throw (RuntimeException, std::exception) { return m_cancelable; } -XFormsEventConcrete::Time_t SAL_CALL XFormsEventConcrete::getTimeStamp() throw (RuntimeException) +XFormsEventConcrete::Time_t SAL_CALL XFormsEventConcrete::getTimeStamp() throw (RuntimeException, std::exception) { return m_time; } -void SAL_CALL XFormsEventConcrete::stopPropagation() throw (RuntimeException) +void SAL_CALL XFormsEventConcrete::stopPropagation() throw (RuntimeException, std::exception) { if(m_cancelable) m_canceled = sal_True; } -void SAL_CALL XFormsEventConcrete::preventDefault() throw (RuntimeException) +void SAL_CALL XFormsEventConcrete::preventDefault() throw (RuntimeException, std::exception) { } void SAL_CALL XFormsEventConcrete::initEvent(const OUString& eventTypeArg, sal_Bool canBubbleArg, - sal_Bool cancelableArg) throw (RuntimeException) + sal_Bool cancelableArg) throw (RuntimeException, std::exception) { m_eventType = eventTypeArg; m_bubbles = canBubbleArg; diff --git a/forms/source/xforms/xformsevent.hxx b/forms/source/xforms/xformsevent.hxx index c468b895bd0a..24b571d0d78f 100644 --- a/forms/source/xforms/xformsevent.hxx +++ b/forms/source/xforms/xformsevent.hxx @@ -42,27 +42,27 @@ class XFormsEventConcrete : public cppu::WeakImplHelper1< XFormsEvent > { inline XFormsEventConcrete( void ) : m_canceled(sal_False) {} virtual ~XFormsEventConcrete( void ) {} - virtual OUString SAL_CALL getType() throw (RuntimeException_t); - virtual XEventTarget_t SAL_CALL getTarget() throw (RuntimeException_t); - virtual XEventTarget_t SAL_CALL getCurrentTarget() throw (RuntimeException_t); - virtual PhaseType_t SAL_CALL getEventPhase() throw (RuntimeException_t); - virtual sal_Bool SAL_CALL getBubbles() throw (RuntimeException_t); - virtual sal_Bool SAL_CALL getCancelable() throw (RuntimeException_t); - virtual Time_t SAL_CALL getTimeStamp() throw (RuntimeException_t); - virtual void SAL_CALL stopPropagation() throw (RuntimeException_t); - virtual void SAL_CALL preventDefault() throw (RuntimeException_t); + virtual OUString SAL_CALL getType() throw (RuntimeException_t, std::exception); + virtual XEventTarget_t SAL_CALL getTarget() throw (RuntimeException_t, std::exception); + virtual XEventTarget_t SAL_CALL getCurrentTarget() throw (RuntimeException_t, std::exception); + virtual PhaseType_t SAL_CALL getEventPhase() throw (RuntimeException_t, std::exception); + virtual sal_Bool SAL_CALL getBubbles() throw (RuntimeException_t, std::exception); + virtual sal_Bool SAL_CALL getCancelable() throw (RuntimeException_t, std::exception); + virtual Time_t SAL_CALL getTimeStamp() throw (RuntimeException_t, std::exception); + virtual void SAL_CALL stopPropagation() throw (RuntimeException_t, std::exception); + virtual void SAL_CALL preventDefault() throw (RuntimeException_t, std::exception); virtual void SAL_CALL initXFormsEvent( const OUString& typeArg, sal_Bool canBubbleArg, sal_Bool cancelableArg ) - throw (RuntimeException_t); + throw (RuntimeException_t, std::exception); virtual void SAL_CALL initEvent( const OUString& eventTypeArg, sal_Bool canBubbleArg, sal_Bool cancelableArg) - throw (RuntimeException_t); + throw (RuntimeException_t, std::exception); private: diff --git a/forms/source/xforms/xpathlib/extension.cxx b/forms/source/xforms/xpathlib/extension.cxx index 146d94b7e6bd..b660473e30a4 100644 --- a/forms/source/xforms/xpathlib/extension.cxx +++ b/forms/source/xforms/xpathlib/extension.cxx @@ -51,7 +51,7 @@ Sequence< OUString > SAL_CALL CLibxml2XFormsExtension::getSupportedServiceNames_ return aSequence; } -Libxml2ExtensionHandle SAL_CALL CLibxml2XFormsExtension::getLibxml2ExtensionHandle() throw (RuntimeException) +Libxml2ExtensionHandle SAL_CALL CLibxml2XFormsExtension::getLibxml2ExtensionHandle() throw (RuntimeException, std::exception) { Libxml2ExtensionHandle aHandle; aHandle.functionLookupFunction = reinterpret_cast< sal_Int64 >( &xforms_lookupFunc ); @@ -61,7 +61,7 @@ Libxml2ExtensionHandle SAL_CALL CLibxml2XFormsExtension::getLibxml2ExtensionHand return aHandle; } -void SAL_CALL CLibxml2XFormsExtension::initialize(const Sequence< Any >& aSequence) throw (RuntimeException) +void SAL_CALL CLibxml2XFormsExtension::initialize(const Sequence< Any >& aSequence) throw (RuntimeException, std::exception) { 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 b95adb5d1b90..d296dd806125 100644 --- a/forms/source/xforms/xpathlib/extension.hxx +++ b/forms/source/xforms/xpathlib/extension.hxx @@ -52,8 +52,8 @@ public: com::sun::star::uno::Reference< com::sun::star::xforms::XModel > getModel(); com::sun::star::uno::Reference< com::sun::star::xml::dom::XNode > getContextNode(); - virtual com::sun::star::xml::xpath::Libxml2ExtensionHandle SAL_CALL getLibxml2ExtensionHandle() throw (com::sun::star::uno::RuntimeException); - virtual void SAL_CALL initialize(const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aSequence) throw (com::sun::star::uno::RuntimeException); + virtual com::sun::star::xml::xpath::Libxml2ExtensionHandle SAL_CALL getLibxml2ExtensionHandle() throw (com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL initialize(const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aSequence) throw (com::sun::star::uno::RuntimeException, std::exception); }; -- cgit