diff options
Diffstat (limited to 'extensions/source/propctrlr')
61 files changed, 748 insertions, 758 deletions
diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx index c8a7af329925..02cb66f53a5c 100644 --- a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx +++ b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx @@ -40,7 +40,7 @@ namespace pcr { } - Sequence<sal_Int8> SAL_CALL MasterDetailLinkDialog::getImplementationId( ) throw(RuntimeException, std::exception) + Sequence<sal_Int8> SAL_CALL MasterDetailLinkDialog::getImplementationId( ) { return css::uno::Sequence<sal_Int8>(); } @@ -52,32 +52,32 @@ namespace pcr } - OUString SAL_CALL MasterDetailLinkDialog::getImplementationName() throw(RuntimeException, std::exception) + OUString SAL_CALL MasterDetailLinkDialog::getImplementationName() { return getImplementationName_static(); } - OUString MasterDetailLinkDialog::getImplementationName_static() throw(RuntimeException) + OUString MasterDetailLinkDialog::getImplementationName_static() { return OUString("org.openoffice.comp.form.ui.MasterDetailLinkDialog"); } - css::uno::Sequence<OUString> SAL_CALL MasterDetailLinkDialog::getSupportedServiceNames() throw(RuntimeException, std::exception) + css::uno::Sequence<OUString> SAL_CALL MasterDetailLinkDialog::getSupportedServiceNames() { return getSupportedServiceNames_static(); } - css::uno::Sequence<OUString> MasterDetailLinkDialog::getSupportedServiceNames_static() throw(RuntimeException) + css::uno::Sequence<OUString> MasterDetailLinkDialog::getSupportedServiceNames_static() { css::uno::Sequence<OUString> aSupported { "com.sun.star.form.MasterDetailLinkDialog" }; return aSupported; } - Reference<XPropertySetInfo> SAL_CALL MasterDetailLinkDialog::getPropertySetInfo() throw(RuntimeException, std::exception) + Reference<XPropertySetInfo> SAL_CALL MasterDetailLinkDialog::getPropertySetInfo() { Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx index 59f6b55aaba3..62422e21e873 100644 --- a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx +++ b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx @@ -38,21 +38,21 @@ namespace pcr // XServiceInfo - static methods /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > getSupportedServiceNames_static() throw( css::uno::RuntimeException ); + static css::uno::Sequence< OUString > getSupportedServiceNames_static(); /// @throws css::uno::RuntimeException - static OUString getImplementationName_static() throw( css::uno::RuntimeException ); + static OUString getImplementationName_static(); static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::uno::XComponentContext >&); private: // XTypeProvider - virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // OPropertyArrayUsageHelper diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index fca52d28af57..b5e0cffeddd6 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -163,10 +163,10 @@ namespace pcr virtual ~PropertyControlContext_Impl() override; // XPropertyControlObserver - virtual void SAL_CALL focusGained( const Reference< XPropertyControl >& Control ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL valueChanged( const Reference< XPropertyControl >& Control ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL focusGained( const Reference< XPropertyControl >& Control ) override; + virtual void SAL_CALL valueChanged( const Reference< XPropertyControl >& Control ) override; // XPropertyControlContext - virtual void SAL_CALL activateNextControl( const Reference< XPropertyControl >& CurrentControl ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL activateNextControl( const Reference< XPropertyControl >& CurrentControl ) override; // IEventProcessor virtual void processEvent( const ::comphelper::AnyEvent& _rEvent ) override; @@ -246,19 +246,19 @@ namespace pcr } - void SAL_CALL PropertyControlContext_Impl::focusGained( const Reference< XPropertyControl >& Control ) throw (RuntimeException, std::exception) + void SAL_CALL PropertyControlContext_Impl::focusGained( const Reference< XPropertyControl >& Control ) { impl_notify_throw( Control, FOCUS_GAINED ); } - void SAL_CALL PropertyControlContext_Impl::valueChanged( const Reference< XPropertyControl >& Control ) throw (RuntimeException, std::exception) + void SAL_CALL PropertyControlContext_Impl::valueChanged( const Reference< XPropertyControl >& Control ) { impl_notify_throw( Control, VALUE_CHANGED ); } - void SAL_CALL PropertyControlContext_Impl::activateNextControl( const Reference< XPropertyControl >& CurrentControl ) throw (RuntimeException, std::exception) + void SAL_CALL PropertyControlContext_Impl::activateNextControl( const Reference< XPropertyControl >& CurrentControl ) { impl_notify_throw( CurrentControl, ACTIVATE_NEXT ); } @@ -935,7 +935,7 @@ namespace pcr } - void SAL_CALL OBrowserListBox::focusGained( const Reference< XPropertyControl >& _rxControl ) throw (RuntimeException) + void SAL_CALL OBrowserListBox::focusGained( const Reference< XPropertyControl >& _rxControl ) { DBG_TESTSOLARMUTEX(); @@ -951,7 +951,7 @@ namespace pcr } - void SAL_CALL OBrowserListBox::valueChanged( const Reference< XPropertyControl >& _rxControl ) throw (RuntimeException) + void SAL_CALL OBrowserListBox::valueChanged( const Reference< XPropertyControl >& _rxControl ) { DBG_TESTSOLARMUTEX(); @@ -973,7 +973,7 @@ namespace pcr } - void SAL_CALL OBrowserListBox::activateNextControl( const Reference< XPropertyControl >& _rxCurrentControl ) throw (RuntimeException) + void SAL_CALL OBrowserListBox::activateNextControl( const Reference< XPropertyControl >& _rxCurrentControl ) { DBG_TESTSOLARMUTEX(); diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx index fb2061dbcb13..be7425b2c54b 100644 --- a/extensions/source/propctrlr/browserlistbox.hxx +++ b/extensions/source/propctrlr/browserlistbox.hxx @@ -144,11 +144,11 @@ namespace pcr void CommitModified( ); /// @throws css::uno::RuntimeException - void SAL_CALL focusGained( const css::uno::Reference< css::inspection::XPropertyControl >& Control ) throw (css::uno::RuntimeException); + void SAL_CALL focusGained( const css::uno::Reference< css::inspection::XPropertyControl >& Control ); /// @throws css::uno::RuntimeException - void SAL_CALL valueChanged( const css::uno::Reference< css::inspection::XPropertyControl >& Control ) throw (css::uno::RuntimeException); + void SAL_CALL valueChanged( const css::uno::Reference< css::inspection::XPropertyControl >& Control ); /// @throws css::uno::RuntimeException - void SAL_CALL activateNextControl( const css::uno::Reference< css::inspection::XPropertyControl >& CurrentControl ) throw (css::uno::RuntimeException); + void SAL_CALL activateNextControl( const css::uno::Reference< css::inspection::XPropertyControl >& CurrentControl ); protected: // IButtonClickListener diff --git a/extensions/source/propctrlr/buttonnavigationhandler.cxx b/extensions/source/propctrlr/buttonnavigationhandler.cxx index c299604a98f3..077660cc9228 100644 --- a/extensions/source/propctrlr/buttonnavigationhandler.cxx +++ b/extensions/source/propctrlr/buttonnavigationhandler.cxx @@ -55,27 +55,27 @@ namespace pcr } - OUString SAL_CALL ButtonNavigationHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL ButtonNavigationHandler::getImplementationName_static( ) { return OUString( "com.sun.star.comp.extensions.ButtonNavigationHandler" ); } - Sequence< OUString > SAL_CALL ButtonNavigationHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL ButtonNavigationHandler::getSupportedServiceNames_static( ) { Sequence<OUString> aSupported { "com.sun.star.form.inspection.ButtonNavigationHandler" }; return aSupported; } - void SAL_CALL ButtonNavigationHandler::inspect( const Reference< XInterface >& _rxIntrospectee ) throw (RuntimeException, NullPointerException, std::exception) + void SAL_CALL ButtonNavigationHandler::inspect( const Reference< XInterface >& _rxIntrospectee ) { ButtonNavigationHandler_Base::inspect( _rxIntrospectee ); m_xSlaveHandler->inspect( _rxIntrospectee ); } - PropertyState SAL_CALL ButtonNavigationHandler::getPropertyState( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) + PropertyState SAL_CALL ButtonNavigationHandler::getPropertyState( const OUString& _rPropertyName ) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) ); @@ -104,7 +104,7 @@ namespace pcr } - Any SAL_CALL ButtonNavigationHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) + Any SAL_CALL ButtonNavigationHandler::getPropertyValue( const OUString& _rPropertyName ) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) ); @@ -135,7 +135,7 @@ namespace pcr } - void SAL_CALL ButtonNavigationHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException, std::exception) + void SAL_CALL ButtonNavigationHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) ); @@ -189,7 +189,7 @@ namespace pcr } - Sequence< OUString > SAL_CALL ButtonNavigationHandler::getActuatingProperties( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL ButtonNavigationHandler::getActuatingProperties( ) { Sequence< OUString > aActuating( 2 ); aActuating[0] = PROPERTY_BUTTONTYPE; @@ -198,7 +198,7 @@ namespace pcr } - InteractiveSelectionResult SAL_CALL ButtonNavigationHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception) + InteractiveSelectionResult SAL_CALL ButtonNavigationHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) ); @@ -219,7 +219,7 @@ namespace pcr } - void SAL_CALL ButtonNavigationHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException, std::exception) + void SAL_CALL ButtonNavigationHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool /*_bFirstTimeInit*/ ) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throwRuntime( _rActuatingPropertyName ) ); @@ -245,7 +245,7 @@ namespace pcr } - LineDescriptor SAL_CALL ButtonNavigationHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception) + LineDescriptor SAL_CALL ButtonNavigationHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) ); diff --git a/extensions/source/propctrlr/buttonnavigationhandler.hxx b/extensions/source/propctrlr/buttonnavigationhandler.hxx index 5a7bf0edb55b..a2f823d8e942 100644 --- a/extensions/source/propctrlr/buttonnavigationhandler.hxx +++ b/extensions/source/propctrlr/buttonnavigationhandler.hxx @@ -41,9 +41,9 @@ namespace pcr const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); /// @throws css::uno::RuntimeException - static OUString SAL_CALL getImplementationName_static( ) throw (css::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (css::uno::RuntimeException); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ); protected: virtual ~ButtonNavigationHandler() override; @@ -52,15 +52,15 @@ namespace pcr protected: // XPropertyHandler overriables - virtual void SAL_CALL inspect( const css::uno::Reference< css::uno::XInterface >& _rxIntrospectee ) throw (css::uno::RuntimeException, css::lang::NullPointerException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL inspect( const css::uno::Reference< css::uno::XInterface >& _rxIntrospectee ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) override; + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) override; virtual css::inspection::InteractiveSelectionResult - SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; - virtual css::inspection::LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; + SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) override; + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) override; + virtual css::inspection::LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) override; // PropertyHandler overridables virtual css::uno::Sequence< css::beans::Property > diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx index 1134d12401cb..51fe0835e734 100644 --- a/extensions/source/propctrlr/cellbindinghandler.cxx +++ b/extensions/source/propctrlr/cellbindinghandler.cxx @@ -56,13 +56,13 @@ namespace pcr } - OUString SAL_CALL CellBindingPropertyHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL CellBindingPropertyHandler::getImplementationName_static( ) { return OUString( "com.sun.star.comp.extensions.CellBindingPropertyHandler" ); } - Sequence< OUString > SAL_CALL CellBindingPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL CellBindingPropertyHandler::getSupportedServiceNames_static( ) { Sequence<OUString> aSupported { "com.sun.star.form.inspection.CellBindingPropertyHandler" }; return aSupported; @@ -85,7 +85,7 @@ namespace pcr } - Sequence< OUString > SAL_CALL CellBindingPropertyHandler::getActuatingProperties( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL CellBindingPropertyHandler::getActuatingProperties( ) { Sequence< OUString > aInterestingProperties( 3 ); aInterestingProperties[0] = PROPERTY_LIST_CELL_RANGE; @@ -95,7 +95,7 @@ namespace pcr } - void SAL_CALL CellBindingPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException, std::exception) + void SAL_CALL CellBindingPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nActuatingPropId( impl_getPropertyId_throwRuntime( _rActuatingPropertyName ) ); @@ -223,7 +223,7 @@ namespace pcr } - Any SAL_CALL CellBindingPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) + Any SAL_CALL CellBindingPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) ); @@ -269,7 +269,7 @@ namespace pcr } - void SAL_CALL CellBindingPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException, std::exception) + void SAL_CALL CellBindingPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) ); @@ -341,7 +341,7 @@ namespace pcr } - Any SAL_CALL CellBindingPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException, std::exception) + Any SAL_CALL CellBindingPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) { ::osl::MutexGuard aGuard( m_aMutex ); Any aPropertyValue; @@ -390,7 +390,7 @@ namespace pcr Any SAL_CALL CellBindingPropertyHandler::convertToControlValue( const OUString& _rPropertyName, - const Any& _rPropertyValue, const Type& /*_rControlValueType*/ ) throw (UnknownPropertyException, RuntimeException, std::exception) + const Any& _rPropertyValue, const Type& /*_rControlValueType*/ ) { ::osl::MutexGuard aGuard( m_aMutex ); Any aControlValue; diff --git a/extensions/source/propctrlr/cellbindinghandler.hxx b/extensions/source/propctrlr/cellbindinghandler.hxx index 96b80419eb30..93b3b84d5c00 100644 --- a/extensions/source/propctrlr/cellbindinghandler.hxx +++ b/extensions/source/propctrlr/cellbindinghandler.hxx @@ -49,21 +49,21 @@ namespace pcr ); /// @throws css::uno::RuntimeException - static OUString SAL_CALL getImplementationName_static( ) throw (css::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (css::uno::RuntimeException); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ); protected: virtual ~CellBindingPropertyHandler() override; protected: // XPropertyHandler overriables - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) override; + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) override; + virtual css::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) override; + virtual css::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) override; + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) override; // PropertyHandler overridables virtual css::uno::Sequence< css::beans::Property > diff --git a/extensions/source/propctrlr/commoncontrol.cxx b/extensions/source/propctrlr/commoncontrol.cxx index 6e9cb6be093d..c84593501edc 100644 --- a/extensions/source/propctrlr/commoncontrol.cxx +++ b/extensions/source/propctrlr/commoncontrol.cxx @@ -47,12 +47,12 @@ namespace pcr { } - void SAL_CALL CommonBehaviourControlHelper::setControlContext( const Reference< XPropertyControlContext >& _controlcontext ) throw (RuntimeException) + void SAL_CALL CommonBehaviourControlHelper::setControlContext( const Reference< XPropertyControlContext >& _controlcontext ) { m_xContext = _controlcontext; } - void SAL_CALL CommonBehaviourControlHelper::notifyModifiedValue( ) throw (RuntimeException) + void SAL_CALL CommonBehaviourControlHelper::notifyModifiedValue( ) { if ( isModified() && m_xContext.is() ) { diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx index f16cf2e93a9f..ed2261b598ba 100644 --- a/extensions/source/propctrlr/commoncontrol.hxx +++ b/extensions/source/propctrlr/commoncontrol.hxx @@ -75,15 +75,15 @@ namespace pcr // XPropertyControl /// @throws css::uno::RuntimeException - ::sal_Int16 SAL_CALL getControlType() throw (css::uno::RuntimeException) { return m_nControlType; } + ::sal_Int16 SAL_CALL getControlType() { return m_nControlType; } /// @throws css::uno::RuntimeException - const css::uno::Reference< css::inspection::XPropertyControlContext >& SAL_CALL getControlContext() throw (css::uno::RuntimeException) { return m_xContext; } + const css::uno::Reference< css::inspection::XPropertyControlContext >& SAL_CALL getControlContext() { return m_xContext; } /// @throws css::uno::RuntimeException - void SAL_CALL setControlContext( const css::uno::Reference< css::inspection::XPropertyControlContext >& _controlcontext ) throw (css::uno::RuntimeException); + void SAL_CALL setControlContext( const css::uno::Reference< css::inspection::XPropertyControlContext >& _controlcontext ); /// @throws css::uno::RuntimeException - bool SAL_CALL isModified( ) throw (css::uno::RuntimeException) { return m_bModified; } + bool SAL_CALL isModified( ) { return m_bModified; } /// @throws css::uno::RuntimeException - void SAL_CALL notifyModifiedValue( ) throw (css::uno::RuntimeException); + void SAL_CALL notifyModifiedValue( ); /** (fail-safe) wrapper around calling our context's activateNextControl */ @@ -124,17 +124,17 @@ namespace pcr inline CommonBehaviourControl( sal_Int16 _nControlType, vcl::Window* _pParentWindow, WinBits _nWindowStyle, bool _bDoSetHandlers = true ); // XPropertyControl - delegated to ->m_aImplControl - virtual ::sal_Int16 SAL_CALL getControlType() throw (css::uno::RuntimeException) override + virtual ::sal_Int16 SAL_CALL getControlType() override { return CommonBehaviourControlHelper::getControlType(); } - virtual css::uno::Reference< css::inspection::XPropertyControlContext > SAL_CALL getControlContext() throw (css::uno::RuntimeException) override + virtual css::uno::Reference< css::inspection::XPropertyControlContext > SAL_CALL getControlContext() override { return CommonBehaviourControlHelper::getControlContext(); } - virtual void SAL_CALL setControlContext( const css::uno::Reference< css::inspection::XPropertyControlContext >& _controlcontext ) throw (css::uno::RuntimeException) override + virtual void SAL_CALL setControlContext( const css::uno::Reference< css::inspection::XPropertyControlContext >& _controlcontext ) override { CommonBehaviourControlHelper::setControlContext( _controlcontext ); } - virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getControlWindow() throw (css::uno::RuntimeException) override + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getControlWindow() override { return VCLUnoHelper::GetInterface( m_pControlWindow ); } - virtual sal_Bool SAL_CALL isModified( ) throw (css::uno::RuntimeException) override + virtual sal_Bool SAL_CALL isModified( ) override { return CommonBehaviourControlHelper::isModified(); } - virtual void SAL_CALL notifyModifiedValue( ) throw (css::uno::RuntimeException) override + virtual void SAL_CALL notifyModifiedValue( ) override { CommonBehaviourControlHelper::notifyModifiedValue(); } // XComponent diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx index 4d84c4e6b2ae..97a8ec3fa440 100644 --- a/extensions/source/propctrlr/composeduiupdate.cxx +++ b/extensions/source/propctrlr/composeduiupdate.cxx @@ -133,16 +133,16 @@ namespace pcr void dispose(); // XObjectInspectorUI overridables - virtual void SAL_CALL enablePropertyUI( const OUString& _rPropertyName, sal_Bool _bEnable ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL enablePropertyUIElements( const OUString& _rPropertyName, ::sal_Int16 _nElements, sal_Bool _bEnable ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL rebuildPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL showPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL hidePropertyUI( const OUString& _rPropertyName ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL showCategory( const OUString& _rCategory, sal_Bool _bShow ) throw (RuntimeException, std::exception) override; - virtual Reference< XPropertyControl > SAL_CALL getPropertyControl( const OUString& _rPropertyName ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL registerControlObserver( const Reference< XPropertyControlObserver >& Observer ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL revokeControlObserver( const Reference< XPropertyControlObserver >& Observer ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setHelpSectionText( const OUString& HelpText ) throw (NoSupportException, RuntimeException, std::exception) override; + virtual void SAL_CALL enablePropertyUI( const OUString& _rPropertyName, sal_Bool _bEnable ) override; + virtual void SAL_CALL enablePropertyUIElements( const OUString& _rPropertyName, ::sal_Int16 _nElements, sal_Bool _bEnable ) override; + virtual void SAL_CALL rebuildPropertyUI( const OUString& _rPropertyName ) override; + virtual void SAL_CALL showPropertyUI( const OUString& _rPropertyName ) override; + virtual void SAL_CALL hidePropertyUI( const OUString& _rPropertyName ) override; + virtual void SAL_CALL showCategory( const OUString& _rCategory, sal_Bool _bShow ) override; + virtual Reference< XPropertyControl > SAL_CALL getPropertyControl( const OUString& _rPropertyName ) override; + virtual void SAL_CALL registerControlObserver( const Reference< XPropertyControlObserver >& Observer ) override; + virtual void SAL_CALL revokeControlObserver( const Reference< XPropertyControlObserver >& Observer ) override; + virtual void SAL_CALL setHelpSectionText( const OUString& HelpText ) override; protected: virtual ~CachedInspectorUI() override; @@ -225,7 +225,7 @@ namespace pcr } - void CachedInspectorUI::enablePropertyUI( const OUString& _rPropertyName, sal_Bool _bEnable ) throw (RuntimeException, std::exception) + void CachedInspectorUI::enablePropertyUI( const OUString& _rPropertyName, sal_Bool _bEnable ) { MethodGuard aGuard( *this ); if ( !m_rMaster.shouldContinuePropertyHandling( _rPropertyName ) ) @@ -256,7 +256,7 @@ namespace pcr } - void CachedInspectorUI::enablePropertyUIElements( const OUString& _rPropertyName, sal_Int16 _nElements, sal_Bool _bEnable ) throw (RuntimeException, std::exception) + void CachedInspectorUI::enablePropertyUIElements( const OUString& _rPropertyName, sal_Int16 _nElements, sal_Bool _bEnable ) { MethodGuard aGuard( *this ); if ( !m_rMaster.shouldContinuePropertyHandling( _rPropertyName ) ) @@ -270,7 +270,7 @@ namespace pcr } - void CachedInspectorUI::rebuildPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException, std::exception) + void CachedInspectorUI::rebuildPropertyUI( const OUString& _rPropertyName ) { MethodGuard aGuard( *this ); if ( !m_rMaster.shouldContinuePropertyHandling( _rPropertyName ) ) @@ -282,7 +282,7 @@ namespace pcr } - void CachedInspectorUI::showPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException, std::exception) + void CachedInspectorUI::showPropertyUI( const OUString& _rPropertyName ) { MethodGuard aGuard( *this ); if ( !m_rMaster.shouldContinuePropertyHandling( _rPropertyName ) ) @@ -296,7 +296,7 @@ namespace pcr } - void CachedInspectorUI::hidePropertyUI( const OUString& _rPropertyName ) throw (RuntimeException, std::exception) + void CachedInspectorUI::hidePropertyUI( const OUString& _rPropertyName ) { MethodGuard aGuard( *this ); if ( !m_rMaster.shouldContinuePropertyHandling( _rPropertyName ) ) @@ -307,7 +307,7 @@ namespace pcr } - void CachedInspectorUI::showCategory( const OUString& _rCategory, sal_Bool _bShow ) throw (RuntimeException, std::exception) + void CachedInspectorUI::showCategory( const OUString& _rCategory, sal_Bool _bShow ) { MethodGuard aGuard( *this ); @@ -316,7 +316,7 @@ namespace pcr } - Reference< XPropertyControl > SAL_CALL CachedInspectorUI::getPropertyControl( const OUString& _rPropertyName ) throw (RuntimeException, std::exception) + Reference< XPropertyControl > SAL_CALL CachedInspectorUI::getPropertyControl( const OUString& _rPropertyName ) { MethodGuard aGuard( *this ); if ( !m_rMaster.shouldContinuePropertyHandling( _rPropertyName ) ) @@ -326,7 +326,7 @@ namespace pcr } - void SAL_CALL CachedInspectorUI::registerControlObserver( const Reference< XPropertyControlObserver >& Observer ) throw (RuntimeException, std::exception) + void SAL_CALL CachedInspectorUI::registerControlObserver( const Reference< XPropertyControlObserver >& Observer ) { OSL_FAIL( "CachedInspectorUI::registerControlObserver: not expected to be called!" ); // CachedInspectorUI is used as context for the controls, and we don't expect them to @@ -335,7 +335,7 @@ namespace pcr } - void SAL_CALL CachedInspectorUI::revokeControlObserver( const Reference< XPropertyControlObserver >& Observer ) throw (RuntimeException, std::exception) + void SAL_CALL CachedInspectorUI::revokeControlObserver( const Reference< XPropertyControlObserver >& Observer ) { OSL_FAIL( "CachedInspectorUI::revokeControlObserver: not expected to be called!" ); // CachedInspectorUI is used as context for the controls, and we don't expect them to @@ -344,7 +344,7 @@ namespace pcr } - void SAL_CALL CachedInspectorUI::setHelpSectionText( const OUString& HelpText ) throw (NoSupportException, RuntimeException, std::exception) + void SAL_CALL CachedInspectorUI::setHelpSectionText( const OUString& HelpText ) { m_rMaster.getDelegatorUI()->setHelpSectionText( HelpText ); } diff --git a/extensions/source/propctrlr/composeduiupdate.hxx b/extensions/source/propctrlr/composeduiupdate.hxx index 21157e3df012..f6170861424b 100644 --- a/extensions/source/propctrlr/composeduiupdate.hxx +++ b/extensions/source/propctrlr/composeduiupdate.hxx @@ -40,7 +40,7 @@ namespace pcr { public: /// @throws css::uno::RuntimeException - virtual bool SAL_CALL hasPropertyByName( const OUString& _rName ) throw (css::uno::RuntimeException) = 0; + virtual bool SAL_CALL hasPropertyByName( const OUString& _rName ) = 0; protected: ~IPropertyExistenceCheck() {} diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx index 4ba8b5feaf25..a598665b29e2 100644 --- a/extensions/source/propctrlr/controlfontdialog.cxx +++ b/extensions/source/propctrlr/controlfontdialog.cxx @@ -65,7 +65,7 @@ namespace pcr } - Sequence<sal_Int8> SAL_CALL OControlFontDialog::getImplementationId( ) throw(RuntimeException, std::exception) + Sequence<sal_Int8> SAL_CALL OControlFontDialog::getImplementationId( ) { return css::uno::Sequence<sal_Int8>(); } @@ -77,31 +77,31 @@ namespace pcr } - OUString SAL_CALL OControlFontDialog::getImplementationName() throw(RuntimeException, std::exception) + OUString SAL_CALL OControlFontDialog::getImplementationName() { return getImplementationName_static(); } - OUString OControlFontDialog::getImplementationName_static() throw(RuntimeException) + OUString OControlFontDialog::getImplementationName_static() { return OUString("org.openoffice.comp.form.ui.OControlFontDialog"); } - css::uno::Sequence<OUString> SAL_CALL OControlFontDialog::getSupportedServiceNames() throw(RuntimeException, std::exception) + css::uno::Sequence<OUString> SAL_CALL OControlFontDialog::getSupportedServiceNames() { return getSupportedServiceNames_static(); } - css::uno::Sequence<OUString> OControlFontDialog::getSupportedServiceNames_static() throw(RuntimeException) + css::uno::Sequence<OUString> OControlFontDialog::getSupportedServiceNames_static() { css::uno::Sequence<OUString> aSupported { "com.sun.star.form.ControlFontDialog" }; return aSupported; } - void OControlFontDialog::initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception) + void OControlFontDialog::initialize( const Sequence< Any >& aArguments ) { Reference<XPropertySet> xGridModel; if (aArguments.getLength() == 1 && (aArguments[0] >>= xGridModel)) @@ -118,7 +118,7 @@ namespace pcr } - Reference<XPropertySetInfo> SAL_CALL OControlFontDialog::getPropertySetInfo() throw(RuntimeException, std::exception) + Reference<XPropertySetInfo> SAL_CALL OControlFontDialog::getPropertySetInfo() { Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; diff --git a/extensions/source/propctrlr/controlfontdialog.hxx b/extensions/source/propctrlr/controlfontdialog.hxx index 24e688eca00f..bbf1ffcc1818 100644 --- a/extensions/source/propctrlr/controlfontdialog.hxx +++ b/extensions/source/propctrlr/controlfontdialog.hxx @@ -55,25 +55,25 @@ namespace pcr virtual ~OControlFontDialog() override; // XTypeProvider - virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XServiceInfo - static methods /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > getSupportedServiceNames_static() throw( css::uno::RuntimeException ); + static css::uno::Sequence< OUString > getSupportedServiceNames_static(); /// @throws css::uno::RuntimeException - static OUString getImplementationName_static() throw( css::uno::RuntimeException ); + static OUString getImplementationName_static(); static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::uno::XComponentContext >&); // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // OPropertyArrayUsageHelper diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx index 09a7eecab288..e01a3778b7c4 100644 --- a/extensions/source/propctrlr/defaultforminspection.cxx +++ b/extensions/source/propctrlr/defaultforminspection.cxx @@ -67,25 +67,25 @@ namespace pcr } - OUString SAL_CALL DefaultFormComponentInspectorModel::getImplementationName( ) throw(RuntimeException, std::exception) + OUString SAL_CALL DefaultFormComponentInspectorModel::getImplementationName( ) { return getImplementationName_static(); } - Sequence< OUString > SAL_CALL DefaultFormComponentInspectorModel::getSupportedServiceNames( ) throw(RuntimeException, std::exception) + Sequence< OUString > SAL_CALL DefaultFormComponentInspectorModel::getSupportedServiceNames( ) { return getSupportedServiceNames_static(); } - OUString DefaultFormComponentInspectorModel::getImplementationName_static( ) throw(RuntimeException) + OUString DefaultFormComponentInspectorModel::getImplementationName_static( ) { return OUString("org.openoffice.comp.extensions.DefaultFormComponentInspectorModel"); } - Sequence< OUString > DefaultFormComponentInspectorModel::getSupportedServiceNames_static( ) throw(RuntimeException) + Sequence< OUString > DefaultFormComponentInspectorModel::getSupportedServiceNames_static( ) { Sequence< OUString > aSupported { "com.sun.star.form.inspection.DefaultFormComponentInspectorModel" }; return aSupported; @@ -98,7 +98,7 @@ namespace pcr } - Sequence< Any > SAL_CALL DefaultFormComponentInspectorModel::getHandlerFactories() throw (RuntimeException, std::exception) + Sequence< Any > SAL_CALL DefaultFormComponentInspectorModel::getHandlerFactories() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -153,7 +153,7 @@ namespace pcr } - Sequence< PropertyCategoryDescriptor > SAL_CALL DefaultFormComponentInspectorModel::describeCategories( ) throw (RuntimeException, std::exception) + Sequence< PropertyCategoryDescriptor > SAL_CALL DefaultFormComponentInspectorModel::describeCategories( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -182,7 +182,7 @@ namespace pcr } - ::sal_Int32 SAL_CALL DefaultFormComponentInspectorModel::getPropertyOrderIndex( const OUString& _rPropertyName ) throw (RuntimeException, std::exception) + ::sal_Int32 SAL_CALL DefaultFormComponentInspectorModel::getPropertyOrderIndex( const OUString& _rPropertyName ) { sal_Int32 nPropertyId( m_pInfoService->getPropertyId( _rPropertyName ) ); if ( nPropertyId == -1 ) @@ -198,7 +198,7 @@ namespace pcr } - void SAL_CALL DefaultFormComponentInspectorModel::initialize( const Sequence< Any >& _arguments ) throw (Exception, RuntimeException, std::exception) + void SAL_CALL DefaultFormComponentInspectorModel::initialize( const Sequence< Any >& _arguments ) { if ( m_bConstructed ) throw AlreadyInitializedException(); diff --git a/extensions/source/propctrlr/defaultforminspection.hxx b/extensions/source/propctrlr/defaultforminspection.hxx index 897a74e6551f..23dee8a92409 100644 --- a/extensions/source/propctrlr/defaultforminspection.hxx +++ b/extensions/source/propctrlr/defaultforminspection.hxx @@ -43,23 +43,23 @@ namespace pcr virtual ~DefaultFormComponentInspectorModel() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XObjectInspectorModel - virtual css::uno::Sequence< css::uno::Any > SAL_CALL getHandlerFactories() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::inspection::PropertyCategoryDescriptor > SAL_CALL describeCategories( ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getPropertyOrderIndex( const OUString& PropertyName ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getHandlerFactories() override; + virtual css::uno::Sequence< css::inspection::PropertyCategoryDescriptor > SAL_CALL describeCategories( ) override; + virtual ::sal_Int32 SAL_CALL getPropertyOrderIndex( const OUString& PropertyName ) override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; public: // XServiceInfo - static versions /// @throws css::uno::RuntimeException - static OUString getImplementationName_static( ) throw(css::uno::RuntimeException); + static OUString getImplementationName_static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > getSupportedServiceNames_static( ) throw(css::uno::RuntimeException); + static css::uno::Sequence< OUString > getSupportedServiceNames_static( ); static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::uno::XComponentContext >&); diff --git a/extensions/source/propctrlr/defaulthelpprovider.cxx b/extensions/source/propctrlr/defaulthelpprovider.cxx index 776dabfab267..9af9b892ff23 100644 --- a/extensions/source/propctrlr/defaulthelpprovider.cxx +++ b/extensions/source/propctrlr/defaulthelpprovider.cxx @@ -67,13 +67,13 @@ namespace pcr } - OUString DefaultHelpProvider::getImplementationName_static( ) throw(RuntimeException) + OUString DefaultHelpProvider::getImplementationName_static( ) { return OUString("org.openoffice.comp.extensions.DefaultHelpProvider"); } - Sequence< OUString > DefaultHelpProvider::getSupportedServiceNames_static( ) throw(RuntimeException) + Sequence< OUString > DefaultHelpProvider::getSupportedServiceNames_static( ) { Sequence< OUString > aSupported { "com.sun.star.inspection.DefaultHelpProvider" }; return aSupported; @@ -86,7 +86,7 @@ namespace pcr } - void SAL_CALL DefaultHelpProvider::focusGained( const Reference< XPropertyControl >& Control ) throw (RuntimeException, std::exception) + void SAL_CALL DefaultHelpProvider::focusGained( const Reference< XPropertyControl >& Control ) { if ( !m_xInspectorUI.is() ) throw RuntimeException( OUString(), *this ); @@ -102,13 +102,13 @@ namespace pcr } - void SAL_CALL DefaultHelpProvider::valueChanged( const Reference< XPropertyControl >& ) throw (RuntimeException, std::exception) + void SAL_CALL DefaultHelpProvider::valueChanged( const Reference< XPropertyControl >& ) { // not interested in } - void SAL_CALL DefaultHelpProvider::initialize( const Sequence< Any >& _arguments ) throw (Exception, RuntimeException, std::exception) + void SAL_CALL DefaultHelpProvider::initialize( const Sequence< Any >& _arguments ) { if ( m_bConstructed ) throw AlreadyInitializedException(); diff --git a/extensions/source/propctrlr/defaulthelpprovider.hxx b/extensions/source/propctrlr/defaulthelpprovider.hxx index 5b2e0fbea200..c5181b1f2d24 100644 --- a/extensions/source/propctrlr/defaulthelpprovider.hxx +++ b/extensions/source/propctrlr/defaulthelpprovider.hxx @@ -51,9 +51,9 @@ namespace pcr // XServiceInfo - static versions /// @throws css::uno::RuntimeException - static OUString getImplementationName_static( ) throw(css::uno::RuntimeException); + static OUString getImplementationName_static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > getSupportedServiceNames_static( ) throw(css::uno::RuntimeException); + static css::uno::Sequence< OUString > getSupportedServiceNames_static( ); static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::uno::XComponentContext >&); @@ -61,11 +61,11 @@ namespace pcr virtual ~DefaultHelpProvider() override; // XPropertyControlObserver - virtual void SAL_CALL focusGained( const css::uno::Reference< css::inspection::XPropertyControl >& Control ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL valueChanged( const css::uno::Reference< css::inspection::XPropertyControl >& Control ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL focusGained( const css::uno::Reference< css::inspection::XPropertyControl >& Control ) override; + virtual void SAL_CALL valueChanged( const css::uno::Reference< css::inspection::XPropertyControl >& Control ) override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; protected: // Service constructors diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx b/extensions/source/propctrlr/editpropertyhandler.cxx index 940abbaf9a59..5f3e3eb39633 100644 --- a/extensions/source/propctrlr/editpropertyhandler.cxx +++ b/extensions/source/propctrlr/editpropertyhandler.cxx @@ -61,20 +61,20 @@ namespace pcr } - OUString SAL_CALL EditPropertyHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL EditPropertyHandler::getImplementationName_static( ) { return OUString( "com.sun.star.comp.extensions.EditPropertyHandler" ); } - Sequence< OUString > SAL_CALL EditPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EditPropertyHandler::getSupportedServiceNames_static( ) { Sequence<OUString> aSupported { "com.sun.star.form.inspection.EditPropertyHandler" }; return aSupported; } - Any SAL_CALL EditPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) + Any SAL_CALL EditPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) ); @@ -130,7 +130,7 @@ namespace pcr } - void SAL_CALL EditPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException, std::exception) + void SAL_CALL EditPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) ); @@ -225,7 +225,7 @@ namespace pcr } - Sequence< OUString > SAL_CALL EditPropertyHandler::getSupersededProperties( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL EditPropertyHandler::getSupersededProperties( ) { ::osl::MutexGuard aGuard( m_aMutex ); ::std::vector< OUString > aSuperseded; @@ -245,7 +245,7 @@ namespace pcr } - Sequence< OUString > SAL_CALL EditPropertyHandler::getActuatingProperties( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL EditPropertyHandler::getActuatingProperties( ) { ::osl::MutexGuard aGuard( m_aMutex ); ::std::vector< OUString > aInterestingActuatingProps; @@ -256,7 +256,7 @@ namespace pcr } - void SAL_CALL EditPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (NullPointerException, RuntimeException, std::exception) + void SAL_CALL EditPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); diff --git a/extensions/source/propctrlr/editpropertyhandler.hxx b/extensions/source/propctrlr/editpropertyhandler.hxx index f0346f2a7515..15dbffa07521 100644 --- a/extensions/source/propctrlr/editpropertyhandler.hxx +++ b/extensions/source/propctrlr/editpropertyhandler.hxx @@ -41,20 +41,20 @@ namespace pcr ); /// @throws css::uno::RuntimeException - static OUString SAL_CALL getImplementationName_static( ) throw (css::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (css::uno::RuntimeException); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ); protected: virtual ~EditPropertyHandler() override; protected: // XPropertyHandler overriables - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupersededProperties( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) override; + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupersededProperties( ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) override; + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) override; // PropertyHandler overridables virtual css::uno::Sequence< css::beans::Property > diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx index 29ba124e0626..c1bb1ee2144d 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.cxx +++ b/extensions/source/propctrlr/eformspropertyhandler.cxx @@ -70,13 +70,13 @@ namespace pcr } - OUString SAL_CALL EFormsPropertyHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL EFormsPropertyHandler::getImplementationName_static( ) { return OUString( "com.sun.star.comp.extensions.EFormsPropertyHandler" ); } - Sequence< OUString > SAL_CALL EFormsPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EFormsPropertyHandler::getSupportedServiceNames_static( ) { Sequence<OUString> aSupported { "com.sun.star.form.inspection.XMLFormsPropertyHandler" }; return aSupported; @@ -92,7 +92,7 @@ namespace pcr } - Any SAL_CALL EFormsPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) + Any SAL_CALL EFormsPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) ); @@ -155,7 +155,7 @@ namespace pcr } - void SAL_CALL EFormsPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException, std::exception) + void SAL_CALL EFormsPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) ); @@ -313,7 +313,7 @@ namespace pcr } - Any SAL_CALL EFormsPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException, std::exception) + Any SAL_CALL EFormsPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) { ::osl::MutexGuard aGuard( m_aMutex ); Any aReturn; @@ -346,7 +346,7 @@ namespace pcr } - Any SAL_CALL EFormsPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException, std::exception) + Any SAL_CALL EFormsPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) { ::osl::MutexGuard aGuard( m_aMutex ); Any aReturn; @@ -379,7 +379,7 @@ namespace pcr } - Sequence< OUString > SAL_CALL EFormsPropertyHandler::getActuatingProperties( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL EFormsPropertyHandler::getActuatingProperties( ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_pHelper.get() ) @@ -392,7 +392,7 @@ namespace pcr } - Sequence< OUString > SAL_CALL EFormsPropertyHandler::getSupersededProperties( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL EFormsPropertyHandler::getSupersededProperties( ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_pHelper.get() ) @@ -405,7 +405,6 @@ namespace pcr LineDescriptor SAL_CALL EFormsPropertyHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) - throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !_rxControlFactory.is() ) @@ -470,7 +469,7 @@ namespace pcr } - InteractiveSelectionResult SAL_CALL EFormsPropertyHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool /*_bPrimary*/, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception) + InteractiveSelectionResult SAL_CALL EFormsPropertyHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool /*_bPrimary*/, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -529,7 +528,7 @@ namespace pcr } - void SAL_CALL EFormsPropertyHandler::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (NullPointerException, RuntimeException, std::exception) + void SAL_CALL EFormsPropertyHandler::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) { ::osl::MutexGuard aGuard( m_aMutex ); EFormsPropertyHandler_Base::addPropertyChangeListener( _rxListener ); @@ -538,7 +537,7 @@ namespace pcr } - void SAL_CALL EFormsPropertyHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException, std::exception) + void SAL_CALL EFormsPropertyHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_pHelper.get() ) @@ -547,7 +546,7 @@ namespace pcr } - void SAL_CALL EFormsPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (NullPointerException, RuntimeException, std::exception) + void SAL_CALL EFormsPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); diff --git a/extensions/source/propctrlr/eformspropertyhandler.hxx b/extensions/source/propctrlr/eformspropertyhandler.hxx index 3b84b3e9c4da..7098811940bf 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.hxx +++ b/extensions/source/propctrlr/eformspropertyhandler.hxx @@ -52,30 +52,30 @@ namespace pcr ); /// @throws css::uno::RuntimeException - static OUString SAL_CALL getImplementationName_static( ) throw (css::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (css::uno::RuntimeException); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ); protected: virtual ~EFormsPropertyHandler() override; protected: // XPropertyHandler overriables - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) override; + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) override; virtual css::uno::Sequence< OUString > - SAL_CALL getActuatingProperties( ) throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getActuatingProperties( ) override; virtual css::uno::Sequence< OUString > - SAL_CALL getSupersededProperties( ) throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getSupersededProperties( ) override; virtual css::inspection::LineDescriptor - SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; + SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) override; virtual css::inspection::InteractiveSelectionResult - SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) override; + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) override; + virtual css::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) override; + virtual css::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) override; + virtual void SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) override; // PropertyHandler overridables virtual css::uno::Sequence< css::beans::Property > diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index f314ad43c279..afe2a4063dcf 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -329,12 +329,12 @@ namespace pcr ScriptEventDescriptor getNormalizedDescriptorByName( const OUString& _rEventName ) const; // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& _rName, const Any& aElement ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override; - virtual Any SAL_CALL getByName( const OUString& _rName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getElementNames( ) throw (RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& _rName ) throw (RuntimeException, std::exception) override; - virtual Type SAL_CALL getElementType( ) throw (RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByName( const OUString& _rName, const Any& aElement ) override; + virtual Any SAL_CALL getByName( const OUString& _rName ) override; + virtual Sequence< OUString > SAL_CALL getElementNames( ) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& _rName ) override; + virtual Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; protected: virtual ~EventHolder( ) override; @@ -375,7 +375,7 @@ namespace pcr return pos->second; } - void SAL_CALL EventHolder::replaceByName( const OUString& _rName, const Any& _rElement ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) + void SAL_CALL EventHolder::replaceByName( const OUString& _rName, const Any& _rElement ) { EventMap::iterator pos = m_aEventNameAccess.find( _rName ); if ( pos == m_aEventNameAccess.end() ) @@ -390,7 +390,7 @@ namespace pcr pos->second.ScriptCode = aExtractor.getOrDefault( "Script", OUString() ); } - Any SAL_CALL EventHolder::getByName( const OUString& _rName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) + Any SAL_CALL EventHolder::getByName( const OUString& _rName ) { ScriptEventDescriptor aDescriptor( impl_getDescriptor_throw( _rName ) ); @@ -403,7 +403,7 @@ namespace pcr return makeAny( aScriptDescriptor ); } - Sequence< OUString > SAL_CALL EventHolder::getElementNames( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL EventHolder::getElementNames( ) { Sequence< OUString > aReturn( m_aEventIndexAccess.size() ); OUString* pReturn = aReturn.getArray(); @@ -425,18 +425,18 @@ namespace pcr return aReturn; } - sal_Bool SAL_CALL EventHolder::hasByName( const OUString& _rName ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL EventHolder::hasByName( const OUString& _rName ) { EventMap::const_iterator pos = m_aEventNameAccess.find( _rName ); return pos != m_aEventNameAccess.end(); } - Type SAL_CALL EventHolder::getElementType( ) throw (RuntimeException, std::exception) + Type SAL_CALL EventHolder::getElementType( ) { return cppu::UnoType<Sequence< PropertyValue >>::get(); } - sal_Bool SAL_CALL EventHolder::hasElements( ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL EventHolder::hasElements( ) { return !m_aEventNameAccess.empty(); } @@ -456,27 +456,27 @@ namespace pcr { } - OUString SAL_CALL EventHandler::getImplementationName( ) throw (RuntimeException, std::exception) + OUString SAL_CALL EventHandler::getImplementationName( ) { return getImplementationName_static(); } - sal_Bool SAL_CALL EventHandler::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL EventHandler::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } - Sequence< OUString > SAL_CALL EventHandler::getSupportedServiceNames( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL EventHandler::getSupportedServiceNames( ) { return getSupportedServiceNames_static(); } - OUString SAL_CALL EventHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL EventHandler::getImplementationName_static( ) { return OUString( "com.sun.star.comp.extensions.EventHandler" ); } - Sequence< OUString > SAL_CALL EventHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EventHandler::getSupportedServiceNames_static( ) { Sequence<OUString> aSupported { "com.sun.star.form.inspection.EventHandler" }; return aSupported; @@ -487,7 +487,7 @@ namespace pcr return *( new EventHandler( _rxContext ) ); } - void SAL_CALL EventHandler::inspect( const Reference< XInterface >& _rxIntrospectee ) throw (RuntimeException, NullPointerException, std::exception) + void SAL_CALL EventHandler::inspect( const Reference< XInterface >& _rxIntrospectee ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -526,7 +526,7 @@ namespace pcr } } - Any SAL_CALL EventHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) + Any SAL_CALL EventHandler::getPropertyValue( const OUString& _rPropertyName ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -550,7 +550,7 @@ namespace pcr return makeAny( aPropertyValue ); } - void SAL_CALL EventHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException, std::exception) + void SAL_CALL EventHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -580,7 +580,7 @@ namespace pcr m_aPropertyListeners.notify( aEvent, &XPropertyChangeListener::propertyChange ); } - Any SAL_CALL EventHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException, std::exception) + Any SAL_CALL EventHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -607,7 +607,7 @@ namespace pcr return makeAny( aAssignedScript ); } - Any SAL_CALL EventHandler::convertToControlValue( const OUString& /*_rPropertyName*/, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException, std::exception) + Any SAL_CALL EventHandler::convertToControlValue( const OUString& /*_rPropertyName*/, const Any& _rPropertyValue, const Type& _rControlValueType ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -671,12 +671,12 @@ namespace pcr return makeAny( sScript ); } - PropertyState SAL_CALL EventHandler::getPropertyState( const OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException, std::exception) + PropertyState SAL_CALL EventHandler::getPropertyState( const OUString& /*_rPropertyName*/ ) { return PropertyState_DIRECT_VALUE; } - void SAL_CALL EventHandler::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (NullPointerException, RuntimeException, std::exception) + void SAL_CALL EventHandler::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !_rxListener.is() ) @@ -684,13 +684,13 @@ namespace pcr m_aPropertyListeners.addListener( _rxListener ); } - void SAL_CALL EventHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException, std::exception) + void SAL_CALL EventHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) { ::osl::MutexGuard aGuard( m_aMutex ); m_aPropertyListeners.removeListener( _rxListener ); } - Sequence< Property > SAL_CALL EventHandler::getSupportedProperties() throw (RuntimeException, std::exception) + Sequence< Property > SAL_CALL EventHandler::getSupportedProperties() { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_bEventsMapInitialized ) @@ -758,13 +758,13 @@ namespace pcr return comphelper::mapValuesToSequence( aOrderedProperties ); } - Sequence< OUString > SAL_CALL EventHandler::getSupersededProperties( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL EventHandler::getSupersededProperties( ) { // none return Sequence< OUString >( ); } - Sequence< OUString > SAL_CALL EventHandler::getActuatingProperties( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL EventHandler::getActuatingProperties( ) { // none return Sequence< OUString >( ); @@ -772,7 +772,6 @@ namespace pcr LineDescriptor SAL_CALL EventHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) - throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception) { if ( !_rxControlFactory.is() ) throw NullPointerException(); @@ -793,12 +792,12 @@ namespace pcr return aDescriptor; } - sal_Bool SAL_CALL EventHandler::isComposable( const OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException, std::exception) + sal_Bool SAL_CALL EventHandler::isComposable( const OUString& /*_rPropertyName*/ ) { return false; } - InteractiveSelectionResult SAL_CALL EventHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception) + InteractiveSelectionResult SAL_CALL EventHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& _rxInspectorUI ) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -872,7 +871,7 @@ namespace pcr return InteractiveSelectionResult_Success; } - void SAL_CALL EventHandler::actuatingPropertyChanged( const OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException, std::exception) + void SAL_CALL EventHandler::actuatingPropertyChanged( const OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) { OSL_FAIL( "EventHandler::actuatingPropertyChanged: no actuating properties -> no callback (well, this is how it *should* be!)" ); } @@ -886,7 +885,7 @@ namespace pcr m_xComponent.clear(); } - sal_Bool SAL_CALL EventHandler::suspend( sal_Bool /*_bSuspend*/ ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL EventHandler::suspend( sal_Bool /*_bSuspend*/ ) { return true; } diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx index dba6b1979200..27b00b736e46 100644 --- a/extensions/source/propctrlr/eventhandler.hxx +++ b/extensions/source/propctrlr/eventhandler.hxx @@ -97,9 +97,9 @@ namespace pcr public: // XServiceInfo - static versions /// @throws css::uno::RuntimeException - static OUString SAL_CALL getImplementationName_static( ) throw (css::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (css::uno::RuntimeException); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ); static css::uno::Reference< css::uno::XInterface > Create( const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); protected: @@ -111,31 +111,31 @@ namespace pcr protected: // XPropertyHandler overridables - virtual void SAL_CALL inspect( const css::uno::Reference< css::uno::XInterface >& _rxIntrospectee ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::Property > SAL_CALL getSupportedProperties() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupersededProperties( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::inspection::LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isComposable( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL inspect( const css::uno::Reference< css::uno::XInterface >& _rxIntrospectee ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) override; + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) override; + virtual css::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) override; + virtual css::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) override; + virtual css::uno::Sequence< css::beans::Property > SAL_CALL getSupportedProperties() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupersededProperties( ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) override; + virtual css::inspection::LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) override; + virtual sal_Bool SAL_CALL isComposable( const OUString& _rPropertyName ) override; + virtual css::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) override; + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) override; + virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) override; // XComponent DECLARE_XCOMPONENT() virtual void SAL_CALL disposing() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; private: /** returns the script events associated with our introspectee diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 46af453d3bdf..862621107965 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -161,13 +161,13 @@ namespace pcr IMPLEMENT_FORWARD_XINTERFACE2(FormComponentPropertyHandler,FormComponentPropertyHandler_Base,::comphelper::OPropertyContainer) - OUString SAL_CALL FormComponentPropertyHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL FormComponentPropertyHandler::getImplementationName_static( ) { return OUString( "com.sun.star.comp.extensions.FormComponentPropertyHandler" ); } - Sequence< OUString > SAL_CALL FormComponentPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL FormComponentPropertyHandler::getSupportedServiceNames_static( ) { Sequence<OUString> aSupported { "com.sun.star.form.inspection.FormComponentPropertyHandler" }; return aSupported; @@ -301,7 +301,7 @@ namespace pcr } - Any SAL_CALL FormComponentPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) + Any SAL_CALL FormComponentPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) { if( _rPropertyName == PROPERTY_ROWSET ) return ::comphelper::OPropertyContainer::getPropertyValue( _rPropertyName ); @@ -311,7 +311,7 @@ namespace pcr } - void SAL_CALL FormComponentPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException, std::exception) + void SAL_CALL FormComponentPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) { if( _rPropertyName == PROPERTY_ROWSET ) { @@ -484,7 +484,7 @@ namespace pcr } - Any SAL_CALL FormComponentPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException, std::exception) + Any SAL_CALL FormComponentPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) ); @@ -618,7 +618,7 @@ namespace pcr } - Any SAL_CALL FormComponentPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException, std::exception) + Any SAL_CALL FormComponentPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) { ::osl::MutexGuard aGuard( m_aMutex ); sal_Int32 nPropId = m_pInfoService->getPropertyId( _rPropertyName ); @@ -798,7 +798,7 @@ namespace pcr } - PropertyState SAL_CALL FormComponentPropertyHandler::getPropertyState( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) + PropertyState SAL_CALL FormComponentPropertyHandler::getPropertyState( const OUString& _rPropertyName ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_xPropertyState.is() ) @@ -807,7 +807,7 @@ namespace pcr } - void SAL_CALL FormComponentPropertyHandler::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (NullPointerException, RuntimeException, std::exception) + void SAL_CALL FormComponentPropertyHandler::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) { ::osl::MutexGuard aGuard( m_aMutex ); FormComponentPropertyHandler_Base::addPropertyChangeListener( _rxListener ); @@ -816,7 +816,7 @@ namespace pcr } - void SAL_CALL FormComponentPropertyHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException, std::exception) + void SAL_CALL FormComponentPropertyHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_xComponent.is() ) @@ -902,13 +902,13 @@ namespace pcr } - Sequence< OUString > SAL_CALL FormComponentPropertyHandler::getSupersededProperties( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL FormComponentPropertyHandler::getSupersededProperties( ) { return Sequence< OUString >( ); } - Sequence< OUString > SAL_CALL FormComponentPropertyHandler::getActuatingProperties( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL FormComponentPropertyHandler::getActuatingProperties( ) { ::osl::MutexGuard aGuard( m_aMutex ); ::std::vector< OUString > aInterestingProperties; @@ -940,7 +940,6 @@ namespace pcr LineDescriptor SAL_CALL FormComponentPropertyHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) - throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception) { if ( !_rxControlFactory.is() ) throw NullPointerException(); @@ -1388,7 +1387,7 @@ namespace pcr } - InteractiveSelectionResult SAL_CALL FormComponentPropertyHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool /*_bPrimary*/, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception) + InteractiveSelectionResult SAL_CALL FormComponentPropertyHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool /*_bPrimary*/, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -1491,7 +1490,7 @@ namespace pcr } - void SAL_CALL FormComponentPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException, std::exception) + void SAL_CALL FormComponentPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -1991,7 +1990,7 @@ namespace pcr } - sal_Bool SAL_CALL FormComponentPropertyHandler::suspend( sal_Bool _bSuspend ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL FormComponentPropertyHandler::suspend( sal_Bool _bSuspend ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( _bSuspend ) @@ -3289,7 +3288,7 @@ namespace pcr return *getArrayHelper(); } - uno::Reference< beans::XPropertySetInfo > SAL_CALL FormComponentPropertyHandler::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception) + uno::Reference< beans::XPropertySetInfo > SAL_CALL FormComponentPropertyHandler::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx index 6ca1de715068..d0afdf3c8c9a 100644 --- a/extensions/source/propctrlr/formcomponenthandler.hxx +++ b/extensions/source/propctrlr/formcomponenthandler.hxx @@ -101,12 +101,12 @@ namespace pcr DECLARE_XINTERFACE( ) // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; /// @throws css::uno::RuntimeException - static OUString SAL_CALL getImplementationName_static( ) throw (css::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (css::uno::RuntimeException); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ); protected: virtual ~FormComponentPropertyHandler() override; @@ -115,20 +115,20 @@ namespace pcr virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // XPropertyHandler overridables - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupersededProperties() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getActuatingProperties() throw (css::uno::RuntimeException, std::exception) override; - virtual css::inspection::LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) override; + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) override; + virtual css::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) override; + virtual css::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupersededProperties() override; + virtual css::uno::Sequence< OUString > SAL_CALL getActuatingProperties() override; + virtual css::inspection::LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) override; virtual css::inspection::InteractiveSelectionResult - SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) override; + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) override; + virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) override; // XComponent virtual void SAL_CALL disposing() override; diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx index 13c5d8ae713d..0c06887c1fc9 100644 --- a/extensions/source/propctrlr/formcontroller.cxx +++ b/extensions/source/propctrlr/formcontroller.cxx @@ -92,7 +92,7 @@ namespace pcr IMPLEMENT_FORWARD_XINTERFACE2( FormController, OPropertyBrowserController, FormController_PropertyBase1 ) - Sequence< Type > SAL_CALL FormController::getTypes( ) throw(RuntimeException, std::exception) + Sequence< Type > SAL_CALL FormController::getTypes( ) { ::cppu::OTypeCollection aTypes( cppu::UnoType<XPropertySet>::get(), @@ -106,13 +106,13 @@ namespace pcr IMPLEMENT_GET_IMPLEMENTATION_ID( FormController ) - OUString SAL_CALL FormController::getImplementationName( ) throw(RuntimeException, std::exception) + OUString SAL_CALL FormController::getImplementationName( ) { return m_aServiceDescriptor.GetImplementationName(); } - Sequence< OUString > SAL_CALL FormController::getSupportedServiceNames( ) throw(RuntimeException, std::exception) + Sequence< OUString > SAL_CALL FormController::getSupportedServiceNames( ) { Sequence< OUString > aSupported( m_aServiceDescriptor.GetSupportedServiceNames() ); aSupported.realloc( aSupported.getLength() + 1 ); @@ -121,13 +121,13 @@ namespace pcr } - OUString FormController::getImplementationName_static( ) throw(RuntimeException) + OUString FormController::getImplementationName_static( ) { return OUString("org.openoffice.comp.extensions.FormController"); } - Sequence< OUString > FormController::getSupportedServiceNames_static( ) throw(RuntimeException) + Sequence< OUString > FormController::getSupportedServiceNames_static( ) { Sequence< OUString > aSupported { "com.sun.star.form.PropertyBrowserController" }; return aSupported; @@ -143,7 +143,7 @@ namespace pcr } - Reference< XPropertySetInfo > SAL_CALL FormController::getPropertySetInfo( ) throw(RuntimeException, std::exception) + Reference< XPropertySetInfo > SAL_CALL FormController::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } @@ -174,7 +174,7 @@ namespace pcr } - sal_Bool SAL_CALL FormController::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) throw (IllegalArgumentException) + sal_Bool SAL_CALL FormController::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) { switch ( nHandle ) { @@ -194,7 +194,7 @@ namespace pcr } - void SAL_CALL FormController::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw (Exception, std::exception) + void SAL_CALL FormController::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) { switch ( _nHandle ) { @@ -248,13 +248,13 @@ namespace pcr //= DialogController - OUString DialogController::getImplementationName_static( ) throw(RuntimeException) + OUString DialogController::getImplementationName_static( ) { return OUString("org.openoffice.comp.extensions.DialogController"); } - Sequence< OUString > DialogController::getSupportedServiceNames_static( ) throw(RuntimeException) + Sequence< OUString > DialogController::getSupportedServiceNames_static( ) { Sequence< OUString > aSupported { "com.sun.star.awt.PropertyBrowserController" }; return aSupported; diff --git a/extensions/source/propctrlr/formcontroller.hxx b/extensions/source/propctrlr/formcontroller.hxx index 73e75af72053..480e278b7ecc 100644 --- a/extensions/source/propctrlr/formcontroller.hxx +++ b/extensions/source/propctrlr/formcontroller.hxx @@ -69,9 +69,9 @@ namespace pcr // XServiceInfo - static versions /// @throws css::uno::RuntimeException - static OUString getImplementationName_static( ) throw(css::uno::RuntimeException); + static OUString getImplementationName_static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > getSupportedServiceNames_static( ) throw(css::uno::RuntimeException); + static css::uno::Sequence< OUString > getSupportedServiceNames_static( ); static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::uno::XComponentContext >&); @@ -82,20 +82,20 @@ namespace pcr DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XPropertySet and friends - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue - ) throw (css::lang::IllegalArgumentException) override; + ) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue - ) throw (css::uno::Exception, std::exception) override; + ) override; virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override; @@ -113,9 +113,9 @@ namespace pcr public: // XServiceInfo - static versions /// @throws css::uno::RuntimeException - static OUString getImplementationName_static( ) throw(css::uno::RuntimeException); + static OUString getImplementationName_static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > getSupportedServiceNames_static( ) throw(css::uno::RuntimeException); + static css::uno::Sequence< OUString > getSupportedServiceNames_static( ); static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::uno::XComponentContext >&); diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx index dfd2ee4031a0..778c6111a406 100644 --- a/extensions/source/propctrlr/formgeometryhandler.cxx +++ b/extensions/source/propctrlr/formgeometryhandler.cxx @@ -167,10 +167,10 @@ namespace pcr } // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const PropertyChangeEvent& _event ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL propertyChange( const PropertyChangeEvent& _event ) override; // XEventListener - virtual void SAL_CALL disposing( const EventObject& _event ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const EventObject& _event ) override; protected: virtual ~ShapeGeometryChangeNotifier() override @@ -210,22 +210,22 @@ namespace pcr ); /// @throws RuntimeException - static OUString SAL_CALL getImplementationName_static( ) throw (RuntimeException); + static OUString SAL_CALL getImplementationName_static( ); /// @throws RuntimeException - static Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (RuntimeException); + static Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ); protected: virtual ~FormGeometryHandler() override; protected: // XPropertyHandler overriables - virtual Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException, std::exception) override; - virtual LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException, std::exception) override; + virtual Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) override; + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) override; + virtual LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) override; + virtual void SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) override; + virtual Sequence< OUString > SAL_CALL getActuatingProperties( ) override; + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) override; // OComponentHandler overridables virtual void SAL_CALL disposing() override; @@ -308,20 +308,20 @@ namespace pcr } - OUString SAL_CALL FormGeometryHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL FormGeometryHandler::getImplementationName_static( ) { return OUString( "com.sun.star.comp.extensions.FormGeometryHandler" ); } - Sequence< OUString > SAL_CALL FormGeometryHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL FormGeometryHandler::getSupportedServiceNames_static( ) { Sequence<OUString> aSupported { "com.sun.star.form.inspection.FormGeometryHandler" }; return aSupported; } - Any SAL_CALL FormGeometryHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) + Any SAL_CALL FormGeometryHandler::getPropertyValue( const OUString& _rPropertyName ) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) ); @@ -370,7 +370,7 @@ namespace pcr } - void SAL_CALL FormGeometryHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException, std::exception) + void SAL_CALL FormGeometryHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) ); @@ -438,7 +438,6 @@ namespace pcr LineDescriptor SAL_CALL FormGeometryHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) - throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) ); @@ -485,7 +484,7 @@ namespace pcr } - void SAL_CALL FormGeometryHandler::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _listener ) throw (RuntimeException, std::exception) + void SAL_CALL FormGeometryHandler::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _listener ) { ::osl::MutexGuard aGuard( m_aMutex ); OSL_PRECOND( m_xChangeNotifier.is(), "FormGeometryHandler::addPropertyChangeListener: no notified, implies no shape!?" ); @@ -494,7 +493,7 @@ namespace pcr } - void SAL_CALL FormGeometryHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _listener ) throw (RuntimeException, std::exception) + void SAL_CALL FormGeometryHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _listener ) { ::osl::MutexGuard aGuard( m_aMutex ); OSL_PRECOND( m_xChangeNotifier.is(), "FormGeometryHandler::removePropertyChangeListener: no notified, implies no shape!?" ); @@ -503,14 +502,14 @@ namespace pcr } - Sequence< OUString > SAL_CALL FormGeometryHandler::getActuatingProperties( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL FormGeometryHandler::getActuatingProperties( ) { Sequence< OUString > aInterestedIn { PROPERTY_TEXT_ANCHOR_TYPE }; return aInterestedIn; } - void SAL_CALL FormGeometryHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException, std::exception) + void SAL_CALL FormGeometryHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool /*_bFirstTimeInit*/ ) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -718,7 +717,7 @@ namespace pcr } - void SAL_CALL ShapeGeometryChangeNotifier::propertyChange( const PropertyChangeEvent& _event ) throw (RuntimeException, std::exception) + void SAL_CALL ShapeGeometryChangeNotifier::propertyChange( const PropertyChangeEvent& _event ) { ::comphelper::ComponentMethodGuard aGuard( *this ); @@ -762,7 +761,7 @@ namespace pcr } - void SAL_CALL ShapeGeometryChangeNotifier::disposing( const EventObject& /*_event*/ ) throw (RuntimeException, std::exception) + void SAL_CALL ShapeGeometryChangeNotifier::disposing( const EventObject& /*_event*/ ) { ::comphelper::ComponentMethodGuard aGuard( *this ); impl_dispose_nothrow(); diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx index 175613312aa5..d0bb41ad5d6e 100644 --- a/extensions/source/propctrlr/genericpropertyhandler.cxx +++ b/extensions/source/propctrlr/genericpropertyhandler.cxx @@ -187,10 +187,10 @@ namespace pcr virtual ~UrlClickHandler() override; // XActionListener - virtual void SAL_CALL actionPerformed( const ActionEvent& rEvent ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL actionPerformed( const ActionEvent& rEvent ) override; // XEventListener - virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const EventObject& Source ) override; protected: void impl_dispatch_throw( const OUString& _rURL ); @@ -216,7 +216,7 @@ namespace pcr { } - void SAL_CALL UrlClickHandler::actionPerformed( const ActionEvent& rEvent ) throw (RuntimeException, std::exception) + void SAL_CALL UrlClickHandler::actionPerformed( const ActionEvent& rEvent ) { Reference< XPropertyControl > xControl( rEvent.Source, UNO_QUERY_THROW ); Any aControlValue( xControl->getValue() ); @@ -231,7 +231,7 @@ namespace pcr impl_dispatch_throw( sURL ); } - void SAL_CALL UrlClickHandler::disposing( const EventObject& /*Source*/ ) throw (RuntimeException, std::exception) + void SAL_CALL UrlClickHandler::disposing( const EventObject& /*Source*/ ) { // not interested in } @@ -266,27 +266,27 @@ namespace pcr { } - OUString SAL_CALL GenericPropertyHandler::getImplementationName( ) throw (RuntimeException, std::exception) + OUString SAL_CALL GenericPropertyHandler::getImplementationName( ) { return getImplementationName_static(); } - sal_Bool SAL_CALL GenericPropertyHandler::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL GenericPropertyHandler::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } - Sequence< OUString > SAL_CALL GenericPropertyHandler::getSupportedServiceNames( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL GenericPropertyHandler::getSupportedServiceNames( ) { return getSupportedServiceNames_static(); } - OUString SAL_CALL GenericPropertyHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL GenericPropertyHandler::getImplementationName_static( ) { return OUString( "com.sun.star.comp.extensions.GenericPropertyHandler" ); } - Sequence< OUString > SAL_CALL GenericPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL GenericPropertyHandler::getSupportedServiceNames_static( ) { Sequence<OUString> aSupported { "com.sun.star.inspection.GenericPropertyHandler" }; return aSupported; @@ -297,7 +297,7 @@ namespace pcr return *( new GenericPropertyHandler( _rxContext ) ); } - void SAL_CALL GenericPropertyHandler::inspect( const Reference< XInterface >& _rxIntrospectee ) throw (RuntimeException, NullPointerException, std::exception) + void SAL_CALL GenericPropertyHandler::inspect( const Reference< XInterface >& _rxIntrospectee ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -334,7 +334,7 @@ namespace pcr m_xComponent->addPropertyChangeListener( OUString(), static_cast< XPropertyChangeListener* >( iterReAdd.next() ) ); } - Any SAL_CALL GenericPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) + Any SAL_CALL GenericPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xComponent.is() ) @@ -343,7 +343,7 @@ namespace pcr return m_xComponent->getPropertyValue( _rPropertyName ); } - void SAL_CALL GenericPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException, std::exception) + void SAL_CALL GenericPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xComponent.is() ) @@ -360,7 +360,7 @@ namespace pcr return rConverter; } - Any SAL_CALL GenericPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException, std::exception) + Any SAL_CALL GenericPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_ensurePropertyMap(); @@ -386,7 +386,7 @@ namespace pcr return aPropertyValue; } - Any SAL_CALL GenericPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException, std::exception) + Any SAL_CALL GenericPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_ensurePropertyMap(); @@ -409,7 +409,7 @@ namespace pcr return aControlValue; } - PropertyState SAL_CALL GenericPropertyHandler::getPropertyState( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) + PropertyState SAL_CALL GenericPropertyHandler::getPropertyState( const OUString& _rPropertyName ) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyState eState = PropertyState_DIRECT_VALUE; @@ -419,7 +419,6 @@ namespace pcr } void SAL_CALL GenericPropertyHandler::addPropertyChangeListener(const Reference< XPropertyChangeListener >& _rxListener) - throw (NullPointerException, RuntimeException, std::exception) { if ( !_rxListener.is() ) throw NullPointerException(); @@ -439,7 +438,7 @@ namespace pcr } } - void SAL_CALL GenericPropertyHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException, std::exception) + void SAL_CALL GenericPropertyHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_xComponent.is() ) @@ -523,7 +522,7 @@ namespace pcr } } - Sequence< Property > SAL_CALL GenericPropertyHandler::getSupportedProperties() throw (RuntimeException, std::exception) + Sequence< Property > SAL_CALL GenericPropertyHandler::getSupportedProperties() { ::osl::MutexGuard aGuard( m_aMutex ); impl_ensurePropertyMap(); @@ -531,7 +530,7 @@ namespace pcr return comphelper::mapValuesToSequence( m_aProperties ); } - Sequence< OUString > SAL_CALL GenericPropertyHandler::getSupersededProperties( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL GenericPropertyHandler::getSupersededProperties( ) { // no superseded properties at all. This handler offers the very basic PropertyHandler // functionality, so it's much more likely that other handlers want to supersede @@ -539,7 +538,7 @@ namespace pcr return Sequence< OUString >( ); } - Sequence< OUString > SAL_CALL GenericPropertyHandler::getActuatingProperties( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL GenericPropertyHandler::getActuatingProperties( ) { // This basic PropertyHandler implementation is too dumb^Wgeneric to know // anything about property dependencies @@ -548,7 +547,6 @@ namespace pcr LineDescriptor SAL_CALL GenericPropertyHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) - throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception) { if ( !_rxControlFactory.is() ) throw NullPointerException(); @@ -595,23 +593,23 @@ namespace pcr return aDescriptor; } - sal_Bool SAL_CALL GenericPropertyHandler::isComposable( const OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException, std::exception) + sal_Bool SAL_CALL GenericPropertyHandler::isComposable( const OUString& /*_rPropertyName*/ ) { return false; } - InteractiveSelectionResult SAL_CALL GenericPropertyHandler::onInteractivePropertySelection( const OUString& /*_rPropertyName*/, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/ ) throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception) + InteractiveSelectionResult SAL_CALL GenericPropertyHandler::onInteractivePropertySelection( const OUString& /*_rPropertyName*/, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/ ) { OSL_FAIL( "GenericPropertyHandler::onInteractivePropertySelection: I'm too dumb to know anything about property browse buttons!" ); return InteractiveSelectionResult_Cancelled; } - void SAL_CALL GenericPropertyHandler::actuatingPropertyChanged( const OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException, std::exception) + void SAL_CALL GenericPropertyHandler::actuatingPropertyChanged( const OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) { OSL_FAIL( "GenericPropertyHandler::actuatingPropertyChanged: no no no, I did not register for any actuating properties!" ); } - sal_Bool SAL_CALL GenericPropertyHandler::suspend( sal_Bool /*_bSuspend*/ ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL GenericPropertyHandler::suspend( sal_Bool /*_bSuspend*/ ) { return true; } diff --git a/extensions/source/propctrlr/genericpropertyhandler.hxx b/extensions/source/propctrlr/genericpropertyhandler.hxx index 58589a6b811c..c64ff2da0068 100644 --- a/extensions/source/propctrlr/genericpropertyhandler.hxx +++ b/extensions/source/propctrlr/genericpropertyhandler.hxx @@ -82,9 +82,9 @@ namespace pcr public: // XServiceInfo - static versions /// @throws css::uno::RuntimeException - static OUString SAL_CALL getImplementationName_static( ) throw (css::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (css::uno::RuntimeException); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ); static css::uno::Reference< css::uno::XInterface > Create( const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); protected: @@ -96,34 +96,34 @@ namespace pcr protected: // XPropertyHandler overridables - virtual void SAL_CALL inspect( const css::uno::Reference< css::uno::XInterface >& _rxIntrospectee ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL inspect( const css::uno::Reference< css::uno::XInterface >& _rxIntrospectee ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) override; + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) override; + virtual css::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) override; + virtual css::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) override; virtual css::uno::Sequence< css::beans::Property > - SAL_CALL getSupportedProperties() throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getSupportedProperties() override; virtual css::uno::Sequence< OUString > - SAL_CALL getSupersededProperties() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getActuatingProperties() throw (css::uno::RuntimeException, std::exception) override; - virtual css::inspection::LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isComposable( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + SAL_CALL getSupersededProperties() override; + virtual css::uno::Sequence< OUString > SAL_CALL getActuatingProperties() override; + virtual css::inspection::LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) override; + virtual sal_Bool SAL_CALL isComposable( const OUString& _rPropertyName ) override; virtual css::inspection::InteractiveSelectionResult - SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) override; + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) override; + virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) override; // XComponent DECLARE_XCOMPONENT() virtual void SAL_CALL disposing() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; private: /** ensures that ->m_aProperties is initialized diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx index d2e21a2dc5ac..7bdd98b4fe98 100644 --- a/extensions/source/propctrlr/handlerhelper.cxx +++ b/extensions/source/propctrlr/handlerhelper.cxx @@ -272,7 +272,7 @@ namespace pcr return xI; } - Reference< XInterface > PropertyHandlerHelper::getContextDocument_throw( const Reference<XComponentContext> & _rContext ) throw (RuntimeException) + Reference< XInterface > PropertyHandlerHelper::getContextDocument_throw( const Reference<XComponentContext> & _rContext ) { Reference< XInterface > xI; Any aReturn = _rContext->getValueByName( "ContextDocument" ); diff --git a/extensions/source/propctrlr/handlerhelper.hxx b/extensions/source/propctrlr/handlerhelper.hxx index 891aa05b290d..8e1f7f47f8ab 100644 --- a/extensions/source/propctrlr/handlerhelper.hxx +++ b/extensions/source/propctrlr/handlerhelper.hxx @@ -197,7 +197,7 @@ namespace pcr static css::uno::Reference< css::uno::XInterface > getContextDocument( const css::uno::Reference<css::uno::XComponentContext> & _rContext ); /// @throws css::uno::RuntimeException - static css::uno::Reference< css::uno::XInterface > getContextDocument_throw( const css::uno::Reference<css::uno::XComponentContext> & _rContext ) throw (css::uno::RuntimeException); + static css::uno::Reference< css::uno::XInterface > getContextDocument_throw( const css::uno::Reference<css::uno::XComponentContext> & _rContext ); /** gets the window of the ObjectInspector in which an property handler lives diff --git a/extensions/source/propctrlr/inspectormodelbase.cxx b/extensions/source/propctrlr/inspectormodelbase.cxx index d4f8d9233276..31009a8e0682 100644 --- a/extensions/source/propctrlr/inspectormodelbase.cxx +++ b/extensions/source/propctrlr/inspectormodelbase.cxx @@ -173,7 +173,7 @@ namespace pcr IMPLEMENT_FORWARD_XTYPEPROVIDER2( ImplInspectorModel, ImplInspectorModel_Base, ImplInspectorModel_PBase ) - Reference< XPropertySetInfo > SAL_CALL ImplInspectorModel::getPropertySetInfo( ) throw (RuntimeException, std::exception) + Reference< XPropertySetInfo > SAL_CALL ImplInspectorModel::getPropertySetInfo( ) { return m_pProperties->getPropertySetInfo(); } @@ -185,13 +185,13 @@ namespace pcr } - sal_Bool SAL_CALL ImplInspectorModel::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) throw (IllegalArgumentException) + sal_Bool SAL_CALL ImplInspectorModel::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) { return m_pProperties->convertFastPropertyValue( rConvertedValue, rOldValue, nHandle, rValue ); } - void SAL_CALL ImplInspectorModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception, std::exception) + void SAL_CALL ImplInspectorModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) { m_pProperties->setFastPropertyValue( nHandle, rValue ); } @@ -203,36 +203,36 @@ namespace pcr } - sal_Bool SAL_CALL ImplInspectorModel::getHasHelpSection() throw (RuntimeException, std::exception) + sal_Bool SAL_CALL ImplInspectorModel::getHasHelpSection() { return m_pProperties->hasHelpSection(); } - ::sal_Int32 SAL_CALL ImplInspectorModel::getMinHelpTextLines() throw (RuntimeException, std::exception) + ::sal_Int32 SAL_CALL ImplInspectorModel::getMinHelpTextLines() { return m_pProperties->getMinHelpTextLines(); } - ::sal_Int32 SAL_CALL ImplInspectorModel::getMaxHelpTextLines() throw (RuntimeException, std::exception) + ::sal_Int32 SAL_CALL ImplInspectorModel::getMaxHelpTextLines() { return m_pProperties->getMaxHelpTextLines(); } - sal_Bool SAL_CALL ImplInspectorModel::getIsReadOnly() throw (css::uno::RuntimeException, std::exception) + sal_Bool SAL_CALL ImplInspectorModel::getIsReadOnly() { return m_pProperties->isReadOnly(); } - void SAL_CALL ImplInspectorModel::setIsReadOnly( sal_Bool IsReadOnly ) throw (css::uno::RuntimeException, std::exception) + void SAL_CALL ImplInspectorModel::setIsReadOnly( sal_Bool IsReadOnly ) { setFastPropertyValue( MODEL_PROPERTY_ID_IS_READ_ONLY, makeAny( IsReadOnly ) ); } - sal_Bool SAL_CALL ImplInspectorModel::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL ImplInspectorModel::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } diff --git a/extensions/source/propctrlr/inspectormodelbase.hxx b/extensions/source/propctrlr/inspectormodelbase.hxx index 747fd7aabd0b..365740653002 100644 --- a/extensions/source/propctrlr/inspectormodelbase.hxx +++ b/extensions/source/propctrlr/inspectormodelbase.hxx @@ -66,21 +66,21 @@ namespace pcr DECLARE_XTYPEPROVIDER() // css::beans::XPropertySet and friends - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; - virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::lang::IllegalArgumentException) override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) override; + virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override; virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override; // css::inspection::XObjectInspectorModel - virtual sal_Bool SAL_CALL getHasHelpSection() throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getMinHelpTextLines() throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getMaxHelpTextLines() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getIsReadOnly() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setIsReadOnly( sal_Bool IsReadOnly ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getHasHelpSection() override; + virtual ::sal_Int32 SAL_CALL getMinHelpTextLines() override; + virtual ::sal_Int32 SAL_CALL getMaxHelpTextLines() override; + virtual sal_Bool SAL_CALL getIsReadOnly() override; + virtual void SAL_CALL setIsReadOnly( sal_Bool IsReadOnly ) override; // css::lang::XServiceInfo - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; protected: void enableHelpSectionProperties( sal_Int32 _nMinHelpTextLines, sal_Int32 _nMaxHelpTextLines ); diff --git a/extensions/source/propctrlr/objectinspectormodel.cxx b/extensions/source/propctrlr/objectinspectormodel.cxx index b2761372526a..06b30c914f22 100644 --- a/extensions/source/propctrlr/objectinspectormodel.cxx +++ b/extensions/source/propctrlr/objectinspectormodel.cxx @@ -59,22 +59,22 @@ namespace pcr ObjectInspectorModel(); // XObjectInspectorModel - virtual Sequence< Any > SAL_CALL getHandlerFactories() throw (RuntimeException, std::exception) override; - virtual Sequence< PropertyCategoryDescriptor > SAL_CALL describeCategories( ) throw (RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getPropertyOrderIndex( const OUString& PropertyName ) throw (RuntimeException, std::exception) override; + virtual Sequence< Any > SAL_CALL getHandlerFactories() override; + virtual Sequence< PropertyCategoryDescriptor > SAL_CALL describeCategories( ) override; + virtual ::sal_Int32 SAL_CALL getPropertyOrderIndex( const OUString& PropertyName ) override; // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XServiceInfo - static versions /// @throws RuntimeException - static OUString getImplementationName_static( ) throw(RuntimeException); + static OUString getImplementationName_static( ); /// @throws RuntimeException - static Sequence< OUString > getSupportedServiceNames_static( ) throw(RuntimeException); + static Sequence< OUString > getSupportedServiceNames_static( ); static Reference< XInterface > SAL_CALL Create(const Reference< XComponentContext >&); @@ -98,27 +98,27 @@ namespace pcr } - Sequence< Any > SAL_CALL ObjectInspectorModel::getHandlerFactories() throw (RuntimeException, std::exception) + Sequence< Any > SAL_CALL ObjectInspectorModel::getHandlerFactories() { return m_aFactories; } - Sequence< PropertyCategoryDescriptor > SAL_CALL ObjectInspectorModel::describeCategories( ) throw (RuntimeException, std::exception) + Sequence< PropertyCategoryDescriptor > SAL_CALL ObjectInspectorModel::describeCategories( ) { // no category info provided by this default implementation return Sequence< PropertyCategoryDescriptor >( ); } - ::sal_Int32 SAL_CALL ObjectInspectorModel::getPropertyOrderIndex( const OUString& /*PropertyName*/ ) throw (RuntimeException, std::exception) + ::sal_Int32 SAL_CALL ObjectInspectorModel::getPropertyOrderIndex( const OUString& /*PropertyName*/ ) { // no ordering provided by this default implementation return 0; } - void SAL_CALL ObjectInspectorModel::initialize( const Sequence< Any >& _arguments ) throw (Exception, RuntimeException, std::exception) + void SAL_CALL ObjectInspectorModel::initialize( const Sequence< Any >& _arguments ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_aFactories.getLength() ) @@ -153,25 +153,25 @@ namespace pcr } - OUString SAL_CALL ObjectInspectorModel::getImplementationName( ) throw (RuntimeException, std::exception) + OUString SAL_CALL ObjectInspectorModel::getImplementationName( ) { return getImplementationName_static(); } - Sequence< OUString > SAL_CALL ObjectInspectorModel::getSupportedServiceNames( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL ObjectInspectorModel::getSupportedServiceNames( ) { return getSupportedServiceNames_static(); } - OUString ObjectInspectorModel::getImplementationName_static( ) throw(RuntimeException) + OUString ObjectInspectorModel::getImplementationName_static( ) { return OUString( "org.openoffice.comp.extensions.ObjectInspectorModel" ); } - Sequence< OUString > ObjectInspectorModel::getSupportedServiceNames_static( ) throw(RuntimeException) + Sequence< OUString > ObjectInspectorModel::getSupportedServiceNames_static( ) { OUString sService( "com.sun.star.inspection.ObjectInspectorModel" ); return Sequence< OUString >( &sService, 1 ); diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx index 0f4d7a661832..bfcaa0f7bbc3 100644 --- a/extensions/source/propctrlr/pcrcommon.hxx +++ b/extensions/source/propctrlr/pcrcommon.hxx @@ -102,20 +102,20 @@ namespace pcr //= UNO helpers #define DECLARE_XCOMPONENT() \ - virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) override; \ - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; \ - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose( ) override; \ + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; \ + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; #define IMPLEMENT_FORWARD_XCOMPONENT( classname, baseclass ) \ - void SAL_CALL classname::dispose( ) throw (css::uno::RuntimeException, std::exception) \ + void SAL_CALL classname::dispose( ) \ { \ baseclass::WeakComponentImplHelperBase::dispose(); \ } \ - void SAL_CALL classname::addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) throw (css::uno::RuntimeException, std::exception) \ + void SAL_CALL classname::addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) \ { \ baseclass::WeakComponentImplHelperBase::addEventListener( Listener ); \ } \ - void SAL_CALL classname::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) throw (css::uno::RuntimeException, std::exception) \ + void SAL_CALL classname::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) \ { \ baseclass::WeakComponentImplHelperBase::removeEventListener( Listener ); \ } \ diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx index d14964f58416..d9569ec5c54e 100644 --- a/extensions/source/propctrlr/pcrunodialogs.cxx +++ b/extensions/source/propctrlr/pcrunodialogs.cxx @@ -70,7 +70,7 @@ namespace pcr } - Sequence<sal_Int8> SAL_CALL OTabOrderDialog::getImplementationId( ) throw(RuntimeException, std::exception) + Sequence<sal_Int8> SAL_CALL OTabOrderDialog::getImplementationId( ) { return css::uno::Sequence<sal_Int8>(); } @@ -82,25 +82,25 @@ namespace pcr } - OUString SAL_CALL OTabOrderDialog::getImplementationName() throw(RuntimeException, std::exception) + OUString SAL_CALL OTabOrderDialog::getImplementationName() { return getImplementationName_static(); } - OUString OTabOrderDialog::getImplementationName_static() throw(RuntimeException) + OUString OTabOrderDialog::getImplementationName_static() { return OUString("org.openoffice.comp.form.ui.OTabOrderDialog"); } - css::uno::Sequence<OUString> SAL_CALL OTabOrderDialog::getSupportedServiceNames() throw(RuntimeException, std::exception) + css::uno::Sequence<OUString> SAL_CALL OTabOrderDialog::getSupportedServiceNames() { return getSupportedServiceNames_static(); } - css::uno::Sequence<OUString> OTabOrderDialog::getSupportedServiceNames_static() throw(RuntimeException) + css::uno::Sequence<OUString> OTabOrderDialog::getSupportedServiceNames_static() { css::uno::Sequence<OUString> aSupported(2); aSupported.getArray()[0] = "com.sun.star.form.ui.TabOrderDialog"; @@ -109,7 +109,7 @@ namespace pcr } - Reference<XPropertySetInfo> SAL_CALL OTabOrderDialog::getPropertySetInfo() throw(RuntimeException, std::exception) + Reference<XPropertySetInfo> SAL_CALL OTabOrderDialog::getPropertySetInfo() { Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; @@ -135,7 +135,7 @@ namespace pcr return VclPtr<TabOrderDialog>::Create( _pParent, m_xTabbingModel, m_xControlContext, m_aContext ); } - void OTabOrderDialog::initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException, std::exception) + void OTabOrderDialog::initialize( const Sequence< Any >& aArguments ) { Reference<css::awt::XTabControllerModel> xTabbingModel; Reference<css::awt::XControlContainer> xControlContext; diff --git a/extensions/source/propctrlr/pcrunodialogs.hxx b/extensions/source/propctrlr/pcrunodialogs.hxx index 91dfacfdd621..98c6a1342b5c 100644 --- a/extensions/source/propctrlr/pcrunodialogs.hxx +++ b/extensions/source/propctrlr/pcrunodialogs.hxx @@ -53,25 +53,25 @@ namespace pcr virtual ~OTabOrderDialog() override; // XTypeProvider - virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XServiceInfo - static methods /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > getSupportedServiceNames_static() throw( css::uno::RuntimeException ); + static css::uno::Sequence< OUString > getSupportedServiceNames_static(); /// @throws css::uno::RuntimeException - static OUString getImplementationName_static() throw( css::uno::RuntimeException ); + static OUString getImplementationName_static(); static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::uno::XComponentContext >&); // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // OPropertyArrayUsageHelper diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 7ab004a9f10c..11e2b66d4656 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -109,7 +109,7 @@ namespace pcr IMPLEMENT_FORWARD_REFCOUNT( OPropertyBrowserController, OPropertyBrowserController_Base ) - Any SAL_CALL OPropertyBrowserController::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception) + Any SAL_CALL OPropertyBrowserController::queryInterface( const Type& _rType ) { Any aReturn = OPropertyBrowserController_Base::queryInterface( _rType ); if ( !aReturn.hasValue() ) @@ -159,7 +159,7 @@ namespace pcr } - Reference< XObjectInspectorModel > SAL_CALL OPropertyBrowserController::getInspectorModel() throw (RuntimeException, std::exception) + Reference< XObjectInspectorModel > SAL_CALL OPropertyBrowserController::getInspectorModel() { return m_xModel; } @@ -237,7 +237,7 @@ namespace pcr } - void SAL_CALL OPropertyBrowserController::setInspectorModel( const Reference< XObjectInspectorModel >& _inspectorModel ) throw (RuntimeException, std::exception) + void SAL_CALL OPropertyBrowserController::setInspectorModel( const Reference< XObjectInspectorModel >& _inspectorModel ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -248,14 +248,14 @@ namespace pcr } - Reference< XObjectInspectorUI > SAL_CALL OPropertyBrowserController::getInspectorUI() throw (RuntimeException, std::exception) + Reference< XObjectInspectorUI > SAL_CALL OPropertyBrowserController::getInspectorUI() { // we're derived from this interface, though we do not expose it in queryInterface and getTypes. return this; } - void SAL_CALL OPropertyBrowserController::inspect( const Sequence< Reference< XInterface > >& _rObjects ) throw (css::util::VetoException, RuntimeException, std::exception) + void SAL_CALL OPropertyBrowserController::inspect( const Sequence< Reference< XInterface > >& _rObjects ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -276,14 +276,14 @@ namespace pcr } - Reference< XDispatch > SAL_CALL OPropertyBrowserController::queryDispatch( const URL& /*URL*/, const OUString& /*TargetFrameName*/, ::sal_Int32 /*SearchFlags*/ ) throw (RuntimeException, std::exception) + Reference< XDispatch > SAL_CALL OPropertyBrowserController::queryDispatch( const URL& /*URL*/, const OUString& /*TargetFrameName*/, ::sal_Int32 /*SearchFlags*/ ) { // we don't have any dispatches at all, right now return Reference< XDispatch >(); } - Sequence< Reference< XDispatch > > SAL_CALL OPropertyBrowserController::queryDispatches( const Sequence< DispatchDescriptor >& Requests ) throw (RuntimeException, std::exception) + Sequence< Reference< XDispatch > > SAL_CALL OPropertyBrowserController::queryDispatches( const Sequence< DispatchDescriptor >& Requests ) { Sequence< Reference< XDispatch > > aReturn; sal_Int32 nLen = Requests.getLength(); @@ -300,7 +300,7 @@ namespace pcr } - void SAL_CALL OPropertyBrowserController::initialize( const Sequence< Any >& _arguments ) throw (Exception, RuntimeException, std::exception) + void SAL_CALL OPropertyBrowserController::initialize( const Sequence< Any >& _arguments ) { if ( m_bConstructed ) throw AlreadyInitializedException(); @@ -337,7 +337,7 @@ namespace pcr } - void SAL_CALL OPropertyBrowserController::attachFrame( const Reference< XFrame >& _rxFrame ) throw(RuntimeException, std::exception) + void SAL_CALL OPropertyBrowserController::attachFrame( const Reference< XFrame >& _rxFrame ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -379,7 +379,7 @@ namespace pcr } - sal_Bool SAL_CALL OPropertyBrowserController::attachModel( const Reference< XModel >& _rxModel ) throw(RuntimeException, std::exception) + sal_Bool SAL_CALL OPropertyBrowserController::attachModel( const Reference< XModel >& _rxModel ) { Reference< XObjectInspectorModel > xModel( _rxModel, UNO_QUERY ); if ( !xModel.is() ) @@ -445,7 +445,7 @@ namespace pcr } - sal_Bool SAL_CALL OPropertyBrowserController::suspend( sal_Bool _bSuspend ) throw(RuntimeException, std::exception) + sal_Bool SAL_CALL OPropertyBrowserController::suspend( sal_Bool _bSuspend ) { ::osl::MutexGuard aGuard( m_aMutex ); OSL_ENSURE( haveView(), "OPropertyBrowserController::suspend: don't have a view anymore!" ); @@ -472,13 +472,13 @@ namespace pcr } - Any SAL_CALL OPropertyBrowserController::getViewData( ) throw(RuntimeException, std::exception) + Any SAL_CALL OPropertyBrowserController::getViewData( ) { return makeAny( m_sPageSelection ); } - void SAL_CALL OPropertyBrowserController::restoreViewData( const Any& Data ) throw(RuntimeException, std::exception) + void SAL_CALL OPropertyBrowserController::restoreViewData( const Any& Data ) { OUString sPageSelection; if ( ( Data >>= sPageSelection ) && !sPageSelection.isEmpty() ) @@ -489,20 +489,20 @@ namespace pcr } - Reference< XModel > SAL_CALL OPropertyBrowserController::getModel( ) throw(RuntimeException, std::exception) + Reference< XModel > SAL_CALL OPropertyBrowserController::getModel( ) { // have no model return Reference< XModel >(); } - Reference< XFrame > SAL_CALL OPropertyBrowserController::getFrame( ) throw(RuntimeException, std::exception) + Reference< XFrame > SAL_CALL OPropertyBrowserController::getFrame( ) { return m_xFrame; } - void SAL_CALL OPropertyBrowserController::dispose( ) throw(RuntimeException, std::exception) + void SAL_CALL OPropertyBrowserController::dispose( ) { SolarMutexGuard aSolarGuard; @@ -528,42 +528,42 @@ namespace pcr } - void SAL_CALL OPropertyBrowserController::addEventListener( const Reference< XEventListener >& _rxListener ) throw(RuntimeException, std::exception) + void SAL_CALL OPropertyBrowserController::addEventListener( const Reference< XEventListener >& _rxListener ) { m_aDisposeListeners.addInterface(_rxListener); } - void SAL_CALL OPropertyBrowserController::removeEventListener( const Reference< XEventListener >& _rxListener ) throw(RuntimeException, std::exception) + void SAL_CALL OPropertyBrowserController::removeEventListener( const Reference< XEventListener >& _rxListener ) { m_aDisposeListeners.removeInterface(_rxListener); } - OUString SAL_CALL OPropertyBrowserController::getImplementationName( ) throw(RuntimeException, std::exception) + OUString SAL_CALL OPropertyBrowserController::getImplementationName( ) { return getImplementationName_static(); } - sal_Bool SAL_CALL OPropertyBrowserController::supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) + sal_Bool SAL_CALL OPropertyBrowserController::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } - Sequence< OUString > SAL_CALL OPropertyBrowserController::getSupportedServiceNames( ) throw(RuntimeException, std::exception) + Sequence< OUString > SAL_CALL OPropertyBrowserController::getSupportedServiceNames( ) { return getSupportedServiceNames_static(); } - OUString OPropertyBrowserController::getImplementationName_static( ) throw(RuntimeException) + OUString OPropertyBrowserController::getImplementationName_static( ) { return OUString("org.openoffice.comp.extensions.ObjectInspector"); } - Sequence< OUString > OPropertyBrowserController::getSupportedServiceNames_static( ) throw(RuntimeException) + Sequence< OUString > OPropertyBrowserController::getSupportedServiceNames_static( ) { Sequence< OUString > aSupported { "com.sun.star.inspection.ObjectInspector" }; return aSupported; @@ -576,7 +576,7 @@ namespace pcr } - void SAL_CALL OPropertyBrowserController::focusGained( const FocusEvent& _rSource ) throw (RuntimeException, std::exception) + void SAL_CALL OPropertyBrowserController::focusGained( const FocusEvent& _rSource ) { Reference< XWindow > xSourceWindow(_rSource.Source, UNO_QUERY); Reference< XWindow > xContainerWindow; @@ -591,13 +591,13 @@ namespace pcr } - void SAL_CALL OPropertyBrowserController::focusLost( const FocusEvent& /*_rSource*/ ) throw (RuntimeException, std::exception) + void SAL_CALL OPropertyBrowserController::focusLost( const FocusEvent& /*_rSource*/ ) { // not interested in } - void SAL_CALL OPropertyBrowserController::disposing( const EventObject& _rSource ) throw(RuntimeException, std::exception) + void SAL_CALL OPropertyBrowserController::disposing( const EventObject& _rSource ) { if ( m_xView.is() && ( m_xView == _rSource.Source ) ) { @@ -704,7 +704,7 @@ namespace pcr } - void SAL_CALL OPropertyBrowserController::propertyChange( const PropertyChangeEvent& _rEvent ) throw (RuntimeException, std::exception) + void SAL_CALL OPropertyBrowserController::propertyChange( const PropertyChangeEvent& _rEvent ) { if ( _rEvent.Source == m_xModel ) { @@ -748,7 +748,7 @@ namespace pcr } - Reference< XPropertyControl > SAL_CALL OPropertyBrowserController::createPropertyControl( ::sal_Int16 ControlType, sal_Bool CreateReadOnly ) throw (IllegalArgumentException, RuntimeException, std::exception) + Reference< XPropertyControl > SAL_CALL OPropertyBrowserController::createPropertyControl( ::sal_Int16 ControlType, sal_Bool CreateReadOnly ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1078,7 +1078,7 @@ namespace pcr } - css::awt::Size SAL_CALL OPropertyBrowserController::getMinimumSize() throw (css::uno::RuntimeException, std::exception) + css::awt::Size SAL_CALL OPropertyBrowserController::getMinimumSize() { css::awt::Size aSize; if( m_pView ) @@ -1088,13 +1088,13 @@ namespace pcr } - css::awt::Size SAL_CALL OPropertyBrowserController::getPreferredSize() throw (css::uno::RuntimeException, std::exception) + css::awt::Size SAL_CALL OPropertyBrowserController::getPreferredSize() { return getMinimumSize(); } - css::awt::Size SAL_CALL OPropertyBrowserController::calcAdjustedSize( const css::awt::Size& _rNewSize ) throw (css::uno::RuntimeException, std::exception) + css::awt::Size SAL_CALL OPropertyBrowserController::calcAdjustedSize( const css::awt::Size& _rNewSize ) { awt::Size aMinSize = getMinimumSize( ); awt::Size aAdjustedSize( _rNewSize ); @@ -1328,7 +1328,7 @@ namespace pcr } - bool SAL_CALL OPropertyBrowserController::hasPropertyByName( const OUString& _rName ) throw (RuntimeException) + bool SAL_CALL OPropertyBrowserController::hasPropertyByName( const OUString& _rName ) { for ( OrderedPropertyMap::const_iterator search = m_aProperties.begin(); search != m_aProperties.end(); @@ -1526,7 +1526,7 @@ namespace pcr } - void OPropertyBrowserController::rebuildPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException, std::exception) + void OPropertyBrowserController::rebuildPropertyUI( const OUString& _rPropertyName ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !haveView() ) @@ -1550,7 +1550,7 @@ namespace pcr } - void OPropertyBrowserController::enablePropertyUI( const OUString& _rPropertyName, sal_Bool _bEnable ) throw (RuntimeException, std::exception) + void OPropertyBrowserController::enablePropertyUI( const OUString& _rPropertyName, sal_Bool _bEnable ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !haveView() ) @@ -1563,7 +1563,7 @@ namespace pcr } - void OPropertyBrowserController::enablePropertyUIElements( const OUString& _rPropertyName, sal_Int16 _nElements, sal_Bool _bEnable ) throw (RuntimeException, std::exception) + void OPropertyBrowserController::enablePropertyUIElements( const OUString& _rPropertyName, sal_Int16 _nElements, sal_Bool _bEnable ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !haveView() ) @@ -1576,7 +1576,7 @@ namespace pcr } - void OPropertyBrowserController::showPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException, std::exception) + void OPropertyBrowserController::showPropertyUI( const OUString& _rPropertyName ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !haveView() ) @@ -1626,7 +1626,7 @@ namespace pcr } - void OPropertyBrowserController::hidePropertyUI( const OUString& _rPropertyName ) throw (RuntimeException, std::exception) + void OPropertyBrowserController::hidePropertyUI( const OUString& _rPropertyName ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !haveView() ) @@ -1639,7 +1639,7 @@ namespace pcr } - void OPropertyBrowserController::showCategory( const OUString& _rCategory, sal_Bool _bShow ) throw (RuntimeException, std::exception) + void OPropertyBrowserController::showCategory( const OUString& _rCategory, sal_Bool _bShow ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !haveView() ) @@ -1652,7 +1652,7 @@ namespace pcr } - Reference< XPropertyControl > SAL_CALL OPropertyBrowserController::getPropertyControl( const OUString& _rPropertyName ) throw (RuntimeException, std::exception) + Reference< XPropertyControl > SAL_CALL OPropertyBrowserController::getPropertyControl( const OUString& _rPropertyName ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !haveView() ) @@ -1663,19 +1663,19 @@ namespace pcr } - void SAL_CALL OPropertyBrowserController::registerControlObserver( const Reference< XPropertyControlObserver >& Observer ) throw (RuntimeException, std::exception) + void SAL_CALL OPropertyBrowserController::registerControlObserver( const Reference< XPropertyControlObserver >& Observer ) { m_aControlObservers.addInterface( Observer ); } - void SAL_CALL OPropertyBrowserController::revokeControlObserver( const Reference< XPropertyControlObserver >& Observer ) throw (RuntimeException, std::exception) + void SAL_CALL OPropertyBrowserController::revokeControlObserver( const Reference< XPropertyControlObserver >& Observer ) { m_aControlObservers.removeInterface( Observer ); } - void SAL_CALL OPropertyBrowserController::setHelpSectionText( const OUString& _rHelpText ) throw (NoSupportException, RuntimeException, std::exception) + void SAL_CALL OPropertyBrowserController::setHelpSectionText( const OUString& _rHelpText ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx index f17a17170ebf..23180e88d25e 100644 --- a/extensions/source/propctrlr/propcontroller.hxx +++ b/extensions/source/propctrlr/propcontroller.hxx @@ -144,42 +144,42 @@ namespace pcr DECLARE_XINTERFACE() // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XController - virtual void SAL_CALL attachFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL attachModel( const css::uno::Reference< css::frame::XModel >& xModel ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL suspend( sal_Bool bSuspend ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getViewData( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL restoreViewData( const css::uno::Any& Data ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::frame::XModel > SAL_CALL getModel( ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::frame::XFrame > SAL_CALL getFrame( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL attachFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) override; + virtual sal_Bool SAL_CALL attachModel( const css::uno::Reference< css::frame::XModel >& xModel ) override; + virtual sal_Bool SAL_CALL suspend( sal_Bool bSuspend ) override; + virtual css::uno::Any SAL_CALL getViewData( ) override; + virtual void SAL_CALL restoreViewData( const css::uno::Any& Data ) override; + virtual css::uno::Reference< css::frame::XModel > SAL_CALL getModel( ) override; + virtual css::uno::Reference< css::frame::XFrame > SAL_CALL getFrame( ) override; // XComponent - virtual void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose( ) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; // XFocusListener - virtual void SAL_CALL focusGained( const css::awt::FocusEvent& _rSource ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL focusLost( const css::awt::FocusEvent& _rSource ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL focusGained( const css::awt::FocusEvent& _rSource ) override; + virtual void SAL_CALL focusLost( const css::awt::FocusEvent& _rSource ) override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // XLayoutConstrains - virtual css::awt::Size SAL_CALL getMinimumSize( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getPreferredSize( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getMinimumSize( ) override; + virtual css::awt::Size SAL_CALL getPreferredSize( ) override; + virtual css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) override; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& _rEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& _rEvent ) override; /** XPropertyControlFactory */ - virtual css::uno::Reference< css::inspection::XPropertyControl > SAL_CALL createPropertyControl( ::sal_Int16 ControlType, sal_Bool CreateReadOnly ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::inspection::XPropertyControl > SAL_CALL createPropertyControl( ::sal_Int16 ControlType, sal_Bool CreateReadOnly ) override; public: explicit OPropertyBrowserController( @@ -191,9 +191,9 @@ namespace pcr public: // XServiceInfo - static versions /// @throws css::uno::RuntimeException - static OUString getImplementationName_static( ) throw(css::uno::RuntimeException); + static OUString getImplementationName_static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > getSupportedServiceNames_static( ) throw(css::uno::RuntimeException); + static css::uno::Sequence< OUString > getSupportedServiceNames_static( ); static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::uno::XComponentContext >&); @@ -207,32 +207,32 @@ namespace pcr virtual void valueChanged( const css::uno::Reference< css::inspection::XPropertyControl >& Control ) override; // IPropertyExistenceCheck - virtual bool SAL_CALL hasPropertyByName( const OUString& _rName ) throw (css::uno::RuntimeException) override; + virtual bool SAL_CALL hasPropertyByName( const OUString& _rName ) override; // XObjectInspectorUI - virtual void SAL_CALL enablePropertyUI( const OUString& _rPropertyName, sal_Bool _bEnable ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL enablePropertyUIElements( const OUString& _rPropertyName, ::sal_Int16 _nElements, sal_Bool _bEnable ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rebuildPropertyUI( const OUString& _rPropertyName ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL showPropertyUI( const OUString& _rPropertyName ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL hidePropertyUI( const OUString& _rPropertyName ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL showCategory( const OUString& _rCategory, sal_Bool _bShow ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::inspection::XPropertyControl > SAL_CALL getPropertyControl( const OUString& _rPropertyName ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL registerControlObserver( const css::uno::Reference< css::inspection::XPropertyControlObserver >& Observer ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL revokeControlObserver( const css::uno::Reference< css::inspection::XPropertyControlObserver >& Observer ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHelpSectionText( const OUString& HelpText ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL enablePropertyUI( const OUString& _rPropertyName, sal_Bool _bEnable ) override; + virtual void SAL_CALL enablePropertyUIElements( const OUString& _rPropertyName, ::sal_Int16 _nElements, sal_Bool _bEnable ) override; + virtual void SAL_CALL rebuildPropertyUI( const OUString& _rPropertyName ) override; + virtual void SAL_CALL showPropertyUI( const OUString& _rPropertyName ) override; + virtual void SAL_CALL hidePropertyUI( const OUString& _rPropertyName ) override; + virtual void SAL_CALL showCategory( const OUString& _rCategory, sal_Bool _bShow ) override; + virtual css::uno::Reference< css::inspection::XPropertyControl > SAL_CALL getPropertyControl( const OUString& _rPropertyName ) override; + virtual void SAL_CALL registerControlObserver( const css::uno::Reference< css::inspection::XPropertyControlObserver >& Observer ) override; + virtual void SAL_CALL revokeControlObserver( const css::uno::Reference< css::inspection::XPropertyControlObserver >& Observer ) override; + virtual void SAL_CALL setHelpSectionText( const OUString& HelpText ) override; // XObjectInspector - virtual css::uno::Reference< css::inspection::XObjectInspectorModel > SAL_CALL getInspectorModel() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setInspectorModel( const css::uno::Reference< css::inspection::XObjectInspectorModel >& _inspectormodel ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::inspection::XObjectInspectorUI > SAL_CALL getInspectorUI() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL inspect( const css::uno::Sequence< css::uno::Reference< css::uno::XInterface > >& Objects ) throw (css::util::VetoException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::inspection::XObjectInspectorModel > SAL_CALL getInspectorModel() override; + virtual void SAL_CALL setInspectorModel( const css::uno::Reference< css::inspection::XObjectInspectorModel >& _inspectormodel ) override; + virtual css::uno::Reference< css::inspection::XObjectInspectorUI > SAL_CALL getInspectorUI() override; + virtual void SAL_CALL inspect( const css::uno::Sequence< css::uno::Reference< css::uno::XInterface > >& Objects ) override; // XDispatchProvider - virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& URL, const OUString& TargetFrameName, ::sal_Int32 SearchFlags ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& Requests ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& URL, const OUString& TargetFrameName, ::sal_Int32 SearchFlags ) override; + virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& Requests ) override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; private: void UpdateUI(); diff --git a/extensions/source/propctrlr/propertycomposer.cxx b/extensions/source/propctrlr/propertycomposer.cxx index dd3f24e78799..1ea3b7a00d7e 100644 --- a/extensions/source/propctrlr/propertycomposer.cxx +++ b/extensions/source/propctrlr/propertycomposer.cxx @@ -110,7 +110,7 @@ namespace pcr } - void SAL_CALL PropertyComposer::inspect( const Reference< XInterface >& _rxIntrospectee ) throw (RuntimeException, NullPointerException, std::exception) + void SAL_CALL PropertyComposer::inspect( const Reference< XInterface >& _rxIntrospectee ) { MethodGuard aGuard( *this ); @@ -124,35 +124,35 @@ namespace pcr } - Any SAL_CALL PropertyComposer::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) + Any SAL_CALL PropertyComposer::getPropertyValue( const OUString& _rPropertyName ) { MethodGuard aGuard( *this ); return m_aSlaveHandlers[0]->getPropertyValue( _rPropertyName ); } - void SAL_CALL PropertyComposer::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException, PropertyVetoException, std::exception) + void SAL_CALL PropertyComposer::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) { MethodGuard aGuard( *this ); ::std::for_each( m_aSlaveHandlers.begin(), m_aSlaveHandlers.end(), SetPropertyValue( _rPropertyName, _rValue ) ); } - Any SAL_CALL PropertyComposer::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException, std::exception) + Any SAL_CALL PropertyComposer::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) { MethodGuard aGuard( *this ); return m_aSlaveHandlers[0]->convertToPropertyValue( _rPropertyName, _rControlValue ); } - Any SAL_CALL PropertyComposer::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException, std::exception) + Any SAL_CALL PropertyComposer::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) { MethodGuard aGuard( *this ); return m_aSlaveHandlers[0]->convertToControlValue( _rPropertyName, _rPropertyValue, _rControlValueType ); } - PropertyState SAL_CALL PropertyComposer::getPropertyState( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) + PropertyState SAL_CALL PropertyComposer::getPropertyState( const OUString& _rPropertyName ) { MethodGuard aGuard( *this ); @@ -191,21 +191,21 @@ namespace pcr } - void SAL_CALL PropertyComposer::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException, std::exception) + void SAL_CALL PropertyComposer::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) { MethodGuard aGuard( *this ); m_aPropertyListeners.addListener( _rxListener ); } - void SAL_CALL PropertyComposer::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException, std::exception) + void SAL_CALL PropertyComposer::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) { MethodGuard aGuard( *this ); m_aPropertyListeners.removeListener( _rxListener ); } - Sequence< Property > SAL_CALL PropertyComposer::getSupportedProperties() throw (RuntimeException, std::exception) + Sequence< Property > SAL_CALL PropertyComposer::getSupportedProperties() { MethodGuard aGuard( *this ); @@ -278,7 +278,7 @@ namespace pcr } - Sequence< OUString > SAL_CALL PropertyComposer::getSupersededProperties( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL PropertyComposer::getSupersededProperties( ) { MethodGuard aGuard( *this ); @@ -289,7 +289,7 @@ namespace pcr } - Sequence< OUString > SAL_CALL PropertyComposer::getActuatingProperties( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL PropertyComposer::getActuatingProperties( ) { MethodGuard aGuard( *this ); @@ -302,21 +302,20 @@ namespace pcr LineDescriptor SAL_CALL PropertyComposer::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) - throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception) { MethodGuard aGuard( *this ); return m_aSlaveHandlers[0]->describePropertyLine( _rPropertyName, _rxControlFactory ); } - sal_Bool SAL_CALL PropertyComposer::isComposable( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) + sal_Bool SAL_CALL PropertyComposer::isComposable( const OUString& _rPropertyName ) { MethodGuard aGuard( *this ); return m_aSlaveHandlers[0]->isComposable( _rPropertyName ); } - InteractiveSelectionResult SAL_CALL PropertyComposer::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception) + InteractiveSelectionResult SAL_CALL PropertyComposer::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -377,7 +376,7 @@ namespace pcr } - void SAL_CALL PropertyComposer::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException, std::exception) + void SAL_CALL PropertyComposer::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -435,7 +434,7 @@ namespace pcr } - void SAL_CALL PropertyComposer::propertyChange( const PropertyChangeEvent& evt ) throw (RuntimeException, std::exception) + void SAL_CALL PropertyComposer::propertyChange( const PropertyChangeEvent& evt ) { if ( !impl_isSupportedProperty_nothrow( evt.PropertyName ) ) // A slave handler might fire events for more properties than we support. Ignore those. @@ -454,14 +453,14 @@ namespace pcr } - void SAL_CALL PropertyComposer::disposing( const EventObject& Source ) throw (RuntimeException, std::exception) + void SAL_CALL PropertyComposer::disposing( const EventObject& Source ) { MethodGuard aGuard( *this ); m_aPropertyListeners.disposing( Source ); } - sal_Bool SAL_CALL PropertyComposer::suspend( sal_Bool _bSuspend ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL PropertyComposer::suspend( sal_Bool _bSuspend ) { MethodGuard aGuard( *this ); for ( PropertyComposer::HandlerArray::const_iterator loop = m_aSlaveHandlers.begin(); @@ -490,7 +489,7 @@ namespace pcr } - bool SAL_CALL PropertyComposer::hasPropertyByName( const OUString& _rName ) throw (RuntimeException) + bool SAL_CALL PropertyComposer::hasPropertyByName( const OUString& _rName ) { return impl_isSupportedProperty_nothrow( _rName ); } diff --git a/extensions/source/propctrlr/propertycomposer.hxx b/extensions/source/propctrlr/propertycomposer.hxx index f38870e9006d..248500e74919 100644 --- a/extensions/source/propctrlr/propertycomposer.hxx +++ b/extensions/source/propctrlr/propertycomposer.hxx @@ -75,41 +75,41 @@ namespace pcr public: // XPropertyHandler overridables - virtual void SAL_CALL inspect( const css::uno::Reference< css::uno::XInterface >& _rxIntrospectee ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, css::beans::PropertyVetoException, std::exception) override; - virtual css::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL inspect( const css::uno::Reference< css::uno::XInterface >& _rxIntrospectee ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) override; + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) override; + virtual css::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) override; + virtual css::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) override; virtual css::beans::PropertyState - SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getPropertyState( const OUString& _rPropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) override; virtual css::uno::Sequence< css::beans::Property > - SAL_CALL getSupportedProperties() throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getSupportedProperties() override; virtual css::uno::Sequence< OUString > - SAL_CALL getSupersededProperties( ) throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getSupersededProperties( ) override; virtual css::uno::Sequence< OUString > - SAL_CALL getActuatingProperties( ) throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getActuatingProperties( ) override; virtual css::inspection::LineDescriptor - SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isComposable( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) override; + virtual sal_Bool SAL_CALL isComposable( const OUString& _rPropertyName ) override; virtual css::inspection::InteractiveSelectionResult - SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) override; + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) override; + virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) override; // XComponent DECLARE_XCOMPONENT() virtual void SAL_CALL disposing() override; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // IPropertyExistenceCheck - virtual bool SAL_CALL hasPropertyByName( const OUString& _rName ) throw (css::uno::RuntimeException) override; + virtual bool SAL_CALL hasPropertyByName( const OUString& _rName ) override; private: /** ensures that m_pUIRequestComposer exists diff --git a/extensions/source/propctrlr/propertycontrolextender.cxx b/extensions/source/propctrlr/propertycontrolextender.cxx index fb935bced843..c48c7675164f 100644 --- a/extensions/source/propctrlr/propertycontrolextender.cxx +++ b/extensions/source/propctrlr/propertycontrolextender.cxx @@ -76,7 +76,7 @@ namespace pcr } - void SAL_CALL PropertyControlExtender::keyPressed( const KeyEvent& _event ) throw (RuntimeException, std::exception) + void SAL_CALL PropertyControlExtender::keyPressed( const KeyEvent& _event ) { OSL_ENSURE( _event.Source == m_pData->xControlWindow, "PropertyControlExtender::keyPressed: where does this come from?" ); if ( ( _event.KeyFunc == KeyFunction::DELETE ) @@ -105,13 +105,13 @@ namespace pcr } - void SAL_CALL PropertyControlExtender::keyReleased( const KeyEvent& /*_event*/ ) throw (RuntimeException, std::exception) + void SAL_CALL PropertyControlExtender::keyReleased( const KeyEvent& /*_event*/ ) { // not interested in } - void SAL_CALL PropertyControlExtender::disposing( const EventObject& Source ) throw (RuntimeException, std::exception) + void SAL_CALL PropertyControlExtender::disposing( const EventObject& Source ) { OSL_ENSURE( Source.Source == m_pData->xControlWindow, "PropertyControlExtender::disposing: where does this come from?" ); (void)Source.Source; diff --git a/extensions/source/propctrlr/propertycontrolextender.hxx b/extensions/source/propctrlr/propertycontrolextender.hxx index e0103d8bcbb2..5fb18c901cae 100644 --- a/extensions/source/propctrlr/propertycontrolextender.hxx +++ b/extensions/source/propctrlr/propertycontrolextender.hxx @@ -45,10 +45,10 @@ namespace pcr ); // XKeyListener - virtual void SAL_CALL keyPressed( const css::awt::KeyEvent& e ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL keyReleased( const css::awt::KeyEvent& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL keyPressed( const css::awt::KeyEvent& e ) override; + virtual void SAL_CALL keyReleased( const css::awt::KeyEvent& e ) override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; protected: virtual ~PropertyControlExtender() override; diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx index d42f0fbb8ec5..44352f1b3cad 100644 --- a/extensions/source/propctrlr/propertyhandler.cxx +++ b/extensions/source/propctrlr/propertyhandler.cxx @@ -66,7 +66,7 @@ namespace pcr { } - void SAL_CALL PropertyHandler::inspect( const Reference< XInterface >& _rxIntrospectee ) throw (RuntimeException, NullPointerException, std::exception) + void SAL_CALL PropertyHandler::inspect( const Reference< XInterface >& _rxIntrospectee ) { if ( !_rxIntrospectee.is() ) throw NullPointerException(); @@ -104,7 +104,7 @@ namespace pcr m_aSupportedProperties.realloc( 0 ); } - Sequence< Property > SAL_CALL PropertyHandler::getSupportedProperties() throw (RuntimeException, std::exception) + Sequence< Property > SAL_CALL PropertyHandler::getSupportedProperties() { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_bSupportedPropertiesAreKnown ) @@ -115,17 +115,17 @@ namespace pcr return m_aSupportedProperties; } - Sequence< OUString > SAL_CALL PropertyHandler::getSupersededProperties( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL PropertyHandler::getSupersededProperties( ) { return Sequence< OUString >(); } - Sequence< OUString > SAL_CALL PropertyHandler::getActuatingProperties( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL PropertyHandler::getActuatingProperties( ) { return Sequence< OUString >(); } - Any SAL_CALL PropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException, std::exception) + Any SAL_CALL PropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId = m_pInfoService->getPropertyId( _rPropertyName ); @@ -151,7 +151,7 @@ namespace pcr return aPropertyValue; } - Any SAL_CALL PropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException, std::exception) + Any SAL_CALL PropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId = m_pInfoService->getPropertyId( _rPropertyName ); @@ -170,14 +170,13 @@ namespace pcr m_xContext, m_xTypeConverter, _rPropertyValue, _rControlValueType ); } - PropertyState SAL_CALL PropertyHandler::getPropertyState( const OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException, std::exception) + PropertyState SAL_CALL PropertyHandler::getPropertyState( const OUString& /*_rPropertyName*/ ) { return PropertyState_DIRECT_VALUE; } LineDescriptor SAL_CALL PropertyHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) - throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception) { if ( !_rxControlFactory.is() ) throw NullPointerException(); @@ -206,24 +205,24 @@ namespace pcr return aDescriptor; } - sal_Bool SAL_CALL PropertyHandler::isComposable( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) + sal_Bool SAL_CALL PropertyHandler::isComposable( const OUString& _rPropertyName ) { ::osl::MutexGuard aGuard( m_aMutex ); return m_pInfoService->isComposeable( _rPropertyName ); } - InteractiveSelectionResult SAL_CALL PropertyHandler::onInteractivePropertySelection( const OUString& /*_rPropertyName*/, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/ ) throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception) + InteractiveSelectionResult SAL_CALL PropertyHandler::onInteractivePropertySelection( const OUString& /*_rPropertyName*/, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/ ) { OSL_FAIL( "PropertyHandler::onInteractivePropertySelection: not implemented!" ); return InteractiveSelectionResult_Cancelled; } - void SAL_CALL PropertyHandler::actuatingPropertyChanged( const OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException, std::exception) + void SAL_CALL PropertyHandler::actuatingPropertyChanged( const OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) { OSL_FAIL( "PropertyHandler::actuatingPropertyChanged: not implemented!" ); } - void SAL_CALL PropertyHandler::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (NullPointerException, RuntimeException, std::exception) + void SAL_CALL PropertyHandler::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !_rxListener.is() ) @@ -231,13 +230,13 @@ namespace pcr m_aPropertyListeners.addListener( _rxListener ); } - void SAL_CALL PropertyHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException, std::exception) + void SAL_CALL PropertyHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) { ::osl::MutexGuard aGuard( m_aMutex ); m_aPropertyListeners.removeListener( _rxListener ); } - sal_Bool SAL_CALL PropertyHandler::suspend( sal_Bool /*_bSuspend*/ ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL PropertyHandler::suspend( sal_Bool /*_bSuspend*/ ) { return true; } @@ -411,7 +410,7 @@ namespace pcr IMPLEMENT_FORWARD_XINTERFACE2( PropertyHandlerComponent, PropertyHandler, PropertyHandlerComponent_Base ) IMPLEMENT_FORWARD_XTYPEPROVIDER2( PropertyHandlerComponent, PropertyHandler, PropertyHandlerComponent_Base ) - sal_Bool SAL_CALL PropertyHandlerComponent::supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL PropertyHandlerComponent::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx index a1b6a429db1d..a46cfc8d471c 100644 --- a/extensions/source/propctrlr/propertyhandler.hxx +++ b/extensions/source/propctrlr/propertyhandler.hxx @@ -103,20 +103,20 @@ namespace pcr virtual ~PropertyHandler() override; // default implementations for XPropertyHandler - virtual void SAL_CALL inspect( const css::uno::Reference< css::uno::XInterface >& _rxIntrospectee ) throw (css::uno::RuntimeException, css::lang::NullPointerException, std::exception) override; - virtual css::uno::Sequence< css::beans::Property > SAL_CALL getSupportedProperties() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupersededProperties( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::inspection::LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isComposable( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL inspect( const css::uno::Reference< css::uno::XInterface >& _rxIntrospectee ) override; + virtual css::uno::Sequence< css::beans::Property > SAL_CALL getSupportedProperties() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupersededProperties( ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getActuatingProperties( ) override; + virtual css::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) override; + virtual css::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& _rPropertyName ) override; + virtual css::inspection::LineDescriptor SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) override; + virtual sal_Bool SAL_CALL isComposable( const OUString& _rPropertyName ) override; + virtual css::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) override; + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) override; + virtual void SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) override; + virtual sal_Bool SAL_CALL suspend( sal_Bool _bSuspend ) override; // XComponent DECLARE_XCOMPONENT() @@ -363,9 +363,9 @@ namespace pcr DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override = 0; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override = 0; + virtual OUString SAL_CALL getImplementationName( ) override = 0; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override = 0; }; @@ -404,8 +404,8 @@ namespace pcr protected: // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; static css::uno::Reference< css::uno::XInterface > SAL_CALL Create( const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); public: @@ -416,14 +416,14 @@ namespace pcr template < class HANDLER > - OUString SAL_CALL HandlerComponentBase< HANDLER >::getImplementationName( ) throw (css::uno::RuntimeException, std::exception) + OUString SAL_CALL HandlerComponentBase< HANDLER >::getImplementationName( ) { return HANDLER::getImplementationName_static(); } template < class HANDLER > - css::uno::Sequence< OUString > SAL_CALL HandlerComponentBase< HANDLER >::getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) + css::uno::Sequence< OUString > SAL_CALL HandlerComponentBase< HANDLER >::getSupportedServiceNames( ) { return HANDLER::getSupportedServiceNames_static(); } diff --git a/extensions/source/propctrlr/propeventtranslation.cxx b/extensions/source/propctrlr/propeventtranslation.cxx index afb33a5be685..736c1e06fca2 100644 --- a/extensions/source/propctrlr/propeventtranslation.cxx +++ b/extensions/source/propctrlr/propeventtranslation.cxx @@ -48,7 +48,7 @@ namespace pcr } - void SAL_CALL PropertyEventTranslation::propertyChange( const PropertyChangeEvent& evt ) throw (RuntimeException, std::exception) + void SAL_CALL PropertyEventTranslation::propertyChange( const PropertyChangeEvent& evt ) { if ( !m_xDelegator.is() ) throw DisposedException(); @@ -64,7 +64,7 @@ namespace pcr } - void SAL_CALL PropertyEventTranslation::disposing( const EventObject& Source ) throw (RuntimeException, std::exception) + void SAL_CALL PropertyEventTranslation::disposing( const EventObject& Source ) { if ( !m_xDelegator.is() ) throw DisposedException(); diff --git a/extensions/source/propctrlr/propeventtranslation.hxx b/extensions/source/propctrlr/propeventtranslation.hxx index dcf52e4d10b2..8bd2f51b163d 100644 --- a/extensions/source/propctrlr/propeventtranslation.hxx +++ b/extensions/source/propctrlr/propeventtranslation.hxx @@ -55,9 +55,9 @@ namespace pcr protected: // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; private: PropertyEventTranslation( const PropertyEventTranslation& ) = delete; diff --git a/extensions/source/propctrlr/sqlcommanddesign.cxx b/extensions/source/propctrlr/sqlcommanddesign.cxx index 643698543e55..4009eb583a5e 100644 --- a/extensions/source/propctrlr/sqlcommanddesign.cxx +++ b/extensions/source/propctrlr/sqlcommanddesign.cxx @@ -110,7 +110,7 @@ namespace pcr } - void SAL_CALL SQLCommandDesigner::propertyChange( const PropertyChangeEvent& Event ) throw (RuntimeException, std::exception) + void SAL_CALL SQLCommandDesigner::propertyChange( const PropertyChangeEvent& Event ) { OSL_ENSURE( m_xDesigner.is() && ( Event.Source == m_xDesigner ), "SQLCommandDesigner::propertyChange: where did this come from?" ); @@ -141,7 +141,7 @@ namespace pcr } - void SAL_CALL SQLCommandDesigner::disposing( const EventObject& Source ) throw (RuntimeException, std::exception) + void SAL_CALL SQLCommandDesigner::disposing( const EventObject& Source ) { if ( m_xDesigner.is() && ( Source.Source == m_xDesigner ) ) { diff --git a/extensions/source/propctrlr/sqlcommanddesign.hxx b/extensions/source/propctrlr/sqlcommanddesign.hxx index 106b94617264..02b9632c7727 100644 --- a/extensions/source/propctrlr/sqlcommanddesign.hxx +++ b/extensions/source/propctrlr/sqlcommanddesign.hxx @@ -110,10 +110,10 @@ namespace pcr protected: // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; protected: virtual ~SQLCommandDesigner() override; diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index e14086e66ab6..7bd5b4e2c0e8 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -76,7 +76,7 @@ namespace pcr } - void SAL_CALL OTimeControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException, std::exception) + void SAL_CALL OTimeControl::setValue( const Any& _rValue ) { util::Time aUNOTime; if ( !( _rValue >>= aUNOTime ) ) @@ -91,7 +91,7 @@ namespace pcr } - Any SAL_CALL OTimeControl::getValue() throw (RuntimeException, std::exception) + Any SAL_CALL OTimeControl::getValue() { Any aPropValue; if ( !getTypedControlWindow()->GetText().isEmpty() ) @@ -102,7 +102,7 @@ namespace pcr } - Type SAL_CALL OTimeControl::getValueType() throw (RuntimeException, std::exception) + Type SAL_CALL OTimeControl::getValueType() { return ::cppu::UnoType<util::Time>::get(); } @@ -127,7 +127,7 @@ namespace pcr } - void SAL_CALL ODateControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException, std::exception) + void SAL_CALL ODateControl::setValue( const Any& _rValue ) { util::Date aUNODate; if ( !( _rValue >>= aUNODate ) ) @@ -143,7 +143,7 @@ namespace pcr } - Any SAL_CALL ODateControl::getValue() throw (RuntimeException, std::exception) + Any SAL_CALL ODateControl::getValue() { Any aPropValue; if ( !getTypedControlWindow()->GetText().isEmpty() ) @@ -155,7 +155,7 @@ namespace pcr } - Type SAL_CALL ODateControl::getValueType() throw (RuntimeException, std::exception) + Type SAL_CALL ODateControl::getValueType() { return ::cppu::UnoType<util::Date>::get(); } @@ -174,7 +174,7 @@ namespace pcr } - void SAL_CALL OEditControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException, std::exception) + void SAL_CALL OEditControl::setValue( const Any& _rValue ) { OUString sText; if ( m_bIsPassword ) @@ -193,7 +193,7 @@ namespace pcr } - Any SAL_CALL OEditControl::getValue() throw (RuntimeException, std::exception) + Any SAL_CALL OEditControl::getValue() { Any aPropValue; @@ -210,7 +210,7 @@ namespace pcr } - Type SAL_CALL OEditControl::getValueType() throw (RuntimeException, std::exception) + Type SAL_CALL OEditControl::getValueType() { return m_bIsPassword ? ::cppu::UnoType<sal_Int16>::get() : ::cppu::UnoType<OUString>::get(); } @@ -266,7 +266,7 @@ namespace pcr } - void SAL_CALL ODateTimeControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException, std::exception) + void SAL_CALL ODateTimeControl::setValue( const Any& _rValue ) { if ( !_rValue.hasValue() ) { @@ -286,7 +286,7 @@ namespace pcr } - Any SAL_CALL ODateTimeControl::getValue() throw (RuntimeException, std::exception) + Any SAL_CALL ODateTimeControl::getValue() { Any aPropValue; if ( !getTypedControlWindow()->GetText().isEmpty() ) @@ -314,7 +314,7 @@ namespace pcr } - Type SAL_CALL ODateTimeControl::getValueType() throw (RuntimeException, std::exception) + Type SAL_CALL ODateTimeControl::getValueType() { return ::cppu::UnoType<util::DateTime>::get(); } @@ -416,14 +416,14 @@ namespace pcr } - Any SAL_CALL OHyperlinkControl::getValue() throw (RuntimeException, std::exception) + Any SAL_CALL OHyperlinkControl::getValue() { OUString sText = getTypedControlWindow()->GetText(); return makeAny( sText ); } - void SAL_CALL OHyperlinkControl::setValue( const Any& _value ) throw (IllegalTypeException, RuntimeException, std::exception) + void SAL_CALL OHyperlinkControl::setValue( const Any& _value ) { OUString sText; _value >>= sText; @@ -431,20 +431,20 @@ namespace pcr } - Type SAL_CALL OHyperlinkControl::getValueType() throw (RuntimeException, std::exception) + Type SAL_CALL OHyperlinkControl::getValueType() { return ::cppu::UnoType<OUString>::get(); } - void SAL_CALL OHyperlinkControl::addActionListener( const Reference< XActionListener >& listener ) throw (RuntimeException, std::exception) + void SAL_CALL OHyperlinkControl::addActionListener( const Reference< XActionListener >& listener ) { if ( listener.is() ) m_aActionListeners.addInterface( listener ); } - void SAL_CALL OHyperlinkControl::removeActionListener( const Reference< XActionListener >& listener ) throw (RuntimeException, std::exception) + void SAL_CALL OHyperlinkControl::removeActionListener( const Reference< XActionListener >& listener ) { m_aActionListeners.removeInterface( listener ); } @@ -486,19 +486,19 @@ namespace pcr } - ::sal_Int16 SAL_CALL ONumericControl::getDecimalDigits() throw (RuntimeException, std::exception) + ::sal_Int16 SAL_CALL ONumericControl::getDecimalDigits() { return getTypedControlWindow()->GetDecimalDigits(); } - void SAL_CALL ONumericControl::setDecimalDigits( ::sal_Int16 _decimaldigits ) throw (RuntimeException, std::exception) + void SAL_CALL ONumericControl::setDecimalDigits( ::sal_Int16 _decimaldigits ) { getTypedControlWindow()->SetDecimalDigits( _decimaldigits ); } - Optional< double > SAL_CALL ONumericControl::getMinValue() throw (RuntimeException, std::exception) + Optional< double > SAL_CALL ONumericControl::getMinValue() { Optional< double > aReturn( true, 0 ); @@ -512,7 +512,7 @@ namespace pcr } - void SAL_CALL ONumericControl::setMinValue( const Optional< double >& _minvalue ) throw (RuntimeException, std::exception) + void SAL_CALL ONumericControl::setMinValue( const Optional< double >& _minvalue ) { if ( !_minvalue.IsPresent ) getTypedControlWindow()->SetMin( ::std::numeric_limits< sal_Int64 >::min() ); @@ -521,7 +521,7 @@ namespace pcr } - Optional< double > SAL_CALL ONumericControl::getMaxValue() throw (RuntimeException, std::exception) + Optional< double > SAL_CALL ONumericControl::getMaxValue() { Optional< double > aReturn( true, 0 ); @@ -535,7 +535,7 @@ namespace pcr } - void SAL_CALL ONumericControl::setMaxValue( const Optional< double >& _maxvalue ) throw (RuntimeException, std::exception) + void SAL_CALL ONumericControl::setMaxValue( const Optional< double >& _maxvalue ) { if ( !_maxvalue.IsPresent ) getTypedControlWindow()->SetMax( ::std::numeric_limits< sal_Int64 >::max() ); @@ -544,13 +544,13 @@ namespace pcr } - ::sal_Int16 SAL_CALL ONumericControl::getDisplayUnit() throw (RuntimeException, std::exception) + ::sal_Int16 SAL_CALL ONumericControl::getDisplayUnit() { return VCLUnoHelper::ConvertToMeasurementUnit( getTypedControlWindow()->GetUnit(), 1 ); } - void SAL_CALL ONumericControl::setDisplayUnit( ::sal_Int16 _displayunit ) throw (IllegalArgumentException, RuntimeException, std::exception) + void SAL_CALL ONumericControl::setDisplayUnit( ::sal_Int16 _displayunit ) { if ( ( _displayunit < MeasureUnit::MM_100TH ) || ( _displayunit > MeasureUnit::PERCENT ) ) throw IllegalArgumentException(); @@ -573,13 +573,13 @@ namespace pcr } - ::sal_Int16 SAL_CALL ONumericControl::getValueUnit() throw (RuntimeException, std::exception) + ::sal_Int16 SAL_CALL ONumericControl::getValueUnit() { return VCLUnoHelper::ConvertToMeasurementUnit( m_eValueUnit, m_nFieldToUNOValueFactor ); } - void SAL_CALL ONumericControl::setValueUnit( ::sal_Int16 _valueunit ) throw (RuntimeException, std::exception) + void SAL_CALL ONumericControl::setValueUnit( ::sal_Int16 _valueunit ) { if ( ( _valueunit < MeasureUnit::MM_100TH ) || ( _valueunit > MeasureUnit::PERCENT ) ) throw IllegalArgumentException(); @@ -587,7 +587,7 @@ namespace pcr } - void SAL_CALL ONumericControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException, std::exception) + void SAL_CALL ONumericControl::setValue( const Any& _rValue ) { if ( !_rValue.hasValue() ) { @@ -620,7 +620,7 @@ namespace pcr } - Any SAL_CALL ONumericControl::getValue() throw (RuntimeException, std::exception) + Any SAL_CALL ONumericControl::getValue() { Any aPropValue; if ( !getTypedControlWindow()->GetText().isEmpty() ) @@ -632,7 +632,7 @@ namespace pcr } - Type SAL_CALL ONumericControl::getValueType() throw (RuntimeException, std::exception) + Type SAL_CALL ONumericControl::getValueType() { return ::cppu::UnoType<double>::get(); } @@ -662,7 +662,7 @@ namespace pcr { } - void SAL_CALL OColorControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException, std::exception) + void SAL_CALL OColorControl::setValue( const Any& _rValue ) { if ( _rValue.hasValue() ) { @@ -675,7 +675,7 @@ namespace pcr getTypedControlWindow()->SetNoSelection(); } - Any SAL_CALL OColorControl::getValue() throw (RuntimeException, std::exception) + Any SAL_CALL OColorControl::getValue() { Any aPropValue; if (!getTypedControlWindow()->IsNoSelection()) @@ -686,7 +686,7 @@ namespace pcr return aPropValue; } - Type SAL_CALL OColorControl::getValueType() throw (RuntimeException, std::exception) + Type SAL_CALL OColorControl::getValueType() { return ::cppu::UnoType<sal_Int32>::get(); } @@ -713,7 +713,7 @@ namespace pcr } - Any SAL_CALL OListboxControl::getValue() throw (RuntimeException, std::exception) + Any SAL_CALL OListboxControl::getValue() { OUString sControlValue( getTypedControlWindow()->GetSelectEntry() ); @@ -724,13 +724,13 @@ namespace pcr } - Type SAL_CALL OListboxControl::getValueType() throw (RuntimeException, std::exception) + Type SAL_CALL OListboxControl::getValueType() { return ::cppu::UnoType<OUString>::get(); } - void SAL_CALL OListboxControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException, std::exception) + void SAL_CALL OListboxControl::setValue( const Any& _rValue ) { if ( !_rValue.hasValue() ) getTypedControlWindow()->SetNoSelection(); @@ -751,24 +751,24 @@ namespace pcr } - void SAL_CALL OListboxControl::clearList() throw (RuntimeException, std::exception) + void SAL_CALL OListboxControl::clearList() { getTypedControlWindow()->Clear(); } - void SAL_CALL OListboxControl::prependListEntry( const OUString& NewEntry ) throw (RuntimeException, std::exception) + void SAL_CALL OListboxControl::prependListEntry( const OUString& NewEntry ) { getTypedControlWindow()->InsertEntry( NewEntry, 0 ); } - void SAL_CALL OListboxControl::appendListEntry( const OUString& NewEntry ) throw (RuntimeException, std::exception) + void SAL_CALL OListboxControl::appendListEntry( const OUString& NewEntry ) { getTypedControlWindow()->InsertEntry( NewEntry ); } - Sequence< OUString > SAL_CALL OListboxControl::getListEntries( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL OListboxControl::getListEntries( ) { const sal_Int32 nCount = getTypedControlWindow()->GetEntryCount(); Sequence< OUString > aRet(nCount); @@ -801,7 +801,7 @@ namespace pcr } - void SAL_CALL OComboboxControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException, std::exception) + void SAL_CALL OComboboxControl::setValue( const Any& _rValue ) { OUString sText; _rValue >>= sText; @@ -809,36 +809,36 @@ namespace pcr } - Any SAL_CALL OComboboxControl::getValue() throw (RuntimeException, std::exception) + Any SAL_CALL OComboboxControl::getValue() { return makeAny( OUString( getTypedControlWindow()->GetText() ) ); } - Type SAL_CALL OComboboxControl::getValueType() throw (RuntimeException, std::exception) + Type SAL_CALL OComboboxControl::getValueType() { return ::cppu::UnoType<OUString>::get(); } - void SAL_CALL OComboboxControl::clearList() throw (RuntimeException, std::exception) + void SAL_CALL OComboboxControl::clearList() { getTypedControlWindow()->Clear(); } - void SAL_CALL OComboboxControl::prependListEntry( const OUString& NewEntry ) throw (RuntimeException, std::exception) + void SAL_CALL OComboboxControl::prependListEntry( const OUString& NewEntry ) { getTypedControlWindow()->InsertEntry( NewEntry, 0 ); } - void SAL_CALL OComboboxControl::appendListEntry( const OUString& NewEntry ) throw (RuntimeException, std::exception) + void SAL_CALL OComboboxControl::appendListEntry( const OUString& NewEntry ) { getTypedControlWindow()->InsertEntry( NewEntry ); } - Sequence< OUString > SAL_CALL OComboboxControl::getListEntries( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL OComboboxControl::getListEntries( ) { const sal_Int32 nCount = getTypedControlWindow()->GetEntryCount(); Sequence< OUString > aRet(nCount); @@ -1271,7 +1271,7 @@ namespace pcr } - void SAL_CALL OMultilineEditControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException, std::exception) + void SAL_CALL OMultilineEditControl::setValue( const Any& _rValue ) { impl_checkDisposed_throw(); @@ -1297,7 +1297,7 @@ namespace pcr } - Any SAL_CALL OMultilineEditControl::getValue() throw (RuntimeException, std::exception) + Any SAL_CALL OMultilineEditControl::getValue() { impl_checkDisposed_throw(); @@ -1315,7 +1315,7 @@ namespace pcr } - Type SAL_CALL OMultilineEditControl::getValueType() throw (RuntimeException, std::exception) + Type SAL_CALL OMultilineEditControl::getValueType() { if ( getTypedControlWindow()->getOperationMode() == eMultiLineText ) return ::cppu::UnoType<OUString>::get(); diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx index d3f64e703276..b4fdb34e1196 100644 --- a/extensions/source/propctrlr/standardcontrol.hxx +++ b/extensions/source/propctrlr/standardcontrol.hxx @@ -86,9 +86,9 @@ namespace pcr OTimeControl( vcl::Window* pParent, WinBits nWinStyle ); // XPropertyControl - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getValue() override; + virtual void SAL_CALL setValue( const css::uno::Any& _value ) override; + virtual css::uno::Type SAL_CALL getValueType() override; }; @@ -101,9 +101,9 @@ namespace pcr ODateControl( vcl::Window* pParent, WinBits nWinStyle ); // XPropertyControl - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getValue() override; + virtual void SAL_CALL setValue( const css::uno::Any& _value ) override; + virtual css::uno::Type SAL_CALL getValueType() override; }; @@ -119,9 +119,9 @@ namespace pcr OEditControl( vcl::Window* _pParent, bool _bPassWord, WinBits nWinStyle ); // XPropertyControl - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getValue() override; + virtual void SAL_CALL setValue( const css::uno::Any& _value ) override; + virtual css::uno::Type SAL_CALL getValueType() override; protected: // CommonBehaviourControlHelper::modified @@ -138,9 +138,9 @@ namespace pcr ODateTimeControl( vcl::Window* pParent,WinBits nWinStyle ); // XPropertyControl - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getValue() override; + virtual void SAL_CALL setValue( const css::uno::Any& _value ) override; + virtual css::uno::Type SAL_CALL getValueType() override; }; @@ -184,13 +184,13 @@ namespace pcr OHyperlinkControl( vcl::Window* _pParent, WinBits _nWinStyle ); // XPropertyControl - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getValue() override; + virtual void SAL_CALL setValue( const css::uno::Any& _value ) override; + virtual css::uno::Type SAL_CALL getValueType() override; // XHyperlinkControl - virtual void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& listener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& listener ) override; + virtual void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& listener ) override; protected: // XComponent @@ -228,21 +228,21 @@ namespace pcr ONumericControl( vcl::Window* pParent, WinBits nWinStyle ); // XPropertyControl - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getValue() override; + virtual void SAL_CALL setValue( const css::uno::Any& _value ) override; + virtual css::uno::Type SAL_CALL getValueType() override; // XNumericControl - virtual ::sal_Int16 SAL_CALL getDecimalDigits() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDecimalDigits( ::sal_Int16 _decimaldigits ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::beans::Optional< double > SAL_CALL getMinValue() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMinValue( const css::beans::Optional< double >& _minvalue ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::beans::Optional< double > SAL_CALL getMaxValue() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMaxValue( const css::beans::Optional< double >& _maxvalue ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int16 SAL_CALL getDisplayUnit() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDisplayUnit( ::sal_Int16 _displayunit ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int16 SAL_CALL getValueUnit() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValueUnit( ::sal_Int16 _valueunit ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int16 SAL_CALL getDecimalDigits() override; + virtual void SAL_CALL setDecimalDigits( ::sal_Int16 _decimaldigits ) override; + virtual css::beans::Optional< double > SAL_CALL getMinValue() override; + virtual void SAL_CALL setMinValue( const css::beans::Optional< double >& _minvalue ) override; + virtual css::beans::Optional< double > SAL_CALL getMaxValue() override; + virtual void SAL_CALL setMaxValue( const css::beans::Optional< double >& _maxvalue ) override; + virtual ::sal_Int16 SAL_CALL getDisplayUnit() override; + virtual void SAL_CALL setDisplayUnit( ::sal_Int16 _displayunit ) override; + virtual ::sal_Int16 SAL_CALL getValueUnit() override; + virtual void SAL_CALL setValueUnit( ::sal_Int16 _valueunit ) override; private: /** converts an API value (<code>double</code>, as passed into <code>set[Max|Min|]Value) into @@ -270,9 +270,9 @@ namespace pcr OColorControl( vcl::Window* pParent, WinBits nWinStyle ); // XPropertyControl - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getValue() override; + virtual void SAL_CALL setValue( const css::uno::Any& _value ) override; + virtual css::uno::Type SAL_CALL getValueType() override; protected: // CommonBehaviourControlHelper::setModified @@ -291,15 +291,15 @@ namespace pcr OListboxControl( vcl::Window* pParent, WinBits nWinStyle ); // XPropertyControl - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getValue() override; + virtual void SAL_CALL setValue( const css::uno::Any& _value ) override; + virtual css::uno::Type SAL_CALL getValueType() override; // XStringListControl - virtual void SAL_CALL clearList( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL prependListEntry( const OUString& NewEntry ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL appendListEntry( const OUString& NewEntry ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getListEntries( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL clearList( ) override; + virtual void SAL_CALL prependListEntry( const OUString& NewEntry ) override; + virtual void SAL_CALL appendListEntry( const OUString& NewEntry ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getListEntries( ) override; protected: // CommonBehaviourControlHelper::setModified @@ -316,15 +316,15 @@ namespace pcr OComboboxControl( vcl::Window* pParent, WinBits nWinStyle ); // XPropertyControl - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getValue() override; + virtual void SAL_CALL setValue( const css::uno::Any& _value ) override; + virtual css::uno::Type SAL_CALL getValueType() override; // XStringListControl - virtual void SAL_CALL clearList( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL prependListEntry( const OUString& NewEntry ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL appendListEntry( const OUString& NewEntry ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getListEntries( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL clearList( ) override; + virtual void SAL_CALL prependListEntry( const OUString& NewEntry ) override; + virtual void SAL_CALL appendListEntry( const OUString& NewEntry ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getListEntries( ) override; protected: DECL_LINK( OnEntrySelected, ComboBox&, void ); @@ -395,9 +395,9 @@ namespace pcr OMultilineEditControl( vcl::Window* pParent, MultiLineOperationMode _eMode, WinBits nWinStyle ); // XPropertyControl - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getValue() override; + virtual void SAL_CALL setValue( const css::uno::Any& _value ) override; + virtual css::uno::Type SAL_CALL getValueType() override; }; diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx index 39c57ccaabdf..9e32fe3ef4c4 100644 --- a/extensions/source/propctrlr/stringrepresentation.cxx +++ b/extensions/source/propctrlr/stringrepresentation.cxx @@ -74,16 +74,16 @@ public: StringRepresentation& operator=(const StringRepresentation&) = delete; // lang::XServiceInfo: - virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (uno::RuntimeException, std::exception) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString & ServiceName) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // inspection::XStringRepresentation: - virtual OUString SAL_CALL convertToControlValue(const uno::Any & PropertyValue) throw (uno::RuntimeException, uno::Exception, std::exception) override; - virtual uno::Any SAL_CALL convertToPropertyValue(const OUString & ControlValue, const uno::Type & ControlValueType) throw (uno::RuntimeException, uno::Exception, std::exception) override; + virtual OUString SAL_CALL convertToControlValue(const uno::Any & PropertyValue) override; + virtual uno::Any SAL_CALL convertToPropertyValue(const OUString & ControlValue, const uno::Type & ControlValueType) override; // lang::XInitialization: - virtual void SAL_CALL initialize(const uno::Sequence< uno::Any > & aArguments) throw (uno::RuntimeException, uno::Exception, std::exception) override; + virtual void SAL_CALL initialize(const uno::Sequence< uno::Any > & aArguments) override; private: virtual ~StringRepresentation() override {} @@ -142,23 +142,23 @@ StringRepresentation::StringRepresentation(uno::Reference< uno::XComponentContex {} // com.sun.star.uno.XServiceInfo: -OUString SAL_CALL StringRepresentation::getImplementationName() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL StringRepresentation::getImplementationName() { return comp_StringRepresentation::_getImplementationName(); } -sal_Bool SAL_CALL StringRepresentation::supportsService(OUString const & serviceName) throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL StringRepresentation::supportsService(OUString const & serviceName) { return cppu::supportsService(this, serviceName); } -uno::Sequence< OUString > SAL_CALL StringRepresentation::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL StringRepresentation::getSupportedServiceNames() { return comp_StringRepresentation::_getSupportedServiceNames(); } // inspection::XStringRepresentation: -OUString SAL_CALL StringRepresentation::convertToControlValue(const uno::Any & PropertyValue) throw (uno::RuntimeException, uno::Exception, std::exception) +OUString SAL_CALL StringRepresentation::convertToControlValue(const uno::Any & PropertyValue) { OUString sReturn; if ( !convertGenericValueToString( PropertyValue, sReturn ) ) @@ -178,7 +178,7 @@ OUString SAL_CALL StringRepresentation::convertToControlValue(const uno::Any & P return sReturn; } -uno::Any SAL_CALL StringRepresentation::convertToPropertyValue(const OUString & ControlValue, const uno::Type & ControlValueType) throw (uno::RuntimeException, uno::Exception, std::exception) +uno::Any SAL_CALL StringRepresentation::convertToPropertyValue(const OUString & ControlValue, const uno::Type & ControlValueType) { uno::Any aReturn; @@ -242,7 +242,7 @@ struct CompareConstants { } // lang::XInitialization: -void SAL_CALL StringRepresentation::initialize(const uno::Sequence< uno::Any > & aArguments) throw (uno::RuntimeException, uno::Exception, std::exception) +void SAL_CALL StringRepresentation::initialize(const uno::Sequence< uno::Any > & aArguments) { sal_Int32 nLength = aArguments.getLength(); if ( nLength ) diff --git a/extensions/source/propctrlr/submissionhandler.cxx b/extensions/source/propctrlr/submissionhandler.cxx index ed0b5d39a1d8..bb3f4a745420 100644 --- a/extensions/source/propctrlr/submissionhandler.cxx +++ b/extensions/source/propctrlr/submissionhandler.cxx @@ -103,20 +103,20 @@ namespace pcr } - OUString SAL_CALL SubmissionPropertyHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL SubmissionPropertyHandler::getImplementationName_static( ) { return OUString( "com.sun.star.comp.extensions.SubmissionPropertyHandler" ); } - Sequence< OUString > SAL_CALL SubmissionPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL SubmissionPropertyHandler::getSupportedServiceNames_static( ) { Sequence<OUString> aSupported { "com.sun.star.form.inspection.SubmissionPropertyHandler" }; return aSupported; } - Any SAL_CALL SubmissionPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) + Any SAL_CALL SubmissionPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) ); @@ -165,7 +165,7 @@ namespace pcr } - void SAL_CALL SubmissionPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException, std::exception) + void SAL_CALL SubmissionPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) ); @@ -208,7 +208,7 @@ namespace pcr } - Sequence< OUString > SAL_CALL SubmissionPropertyHandler::getActuatingProperties( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL SubmissionPropertyHandler::getActuatingProperties( ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_pHelper.get() ) @@ -219,7 +219,7 @@ namespace pcr } - Sequence< OUString > SAL_CALL SubmissionPropertyHandler::getSupersededProperties( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL SubmissionPropertyHandler::getSupersededProperties( ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_pHelper.get() ) @@ -274,7 +274,6 @@ namespace pcr LineDescriptor SAL_CALL SubmissionPropertyHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) - throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !_rxControlFactory.is() ) @@ -313,7 +312,7 @@ namespace pcr } - void SAL_CALL SubmissionPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (NullPointerException, RuntimeException, std::exception) + void SAL_CALL SubmissionPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -339,7 +338,7 @@ namespace pcr } - Any SAL_CALL SubmissionPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException, std::exception) + Any SAL_CALL SubmissionPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) { ::osl::MutexGuard aGuard( m_aMutex ); Any aPropertyValue; @@ -378,7 +377,7 @@ namespace pcr } - Any SAL_CALL SubmissionPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException, std::exception) + Any SAL_CALL SubmissionPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) { ::osl::MutexGuard aGuard( m_aMutex ); Any aControlValue; @@ -419,7 +418,7 @@ namespace pcr } - void SubmissionPropertyHandler::_propertyChanged( const PropertyChangeEvent& _rEvent ) throw(RuntimeException) + void SubmissionPropertyHandler::_propertyChanged( const PropertyChangeEvent& _rEvent ) { if ( _rEvent.PropertyName == PROPERTY_BUTTONTYPE ) firePropertyChange( PROPERTY_XFORMS_BUTTONTYPE, PROPERTY_ID_XFORMS_BUTTONTYPE, _rEvent.OldValue, _rEvent.NewValue ); diff --git a/extensions/source/propctrlr/submissionhandler.hxx b/extensions/source/propctrlr/submissionhandler.hxx index f0408e4d2c8b..0d8c035daf0d 100644 --- a/extensions/source/propctrlr/submissionhandler.hxx +++ b/extensions/source/propctrlr/submissionhandler.hxx @@ -78,25 +78,25 @@ namespace pcr ); /// @throws css::uno::RuntimeException - static OUString SAL_CALL getImplementationName_static( ) throw (css::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (css::uno::RuntimeException); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ); virtual ~SubmissionPropertyHandler() override; protected: // XPropertyHandler overriables - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) override; + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) override; virtual css::uno::Sequence< OUString > - SAL_CALL getActuatingProperties( ) throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getActuatingProperties( ) override; virtual css::uno::Sequence< OUString > - SAL_CALL getSupersededProperties( ) throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getSupersededProperties( ) override; virtual css::inspection::LineDescriptor - SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) override; + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) override; + virtual css::uno::Any SAL_CALL convertToPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rControlValue ) override; + virtual css::uno::Any SAL_CALL convertToControlValue( const OUString& _rPropertyName, const css::uno::Any& _rPropertyValue, const css::uno::Type& _rControlValueType ) override; // PropertyHandler overridables virtual css::uno::Sequence< css::beans::Property > @@ -105,7 +105,7 @@ namespace pcr private: // OPropertyChangeListener - virtual void _propertyChanged(const css::beans::PropertyChangeEvent& _rEvent) throw( css::uno::RuntimeException) override; + virtual void _propertyChanged(const css::beans::PropertyChangeEvent& _rEvent) override; }; diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index 32796b05e2cd..faae6af08fcf 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/extensions/source/propctrlr/taborder.cxx @@ -94,14 +94,14 @@ namespace pcr } // XTabControllerModel - virtual void SAL_CALL setControlModels(const Sequence< Reference< XControlModel > >& rModels) throw( RuntimeException, std::exception ) override {m_aModels = rModels;} - virtual Sequence< Reference< XControlModel > > SAL_CALL getControlModels() throw( RuntimeException, std::exception ) override {return m_aModels;} - virtual void SAL_CALL setGroup(const Sequence< Reference< XControlModel > >& /*Group*/, const OUString& /*GroupName*/) throw( RuntimeException, std::exception ) override {} - virtual sal_Int32 SAL_CALL getGroupCount() throw( RuntimeException, std::exception ) override {return 0;} - virtual void SAL_CALL getGroup(sal_Int32 /*nGroup*/, Sequence< Reference< XControlModel > >& /*Group*/, OUString& /*Name*/) throw( RuntimeException, std::exception ) override {} - virtual void SAL_CALL getGroupByName(const OUString& /*Name*/, Sequence< Reference< XControlModel > >& /*Group*/) throw( RuntimeException, std::exception ) override {} - virtual sal_Bool SAL_CALL getGroupControl() throw( RuntimeException, std::exception ) override {return false;} ; - virtual void SAL_CALL setGroupControl(sal_Bool /*GroupControl*/) throw( RuntimeException, std::exception ) override {}; + virtual void SAL_CALL setControlModels(const Sequence< Reference< XControlModel > >& rModels) override {m_aModels = rModels;} + virtual Sequence< Reference< XControlModel > > SAL_CALL getControlModels() override {return m_aModels;} + virtual void SAL_CALL setGroup(const Sequence< Reference< XControlModel > >& /*Group*/, const OUString& /*GroupName*/) override {} + virtual sal_Int32 SAL_CALL getGroupCount() override {return 0;} + virtual void SAL_CALL getGroup(sal_Int32 /*nGroup*/, Sequence< Reference< XControlModel > >& /*Group*/, OUString& /*Name*/) override {} + virtual void SAL_CALL getGroupByName(const OUString& /*Name*/, Sequence< Reference< XControlModel > >& /*Group*/) override {} + virtual sal_Bool SAL_CALL getGroupControl() override {return false;} ; + virtual void SAL_CALL setGroupControl(sal_Bool /*GroupControl*/) override {}; }; diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx index 7c9e2f277f78..143d3796c248 100644 --- a/extensions/source/propctrlr/usercontrol.cxx +++ b/extensions/source/propctrlr/usercontrol.cxx @@ -94,7 +94,7 @@ namespace pcr } - void SAL_CALL OFormatSampleControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException, std::exception) + void SAL_CALL OFormatSampleControl::setValue( const Any& _rValue ) { sal_Int32 nFormatKey = 0; if ( _rValue >>= nFormatKey ) @@ -152,7 +152,7 @@ namespace pcr return nValue; } - Any SAL_CALL OFormatSampleControl::getValue() throw (RuntimeException, std::exception) + Any SAL_CALL OFormatSampleControl::getValue() { Any aPropValue; if ( !getTypedControlWindow()->GetText().isEmpty() ) @@ -161,7 +161,7 @@ namespace pcr } - Type SAL_CALL OFormatSampleControl::getValueType() throw (RuntimeException, std::exception) + Type SAL_CALL OFormatSampleControl::getValueType() { return ::cppu::UnoType<sal_Int32>::get(); } @@ -184,7 +184,7 @@ namespace pcr } - void SAL_CALL OFormattedNumericControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException, std::exception) + void SAL_CALL OFormattedNumericControl::setValue( const Any& _rValue ) { double nValue( 0 ); if ( _rValue >>= nValue ) @@ -194,7 +194,7 @@ namespace pcr } - Any SAL_CALL OFormattedNumericControl::getValue() throw (RuntimeException, std::exception) + Any SAL_CALL OFormattedNumericControl::getValue() { Any aPropValue; if ( !getTypedControlWindow()->GetText().isEmpty() ) @@ -203,7 +203,7 @@ namespace pcr } - Type SAL_CALL OFormattedNumericControl::getValueType() throw (RuntimeException, std::exception) + Type SAL_CALL OFormattedNumericControl::getValueType() { return ::cppu::UnoType<double>::get(); } @@ -275,7 +275,7 @@ namespace pcr } - void SAL_CALL OFileUrlControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException, std::exception) + void SAL_CALL OFileUrlControl::setValue( const Any& _rValue ) { OUString sURL; if ( ( _rValue >>= sURL ) ) @@ -290,7 +290,7 @@ namespace pcr } - Any SAL_CALL OFileUrlControl::getValue() throw (RuntimeException, std::exception) + Any SAL_CALL OFileUrlControl::getValue() { Any aPropValue; if ( !getTypedControlWindow()->GetText().isEmpty() ) @@ -299,7 +299,7 @@ namespace pcr } - Type SAL_CALL OFileUrlControl::getValueType() throw (RuntimeException, std::exception) + Type SAL_CALL OFileUrlControl::getValueType() { return ::cppu::UnoType<OUString>::get(); } @@ -322,7 +322,7 @@ namespace pcr } - ::sal_Int16 SAL_CALL OTimeDurationControl::getControlType() throw (css::uno::RuntimeException) + ::sal_Int16 SAL_CALL OTimeDurationControl::getControlType() { // don't use the base class'es method, it would claim we're a standard control, which // we in fact aren't diff --git a/extensions/source/propctrlr/usercontrol.hxx b/extensions/source/propctrlr/usercontrol.hxx index 64daff191e42..f6bdffd3f00a 100644 --- a/extensions/source/propctrlr/usercontrol.hxx +++ b/extensions/source/propctrlr/usercontrol.hxx @@ -62,9 +62,9 @@ namespace pcr explicit OFormatSampleControl( vcl::Window* pParent ); // XPropertyControl - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getValue() override; + virtual void SAL_CALL setValue( const css::uno::Any& _value ) override; + virtual css::uno::Type SAL_CALL getValueType() override; inline void SetFormatSupplier( const SvNumberFormatsSupplierObj* _pSupplier ) { @@ -105,9 +105,9 @@ namespace pcr OFormattedNumericControl( vcl::Window* pParent, WinBits nWinStyle); // XPropertyControl - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getValue() override; + virtual void SAL_CALL setValue( const css::uno::Any& _value ) override; + virtual css::uno::Type SAL_CALL getValueType() override; void SetFormatDescription( const FormatDescription& rDesc ); @@ -131,9 +131,9 @@ namespace pcr explicit OFileUrlControl( vcl::Window* pParent ); // XPropertyControl - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::beans::IllegalTypeException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Type SAL_CALL getValueType() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getValue() override; + virtual void SAL_CALL setValue( const css::uno::Any& _value ) override; + virtual css::uno::Type SAL_CALL getValueType() override; protected: virtual ~OFileUrlControl() override; @@ -149,7 +149,7 @@ namespace pcr virtual ~OTimeDurationControl() override; // XPropertyControl - ::sal_Int16 SAL_CALL getControlType() throw (css::uno::RuntimeException) override; + ::sal_Int16 SAL_CALL getControlType() override; private: DECL_LINK( OnCustomConvert, MetricFormatter&, void ); diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx index 136915e2ede6..559c9a1f89c1 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx @@ -83,20 +83,20 @@ namespace pcr } - OUString SAL_CALL XSDValidationPropertyHandler::getImplementationName_static( ) throw (RuntimeException) + OUString SAL_CALL XSDValidationPropertyHandler::getImplementationName_static( ) { return OUString( "com.sun.star.comp.extensions.XSDValidationPropertyHandler" ); } - Sequence< OUString > SAL_CALL XSDValidationPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL XSDValidationPropertyHandler::getSupportedServiceNames_static( ) { Sequence<OUString> aSupported { "com.sun.star.form.inspection.XSDValidationPropertyHandler" }; return aSupported; } - Any SAL_CALL XSDValidationPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) + Any SAL_CALL XSDValidationPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) ); @@ -126,7 +126,7 @@ namespace pcr } - void SAL_CALL XSDValidationPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException, std::exception) + void SAL_CALL XSDValidationPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) { ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) ); @@ -221,7 +221,7 @@ namespace pcr } - Sequence< OUString > SAL_CALL XSDValidationPropertyHandler::getSupersededProperties( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL XSDValidationPropertyHandler::getSupersededProperties( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -256,7 +256,7 @@ namespace pcr } - Sequence< OUString > SAL_CALL XSDValidationPropertyHandler::getActuatingProperties( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL XSDValidationPropertyHandler::getActuatingProperties( ) { ::osl::MutexGuard aGuard( m_aMutex ); ::std::vector< OUString > aInterestedInActuations; @@ -283,7 +283,6 @@ namespace pcr LineDescriptor SAL_CALL XSDValidationPropertyHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) - throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !_rxControlFactory.is() ) @@ -417,7 +416,7 @@ namespace pcr } - InteractiveSelectionResult SAL_CALL XSDValidationPropertyHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, Any& /*_rData*/, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException, std::exception) + InteractiveSelectionResult SAL_CALL XSDValidationPropertyHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, Any& /*_rData*/, const Reference< XObjectInspectorUI >& _rxInspectorUI ) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); @@ -455,7 +454,7 @@ namespace pcr } - void SAL_CALL XSDValidationPropertyHandler::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (NullPointerException, RuntimeException, std::exception) + void SAL_CALL XSDValidationPropertyHandler::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) { ::osl::MutexGuard aGuard( m_aMutex ); XSDValidationPropertyHandler_Base::addPropertyChangeListener( _rxListener ); @@ -464,7 +463,7 @@ namespace pcr } - void SAL_CALL XSDValidationPropertyHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException, std::exception) + void SAL_CALL XSDValidationPropertyHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_pHelper.get() ) @@ -553,7 +552,7 @@ namespace pcr } - void SAL_CALL XSDValidationPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException, std::exception) + void SAL_CALL XSDValidationPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) { if ( !_rxInspectorUI.is() ) throw NullPointerException(); diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx index a6779e3f5b30..c65f37a21b92 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx @@ -46,28 +46,28 @@ namespace pcr ); /// @throws css::uno::RuntimeException - static OUString SAL_CALL getImplementationName_static( ) throw (css::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (css::uno::RuntimeException); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ); protected: virtual ~XSDValidationPropertyHandler() override; protected: // XPropertyHandler overriables - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& _rPropertyName ) override; + virtual void SAL_CALL setPropertyValue( const OUString& _rPropertyName, const css::uno::Any& _rValue ) override; virtual css::uno::Sequence< OUString > - SAL_CALL getSupersededProperties( ) throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getSupersededProperties( ) override; virtual css::uno::Sequence< OUString > - SAL_CALL getActuatingProperties( ) throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getActuatingProperties( ) override; virtual css::inspection::LineDescriptor - SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; + SAL_CALL describePropertyLine( const OUString& _rPropertyName, const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ) override; virtual css::inspection::InteractiveSelectionResult - SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (css::beans::UnknownPropertyException, css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, css::uno::Any& _rData, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI ) override; + virtual void SAL_CALL actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const css::uno::Any& _rNewValue, const css::uno::Any& _rOldValue, const css::uno::Reference< css::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) override; + virtual void SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& _rxListener ) override; // PropertyHandler overridables virtual css::uno::Sequence< css::beans::Property > |