diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-01-26 12:28:58 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-01-26 12:54:43 +0000 |
commit | e57ca02849c3d87142ff5ff9099a212e72b8139c (patch) | |
tree | bcce66b27261553c308779f3e8663a269ed3a671 /sdext/source | |
parent | 8802ebd5172ec4bc412a59d136c82b77ab452281 (diff) |
Remove dynamic exception specifications
...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at
<https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html>
"Dynamic Exception Specifications" for details.
Most changes have been done automatically by the rewriting loplugin:dynexcspec
(after enabling the rewriting mode, to be committed shortly). The way it only
removes exception specs from declarations if it also sees a definition, it
identified some dead declarations-w/o-definitions (that have been removed
manually) and some cases where a definition appeared in multiple include files
(which have also been cleaned up manually). There's also been cases of macro
paramters (that were used to abstract over exception specs) that have become
unused now (and been removed).
Furthermore, some code needed to be cleaned up manually
(avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no
configurations available that would actually build that code. Missing @throws
documentation has not been applied in such manual clean-up.
Change-Id: I3408691256c9b0c12bc5332de976743626e13960
Reviewed-on: https://gerrit.libreoffice.org/33574
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sdext/source')
64 files changed, 378 insertions, 1009 deletions
diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx index 787a6ddf6830..6e5cff3f70b2 100644 --- a/sdext/source/minimizer/informationdialog.cxx +++ b/sdext/source/minimizer/informationdialog.cxx @@ -346,7 +346,6 @@ void InformationDialog::execute() void OKActionListener::actionPerformed( const ActionEvent& rEvent ) - throw ( css::uno::RuntimeException, std::exception ) { if ( rEvent.ActionCommand == "button" ) { @@ -354,7 +353,6 @@ void OKActionListener::actionPerformed( const ActionEvent& rEvent ) } } void OKActionListener::disposing( const css::lang::EventObject& /* Source */ ) - throw ( css::uno::RuntimeException, std::exception ) { } diff --git a/sdext/source/minimizer/informationdialog.hxx b/sdext/source/minimizer/informationdialog.hxx index 3de345eb8234..530f01bcf33a 100644 --- a/sdext/source/minimizer/informationdialog.hxx +++ b/sdext/source/minimizer/informationdialog.hxx @@ -69,8 +69,8 @@ class OKActionListener : public ::cppu::WeakImplHelper< css::awt::XActionListene public: explicit OKActionListener( InformationDialog& rInformationDialog ) : mrInformationDialog( rInformationDialog ){} - virtual void SAL_CALL actionPerformed( const css::awt::ActionEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL actionPerformed( const css::awt::ActionEvent& Event ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; private: InformationDialog& mrInformationDialog; diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx index 014228540a40..c72b44a12ad7 100644 --- a/sdext/source/minimizer/optimizerdialog.cxx +++ b/sdext/source/minimizer/optimizerdialog.cxx @@ -347,7 +347,6 @@ void OptimizerDialog::UpdateStatus( const css::uno::Sequence< css::beans::Proper void ItemListener::itemStateChanged( const ItemEvent& Event ) - throw ( RuntimeException, std::exception ) { try { @@ -475,13 +474,11 @@ void ItemListener::itemStateChanged( const ItemEvent& Event ) } } void ItemListener::disposing( const css::lang::EventObject& /* Source */ ) - throw ( css::uno::RuntimeException, std::exception ) { } void ActionListener::actionPerformed( const ActionEvent& rEvent ) - throw ( css::uno::RuntimeException, std::exception ) { switch( TKGet( rEvent.ActionCommand ) ) { @@ -614,13 +611,11 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent ) } } void ActionListener::disposing( const css::lang::EventObject& /* Source */ ) - throw ( css::uno::RuntimeException, std::exception ) { } void ActionListenerListBox0Pg0::actionPerformed( const ActionEvent& rEvent ) - throw ( css::uno::RuntimeException, std::exception ) { if ( !rEvent.ActionCommand.isEmpty() ) { @@ -632,13 +627,11 @@ void ActionListenerListBox0Pg0::actionPerformed( const ActionEvent& rEvent ) mrOptimizerDialog.UpdateControlStates(); } void ActionListenerListBox0Pg0::disposing( const css::lang::EventObject& /* Source */ ) - throw ( css::uno::RuntimeException, std::exception ) { } void TextListenerFormattedField0Pg1::textChanged( const TextEvent& /* rEvent */ ) - throw ( css::uno::RuntimeException, std::exception ) { double fDouble = 0; Any aAny = mrOptimizerDialog.getControlProperty( "FormattedField0Pg1", "EffectiveValue" ); @@ -646,13 +639,11 @@ void TextListenerFormattedField0Pg1::textChanged( const TextEvent& /* rEvent */ mrOptimizerDialog.SetConfigProperty( TK_JPEGQuality, Any( (sal_Int32)fDouble ) ); } void TextListenerFormattedField0Pg1::disposing( const css::lang::EventObject& /* Source */ ) - throw ( css::uno::RuntimeException, std::exception ) { } void TextListenerComboBox0Pg1::textChanged( const TextEvent& /* rEvent */ ) - throw ( css::uno::RuntimeException, std::exception ) { OUString aString; Any aAny = mrOptimizerDialog.getControlProperty( "ComboBox0Pg1", "Text" ); @@ -674,13 +665,11 @@ void TextListenerComboBox0Pg1::textChanged( const TextEvent& /* rEvent */ ) } } void TextListenerComboBox0Pg1::disposing( const css::lang::EventObject& /* Source */ ) - throw ( css::uno::RuntimeException, std::exception ) { } void SpinListenerFormattedField0Pg1::up( const SpinEvent& /* rEvent */ ) - throw ( css::uno::RuntimeException, std::exception ) { double fDouble; Any aAny = mrOptimizerDialog.getControlProperty( "FormattedField0Pg1", "EffectiveValue" ); @@ -694,7 +683,6 @@ void SpinListenerFormattedField0Pg1::up( const SpinEvent& /* rEvent */ ) } } void SpinListenerFormattedField0Pg1::down( const SpinEvent& /* rEvent */ ) - throw ( css::uno::RuntimeException, std::exception ) { double fDouble; Any aAny = mrOptimizerDialog.getControlProperty( "FormattedField0Pg1", "EffectiveValue" ); @@ -708,19 +696,16 @@ void SpinListenerFormattedField0Pg1::down( const SpinEvent& /* rEvent */ ) } } void SpinListenerFormattedField0Pg1::first( const SpinEvent& /* rEvent */ ) - throw ( css::uno::RuntimeException, std::exception ) { mrOptimizerDialog.setControlProperty( "FormattedField0Pg1", "EffectiveValue", Any( static_cast< double >( 0 ) ) ); mrOptimizerDialog.SetConfigProperty( TK_JPEGQuality, Any( (sal_Int32)0 ) ); } void SpinListenerFormattedField0Pg1::last( const SpinEvent& /* rEvent */ ) - throw ( css::uno::RuntimeException, std::exception ) { mrOptimizerDialog.setControlProperty( "FormattedField0Pg1", "EffectiveValue", Any( static_cast< double >( 100 ) ) ); mrOptimizerDialog.SetConfigProperty( TK_JPEGQuality, Any( (sal_Int32)100 ) ); } void SpinListenerFormattedField0Pg1::disposing( const css::lang::EventObject& /* Source */ ) - throw ( css::uno::RuntimeException, std::exception ) { } diff --git a/sdext/source/minimizer/optimizerdialog.hxx b/sdext/source/minimizer/optimizerdialog.hxx index 4b01f1792852..c2cb67574426 100644 --- a/sdext/source/minimizer/optimizerdialog.hxx +++ b/sdext/source/minimizer/optimizerdialog.hxx @@ -130,8 +130,8 @@ class ItemListener : public ::cppu::WeakImplHelper< css::awt::XItemListener > public: explicit ItemListener( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){} - virtual void SAL_CALL itemStateChanged( const css::awt::ItemEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL itemStateChanged( const css::awt::ItemEvent& Event ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; private: OptimizerDialog& mrOptimizerDialog; @@ -143,8 +143,8 @@ class ActionListener : public ::cppu::WeakImplHelper< css::awt::XActionListener public: explicit ActionListener( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){} - virtual void SAL_CALL actionPerformed( const css::awt::ActionEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL actionPerformed( const css::awt::ActionEvent& Event ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; private: OptimizerDialog& mrOptimizerDialog; @@ -156,8 +156,8 @@ class ActionListenerListBox0Pg0 : public ::cppu::WeakImplHelper< css::awt::XActi public: explicit ActionListenerListBox0Pg0( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){} - virtual void SAL_CALL actionPerformed( const css::awt::ActionEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL actionPerformed( const css::awt::ActionEvent& Event ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; private: OptimizerDialog& mrOptimizerDialog; @@ -169,8 +169,8 @@ class TextListenerFormattedField0Pg1 : public ::cppu::WeakImplHelper< css::awt:: public: explicit TextListenerFormattedField0Pg1( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){} - virtual void SAL_CALL textChanged( const css::awt::TextEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL textChanged( const css::awt::TextEvent& Event ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; private: OptimizerDialog& mrOptimizerDialog; @@ -182,8 +182,8 @@ class TextListenerComboBox0Pg1 : public ::cppu::WeakImplHelper< css::awt::XTextL public: explicit TextListenerComboBox0Pg1( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){} - virtual void SAL_CALL textChanged( const css::awt::TextEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL textChanged( const css::awt::TextEvent& Event ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; private: OptimizerDialog& mrOptimizerDialog; @@ -195,11 +195,11 @@ class SpinListenerFormattedField0Pg1 : public ::cppu::WeakImplHelper< css::awt:: public: explicit SpinListenerFormattedField0Pg1( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){} - virtual void SAL_CALL up( const css::awt::SpinEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL down( const css::awt::SpinEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL first( const css::awt::SpinEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL last( const css::awt::SpinEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL up( const css::awt::SpinEvent& Event ) override; + virtual void SAL_CALL down( const css::awt::SpinEvent& Event ) override; + virtual void SAL_CALL first( const css::awt::SpinEvent& Event ) override; + virtual void SAL_CALL last( const css::awt::SpinEvent& Event ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; private: OptimizerDialog& mrOptimizerDialog; diff --git a/sdext/source/minimizer/pppoptimizer.cxx b/sdext/source/minimizer/pppoptimizer.cxx index 460e4c386a23..b0a5077c5a1e 100644 --- a/sdext/source/minimizer/pppoptimizer.cxx +++ b/sdext/source/minimizer/pppoptimizer.cxx @@ -47,7 +47,7 @@ PPPOptimizer::~PPPOptimizer() Reference< css::frame::XDispatch > SAL_CALL PPPOptimizer::queryDispatch( - const URL& aURL, const OUString& /* aTargetFrameName */, sal_Int32 /* nSearchFlags */ ) throw( RuntimeException, std::exception ) + const URL& aURL, const OUString& /* aTargetFrameName */, sal_Int32 /* nSearchFlags */ ) { Reference < XDispatch > xRet; if ( aURL.Protocol.equalsIgnoreAsciiCase( "vnd.com.sun.star.comp.PPPOptimizer:" ) ) @@ -60,7 +60,7 @@ Reference< css::frame::XDispatch > SAL_CALL PPPOptimizer::queryDispatch( Sequence< Reference< css::frame::XDispatch > > SAL_CALL PPPOptimizer::queryDispatches( - const Sequence< css::frame::DispatchDescriptor >& aDescripts ) throw( RuntimeException, std::exception ) + const Sequence< css::frame::DispatchDescriptor >& aDescripts ) { Sequence< Reference< css::frame::XDispatch> > aReturn( aDescripts.getLength() ); Reference< css::frame::XDispatch>* pReturn = aReturn.getArray(); @@ -77,7 +77,6 @@ Sequence< Reference< css::frame::XDispatch > > SAL_CALL PPPOptimizer::queryDispa void SAL_CALL PPPOptimizer::dispatch( const URL& rURL, const Sequence< PropertyValue >& lArguments ) - throw( RuntimeException, std::exception ) { if ( mxController.is() && rURL.Protocol.equalsIgnoreAsciiCase( "vnd.com.sun.star.comp.PPPOptimizer:" ) ) { @@ -101,7 +100,6 @@ void SAL_CALL PPPOptimizer::dispatch( const URL& rURL, const Sequence< PropertyV void SAL_CALL PPPOptimizer::addStatusListener( const Reference< XStatusListener >&, const URL& ) - throw( RuntimeException, std::exception ) { // TODO OSL_FAIL( "PPPOptimizer::addStatusListener()\nNot implemented yet!" ); @@ -109,7 +107,6 @@ void SAL_CALL PPPOptimizer::addStatusListener( const Reference< XStatusListener void SAL_CALL PPPOptimizer::removeStatusListener( const Reference< XStatusListener >&, const URL& ) - throw( RuntimeException, std::exception ) { // TODO OSL_FAIL( "PPPOptimizer::removeStatusListener()\nNot implemented yet!" ); diff --git a/sdext/source/minimizer/pppoptimizer.hxx b/sdext/source/minimizer/pppoptimizer.hxx index 91ef44cbd147..ebac7d5babca 100644 --- a/sdext/source/minimizer/pppoptimizer.hxx +++ b/sdext/source/minimizer/pppoptimizer.hxx @@ -44,23 +44,19 @@ public: // XDispatchProvider virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( - const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) - throw(css::uno::RuntimeException, std::exception) override; + const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) override; virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( - const css::uno::Sequence< css::frame::DispatchDescriptor >& aDescripts ) throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Sequence< css::frame::DispatchDescriptor >& aDescripts ) override; // XDispatch virtual void SAL_CALL dispatch( const css::util::URL& aURL, - const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) override; virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, - const css::util::URL& aURL ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::util::URL& aURL ) override; virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, - const css::util::URL& aURL ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::util::URL& aURL ) override; static sal_Int64 GetFileSize( const OUString& rURL ); }; diff --git a/sdext/source/minimizer/pppoptimizerdialog.cxx b/sdext/source/minimizer/pppoptimizerdialog.cxx index 122875cebb45..244eb2939262 100644 --- a/sdext/source/minimizer/pppoptimizerdialog.cxx +++ b/sdext/source/minimizer/pppoptimizerdialog.cxx @@ -42,7 +42,6 @@ PPPOptimizerDialog::~PPPOptimizerDialog() } void SAL_CALL PPPOptimizerDialog::initialize( const Sequence< Any >& aArguments ) - throw ( Exception, RuntimeException, std::exception ) { if( aArguments.getLength() != 1 ) throw IllegalArgumentException(); @@ -53,25 +52,22 @@ void SAL_CALL PPPOptimizerDialog::initialize( const Sequence< Any >& aArguments } OUString SAL_CALL PPPOptimizerDialog::getImplementationName() - throw (RuntimeException, std::exception) { return PPPOptimizerDialog_getImplementationName(); } sal_Bool SAL_CALL PPPOptimizerDialog::supportsService( const OUString& ServiceName ) - throw ( RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL PPPOptimizerDialog::getSupportedServiceNames() - throw (RuntimeException, std::exception) { return PPPOptimizerDialog_getSupportedServiceNames(); } Reference< css::frame::XDispatch > SAL_CALL PPPOptimizerDialog::queryDispatch( - const URL& aURL, const OUString& /* aTargetFrameName */, sal_Int32 /* nSearchFlags */ ) throw( RuntimeException, std::exception ) + const URL& aURL, const OUString& /* aTargetFrameName */, sal_Int32 /* nSearchFlags */ ) { Reference < XDispatch > xRet; if ( aURL.Protocol.equalsIgnoreAsciiCase( "vnd.com.sun.star.comp.PresentationMinimizer:" ) ) @@ -81,7 +77,7 @@ Reference< css::frame::XDispatch > SAL_CALL PPPOptimizerDialog::queryDispatch( } Sequence< Reference< css::frame::XDispatch > > SAL_CALL PPPOptimizerDialog::queryDispatches( - const Sequence< css::frame::DispatchDescriptor >& aDescripts ) throw( RuntimeException, std::exception ) + const Sequence< css::frame::DispatchDescriptor >& aDescripts ) { Sequence< Reference< css::frame::XDispatch> > aReturn( aDescripts.getLength() ); Reference< css::frame::XDispatch>* pReturn = aReturn.getArray(); @@ -95,7 +91,6 @@ Sequence< Reference< css::frame::XDispatch > > SAL_CALL PPPOptimizerDialog::quer void SAL_CALL PPPOptimizerDialog::dispatch( const URL& rURL, const Sequence< PropertyValue >& rArguments ) - throw( RuntimeException, std::exception ) { if ( mxController.is() && rURL.Protocol.equalsIgnoreAsciiCase( "vnd.com.sun.star.comp.PresentationMinimizer:" ) ) @@ -143,14 +138,12 @@ void SAL_CALL PPPOptimizerDialog::dispatch( const URL& rURL, } void SAL_CALL PPPOptimizerDialog::addStatusListener( const Reference< XStatusListener >&, const URL& ) - throw( RuntimeException, std::exception ) { // TODO // OSL_FAIL( "PPPOptimizerDialog::addStatusListener()\nNot implemented yet!" ); } void SAL_CALL PPPOptimizerDialog::removeStatusListener( const Reference< XStatusListener >&, const URL& ) - throw( RuntimeException, std::exception ) { // TODO // OSL_FAIL( "PPPOptimizerDialog::removeStatusListener()\nNot implemented yet!" ); @@ -168,7 +161,6 @@ Sequence< OUString > PPPOptimizerDialog_getSupportedServiceNames() } Reference< XInterface > PPPOptimizerDialog_createInstance( const Reference< XComponentContext > & rSMgr) - throw( Exception ) { return static_cast<cppu::OWeakObject*>(new PPPOptimizerDialog( rSMgr )); } diff --git a/sdext/source/minimizer/pppoptimizerdialog.hxx b/sdext/source/minimizer/pppoptimizerdialog.hxx index b0e2ce757d82..6c247ecfb66f 100644 --- a/sdext/source/minimizer/pppoptimizerdialog.hxx +++ b/sdext/source/minimizer/pppoptimizerdialog.hxx @@ -54,45 +54,36 @@ public: virtual ~PPPOptimizerDialog() override; // XInitialization - void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; + void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XDispatchProvider virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( - const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) - throw(css::uno::RuntimeException, std::exception) override; + const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) override; virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( - const css::uno::Sequence< css::frame::DispatchDescriptor >& aDescripts ) throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Sequence< css::frame::DispatchDescriptor >& aDescripts ) override; // XDispatch virtual void SAL_CALL dispatch( const css::util::URL& aURL, - const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) override; virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, - const css::util::URL& aURL ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::util::URL& aURL ) override; virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, - const css::util::URL& aURL ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::util::URL& aURL ) override; }; OUString PPPOptimizerDialog_getImplementationName(); css::uno::Sequence< OUString > PPPOptimizerDialog_getSupportedServiceNames(); /// @throws css::uno::Exception -css::uno::Reference< css::uno::XInterface > PPPOptimizerDialog_createInstance( const css::uno::Reference< css::uno::XComponentContext > & rSMgr ) - throw( css::uno::Exception ); +css::uno::Reference< css::uno::XInterface > PPPOptimizerDialog_createInstance( const css::uno::Reference< css::uno::XComponentContext > & rSMgr ); #endif // INCLUDED_SDEXT_SOURCE_MINIMIZER_PPPOPTIMIZERDIALOG_HXX diff --git a/sdext/source/minimizer/unodialog.cxx b/sdext/source/minimizer/unodialog.cxx index 9bb02189c567..c3a44f524523 100644 --- a/sdext/source/minimizer/unodialog.cxx +++ b/sdext/source/minimizer/unodialog.cxx @@ -84,7 +84,6 @@ void UnoDialog::endExecute( bool bStatus ) Reference< XWindowPeer > UnoDialog::createWindowPeer( Reference< XWindowPeer > const & xParentPeer ) - throw ( Exception ) { mxDialog->setVisible( false ); Reference< XToolkit > xToolkit( Toolkit::create( mxContext ), UNO_QUERY_THROW ); diff --git a/sdext/source/minimizer/unodialog.hxx b/sdext/source/minimizer/unodialog.hxx index a2eafd4062d2..5c4179768d50 100644 --- a/sdext/source/minimizer/unodialog.hxx +++ b/sdext/source/minimizer/unodialog.hxx @@ -61,8 +61,7 @@ public: void endExecute( bool bStatus ); /// @throws css::uno::Exception - css::uno::Reference< css::awt::XWindowPeer > createWindowPeer( css::uno::Reference< css::awt::XWindowPeer > const & xParentPeer ) - throw ( css::uno::Exception ); + css::uno::Reference< css::awt::XWindowPeer > createWindowPeer( css::uno::Reference< css::awt::XWindowPeer > const & xParentPeer ); css::uno::Reference< css::uno::XInterface > insertControlModel( const OUString& rServiceName, const OUString& rName, const css::uno::Sequence< OUString >& rPropertyNames, const css::uno::Sequence< css::uno::Any >& rPropertyValues ); diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx index 7d2975857518..3c078525fb31 100644 --- a/sdext/source/pdfimport/filterdet.cxx +++ b/sdext/source/pdfimport/filterdet.cxx @@ -187,7 +187,7 @@ PDFDetector::PDFDetector( const uno::Reference< uno::XComponentContext >& xConte {} // XExtendedFilterDetection -OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue >& rFilterData ) throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue >& rFilterData ) { osl::MutexGuard const guard( m_aMutex ); bool bSuccess = false; @@ -382,19 +382,16 @@ OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue >& rF } OUString PDFDetector::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("org.libreoffice.comp.documents.PDFDetector"); } sal_Bool PDFDetector::supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence<OUString> PDFDetector::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<OUString>{"com.sun.star.document.ImportFilter"}; } diff --git a/sdext/source/pdfimport/filterdet.hxx b/sdext/source/pdfimport/filterdet.hxx index c2af1d257ee1..995ed5991695 100644 --- a/sdext/source/pdfimport/filterdet.hxx +++ b/sdext/source/pdfimport/filterdet.hxx @@ -49,17 +49,13 @@ public: // XExtendedFilterDetection virtual OUString SAL_CALL detect( css::uno::Sequence< - css::beans::PropertyValue >& io_rDescriptor ) - throw (css::uno::RuntimeException, std::exception) override; + css::beans::PropertyValue >& io_rDescriptor ) override; - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getImplementationName() override; - sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override; - css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; }; diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx index 6c8a8959319c..df10b09a108a 100644 --- a/sdext/source/pdfimport/misc/pwdinteract.cxx +++ b/sdext/source/pdfimport/misc/pwdinteract.cxx @@ -57,15 +57,15 @@ public: PDFPasswordRequest& operator=(const PDFPasswordRequest&) = delete; // XInteractionRequest - virtual uno::Any SAL_CALL getRequest( ) throw (uno::RuntimeException, std::exception) override; - virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations( ) throw (uno::RuntimeException, std::exception) override; + virtual uno::Any SAL_CALL getRequest( ) override; + virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations( ) override; // XInteractionPassword - virtual void SAL_CALL setPassword( const OUString& rPwd ) throw (uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getPassword() throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPassword( const OUString& rPwd ) override; + virtual OUString SAL_CALL getPassword() override; // XInteractionContinuation - virtual void SAL_CALL select() throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL select() override; bool isSelected() const { osl::MutexGuard const guard( m_aMutex ); return m_bSelected; } @@ -86,33 +86,33 @@ PDFPasswordRequest::PDFPasswordRequest( bool bFirstTry, const OUString& rName ) m_bSelected(false) {} -uno::Any PDFPasswordRequest::getRequest() throw (uno::RuntimeException, std::exception) +uno::Any PDFPasswordRequest::getRequest() { return m_aRequest; } -uno::Sequence< uno::Reference< task::XInteractionContinuation > > PDFPasswordRequest::getContinuations() throw (uno::RuntimeException, std::exception) +uno::Sequence< uno::Reference< task::XInteractionContinuation > > PDFPasswordRequest::getContinuations() { uno::Sequence< uno::Reference< task::XInteractionContinuation > > aRet( 1 ); aRet[0] = this; return aRet; } -void PDFPasswordRequest::setPassword( const OUString& rPwd ) throw (uno::RuntimeException, std::exception) +void PDFPasswordRequest::setPassword( const OUString& rPwd ) { osl::MutexGuard const guard( m_aMutex ); m_aPassword = rPwd; } -OUString PDFPasswordRequest::getPassword() throw (uno::RuntimeException, std::exception) +OUString PDFPasswordRequest::getPassword() { osl::MutexGuard const guard( m_aMutex ); return m_aPassword; } -void PDFPasswordRequest::select() throw (uno::RuntimeException, std::exception) +void PDFPasswordRequest::select() { osl::MutexGuard const guard( m_aMutex ); @@ -130,7 +130,7 @@ public: private: virtual ~UnsupportedEncryptionFormatRequest() override {} - virtual uno::Any SAL_CALL getRequest() throw (uno::RuntimeException, std::exception) override { + virtual uno::Any SAL_CALL getRequest() override { return uno::makeAny( task::ErrorCodeRequest( OUString(), uno::Reference< uno::XInterface >(), @@ -140,7 +140,7 @@ private: } virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > - SAL_CALL getContinuations() throw (uno::RuntimeException, std::exception) override { + SAL_CALL getContinuations() override { return uno::Sequence< uno::Reference< task::XInteractionContinuation > >(); } diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx index f554f8148b8c..9738d62615bf 100644 --- a/sdext/source/pdfimport/pdfiadaptor.cxx +++ b/sdext/source/pdfimport/pdfiadaptor.cxx @@ -56,7 +56,7 @@ PDFIHybridAdaptor::PDFIHybridAdaptor( const uno::Reference< uno::XComponentConte } // XFilter -sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::PropertyValue >& rFilterData ) throw( uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::PropertyValue >& rFilterData ) { bool bRet = false; if( m_xModel.is() ) @@ -187,12 +187,12 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert return bRet; } -void SAL_CALL PDFIHybridAdaptor::cancel() throw(std::exception) +void SAL_CALL PDFIHybridAdaptor::cancel() { } //XImporter -void SAL_CALL PDFIHybridAdaptor::setTargetDocument( const uno::Reference< lang::XComponent >& xDocument ) throw( lang::IllegalArgumentException, std::exception ) +void SAL_CALL PDFIHybridAdaptor::setTargetDocument( const uno::Reference< lang::XComponent >& xDocument ) { SAL_INFO("sdext.pdfimport", "PDFIAdaptor::setTargetDocument" ); m_xModel.set( xDocument, uno::UNO_QUERY ); @@ -201,19 +201,16 @@ void SAL_CALL PDFIHybridAdaptor::setTargetDocument( const uno::Reference< lang:: } OUString PDFIHybridAdaptor::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("org.libreoffice.comp.documents.HybridPDFImport"); } sal_Bool PDFIHybridAdaptor::supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence<OUString> PDFIHybridAdaptor::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<OUString>{"com.sun.star.document.ImportFilter"}; } @@ -283,7 +280,7 @@ bool PDFIRawAdaptor::odfConvert( const OUString& rURL, // XImportFilter sal_Bool SAL_CALL PDFIRawAdaptor::importer( const uno::Sequence< beans::PropertyValue >& rSourceData, const uno::Reference< xml::sax::XDocumentHandler >& rHdl, - const uno::Sequence< OUString >& /*rUserData*/ ) throw( uno::RuntimeException, std::exception ) + const uno::Sequence< OUString >& /*rUserData*/ ) { // get the InputStream carrying the PDF content uno::Reference< io::XInputStream > xInput; @@ -325,7 +322,7 @@ sal_Bool SAL_CALL PDFIRawAdaptor::importer( const uno::Sequence< beans::Property } //XImporter -void SAL_CALL PDFIRawAdaptor::setTargetDocument( const uno::Reference< lang::XComponent >& xDocument ) throw( lang::IllegalArgumentException, std::exception ) +void SAL_CALL PDFIRawAdaptor::setTargetDocument( const uno::Reference< lang::XComponent >& xDocument ) { SAL_INFO("sdext.pdfimport", "PDFIAdaptor::setTargetDocument" ); m_xModel.set( xDocument, uno::UNO_QUERY ); @@ -334,19 +331,16 @@ void SAL_CALL PDFIRawAdaptor::setTargetDocument( const uno::Reference< lang::XCo } OUString PDFIRawAdaptor::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return m_implementationName; } sal_Bool PDFIRawAdaptor::supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence<OUString> PDFIRawAdaptor::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Sequence<OUString>{"com.sun.star.document.ImportFilter"}; } diff --git a/sdext/source/pdfimport/pdfiadaptor.hxx b/sdext/source/pdfimport/pdfiadaptor.hxx index db26526787c2..1e5bc3687fd0 100644 --- a/sdext/source/pdfimport/pdfiadaptor.hxx +++ b/sdext/source/pdfimport/pdfiadaptor.hxx @@ -59,21 +59,17 @@ namespace pdfi css::uno::XComponentContext >& xContext ); // XFilter - virtual sal_Bool SAL_CALL filter( const css::uno::Sequence<css::beans::PropertyValue>& rFilterData ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL cancel() throw(std::exception) override; + virtual sal_Bool SAL_CALL filter( const css::uno::Sequence<css::beans::PropertyValue>& rFilterData ) override; + virtual void SAL_CALL cancel() override; // XImporter - virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDocument ) - throw( css::lang::IllegalArgumentException, std::exception ) override; + virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDocument ) override; - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getImplementationName() override; - sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override; - css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; }; typedef ::cppu::WeakComponentImplHelper< @@ -133,20 +129,16 @@ namespace pdfi // XImportFilter virtual sal_Bool SAL_CALL importer( const css::uno::Sequence< css::beans::PropertyValue >& rSourceData, const css::uno::Reference< css::xml::sax::XDocumentHandler >& rHdl, - const css::uno::Sequence< OUString >& rUserData ) throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Sequence< OUString >& rUserData ) override; // XImporter - virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDocument ) - throw( css::lang::IllegalArgumentException, std::exception ) override; + virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDocument ) override; - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getImplementationName() override; - sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override; - css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; }; } diff --git a/sdext/source/pdfimport/sax/saxattrlist.cxx b/sdext/source/pdfimport/sax/saxattrlist.cxx index 6fa5db9bd3cd..5b65cd9cd531 100644 --- a/sdext/source/pdfimport/sax/saxattrlist.cxx +++ b/sdext/source/pdfimport/sax/saxattrlist.cxx @@ -54,37 +54,37 @@ namespace { } } -sal_Int16 SAL_CALL SaxAttrList::getLength() throw(std::exception) +sal_Int16 SAL_CALL SaxAttrList::getLength() { return sal_Int16(m_aAttributes.size()); } -OUString SAL_CALL SaxAttrList::getNameByIndex( sal_Int16 i_nIndex ) throw(std::exception) +OUString SAL_CALL SaxAttrList::getNameByIndex( sal_Int16 i_nIndex ) { return (i_nIndex < sal_Int16(m_aAttributes.size())) ? m_aAttributes[i_nIndex].m_aName : OUString(); } -OUString SAL_CALL SaxAttrList::getTypeByIndex( sal_Int16 i_nIndex) throw(std::exception) +OUString SAL_CALL SaxAttrList::getTypeByIndex( sal_Int16 i_nIndex) { return (i_nIndex < sal_Int16(m_aAttributes.size())) ? getCDATAString() : OUString(); } -OUString SAL_CALL SaxAttrList::getTypeByName( const OUString& i_rName ) throw(std::exception) +OUString SAL_CALL SaxAttrList::getTypeByName( const OUString& i_rName ) { return (m_aIndexMap.find( i_rName ) != m_aIndexMap.end()) ? getCDATAString() : OUString(); } -OUString SAL_CALL SaxAttrList::getValueByIndex( sal_Int16 i_nIndex ) throw(std::exception) +OUString SAL_CALL SaxAttrList::getValueByIndex( sal_Int16 i_nIndex ) { return (i_nIndex < sal_Int16(m_aAttributes.size())) ? m_aAttributes[i_nIndex].m_aValue : OUString(); } -OUString SAL_CALL SaxAttrList::getValueByName(const OUString& i_rName) throw(std::exception) +OUString SAL_CALL SaxAttrList::getValueByName(const OUString& i_rName) { std::unordered_map< OUString, size_t, OUStringHash >::const_iterator it = m_aIndexMap.find( i_rName ); return (it != m_aIndexMap.end()) ? m_aAttributes[it->second].m_aValue : OUString(); } -css::uno::Reference< css::util::XCloneable > SAL_CALL SaxAttrList::createClone() throw(std::exception) +css::uno::Reference< css::util::XCloneable > SAL_CALL SaxAttrList::createClone() { return new SaxAttrList( *this ); } diff --git a/sdext/source/pdfimport/sax/saxattrlist.hxx b/sdext/source/pdfimport/sax/saxattrlist.hxx index c57cd5ac69f4..73c9222a2258 100644 --- a/sdext/source/pdfimport/sax/saxattrlist.hxx +++ b/sdext/source/pdfimport/sax/saxattrlist.hxx @@ -52,15 +52,15 @@ namespace pdfi virtual ~SaxAttrList() override; // css::xml::sax::XAttributeList - virtual sal_Int16 SAL_CALL getLength() throw(std::exception) override; - virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw(std::exception) override; - virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw(std::exception) override; - virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw(std::exception) override; - virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw(std::exception) override; - virtual OUString SAL_CALL getValueByName(const OUString& aName) throw(std::exception) override; + virtual sal_Int16 SAL_CALL getLength() override; + virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) override; + virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) override; + virtual OUString SAL_CALL getTypeByName(const OUString& aName) override; + virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) override; + virtual OUString SAL_CALL getValueByName(const OUString& aName) override; // css::util::XCloneable - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() throw(std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; }; } diff --git a/sdext/source/pdfimport/test/outputwrap.hxx b/sdext/source/pdfimport/test/outputwrap.hxx index aa4c541229df..bd9fddc5cd56 100644 --- a/sdext/source/pdfimport/test/outputwrap.hxx +++ b/sdext/source/pdfimport/test/outputwrap.hxx @@ -44,18 +44,18 @@ typedef ::cppu::WeakComponentImplHelper< maFile.open(osl_File_OpenFlag_Create|osl_File_OpenFlag_Write); } - virtual void SAL_CALL writeBytes( const css::uno::Sequence< ::sal_Int8 >& aData ) throw (css::io::NotConnectedException,css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL writeBytes( const css::uno::Sequence< ::sal_Int8 >& aData ) override { sal_uInt64 nBytesWritten(0); maFile.write(aData.getConstArray(),aData.getLength(),nBytesWritten); } - virtual void SAL_CALL flush() throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL flush() override { } - virtual void SAL_CALL closeOutput() throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL closeOutput() override { maFile.close(); } @@ -72,16 +72,16 @@ typedef ::cppu::WeakComponentImplHelper< { } - virtual void SAL_CALL writeBytes(const css::uno::Sequence< ::sal_Int8 >& aData) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL writeBytes(const css::uno::Sequence< ::sal_Int8 >& aData) override { maBuffer.append(reinterpret_cast<const sal_Char *>(aData.getConstArray()), aData.getLength()); } - virtual void SAL_CALL flush() throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL flush() override { } - virtual void SAL_CALL closeOutput() throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL closeOutput() override { mrString = maBuffer.makeStringAndClear(); } diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index 86f17c26aa9c..1a1b206d99b1 100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -95,105 +95,77 @@ public: //----- XAccessible ------------------------------------------------------- virtual css::uno::Reference<css::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleContext() override; //----- XAccessibleContext ---------------------------------------------- - virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild (sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + getAccessibleChild (sal_Int32 nIndex) override; - virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleParent() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleParent() override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; - virtual sal_Int16 SAL_CALL getAccessibleRole() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getAccessibleRole() override; - virtual OUString SAL_CALL getAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAccessibleDescription() override; - virtual OUString SAL_CALL getAccessibleName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAccessibleName() override; virtual css::uno::Reference<css::accessibility::XAccessibleRelationSet> SAL_CALL - getAccessibleRelationSet() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleRelationSet() override; virtual css::uno::Reference<css::accessibility::XAccessibleStateSet> SAL_CALL - getAccessibleStateSet() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleStateSet() override; - virtual css::lang::Locale SAL_CALL getLocale() - throw (css::uno::RuntimeException, - css::accessibility::IllegalAccessibleComponentStateException, std::exception) override; + virtual css::lang::Locale SAL_CALL getLocale() override; //----- XAccessibleComponent -------------------------------------------- virtual sal_Bool SAL_CALL containsPoint ( - const css::awt::Point& aPoint) - throw (css::uno::RuntimeException, std::exception) override; + const css::awt::Point& aPoint) override; virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL getAccessibleAtPoint ( - const css::awt::Point& aPoint) - throw (css::uno::RuntimeException, std::exception) override; + const css::awt::Point& aPoint) override; - virtual css::awt::Rectangle SAL_CALL getBounds() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getBounds() override; - virtual css::awt::Point SAL_CALL getLocation() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocation() override; - virtual css::awt::Point SAL_CALL getLocationOnScreen() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocationOnScreen() override; - virtual css::awt::Size SAL_CALL getSize() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize() override; - virtual void SAL_CALL grabFocus() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL grabFocus() override; - virtual sal_Int32 SAL_CALL getForeground() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getForeground() override; - virtual sal_Int32 SAL_CALL getBackground() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getBackground() override; //----- XAccessibleEventBroadcaster -------------------------------------- virtual void SAL_CALL addAccessibleEventListener ( - const css::uno::Reference<css::accessibility::XAccessibleEventListener>& rxListener) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::accessibility::XAccessibleEventListener>& rxListener) override; virtual void SAL_CALL removeAccessibleEventListener ( - const css::uno::Reference<css::accessibility::XAccessibleEventListener>& rxListener) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::accessibility::XAccessibleEventListener>& rxListener) override; //----- XWindowListener --------------------------------------------------- - virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) override; - virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) override; - virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) override; - virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) override; //----- XEventListener ---------------------------------------------------- - virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) override; protected: OUString msName; @@ -216,8 +188,7 @@ protected: void UpdateState (const sal_Int16 aState, const bool bValue); /// @throws css::lang::DisposedException - void ThrowIfDisposed() const - throw (css::lang::DisposedException); + void ThrowIfDisposed() const; }; //===== AccessibleStateSet ==================================================== @@ -239,17 +210,13 @@ public: //----- XAccessibleStateSet ----------------------------------------------- - virtual sal_Bool SAL_CALL isEmpty() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isEmpty() override; - virtual sal_Bool SAL_CALL contains (sal_Int16 nState) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL contains (sal_Int16 nState) override; - virtual sal_Bool SAL_CALL containsAll (const css::uno::Sequence<sal_Int16>& rStateSet) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL containsAll (const css::uno::Sequence<sal_Int16>& rStateSet) override; - virtual css::uno::Sequence<sal_Int16> SAL_CALL getStates() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<sal_Int16> SAL_CALL getStates() override; private: const sal_Int32 mnStateSet; @@ -276,17 +243,13 @@ public: //----- XAccessibleRelationSet -------------------------------------------- - virtual sal_Int32 SAL_CALL getRelationCount() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getRelationCount() override; - virtual AccessibleRelation SAL_CALL getRelation (sal_Int32 nIndex) - throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) override; + virtual AccessibleRelation SAL_CALL getRelation (sal_Int32 nIndex) override; - virtual sal_Bool SAL_CALL containsRelation (sal_Int16 nRelationType) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL containsRelation (sal_Int16 nRelationType) override; - virtual AccessibleRelation SAL_CALL getRelationByType (sal_Int16 nRelationType) - throw (css::uno::RuntimeException, std::exception) override; + virtual AccessibleRelation SAL_CALL getRelationByType (sal_Int16 nRelationType) override; private: ::std::vector<AccessibleRelation> maRelations; @@ -314,78 +277,54 @@ public: //----- XAccessibleContext ------------------------------------------------ virtual css::uno::Reference<css::accessibility::XAccessibleRelationSet> SAL_CALL - getAccessibleRelationSet() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleRelationSet() override; //----- XAccessibleText --------------------------------------------------- - virtual sal_Int32 SAL_CALL getCaretPosition() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCaretPosition() override; - virtual sal_Bool SAL_CALL setCaretPosition (sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL setCaretPosition (sal_Int32 nIndex) override; - virtual sal_Unicode SAL_CALL getCharacter (sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Unicode SAL_CALL getCharacter (sal_Int32 nIndex) override; virtual css::uno::Sequence<css::beans::PropertyValue> SAL_CALL getCharacterAttributes ( ::sal_Int32 nIndex, - const css::uno::Sequence<OUString>& rRequestedAttributes) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence<OUString>& rRequestedAttributes) override; - virtual css::awt::Rectangle SAL_CALL getCharacterBounds (sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getCharacterBounds (sal_Int32 nIndex) override; - virtual sal_Int32 SAL_CALL getCharacterCount() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCharacterCount() override; - virtual sal_Int32 SAL_CALL getIndexAtPoint (const css::awt::Point& rPoint) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getIndexAtPoint (const css::awt::Point& rPoint) override; - virtual OUString SAL_CALL getSelectedText() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSelectedText() override; - virtual sal_Int32 SAL_CALL getSelectionStart() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getSelectionStart() override; - virtual sal_Int32 SAL_CALL getSelectionEnd() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getSelectionEnd() override; - virtual sal_Bool SAL_CALL setSelection (sal_Int32 nStartIndex, sal_Int32 nEndIndex) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL setSelection (sal_Int32 nStartIndex, sal_Int32 nEndIndex) override; - virtual OUString SAL_CALL getText() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getText() override; virtual OUString SAL_CALL getTextRange ( sal_Int32 nStartIndex, - sal_Int32 nEndIndex) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + sal_Int32 nEndIndex) override; virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex ( sal_Int32 nIndex, - sal_Int16 nTextType) - throw (css::lang::IndexOutOfBoundsException, - css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + sal_Int16 nTextType) override; virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex ( sal_Int32 nIndex, - sal_Int16 nTextType) - throw (css::lang::IndexOutOfBoundsException, - css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + sal_Int16 nTextType) override; virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex ( sal_Int32 nIndex, - sal_Int16 nTextType) - throw (css::lang::IndexOutOfBoundsException, - css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + sal_Int16 nTextType) override; - virtual sal_Bool SAL_CALL copyText (sal_Int32 nStartIndex, sal_Int32 nEndIndex) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL copyText (sal_Int32 nStartIndex, sal_Int32 nEndIndex) override; protected: virtual awt::Point GetRelativeLocation() override; @@ -718,7 +657,6 @@ void SAL_CALL PresenterAccessible::disposing() //----- XAccessible ----------------------------------------------------------- Reference<XAccessibleContext> SAL_CALL PresenterAccessible::getAccessibleContext() - throw (css::uno::RuntimeException, std::exception) { if ( ! mpAccessibleConsole.is()) { @@ -742,7 +680,6 @@ Reference<XAccessibleContext> SAL_CALL PresenterAccessible::getAccessibleContext //----- XFocusListener ---------------------------------------------------- void SAL_CALL PresenterAccessible::focusGained (const css::awt::FocusEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) { (void)rEvent; SAL_INFO("sdext.presenter", OSL_THIS_FUNC << ": PresenterAccessible::focusGained at " << this @@ -751,7 +688,6 @@ void SAL_CALL PresenterAccessible::focusGained (const css::awt::FocusEvent& rEve } void SAL_CALL PresenterAccessible::focusLost (const css::awt::FocusEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) { (void)rEvent; SAL_INFO("sdext.presenter", OSL_THIS_FUNC << ": PresenterAccessible::focusLost at " << this); @@ -761,7 +697,6 @@ void SAL_CALL PresenterAccessible::focusLost (const css::awt::FocusEvent& rEvent //----- XEventListener ---------------------------------------------------- void SAL_CALL PresenterAccessible::disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) { if (rEvent.Source == mxMainWindow) mxMainWindow = nullptr; @@ -770,7 +705,6 @@ void SAL_CALL PresenterAccessible::disposing (const css::lang::EventObject& rEve //----- XInitialize ----------------------------------------------------------- void SAL_CALL PresenterAccessible::initialize (const css::uno::Sequence<css::uno::Any>& rArguments) - throw (css::uno::RuntimeException, std::exception) { if (rArguments.getLength() >= 1) { @@ -846,7 +780,6 @@ void SAL_CALL PresenterAccessible::AccessibleObject::disposing() Reference<XAccessibleContext> SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleContext() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -856,7 +789,6 @@ Reference<XAccessibleContext> SAL_CALL //----- XAccessibleContext ---------------------------------------------- sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleChildCount() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -867,7 +799,6 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleChildCoun Reference<XAccessible> SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleChild (sal_Int32 nIndex) - throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception) { ThrowIfDisposed(); @@ -879,7 +810,6 @@ Reference<XAccessible> SAL_CALL Reference<XAccessible> SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleParent() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -888,7 +818,6 @@ Reference<XAccessible> SAL_CALL sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleIndexInParent() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -910,7 +839,6 @@ sal_Int32 SAL_CALL sal_Int16 SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleRole() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -919,7 +847,6 @@ sal_Int16 SAL_CALL OUString SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleDescription() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -928,7 +855,6 @@ OUString SAL_CALL OUString SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleName() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -937,7 +863,6 @@ OUString SAL_CALL Reference<XAccessibleRelationSet> SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleRelationSet() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -946,7 +871,6 @@ Reference<XAccessibleRelationSet> SAL_CALL Reference<XAccessibleStateSet> SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleStateSet() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -955,8 +879,6 @@ Reference<XAccessibleStateSet> SAL_CALL lang::Locale SAL_CALL PresenterAccessible::AccessibleObject::getLocale() - throw (RuntimeException, - IllegalAccessibleComponentStateException, std::exception) { ThrowIfDisposed(); @@ -973,7 +895,6 @@ lang::Locale SAL_CALL sal_Bool SAL_CALL PresenterAccessible::AccessibleObject::containsPoint ( const awt::Point& rPoint) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -991,7 +912,6 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleObject::containsPoint ( Reference<XAccessible> SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleAtPoint (const awt::Point& rPoint) - throw (RuntimeException, std::exception) { (void)rPoint; ThrowIfDisposed(); @@ -1000,7 +920,6 @@ Reference<XAccessible> SAL_CALL } awt::Rectangle SAL_CALL PresenterAccessible::AccessibleObject::getBounds() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1011,7 +930,6 @@ awt::Rectangle SAL_CALL PresenterAccessible::AccessibleObject::getBounds() } awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocation() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1021,7 +939,6 @@ awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocation() } awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocationOnScreen() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1034,7 +951,6 @@ awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocationOnScreen() } awt::Size SAL_CALL PresenterAccessible::AccessibleObject::getSize() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1044,7 +960,6 @@ awt::Size SAL_CALL PresenterAccessible::AccessibleObject::getSize() } void SAL_CALL PresenterAccessible::AccessibleObject::grabFocus() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mxBorderWindow.is()) @@ -1054,7 +969,6 @@ void SAL_CALL PresenterAccessible::AccessibleObject::grabFocus() } sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getForeground() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1062,7 +976,6 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getForeground() } sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getBackground() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1073,7 +986,6 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getBackground() void SAL_CALL PresenterAccessible::AccessibleObject::addAccessibleEventListener ( const Reference<XAccessibleEventListener>& rxListener) - throw (RuntimeException, std::exception) { if (rxListener.is()) { @@ -1093,7 +1005,6 @@ void SAL_CALL PresenterAccessible::AccessibleObject::addAccessibleEventListener void SAL_CALL PresenterAccessible::AccessibleObject::removeAccessibleEventListener ( const Reference<XAccessibleEventListener>& rxListener) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (rxListener.is()) @@ -1112,7 +1023,6 @@ void SAL_CALL PresenterAccessible::AccessibleObject::removeAccessibleEventListen void SAL_CALL PresenterAccessible::AccessibleObject::windowResized ( const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) { (void)rEvent; @@ -1121,7 +1031,6 @@ void SAL_CALL PresenterAccessible::AccessibleObject::windowResized ( void SAL_CALL PresenterAccessible::AccessibleObject::windowMoved ( const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) { (void)rEvent; @@ -1130,7 +1039,6 @@ void SAL_CALL PresenterAccessible::AccessibleObject::windowMoved ( void SAL_CALL PresenterAccessible::AccessibleObject::windowShown ( const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) { (void)rEvent; UpdateStateSet(); @@ -1138,7 +1046,6 @@ void SAL_CALL PresenterAccessible::AccessibleObject::windowShown ( void SAL_CALL PresenterAccessible::AccessibleObject::windowHidden ( const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) { (void)rEvent; UpdateStateSet(); @@ -1147,7 +1054,6 @@ void SAL_CALL PresenterAccessible::AccessibleObject::windowHidden ( //----- XEventListener -------------------------------------------------------- void SAL_CALL PresenterAccessible::AccessibleObject::disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) { if (rEvent.Source == mxContentWindow) { @@ -1330,7 +1236,6 @@ awt::Point PresenterAccessible::AccessibleObject::GetAbsoluteParentLocation() } void PresenterAccessible::AccessibleObject::ThrowIfDisposed() const - throw (lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) throw lang::DisposedException("object has already been disposed", uno::Reference<uno::XInterface>(const_cast<uno::XWeak*>(static_cast<uno::XWeak const *>(this)))); @@ -1357,19 +1262,16 @@ sal_uInt32 AccessibleStateSet::GetStateMask (const sal_Int16 nState) //----- XAccessibleStateSet --------------------------------------------------- sal_Bool SAL_CALL AccessibleStateSet::isEmpty() - throw (css::uno::RuntimeException, std::exception) { return mnStateSet==0; } sal_Bool SAL_CALL AccessibleStateSet::contains (sal_Int16 nState) - throw (css::uno::RuntimeException, std::exception) { return (mnStateSet & GetStateMask(nState)) != 0; } sal_Bool SAL_CALL AccessibleStateSet::containsAll (const css::uno::Sequence<sal_Int16>& rStateSet) - throw (css::uno::RuntimeException, std::exception) { for (sal_Int32 nIndex=0,nCount=rStateSet.getLength(); nIndex<nCount; ++nIndex) { @@ -1380,7 +1282,6 @@ sal_Bool SAL_CALL AccessibleStateSet::containsAll (const css::uno::Sequence<sal_ } css::uno::Sequence<sal_Int16> SAL_CALL AccessibleStateSet::getStates() - throw (css::uno::RuntimeException, std::exception) { ::std::vector<sal_Int16> aStates; aStates.reserve(sizeof(mnStateSet)*8); @@ -1411,13 +1312,11 @@ void AccessibleRelationSet::AddRelation ( //----- XAccessibleRelationSet ------------------------------------------------ sal_Int32 SAL_CALL AccessibleRelationSet::getRelationCount() - throw (css::uno::RuntimeException, std::exception) { return maRelations.size(); } AccessibleRelation SAL_CALL AccessibleRelationSet::getRelation (sal_Int32 nIndex) - throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) { if (nIndex<0 && sal_uInt32(nIndex)>=maRelations.size()) return AccessibleRelation(); @@ -1426,7 +1325,6 @@ AccessibleRelation SAL_CALL AccessibleRelationSet::getRelation (sal_Int32 nIndex } sal_Bool SAL_CALL AccessibleRelationSet::containsRelation (sal_Int16 nRelationType) - throw (css::uno::RuntimeException, std::exception) { for (::std::vector<AccessibleRelation>::const_iterator iRelation(maRelations.begin()); iRelation!=maRelations.end(); @@ -1439,7 +1337,6 @@ sal_Bool SAL_CALL AccessibleRelationSet::containsRelation (sal_Int16 nRelationTy } AccessibleRelation SAL_CALL AccessibleRelationSet::getRelationByType (sal_Int16 nRelationType) - throw (css::uno::RuntimeException, std::exception) { for (::std::vector<AccessibleRelation>::const_iterator iRelation(maRelations.begin()); iRelation!=maRelations.end(); @@ -1468,7 +1365,6 @@ PresenterAccessible::AccessibleParagraph::AccessibleParagraph ( Reference<XAccessibleRelationSet> SAL_CALL PresenterAccessible::AccessibleParagraph::getAccessibleRelationSet() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1497,7 +1393,6 @@ Reference<XAccessibleRelationSet> SAL_CALL //----- XAccessibleText ------------------------------------------------------- sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCaretPosition() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1509,7 +1404,6 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCaretPosition() } sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setCaretPosition (sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1523,7 +1417,6 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setCaretPosition (sa } sal_Unicode SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacter (sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1536,7 +1429,6 @@ Sequence<css::beans::PropertyValue> SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterAttributes ( ::sal_Int32 nIndex, const css::uno::Sequence<OUString>& rRequestedAttributes) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1559,7 +1451,6 @@ Sequence<css::beans::PropertyValue> SAL_CALL awt::Rectangle SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterBounds ( sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1586,7 +1477,6 @@ awt::Rectangle SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterBo } sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterCount() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1599,7 +1489,6 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterCount() sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getIndexAtPoint ( const css::awt::Point& ) - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); sal_Int32 nIndex (-1); @@ -1607,7 +1496,6 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getIndexAtPoint ( } OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectedText() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1615,7 +1503,6 @@ OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectedText() } sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionStart() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1623,7 +1510,6 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionStart() } sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionEnd() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1633,7 +1519,6 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionEnd() sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setSelection ( sal_Int32 nStartIndex, sal_Int32 nEndIndex) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { (void)nEndIndex; ThrowIfDisposed(); @@ -1642,7 +1527,6 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setSelection ( } OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getText() - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1656,7 +1540,6 @@ OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getText() OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getTextRange ( sal_Int32 nLocalStartIndex, sal_Int32 nLocalEndIndex) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1674,9 +1557,6 @@ OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getTextRange ( TextSegment SAL_CALL PresenterAccessible::AccessibleParagraph::getTextAtIndex ( sal_Int32 nLocalCharacterIndex, sal_Int16 nTextType) - throw (css::lang::IndexOutOfBoundsException, - css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1690,9 +1570,6 @@ TextSegment SAL_CALL PresenterAccessible::AccessibleParagraph::getTextAtIndex ( TextSegment SAL_CALL PresenterAccessible::AccessibleParagraph::getTextBeforeIndex ( sal_Int32 nLocalCharacterIndex, sal_Int16 nTextType) - throw (css::lang::IndexOutOfBoundsException, - css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1706,9 +1583,6 @@ TextSegment SAL_CALL PresenterAccessible::AccessibleParagraph::getTextBeforeInde TextSegment SAL_CALL PresenterAccessible::AccessibleParagraph::getTextBehindIndex ( sal_Int32 nLocalCharacterIndex, sal_Int16 nTextType) - throw (css::lang::IndexOutOfBoundsException, - css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1722,7 +1596,6 @@ TextSegment SAL_CALL PresenterAccessible::AccessibleParagraph::getTextBehindInde sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::copyText ( sal_Int32 nStartIndex, sal_Int32 nEndIndex) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); diff --git a/sdext/source/presenter/PresenterAccessibility.hxx b/sdext/source/presenter/PresenterAccessibility.hxx index 7bb26b8b78b1..eb8531ac84db 100644 --- a/sdext/source/presenter/PresenterAccessibility.hxx +++ b/sdext/source/presenter/PresenterAccessibility.hxx @@ -73,26 +73,21 @@ public: //----- XAccessible ------------------------------------------------------- virtual css::uno::Reference<css::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleContext() override; //----- XFocusListener ---------------------------------------------------- - virtual void SAL_CALL focusGained (const css::awt::FocusEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL focusGained (const css::awt::FocusEvent& rEvent) override; - virtual void SAL_CALL focusLost (const css::awt::FocusEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL focusLost (const css::awt::FocusEvent& rEvent) override; //----- XEventListener ---------------------------------------------------- - virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) override; //----- XInitialization --------------------------------------------------- - virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) override; class AccessibleObject; class AccessibleParagraph; diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx index fc787724efef..baf81e5aee35 100644 --- a/sdext/source/presenter/PresenterButton.cxx +++ b/sdext/source/presenter/PresenterButton.cxx @@ -231,28 +231,24 @@ css::geometry::IntegerSize2D const & PresenterButton::GetSize() //----- XWindowListener ------------------------------------------------------- void SAL_CALL PresenterButton::windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); } void SAL_CALL PresenterButton::windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); } void SAL_CALL PresenterButton::windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); } void SAL_CALL PresenterButton::windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -261,7 +257,6 @@ void SAL_CALL PresenterButton::windowHidden (const css::lang::EventObject& rEven //----- XPaintListener -------------------------------------------------------- void SAL_CALL PresenterButton::windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); if (mxWindow.is() && mxCanvas.is()) @@ -294,7 +289,6 @@ void SAL_CALL PresenterButton::windowPaint (const css::awt::PaintEvent& rEvent) //----- XMouseListener -------------------------------------------------------- void SAL_CALL PresenterButton::mousePressed (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -302,7 +296,6 @@ void SAL_CALL PresenterButton::mousePressed (const css::awt::MouseEvent& rEvent) } void SAL_CALL PresenterButton::mouseReleased (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -318,7 +311,6 @@ void SAL_CALL PresenterButton::mouseReleased (const css::awt::MouseEvent& rEvent } void SAL_CALL PresenterButton::mouseEntered (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -327,7 +319,6 @@ void SAL_CALL PresenterButton::mouseEntered (const css::awt::MouseEvent& rEvent) } void SAL_CALL PresenterButton::mouseExited (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -338,14 +329,12 @@ void SAL_CALL PresenterButton::mouseExited (const css::awt::MouseEvent& rEvent) //----- XMouseMotionListener -------------------------------------------------- void SAL_CALL PresenterButton::mouseMoved (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); } void SAL_CALL PresenterButton::mouseDragged (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -354,7 +343,6 @@ void SAL_CALL PresenterButton::mouseDragged (const css::awt::MouseEvent& rEvent) //----- lang::XEventListener -------------------------------------------------- void SAL_CALL PresenterButton::disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) { if (rEvent.Source == mxWindow) mxWindow = nullptr; @@ -503,7 +491,6 @@ Reference<beans::XPropertySet> PresenterButton::GetConfigurationProperties ( } void PresenterButton::ThrowIfDisposed() const - throw (css::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) { diff --git a/sdext/source/presenter/PresenterButton.hxx b/sdext/source/presenter/PresenterButton.hxx index fe16bcb2cbf0..18a504c20d59 100644 --- a/sdext/source/presenter/PresenterButton.hxx +++ b/sdext/source/presenter/PresenterButton.hxx @@ -74,48 +74,36 @@ public: // XWindowListener - virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) override; - virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) override; - virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) override; - virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) override; // XPaintListener - virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) override; // XMouseListener - virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) override; - virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) override; - virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) override; - virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) override; // XMouseMotionListener - virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) override; - virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) override; // lang::XEventListener - virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) override; private: ::rtl::Reference<PresenterController> mpPresenterController; @@ -161,8 +149,7 @@ private: const OUString& rsConfgurationName); /// @throws css::lang::DisposedException - void ThrowIfDisposed() const - throw (css::lang::DisposedException); + void ThrowIfDisposed() const; }; } } diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx index f6e39cd4b51b..1bb33c46b1e0 100644 --- a/sdext/source/presenter/PresenterController.cxx +++ b/sdext/source/presenter/PresenterController.cxx @@ -720,7 +720,6 @@ IPresentationTime* PresenterController::GetPresentationTime() void SAL_CALL PresenterController::notifyConfigurationChange ( const ConfigurationChangeEvent& rEvent) - throw (RuntimeException, std::exception) { if (rBHelper.bDisposed || rBHelper.bInDispose) { @@ -802,7 +801,6 @@ void SAL_CALL PresenterController::notifyConfigurationChange ( void SAL_CALL PresenterController::disposing ( const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { if (rEvent.Source == mxController) mxController = nullptr; @@ -818,7 +816,6 @@ void SAL_CALL PresenterController::disposing ( void SAL_CALL PresenterController::frameAction ( const frame::FrameActionEvent& rEvent) - throw (RuntimeException, std::exception) { if (rEvent.Action == frame::FrameAction_FRAME_ACTIVATED) { @@ -830,7 +827,6 @@ void SAL_CALL PresenterController::frameAction ( //----- XKeyListener ---------------------------------------------------------- void SAL_CALL PresenterController::keyPressed (const awt::KeyEvent& rEvent) - throw (RuntimeException, std::exception) { // Tell all views about the unhandled key event. PresenterPaneContainer::PaneList::const_iterator iPane; @@ -846,7 +842,6 @@ void SAL_CALL PresenterController::keyPressed (const awt::KeyEvent& rEvent) } void SAL_CALL PresenterController::keyReleased (const awt::KeyEvent& rEvent) - throw (RuntimeException, std::exception) { if (rEvent.Source != mxMainWindow) return; @@ -1048,13 +1043,11 @@ void PresenterController::HandleNumericKeyPress ( //----- XFocusListener -------------------------------------------------------- void SAL_CALL PresenterController::focusGained (const css::awt::FocusEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) { (void)rEvent; } void SAL_CALL PresenterController::focusLost (const css::awt::FocusEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) { (void)rEvent; } @@ -1062,7 +1055,6 @@ void SAL_CALL PresenterController::focusLost (const css::awt::FocusEvent& rEvent //----- XMouseListener -------------------------------------------------------- void SAL_CALL PresenterController::mousePressed (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) { (void)rEvent; if (mxMainWindow.is()) @@ -1070,19 +1062,16 @@ void SAL_CALL PresenterController::mousePressed (const css::awt::MouseEvent& rEv } void SAL_CALL PresenterController::mouseReleased (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) { (void)rEvent; } void SAL_CALL PresenterController::mouseEntered (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) { (void)rEvent; } void SAL_CALL PresenterController::mouseExited (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) { (void)rEvent; } @@ -1090,13 +1079,11 @@ void SAL_CALL PresenterController::mouseExited (const css::awt::MouseEvent& rEve //----- XMouseMotionListener -------------------------------------------------- void SAL_CALL PresenterController::mouseMoved (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) { (void)rEvent; } void SAL_CALL PresenterController::mouseDragged (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) { (void)rEvent; } diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx index d9eef94da5b9..958d5c3ef26c 100644 --- a/sdext/source/presenter/PresenterController.hxx +++ b/sdext/source/presenter/PresenterController.hxx @@ -145,56 +145,43 @@ public: // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( - const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::drawing::framework::ConfigurationChangeEvent& rEvent) override; // XEventListener virtual void SAL_CALL disposing ( - const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& rEvent) override; // XFrameActionListener virtual void SAL_CALL frameAction ( - const css::frame::FrameActionEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::frame::FrameActionEvent& rEvent) override; // XKeyListener - virtual void SAL_CALL keyPressed (const css::awt::KeyEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL keyReleased (const css::awt::KeyEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL keyPressed (const css::awt::KeyEvent& rEvent) override; + virtual void SAL_CALL keyReleased (const css::awt::KeyEvent& rEvent) override; // XFocusListener - virtual void SAL_CALL focusGained (const css::awt::FocusEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL focusLost (const css::awt::FocusEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL focusGained (const css::awt::FocusEvent& rEvent) override; + virtual void SAL_CALL focusLost (const css::awt::FocusEvent& rEvent) override; // XMouseListener - virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) override; - virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) override; - virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) override; - virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) override; // XMouseMotionListener - virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) override; - virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) override; private: typedef ::std::map<css::uno::Reference<css::frame::XFrame>,rtl::Reference<PresenterController> > InstanceContainer; diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx index 23834291fafe..d6f3986be086 100644 --- a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx +++ b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx @@ -63,14 +63,12 @@ void SAL_CALL PresenterCurrentSlideObserver::disposing() void SAL_CALL PresenterCurrentSlideObserver::beginEvent ( const Reference<animations::XAnimationNode>& rNode) - throw (css::uno::RuntimeException, std::exception) { (void)rNode; } void SAL_CALL PresenterCurrentSlideObserver::endEvent ( const Reference<animations::XAnimationNode>& rNode) - throw(css::uno::RuntimeException, std::exception) { (void)rNode; } @@ -78,23 +76,19 @@ void SAL_CALL PresenterCurrentSlideObserver::endEvent ( void SAL_CALL PresenterCurrentSlideObserver::repeat ( const css::uno::Reference<css::animations::XAnimationNode>& rNode, sal_Int32) - throw (css::uno::RuntimeException, std::exception) { (void)rNode; } void SAL_CALL PresenterCurrentSlideObserver::paused() - throw (css::uno::RuntimeException, std::exception) { } void SAL_CALL PresenterCurrentSlideObserver::resumed() - throw (css::uno::RuntimeException, std::exception) { } void SAL_CALL PresenterCurrentSlideObserver::slideEnded (sal_Bool bReverse) - throw (css::uno::RuntimeException, std::exception) { // Determine whether the new current slide (the one after the one that // just ended) is the slide past the last slide in the presentation, @@ -106,24 +100,20 @@ void SAL_CALL PresenterCurrentSlideObserver::slideEnded (sal_Bool bReverse) } void SAL_CALL PresenterCurrentSlideObserver::hyperLinkClicked (const OUString &) - throw (css::uno::RuntimeException, std::exception) { } void SAL_CALL PresenterCurrentSlideObserver::slideTransitionStarted() - throw (css::uno::RuntimeException, std::exception) { if( mpPresenterController.is() ) mpPresenterController->UpdateCurrentSlide(0); } void SAL_CALL PresenterCurrentSlideObserver::slideTransitionEnded() - throw (css::uno::RuntimeException, std::exception) { } void SAL_CALL PresenterCurrentSlideObserver::slideAnimationsEnded() - throw (css::uno::RuntimeException, std::exception) { } @@ -131,7 +121,6 @@ void SAL_CALL PresenterCurrentSlideObserver::slideAnimationsEnded() void SAL_CALL PresenterCurrentSlideObserver::disposing ( const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { if (rEvent.Source == Reference<XInterface>(static_cast<XWeak*>(mpPresenterController.get()))) dispose(); diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx index c68c6861c07a..087084e7d1b7 100644 --- a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx +++ b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx @@ -55,23 +55,22 @@ public: virtual void SAL_CALL disposing() override; // XSlideShowListener - virtual void SAL_CALL paused( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL resumed( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL slideTransitionStarted( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL slideTransitionEnded( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL slideAnimationsEnded( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL hyperLinkClicked( const OUString& hyperLink ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL paused( ) override; + virtual void SAL_CALL resumed( ) override; + virtual void SAL_CALL slideTransitionStarted( ) override; + virtual void SAL_CALL slideTransitionEnded( ) override; + virtual void SAL_CALL slideAnimationsEnded( ) override; + virtual void SAL_CALL slideEnded(sal_Bool bReverse) override; + virtual void SAL_CALL hyperLinkClicked( const OUString& hyperLink ) override; // XAnimationListener - virtual void SAL_CALL beginEvent( const css::uno::Reference< css::animations::XAnimationNode >& Node ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endEvent( const css::uno::Reference< css::animations::XAnimationNode >& Node ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL repeat( const css::uno::Reference< css::animations::XAnimationNode >& Node, ::sal_Int32 Repeat ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL beginEvent( const css::uno::Reference< css::animations::XAnimationNode >& Node ) override; + virtual void SAL_CALL endEvent( const css::uno::Reference< css::animations::XAnimationNode >& Node ) override; + virtual void SAL_CALL repeat( const css::uno::Reference< css::animations::XAnimationNode >& Node, ::sal_Int32 Repeat ) override; // XEventListener virtual void SAL_CALL disposing ( - const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& rEvent) override; private: ::rtl::Reference<PresenterController> mpPresenterController; diff --git a/sdext/source/presenter/PresenterFrameworkObserver.cxx b/sdext/source/presenter/PresenterFrameworkObserver.cxx index 336a47e6c486..d35c378f3aff 100644 --- a/sdext/source/presenter/PresenterFrameworkObserver.cxx +++ b/sdext/source/presenter/PresenterFrameworkObserver.cxx @@ -100,7 +100,6 @@ void PresenterFrameworkObserver::Shutdown() } void SAL_CALL PresenterFrameworkObserver::disposing (const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { if ( ! rEvent.Source.is()) return; @@ -115,7 +114,6 @@ void SAL_CALL PresenterFrameworkObserver::disposing (const lang::EventObject& rE void SAL_CALL PresenterFrameworkObserver::notifyConfigurationChange ( const ConfigurationChangeEvent& rEvent) - throw (RuntimeException, std::exception) { bool bDispose(false); diff --git a/sdext/source/presenter/PresenterFrameworkObserver.hxx b/sdext/source/presenter/PresenterFrameworkObserver.hxx index 4406e6836119..3937606d7d80 100644 --- a/sdext/source/presenter/PresenterFrameworkObserver.hxx +++ b/sdext/source/presenter/PresenterFrameworkObserver.hxx @@ -52,11 +52,9 @@ public: const Action& rAction); virtual void SAL_CALL disposing() override; - virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) override; virtual void SAL_CALL notifyConfigurationChange ( - const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::drawing::framework::ConfigurationChangeEvent& rEvent) override; private: css::uno::Reference<css::drawing::framework::XConfigurationController> mxConfigurationController; diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx index 42ba18411179..92d7819da92e 100644 --- a/sdext/source/presenter/PresenterHelpView.cxx +++ b/sdext/source/presenter/PresenterHelpView.cxx @@ -209,7 +209,6 @@ void SAL_CALL PresenterHelpView::disposing() //----- lang::XEventListener -------------------------------------------------- void SAL_CALL PresenterHelpView::disposing (const lang::EventObject& rEventObject) - throw (RuntimeException, std::exception) { if (rEventObject.Source == mxCanvas) { @@ -225,7 +224,6 @@ void SAL_CALL PresenterHelpView::disposing (const lang::EventObject& rEventObjec //----- XWindowListener ------------------------------------------------------- void SAL_CALL PresenterHelpView::windowResized (const awt::WindowEvent& rEvent) - throw (uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -233,14 +231,12 @@ void SAL_CALL PresenterHelpView::windowResized (const awt::WindowEvent& rEvent) } void SAL_CALL PresenterHelpView::windowMoved (const awt::WindowEvent& rEvent) - throw (uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); } void SAL_CALL PresenterHelpView::windowShown (const lang::EventObject& rEvent) - throw (uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -248,7 +244,6 @@ void SAL_CALL PresenterHelpView::windowShown (const lang::EventObject& rEvent) } void SAL_CALL PresenterHelpView::windowHidden (const lang::EventObject& rEvent) - throw (uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -257,7 +252,6 @@ void SAL_CALL PresenterHelpView::windowHidden (const lang::EventObject& rEvent) //----- XPaintListener -------------------------------------------------------- void SAL_CALL PresenterHelpView::windowPaint (const css::awt::PaintEvent& rEvent) - throw (RuntimeException, std::exception) { Paint(rEvent.UpdateRect); } @@ -453,14 +447,12 @@ void PresenterHelpView::CheckFontSize() //----- XResourceId ----------------------------------------------------------- Reference<XResourceId> SAL_CALL PresenterHelpView::getResourceId() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); return mxViewId; } sal_Bool SAL_CALL PresenterHelpView::isAnchorOnly() - throw (RuntimeException, std::exception) { return false; } @@ -502,7 +494,6 @@ void PresenterHelpView::Resize() } void PresenterHelpView::ThrowIfDisposed() - throw (lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) { diff --git a/sdext/source/presenter/PresenterHelpView.hxx b/sdext/source/presenter/PresenterHelpView.hxx index 67f314b82613..3d2a4a25069e 100644 --- a/sdext/source/presenter/PresenterHelpView.hxx +++ b/sdext/source/presenter/PresenterHelpView.hxx @@ -60,35 +60,27 @@ public: // lang::XEventListener virtual void SAL_CALL - disposing (const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException, std::exception) override; + disposing (const css::lang::EventObject& rEventObject) override; // XWindowListener - virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) override; - virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) override; - virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) override; - virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) override; // XPaintListener - virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) override; // XResourceId - virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() override; - virtual sal_Bool SAL_CALL isAnchorOnly() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isAnchorOnly() override; private: class TextContainer; @@ -120,8 +112,7 @@ private: /** @throws css::lang::DisposedException when the object has already been disposed. */ - void ThrowIfDisposed() - throw (css::lang::DisposedException); + void ThrowIfDisposed(); }; } } // end of namespace ::sdext::presenter diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx index c964839a38b4..4fc1ac3a4995 100644 --- a/sdext/source/presenter/PresenterNotesView.cxx +++ b/sdext/source/presenter/PresenterNotesView.cxx @@ -282,7 +282,6 @@ void PresenterNotesView::SetSlide (const Reference<drawing::XDrawPage>& rxNotesP //----- lang::XEventListener ------------------------------------------------- void SAL_CALL PresenterNotesView::disposing (const lang::EventObject& rEventObject) - throw (RuntimeException, std::exception) { if (rEventObject.Source == mxParentWindow) mxParentWindow = nullptr; @@ -291,26 +290,22 @@ void SAL_CALL PresenterNotesView::disposing (const lang::EventObject& rEventObje //----- XWindowListener ------------------------------------------------------- void SAL_CALL PresenterNotesView::windowResized (const awt::WindowEvent& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; Layout(); } void SAL_CALL PresenterNotesView::windowMoved (const awt::WindowEvent& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; } void SAL_CALL PresenterNotesView::windowShown (const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; } void SAL_CALL PresenterNotesView::windowHidden (const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; } @@ -318,7 +313,6 @@ void SAL_CALL PresenterNotesView::windowHidden (const lang::EventObject& rEvent) //----- XPaintListener -------------------------------------------------------- void SAL_CALL PresenterNotesView::windowPaint (const awt::PaintEvent& rEvent) - throw (RuntimeException, std::exception) { if (rBHelper.bDisposed || rBHelper.bInDispose) { @@ -337,13 +331,11 @@ void SAL_CALL PresenterNotesView::windowPaint (const awt::PaintEvent& rEvent) //----- XResourceId ----------------------------------------------------------- Reference<XResourceId> SAL_CALL PresenterNotesView::getResourceId() - throw (RuntimeException, std::exception) { return mxViewId; } sal_Bool SAL_CALL PresenterNotesView::isAnchorOnly() - throw (RuntimeException, std::exception) { return false; } @@ -351,7 +343,6 @@ sal_Bool SAL_CALL PresenterNotesView::isAnchorOnly() //----- XDrawView ------------------------------------------------------------- void SAL_CALL PresenterNotesView::setCurrentPage (const Reference<drawing::XDrawPage>& rxSlide) - throw (RuntimeException, std::exception) { // Get the associated notes page. mxCurrentNotesPage = nullptr; @@ -369,7 +360,6 @@ void SAL_CALL PresenterNotesView::setCurrentPage (const Reference<drawing::XDraw } Reference<drawing::XDrawPage> SAL_CALL PresenterNotesView::getCurrentPage() - throw (RuntimeException, std::exception) { return nullptr; } @@ -377,7 +367,6 @@ Reference<drawing::XDrawPage> SAL_CALL PresenterNotesView::getCurrentPage() //----- XKeyListener ---------------------------------------------------------- void SAL_CALL PresenterNotesView::keyPressed (const awt::KeyEvent& rEvent) - throw (RuntimeException, std::exception) { switch (rEvent.KeyCode) { @@ -419,7 +408,6 @@ void SAL_CALL PresenterNotesView::keyPressed (const awt::KeyEvent& rEvent) } void SAL_CALL PresenterNotesView::keyReleased (const awt::KeyEvent& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; } diff --git a/sdext/source/presenter/PresenterNotesView.hxx b/sdext/source/presenter/PresenterNotesView.hxx index 99976cc39461..57aa2d044241 100644 --- a/sdext/source/presenter/PresenterNotesView.hxx +++ b/sdext/source/presenter/PresenterNotesView.hxx @@ -88,51 +88,39 @@ public: // lang::XEventListener virtual void SAL_CALL - disposing (const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException, std::exception) override; + disposing (const css::lang::EventObject& rEventObject) override; // XWindowListener - virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) override; - virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) override; - virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) override; - virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) override; // XPaintListener - virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) override; // XResourceId - virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() override; - virtual sal_Bool SAL_CALL isAnchorOnly() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isAnchorOnly() override; // XDrawView virtual void SAL_CALL setCurrentPage ( - const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) override; - virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() override; // XKeyListener - virtual void SAL_CALL keyPressed (const css::awt::KeyEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL keyReleased (const css::awt::KeyEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL keyPressed (const css::awt::KeyEvent& rEvent) override; + virtual void SAL_CALL keyReleased (const css::awt::KeyEvent& rEvent) override; private: css::uno::Reference<css::drawing::framework::XResourceId> mxViewId; diff --git a/sdext/source/presenter/PresenterPane.cxx b/sdext/source/presenter/PresenterPane.cxx index 8efbb05e1ee7..14036c8f3617 100644 --- a/sdext/source/presenter/PresenterPane.cxx +++ b/sdext/source/presenter/PresenterPane.cxx @@ -56,14 +56,12 @@ PresenterPane::~PresenterPane() //----- XPane ----------------------------------------------------------------- Reference<awt::XWindow> SAL_CALL PresenterPane::getWindow() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); return mxContentWindow; } Reference<rendering::XCanvas> SAL_CALL PresenterPane::getCanvas() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); return mxContentCanvas; @@ -72,7 +70,6 @@ Reference<rendering::XCanvas> SAL_CALL PresenterPane::getCanvas() //----- XWindowListener ------------------------------------------------------- void SAL_CALL PresenterPane::windowResized (const awt::WindowEvent& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; PresenterPaneBase::windowResized(rEvent); @@ -87,7 +84,6 @@ void SAL_CALL PresenterPane::windowResized (const awt::WindowEvent& rEvent) } void SAL_CALL PresenterPane::windowMoved (const awt::WindowEvent& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; PresenterPaneBase::windowMoved(rEvent); @@ -101,7 +97,6 @@ void SAL_CALL PresenterPane::windowMoved (const awt::WindowEvent& rEvent) } void SAL_CALL PresenterPane::windowShown (const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; PresenterPaneBase::windowShown(rEvent); @@ -119,7 +114,6 @@ void SAL_CALL PresenterPane::windowShown (const lang::EventObject& rEvent) } void SAL_CALL PresenterPane::windowHidden (const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; PresenterPaneBase::windowHidden(rEvent); @@ -131,7 +125,6 @@ void SAL_CALL PresenterPane::windowHidden (const lang::EventObject& rEvent) //----- XPaintListener -------------------------------------------------------- void SAL_CALL PresenterPane::windowPaint (const awt::PaintEvent& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); diff --git a/sdext/source/presenter/PresenterPane.hxx b/sdext/source/presenter/PresenterPane.hxx index fbd61446c9c2..dc12aa920abc 100644 --- a/sdext/source/presenter/PresenterPane.hxx +++ b/sdext/source/presenter/PresenterPane.hxx @@ -51,30 +51,23 @@ public: // XPane - css::uno::Reference<css::awt::XWindow> SAL_CALL getWindow() - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::awt::XWindow> SAL_CALL getWindow() override; - css::uno::Reference<css::rendering::XCanvas> SAL_CALL getCanvas() - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference<css::rendering::XCanvas> SAL_CALL getCanvas() override; // XWindowListener - virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) override; - virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) override; - virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) override; - virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) override; // XPaintListener - virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) override; private: /** Store the bounding box so that when the window is resized or moved diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx index 0303cd9691c6..295e76c94284 100644 --- a/sdext/source/presenter/PresenterPaneBase.cxx +++ b/sdext/source/presenter/PresenterPaneBase.cxx @@ -134,7 +134,6 @@ const awt::Point& PresenterPaneBase::GetCalloutAnchor() const //----- XInitialization ------------------------------------------------------- void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments) - throw (Exception, RuntimeException, std::exception) { ThrowIfDisposed(); @@ -231,14 +230,12 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments) //----- XResourceId ----------------------------------------------------------- Reference<XResourceId> SAL_CALL PresenterPaneBase::getResourceId() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); return mxPaneId; } sal_Bool SAL_CALL PresenterPaneBase::isAnchorOnly() - throw (RuntimeException, std::exception) { return true; } @@ -246,28 +243,24 @@ sal_Bool SAL_CALL PresenterPaneBase::isAnchorOnly() //----- XWindowListener ------------------------------------------------------- void SAL_CALL PresenterPaneBase::windowResized (const awt::WindowEvent& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); } void SAL_CALL PresenterPaneBase::windowMoved (const awt::WindowEvent& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); } void SAL_CALL PresenterPaneBase::windowShown (const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); } void SAL_CALL PresenterPaneBase::windowHidden (const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -276,7 +269,6 @@ void SAL_CALL PresenterPaneBase::windowHidden (const lang::EventObject& rEvent) //----- lang::XEventListener -------------------------------------------------- void SAL_CALL PresenterPaneBase::disposing (const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { if (rEvent.Source == mxBorderWindow) { @@ -402,7 +394,6 @@ bool PresenterPaneBase::IsVisible() const } void PresenterPaneBase::ThrowIfDisposed() - throw (css::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) { diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx index 9a31c2eacf27..3f19273236d7 100644 --- a/sdext/source/presenter/PresenterPaneBase.hxx +++ b/sdext/source/presenter/PresenterPaneBase.hxx @@ -78,35 +78,27 @@ public: // XInitialization - virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) override; // XResourceId - virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() override; - virtual sal_Bool SAL_CALL isAnchorOnly() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isAnchorOnly() override; // XWindowListener - virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) override; - virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) override; - virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) override; - virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) override; // lang::XEventListener - virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) override; protected: ::rtl::Reference<PresenterController> mpPresenterController; @@ -141,8 +133,7 @@ protected: /** @throws css::lang::DisposedException when the object has already been disposed. */ - void ThrowIfDisposed() - throw (css::lang::DisposedException); + void ThrowIfDisposed(); }; } } // end of namespace ::sd::presenter diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx index 7d6f60a7224f..47f86d1f44bc 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx @@ -172,7 +172,6 @@ awt::Rectangle SAL_CALL PresenterPaneBorderPainter::addBorder ( const OUString& rsPaneBorderStyleName, const css::awt::Rectangle& rRectangle, drawing::framework::BorderType eBorderType) - throw(css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -185,7 +184,6 @@ awt::Rectangle SAL_CALL PresenterPaneBorderPainter::removeBorder ( const OUString& rsPaneBorderStyleName, const css::awt::Rectangle& rRectangle, drawing::framework::BorderType eBorderType) - throw(css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -200,7 +198,6 @@ void SAL_CALL PresenterPaneBorderPainter::paintBorder ( const css::awt::Rectangle& rOuterBorderRectangle, const css::awt::Rectangle& rRepaintArea, const OUString& rsTitle) - throw(css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -236,7 +233,6 @@ void SAL_CALL PresenterPaneBorderPainter::paintBorderWithCallout ( const css::awt::Rectangle& rRepaintArea, const OUString& rsTitle, const css::awt::Point& rCalloutAnchor) - throw(css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -268,7 +264,6 @@ void SAL_CALL PresenterPaneBorderPainter::paintBorderWithCallout ( awt::Point SAL_CALL PresenterPaneBorderPainter::getCalloutOffset ( const OUString& rsPaneBorderStyleName) - throw(css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); ProvideTheme(); @@ -370,7 +365,6 @@ awt::Rectangle PresenterPaneBorderPainter::RemoveBorder ( } void PresenterPaneBorderPainter::ThrowIfDisposed() const - throw (css::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) { diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.hxx b/sdext/source/presenter/PresenterPaneBorderPainter.hxx index 8230cd58a1aa..467926d5469d 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.hxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.hxx @@ -90,22 +90,19 @@ public: virtual css::awt::Rectangle SAL_CALL addBorder ( const OUString& rsPaneBorderStyleName, const css::awt::Rectangle& rRectangle, - css::drawing::framework::BorderType eBorderType) - throw(css::uno::RuntimeException, std::exception) override; + css::drawing::framework::BorderType eBorderType) override; virtual css::awt::Rectangle SAL_CALL removeBorder ( const OUString& rsPaneBorderStyleName, const css::awt::Rectangle& rRectangle, - css::drawing::framework::BorderType eBorderType) - throw(css::uno::RuntimeException, std::exception) override; + css::drawing::framework::BorderType eBorderType) override; virtual void SAL_CALL paintBorder ( const OUString& rsPaneBorderStyleName, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const css::awt::Rectangle& rOuterBorderRectangle, const css::awt::Rectangle& rRepaintArea, - const OUString& rsTitle) - throw(css::uno::RuntimeException, std::exception) override; + const OUString& rsTitle) override; virtual void SAL_CALL paintBorderWithCallout ( const OUString& rsPaneBorderStyleName, @@ -113,12 +110,10 @@ public: const css::awt::Rectangle& rOuterBorderRectangle, const css::awt::Rectangle& rRepaintArea, const OUString& rsTitle, - const css::awt::Point& rCalloutAnchor) - throw(css::uno::RuntimeException, std::exception) override; + const css::awt::Point& rCalloutAnchor) override; virtual css::awt::Point SAL_CALL getCalloutOffset ( - const OUString& rsPaneBorderStyleName) - throw(css::uno::RuntimeException, std::exception) override; + const OUString& rsPaneBorderStyleName) override; private: css::uno::Reference<css::uno::XComponentContext> mxContext; @@ -136,8 +131,7 @@ private: void ProvideTheme(); /// @throws css::lang::DisposedException - void ThrowIfDisposed() const - throw (css::lang::DisposedException); + void ThrowIfDisposed() const; }; } } // end of namespace ::sd::presenter diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx index d22616334b2f..05a6a1e3e54d 100644 --- a/sdext/source/presenter/PresenterPaneContainer.cxx +++ b/sdext/source/presenter/PresenterPaneContainer.cxx @@ -355,7 +355,6 @@ void PresenterPaneContainer::ToTop (const SharedPaneDescriptor& rpDescriptor) void SAL_CALL PresenterPaneContainer::disposing ( const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) { SharedPaneDescriptor pDescriptor ( FindContentWindow(Reference<awt::XWindow>(rEvent.Source, UNO_QUERY))); diff --git a/sdext/source/presenter/PresenterPaneContainer.hxx b/sdext/source/presenter/PresenterPaneContainer.hxx index 6961a07bd00f..ea9ba7292aab 100644 --- a/sdext/source/presenter/PresenterPaneContainer.hxx +++ b/sdext/source/presenter/PresenterPaneContainer.hxx @@ -168,8 +168,7 @@ public: // XEventListener virtual void SAL_CALL disposing ( - const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& rEvent) override; private: css::uno::Reference<css::drawing::XPresenterHelper> mxPresenterHelper; diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx index 9be6b39bc4ae..3477895c03d3 100644 --- a/sdext/source/presenter/PresenterPaneFactory.cxx +++ b/sdext/source/presenter/PresenterPaneFactory.cxx @@ -115,7 +115,6 @@ PresenterPaneFactory::~PresenterPaneFactory() } void SAL_CALL PresenterPaneFactory::disposing() - throw (RuntimeException) { Reference<XConfigurationController> xCC (mxConfigurationControllerWeak); if (xCC.is()) @@ -141,7 +140,6 @@ void SAL_CALL PresenterPaneFactory::disposing() Reference<XResource> SAL_CALL PresenterPaneFactory::createResource ( const Reference<XResourceId>& rxPaneId) - throw (RuntimeException, IllegalArgumentException, WrappedTargetException, std::exception) { ThrowIfDisposed(); @@ -181,7 +179,6 @@ Reference<XResource> SAL_CALL PresenterPaneFactory::createResource ( } void SAL_CALL PresenterPaneFactory::releaseResource (const Reference<XResource>& rxResource) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -317,7 +314,6 @@ Reference<XResource> PresenterPaneFactory::CreatePane ( } void PresenterPaneFactory::ThrowIfDisposed() const - throw (css::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) { diff --git a/sdext/source/presenter/PresenterPaneFactory.hxx b/sdext/source/presenter/PresenterPaneFactory.hxx index 932111af0411..f605a0d8f59c 100644 --- a/sdext/source/presenter/PresenterPaneFactory.hxx +++ b/sdext/source/presenter/PresenterPaneFactory.hxx @@ -71,22 +71,19 @@ public: const ::rtl::Reference<PresenterController>& rpPresenterController); virtual ~PresenterPaneFactory() override; - virtual void SAL_CALL disposing() - throw (css::uno::RuntimeException) override; + virtual void SAL_CALL disposing() override; // XResourceFactory virtual css::uno::Reference<css::drawing::framework::XResource> SAL_CALL createResource ( const css::uno::Reference< - css::drawing::framework::XResourceId>& rxPaneId) - throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, std::exception) override; + css::drawing::framework::XResourceId>& rxPaneId) override; virtual void SAL_CALL releaseResource ( const css::uno::Reference<css::drawing::framework::XResource>& - rxPane) - throw (css::uno::RuntimeException, std::exception) override; + rxPane) override; private: css::uno::WeakReference<css::uno::XComponentContext> mxComponentContextWeak; @@ -113,7 +110,7 @@ private: const bool bIsSpritePane); /// @throws css::lang::DisposedException - void ThrowIfDisposed() const throw (css::lang::DisposedException); + void ThrowIfDisposed() const; }; } } diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx index b5b18813cea0..07470b31816d 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.cxx +++ b/sdext/source/presenter/PresenterProtocolHandler.cxx @@ -195,28 +195,23 @@ public: // XDispatch virtual void SAL_CALL dispatch( const css::util::URL& aURL, - const css::uno::Sequence<css::beans::PropertyValue>& rArguments) - throw(css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence<css::beans::PropertyValue>& rArguments) override; virtual void SAL_CALL addStatusListener( const css::uno::Reference<css::frame::XStatusListener>& rxListener, - const css::util::URL& rURL) - throw(css::uno::RuntimeException, std::exception) override; + const css::util::URL& rURL) override; virtual void SAL_CALL removeStatusListener ( const css::uno::Reference<css::frame::XStatusListener>& rxListener, - const css::util::URL& rURL) - throw(css::uno::RuntimeException, std::exception) override; + const css::util::URL& rURL) override; // document::XEventListener - virtual void SAL_CALL notifyEvent (const css::document::EventObject& rEvent) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL notifyEvent (const css::document::EventObject& rEvent) override; // lang::XEventListener - virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) override; private: OUString msURLPath; @@ -270,7 +265,6 @@ void SAL_CALL PresenterProtocolHandler::disposing() //----- XInitialize ----------------------------------------------------------- void SAL_CALL PresenterProtocolHandler::initialize (const Sequence<Any>& aArguments) - throw (Exception, RuntimeException, std::exception) { ThrowIfDisposed(); if (aArguments.getLength() > 0) @@ -291,20 +285,17 @@ void SAL_CALL PresenterProtocolHandler::initialize (const Sequence<Any>& aArgume } OUString PresenterProtocolHandler::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return getImplementationName_static(); } sal_Bool PresenterProtocolHandler::supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence<OUString> PresenterProtocolHandler::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { return getSupportedServiceNames_static(); } @@ -315,7 +306,6 @@ Reference<frame::XDispatch> SAL_CALL PresenterProtocolHandler::queryDispatch ( const css::util::URL& rURL, const OUString& rsTargetFrameName, sal_Int32 nSearchFlags) - throw(RuntimeException, std::exception) { (void)rsTargetFrameName; (void)nSearchFlags; @@ -333,7 +323,6 @@ Reference<frame::XDispatch> SAL_CALL PresenterProtocolHandler::queryDispatch ( Sequence<Reference<frame::XDispatch> > SAL_CALL PresenterProtocolHandler::queryDispatches( const Sequence<frame::DispatchDescriptor>& rDescriptors) - throw(RuntimeException, std::exception) { (void)rDescriptors; ThrowIfDisposed(); @@ -342,7 +331,6 @@ Sequence<Reference<frame::XDispatch> > SAL_CALL PresenterProtocolHandler::queryD void PresenterProtocolHandler::ThrowIfDisposed() const - throw (css::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) { @@ -442,7 +430,6 @@ void PresenterProtocolHandler::Dispatch::disposing() void SAL_CALL PresenterProtocolHandler::Dispatch::dispatch( const css::util::URL& rURL, const css::uno::Sequence<css::beans::PropertyValue>& /*rArguments*/) - throw(css::uno::RuntimeException, std::exception) { if (rBHelper.bDisposed || rBHelper.bInDispose) { @@ -468,7 +455,6 @@ void SAL_CALL PresenterProtocolHandler::Dispatch::dispatch( void SAL_CALL PresenterProtocolHandler::Dispatch::addStatusListener( const css::uno::Reference<css::frame::XStatusListener>& rxListener, const css::util::URL& rURL) - throw(css::uno::RuntimeException, std::exception) { if (rURL.Path == msURLPath) { @@ -488,7 +474,6 @@ void SAL_CALL PresenterProtocolHandler::Dispatch::addStatusListener( void SAL_CALL PresenterProtocolHandler::Dispatch::removeStatusListener ( const css::uno::Reference<css::frame::XStatusListener>& rxListener, const css::util::URL& rURL) - throw(css::uno::RuntimeException, std::exception) { if (rURL.Path == msURLPath) { @@ -508,7 +493,6 @@ void SAL_CALL PresenterProtocolHandler::Dispatch::removeStatusListener ( void SAL_CALL PresenterProtocolHandler::Dispatch::notifyEvent ( const css::document::EventObject& rEvent) - throw(css::uno::RuntimeException, std::exception) { (void)rEvent; @@ -518,7 +502,6 @@ void SAL_CALL PresenterProtocolHandler::Dispatch::notifyEvent ( //----- lang::XEventListener -------------------------------------------------- void SAL_CALL PresenterProtocolHandler::Dispatch::disposing (const css::lang::EventObject& rEvent) - throw(css::uno::RuntimeException, std::exception) { (void)rEvent; mbIsListeningToWindowManager = false; diff --git a/sdext/source/presenter/PresenterProtocolHandler.hxx b/sdext/source/presenter/PresenterProtocolHandler.hxx index 68594dbfc721..890b65db4bbf 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.hxx +++ b/sdext/source/presenter/PresenterProtocolHandler.hxx @@ -57,17 +57,13 @@ public: // XInitialization virtual void SAL_CALL initialize( - const css::uno::Sequence<css::uno::Any>& aArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence<css::uno::Any>& aArguments) override; - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getImplementationName() override; - sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override; - css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XDispatchProvider @@ -75,20 +71,18 @@ public: queryDispatch ( const css::util::URL& aURL, const OUString& aTargetFrameName, - sal_Int32 nSearchFlags ) - throw(css::uno::RuntimeException, std::exception) override; + sal_Int32 nSearchFlags ) override; virtual css::uno::Sequence<css::uno::Reference<css::frame::XDispatch> > SAL_CALL queryDispatches( - const css::uno::Sequence< css::frame::DispatchDescriptor>& rDescriptors) - throw(css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::frame::DispatchDescriptor>& rDescriptors) override; private: class Dispatch; ::rtl::Reference<PresenterController> mpPresenterController; /// @throws css::lang::DisposedException - void ThrowIfDisposed() const throw (css::lang::DisposedException); + void ThrowIfDisposed() const; }; } } diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index fdda9b6bcafc..e5d61a768adf 100644 --- a/sdext/source/presenter/PresenterScreen.cxx +++ b/sdext/source/presenter/PresenterScreen.cxx @@ -74,11 +74,11 @@ namespace { // document::XEventListener - virtual void SAL_CALL notifyEvent( const css::document::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL notifyEvent( const css::document::EventObject& Event ) override; // XEventListener - virtual void SAL_CALL disposing ( const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing ( const css::lang::EventObject& rEvent) override; private: css::uno::Reference<css::frame::XModel2 > mxModel; @@ -125,7 +125,6 @@ void SAL_CALL PresenterScreenJob::disposing() Any SAL_CALL PresenterScreenJob::execute( const Sequence< beans::NamedValue >& Arguments ) - throw (lang::IllegalArgumentException, Exception, RuntimeException, std::exception) { Sequence< beans::NamedValue > lEnv; @@ -206,7 +205,7 @@ void SAL_CALL PresenterScreenListener::disposing() // document::XEventListener -void SAL_CALL PresenterScreenListener::notifyEvent( const css::document::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL PresenterScreenListener::notifyEvent( const css::document::EventObject& Event ) { if (rBHelper.bDisposed || rBHelper.bInDispose) { @@ -235,7 +234,6 @@ void SAL_CALL PresenterScreenListener::notifyEvent( const css::document::EventOb // XEventListener void SAL_CALL PresenterScreenListener::disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) { (void)rEvent; @@ -306,7 +304,6 @@ void SAL_CALL PresenterScreen::disposing() //----- XEventListener -------------------------------------------------------- void SAL_CALL PresenterScreen::disposing (const lang::EventObject& /*rEvent*/) - throw (RuntimeException, std::exception) { mxSlideShowControllerWeak = WeakReference<presentation::XSlideShowController>(); RequestShutdownPresenterScreen(); diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx index 53f234d45d39..fe9346231195 100644 --- a/sdext/source/presenter/PresenterScreen.hxx +++ b/sdext/source/presenter/PresenterScreen.hxx @@ -68,10 +68,7 @@ public: // XJob virtual css::uno::Any SAL_CALL execute( - const css::uno::Sequence<css::beans::NamedValue >& Arguments) - throw (css::lang::IllegalArgumentException, - css::uno::Exception, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence<css::beans::NamedValue >& Arguments) override; private: explicit PresenterScreenJob (const css::uno::Reference<css::uno::XComponentContext>& rxContext); @@ -123,7 +120,7 @@ public: // XEventListener - virtual void SAL_CALL disposing ( const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing ( const css::lang::EventObject& rEvent) override; private: css::uno::Reference<css::frame::XModel2 > mxModel; diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx index 8cba1bcafa01..89ac7f52ce16 100644 --- a/sdext/source/presenter/PresenterScrollBar.cxx +++ b/sdext/source/presenter/PresenterScrollBar.cxx @@ -322,25 +322,21 @@ void PresenterScrollBar::Paint ( //----- XWindowListener ------------------------------------------------------- void SAL_CALL PresenterScrollBar::windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) { (void)rEvent; } void SAL_CALL PresenterScrollBar::windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) { (void)rEvent; } void SAL_CALL PresenterScrollBar::windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) { (void)rEvent; } void SAL_CALL PresenterScrollBar::windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) { (void)rEvent; } @@ -348,7 +344,6 @@ void SAL_CALL PresenterScrollBar::windowHidden (const css::lang::EventObject& rE //----- XPaintListener -------------------------------------------------------- void SAL_CALL PresenterScrollBar::windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) { if (mxWindow.is()) { @@ -367,7 +362,6 @@ void SAL_CALL PresenterScrollBar::windowPaint (const css::awt::PaintEvent& rEven //----- XMouseListener -------------------------------------------------------- void SAL_CALL PresenterScrollBar::mousePressed (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) { maDragAnchor.X = rEvent.X; maDragAnchor.Y = rEvent.Y; @@ -377,7 +371,6 @@ void SAL_CALL PresenterScrollBar::mousePressed (const css::awt::MouseEvent& rEve } void SAL_CALL PresenterScrollBar::mouseReleased (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) { (void)rEvent; @@ -388,13 +381,11 @@ void SAL_CALL PresenterScrollBar::mouseReleased (const css::awt::MouseEvent& rEv } void SAL_CALL PresenterScrollBar::mouseEntered (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) { (void)rEvent; } void SAL_CALL PresenterScrollBar::mouseExited (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) { (void)rEvent; if (meMouseMoveArea != None) @@ -412,7 +403,6 @@ void SAL_CALL PresenterScrollBar::mouseExited (const css::awt::MouseEvent& rEven //----- XMouseMotionListener -------------------------------------------------- void SAL_CALL PresenterScrollBar::mouseMoved (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) { const Area eArea (GetArea(rEvent.X, rEvent.Y)); if (eArea != meMouseMoveArea) @@ -428,7 +418,6 @@ void SAL_CALL PresenterScrollBar::mouseMoved (const css::awt::MouseEvent& rEvent } void SAL_CALL PresenterScrollBar::mouseDragged (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) { if (meButtonDownArea != Thumb) return; @@ -449,7 +438,6 @@ void SAL_CALL PresenterScrollBar::mouseDragged (const css::awt::MouseEvent& rEve //----- lang::XEventListener -------------------------------------------------- void SAL_CALL PresenterScrollBar::disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) { if (rEvent.Source == mxWindow) mxWindow = nullptr; diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx index 26341835c7ea..46a6704bc7f8 100644 --- a/sdext/source/presenter/PresenterScrollBar.hxx +++ b/sdext/source/presenter/PresenterScrollBar.hxx @@ -110,48 +110,36 @@ public: // XWindowListener - virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) override; - virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) override; - virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) override; - virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) override; // XPaintListener - virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) override; // XMouseListener - virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) override; - virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) override; - virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) override; - virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) override; // XMouseMotionListener - virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) override; - virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) override; // lang::XEventListener - virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) override; enum Area { Total, Pager, Thumb, PagerUp, PagerDown, PrevButton, NextButton, None, AreaCount = None }; diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx index 75a5a64b1ba7..978a6577ac45 100644 --- a/sdext/source/presenter/PresenterSlidePreview.cxx +++ b/sdext/source/presenter/PresenterSlidePreview.cxx @@ -126,13 +126,11 @@ void SAL_CALL PresenterSlidePreview::disposing() //----- XResourceId ----------------------------------------------------------- Reference<XResourceId> SAL_CALL PresenterSlidePreview::getResourceId() - throw (RuntimeException, std::exception) { return mxViewId; } sal_Bool SAL_CALL PresenterSlidePreview::isAnchorOnly() - throw (RuntimeException, std::exception) { return false; } @@ -140,7 +138,6 @@ sal_Bool SAL_CALL PresenterSlidePreview::isAnchorOnly() //----- XWindowListener ------------------------------------------------------- void SAL_CALL PresenterSlidePreview::windowResized (const awt::WindowEvent& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -149,13 +146,11 @@ void SAL_CALL PresenterSlidePreview::windowResized (const awt::WindowEvent& rEve } void SAL_CALL PresenterSlidePreview::windowMoved (const awt::WindowEvent& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; } void SAL_CALL PresenterSlidePreview::windowShown (const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -164,7 +159,6 @@ void SAL_CALL PresenterSlidePreview::windowShown (const lang::EventObject& rEven } void SAL_CALL PresenterSlidePreview::windowHidden (const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; } @@ -172,7 +166,6 @@ void SAL_CALL PresenterSlidePreview::windowHidden (const lang::EventObject& rEve //----- XPaintListener -------------------------------------------------------- void SAL_CALL PresenterSlidePreview::windowPaint (const awt::PaintEvent& rEvent) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -188,7 +181,6 @@ void SAL_CALL PresenterSlidePreview::windowPaint (const awt::PaintEvent& rEvent) //----- lang::XEventListener -------------------------------------------------- void SAL_CALL PresenterSlidePreview::disposing (const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { if (rEvent.Source == mxWindow) { @@ -201,7 +193,6 @@ void SAL_CALL PresenterSlidePreview::disposing (const lang::EventObject& rEvent) //----- XDrawView ------------------------------------------------------------- void SAL_CALL PresenterSlidePreview::setCurrentPage (const Reference<drawing::XDrawPage>& rxSlide) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); ::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex()); @@ -209,7 +200,6 @@ void SAL_CALL PresenterSlidePreview::setCurrentPage (const Reference<drawing::XD } Reference<drawing::XDrawPage> SAL_CALL PresenterSlidePreview::getCurrentPage() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); return nullptr; @@ -383,7 +373,6 @@ void PresenterSlidePreview::Resize() } void PresenterSlidePreview::ThrowIfDisposed() - throw (css::lang::DisposedException) { if (PresenterSlidePreviewInterfaceBase::rBHelper.bDisposed || PresenterSlidePreviewInterfaceBase::rBHelper.bInDispose) { diff --git a/sdext/source/presenter/PresenterSlidePreview.hxx b/sdext/source/presenter/PresenterSlidePreview.hxx index f94eab89cccd..2df1d56c9981 100644 --- a/sdext/source/presenter/PresenterSlidePreview.hxx +++ b/sdext/source/presenter/PresenterSlidePreview.hxx @@ -69,43 +69,33 @@ public: // XResourceId - virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() override; - virtual sal_Bool SAL_CALL isAnchorOnly() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isAnchorOnly() override; // XWindowListener - virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) override; - virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) override; - virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) override; - virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) override; // XPaintListener - virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) override; // lang::XEventListener - virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) override; // XDrawView virtual void SAL_CALL setCurrentPage ( - const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) override; - virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() override; protected: ::rtl::Reference<PresenterController> mpPresenterController; @@ -148,7 +138,7 @@ private: /** @throws css::lang::DisposedException when the object has already been disposed. */ - void ThrowIfDisposed() throw (css::lang::DisposedException); + void ThrowIfDisposed(); }; } } // end of namespace ::sd::presenter diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx index 6237a165f058..25a357e823c3 100644 --- a/sdext/source/presenter/PresenterSlideShowView.cxx +++ b/sdext/source/presenter/PresenterSlideShowView.cxx @@ -253,7 +253,6 @@ void PresenterSlideShowView::disposing() void SAL_CALL PresenterSlideShowView::setCurrentPage ( const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) - throw (css::uno::RuntimeException, std::exception) { mxCurrentSlide = rxSlide; if (mpPresenterController.get() != nullptr @@ -295,7 +294,6 @@ void SAL_CALL PresenterSlideShowView::setCurrentPage ( } css::uno::Reference<css::drawing::XDrawPage> SAL_CALL PresenterSlideShowView::getCurrentPage() - throw (css::uno::RuntimeException, std::exception) { return mxCurrentSlide; } @@ -314,7 +312,6 @@ void PresenterSlideShowView::ReleaseView() //----- XSlideShowView -------------------------------------------------------- Reference<rendering::XSpriteCanvas> SAL_CALL PresenterSlideShowView::getCanvas() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -322,7 +319,6 @@ Reference<rendering::XSpriteCanvas> SAL_CALL PresenterSlideShowView::getCanvas() } void SAL_CALL PresenterSlideShowView::clear() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); mbIsForcedPaintPending = false; @@ -350,7 +346,6 @@ void SAL_CALL PresenterSlideShowView::clear() } geometry::AffineMatrix2D SAL_CALL PresenterSlideShowView::getTransformation() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -377,7 +372,6 @@ geometry::AffineMatrix2D SAL_CALL PresenterSlideShowView::getTransformation() } geometry::IntegerSize2D SAL_CALL PresenterSlideShowView::getTranslationOffset() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); return geometry::IntegerSize2D(0,0); @@ -385,7 +379,6 @@ geometry::IntegerSize2D SAL_CALL PresenterSlideShowView::getTranslationOffset() void SAL_CALL PresenterSlideShowView::addTransformationChangedListener( const Reference<util::XModifyListener>& rxListener) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); maBroadcaster.addListener( @@ -395,7 +388,6 @@ void SAL_CALL PresenterSlideShowView::addTransformationChangedListener( void SAL_CALL PresenterSlideShowView::removeTransformationChangedListener( const Reference<util::XModifyListener>& rxListener) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); maBroadcaster.removeListener( @@ -405,7 +397,6 @@ void SAL_CALL PresenterSlideShowView::removeTransformationChangedListener( void SAL_CALL PresenterSlideShowView::addPaintListener( const Reference<awt::XPaintListener>& rxListener) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); maBroadcaster.addListener( @@ -415,7 +406,6 @@ void SAL_CALL PresenterSlideShowView::addPaintListener( void SAL_CALL PresenterSlideShowView::removePaintListener( const Reference<awt::XPaintListener>& rxListener) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); maBroadcaster.removeListener( @@ -425,7 +415,6 @@ void SAL_CALL PresenterSlideShowView::removePaintListener( void SAL_CALL PresenterSlideShowView::addMouseListener( const Reference<awt::XMouseListener>& rxListener) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); maBroadcaster.addListener( @@ -435,7 +424,6 @@ void SAL_CALL PresenterSlideShowView::addMouseListener( void SAL_CALL PresenterSlideShowView::removeMouseListener( const Reference<awt::XMouseListener>& rxListener) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); maBroadcaster.removeListener( @@ -445,7 +433,6 @@ void SAL_CALL PresenterSlideShowView::removeMouseListener( void SAL_CALL PresenterSlideShowView::addMouseMotionListener( const Reference<awt::XMouseMotionListener>& rxListener) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); maBroadcaster.addListener( @@ -455,7 +442,6 @@ void SAL_CALL PresenterSlideShowView::addMouseMotionListener( void SAL_CALL PresenterSlideShowView::removeMouseMotionListener( const Reference<awt::XMouseMotionListener>& rxListener) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); maBroadcaster.removeListener( @@ -464,7 +450,6 @@ void SAL_CALL PresenterSlideShowView::removeMouseMotionListener( } void SAL_CALL PresenterSlideShowView::setMouseCursor(::sal_Int16 nPointerShape) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -484,7 +469,7 @@ void SAL_CALL PresenterSlideShowView::setMouseCursor(::sal_Int16 nPointerShape) } } -awt::Rectangle SAL_CALL PresenterSlideShowView::getCanvasArea( ) throw (RuntimeException, std::exception) +awt::Rectangle SAL_CALL PresenterSlideShowView::getCanvasArea( ) { if( mxViewWindow.is() && mxTopPane.is() ) return mxPresenterHelper->getWindowExtentsRelative( mxViewWindow, mxTopPane->getWindow() ); @@ -499,7 +484,6 @@ awt::Rectangle SAL_CALL PresenterSlideShowView::getCanvasArea( ) throw (Runtime //----- lang::XEventListener -------------------------------------------------- void SAL_CALL PresenterSlideShowView::disposing (const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { if (rEvent.Source == mxViewWindow) mxViewWindow = nullptr; @@ -510,7 +494,6 @@ void SAL_CALL PresenterSlideShowView::disposing (const lang::EventObject& rEvent //----- XPaintListener -------------------------------------------------------- void SAL_CALL PresenterSlideShowView::windowPaint (const awt::PaintEvent& rEvent) - throw (RuntimeException, std::exception) { // Deactivated views must not be painted. if ( ! mbIsPresenterViewActive) @@ -531,7 +514,6 @@ void SAL_CALL PresenterSlideShowView::windowPaint (const awt::PaintEvent& rEvent //----- XMouseListener -------------------------------------------------------- void SAL_CALL PresenterSlideShowView::mousePressed (const awt::MouseEvent& rEvent) - throw (RuntimeException, std::exception) { awt::MouseEvent aEvent (rEvent); aEvent.Source = static_cast<XWeak*>(this); @@ -551,7 +533,6 @@ void SAL_CALL PresenterSlideShowView::mousePressed (const awt::MouseEvent& rEven } void SAL_CALL PresenterSlideShowView::mouseReleased (const awt::MouseEvent& rEvent) - throw (RuntimeException, std::exception) { awt::MouseEvent aEvent (rEvent); aEvent.Source = static_cast<XWeak*>(this); @@ -564,7 +545,6 @@ void SAL_CALL PresenterSlideShowView::mouseReleased (const awt::MouseEvent& rEve } void SAL_CALL PresenterSlideShowView::mouseEntered (const awt::MouseEvent& rEvent) - throw (RuntimeException, std::exception) { awt::MouseEvent aEvent (rEvent); aEvent.Source = static_cast<XWeak*>(this); @@ -577,7 +557,6 @@ void SAL_CALL PresenterSlideShowView::mouseEntered (const awt::MouseEvent& rEven } void SAL_CALL PresenterSlideShowView::mouseExited (const awt::MouseEvent& rEvent) - throw (RuntimeException, std::exception) { awt::MouseEvent aEvent (rEvent); aEvent.Source = static_cast<XWeak*>(this); @@ -592,7 +571,6 @@ void SAL_CALL PresenterSlideShowView::mouseExited (const awt::MouseEvent& rEvent //----- XMouseMotionListener -------------------------------------------------- void SAL_CALL PresenterSlideShowView::mouseDragged (const awt::MouseEvent& rEvent) - throw (RuntimeException, std::exception) { awt::MouseEvent aEvent (rEvent); aEvent.Source = static_cast<XWeak*>(this); @@ -605,7 +583,6 @@ void SAL_CALL PresenterSlideShowView::mouseDragged (const awt::MouseEvent& rEven } void SAL_CALL PresenterSlideShowView::mouseMoved (const awt::MouseEvent& rEvent) - throw (RuntimeException, std::exception) { awt::MouseEvent aEvent (rEvent); aEvent.Source = static_cast<XWeak*>(this); @@ -620,7 +597,6 @@ void SAL_CALL PresenterSlideShowView::mouseMoved (const awt::MouseEvent& rEvent) //----- XWindowListener ------------------------------------------------------- void SAL_CALL PresenterSlideShowView::windowResized (const awt::WindowEvent& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; @@ -631,7 +607,6 @@ void SAL_CALL PresenterSlideShowView::windowResized (const awt::WindowEvent& rEv } void SAL_CALL PresenterSlideShowView::windowMoved (const awt::WindowEvent& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; if ( ! mbIsPaintPending) @@ -639,14 +614,12 @@ void SAL_CALL PresenterSlideShowView::windowMoved (const awt::WindowEvent& rEven } void SAL_CALL PresenterSlideShowView::windowShown (const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; Resize(); } void SAL_CALL PresenterSlideShowView::windowHidden (const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; } @@ -654,13 +627,11 @@ void SAL_CALL PresenterSlideShowView::windowHidden (const lang::EventObject& rEv //----- XView ----------------------------------------------------------------- Reference<XResourceId> SAL_CALL PresenterSlideShowView::getResourceId() - throw(RuntimeException, std::exception) { return mxViewId; } sal_Bool SAL_CALL PresenterSlideShowView::isAnchorOnly() - throw (RuntimeException, std::exception) { return false; } @@ -984,7 +955,6 @@ void PresenterSlideShowView::CreateBackgroundPolygons() } void PresenterSlideShowView::ThrowIfDisposed() - throw (css::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) { diff --git a/sdext/source/presenter/PresenterSlideShowView.hxx b/sdext/source/presenter/PresenterSlideShowView.hxx index a324f7009d02..b7a3e76a6158 100644 --- a/sdext/source/presenter/PresenterSlideShowView.hxx +++ b/sdext/source/presenter/PresenterSlideShowView.hxx @@ -79,124 +79,94 @@ public: // XSlideShowView virtual css::uno::Reference< - css::rendering::XSpriteCanvas > SAL_CALL getCanvas() - throw (css::uno::RuntimeException, std::exception) override; + css::rendering::XSpriteCanvas > SAL_CALL getCanvas() override; - virtual void SAL_CALL clear() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL clear() override; - virtual css::geometry::AffineMatrix2D SAL_CALL getTransformation() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::geometry::AffineMatrix2D SAL_CALL getTransformation() override; - virtual css::geometry::IntegerSize2D SAL_CALL getTranslationOffset() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::geometry::IntegerSize2D SAL_CALL getTranslationOffset() override; virtual void SAL_CALL addTransformationChangedListener( const css::uno::Reference< - css::util::XModifyListener >& xListener) - throw (css::uno::RuntimeException, std::exception) override; + css::util::XModifyListener >& xListener) override; virtual void SAL_CALL removeTransformationChangedListener( const css::uno::Reference< - css::util::XModifyListener >& xListener) - throw (css::uno::RuntimeException, std::exception) override; + css::util::XModifyListener >& xListener) override; virtual void SAL_CALL addPaintListener( const css::uno::Reference< - css::awt::XPaintListener >& xListener) - throw (css::uno::RuntimeException, std::exception) override; + css::awt::XPaintListener >& xListener) override; virtual void SAL_CALL removePaintListener( const css::uno::Reference< - css::awt::XPaintListener >& xListener) - throw (css::uno::RuntimeException, std::exception) override; + css::awt::XPaintListener >& xListener) override; virtual void SAL_CALL addMouseListener( const css::uno::Reference< - css::awt::XMouseListener >& xListener) - throw (css::uno::RuntimeException, std::exception) override; + css::awt::XMouseListener >& xListener) override; virtual void SAL_CALL removeMouseListener( const css::uno::Reference< - css::awt::XMouseListener >& xListener) - throw (css::uno::RuntimeException, std::exception) override; + css::awt::XMouseListener >& xListener) override; virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< - css::awt::XMouseMotionListener >& xListener) - throw (css::uno::RuntimeException, std::exception) override; + css::awt::XMouseMotionListener >& xListener) override; virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< - css::awt::XMouseMotionListener >& xListener) - throw (css::uno::RuntimeException, std::exception) override; + css::awt::XMouseMotionListener >& xListener) override; - virtual void SAL_CALL setMouseCursor(::sal_Int16 nPointerShape) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setMouseCursor(::sal_Int16 nPointerShape) override; - virtual css::awt::Rectangle SAL_CALL getCanvasArea( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getCanvasArea( ) override; // lang::XEventListener - virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) override; // XPaintListener - virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) override; // XMouseListener - virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) override; - virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) override; - virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) override; - virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) override; // XMouseMotionListener - virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) override; - virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) override; // XWindowListener - virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) override; - virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) override; - virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) override; - virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) override; // XView virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL - getResourceId() - throw(css::uno::RuntimeException, std::exception) override; + getResourceId() override; - virtual sal_Bool SAL_CALL isAnchorOnly() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isAnchorOnly() override; // XDrawView virtual void SAL_CALL setCurrentPage ( - const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) override; - virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() override; // CachablePresenterView @@ -261,8 +231,7 @@ private: /** @throws css::lang::DisposedException when the object has already been disposed. */ - void ThrowIfDisposed() - throw (css::lang::DisposedException); + void ThrowIfDisposed(); void impl_addAndConfigureView(); }; diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx index d493344561d9..fdb3ddec8781 100644 --- a/sdext/source/presenter/PresenterSlideSorter.cxx +++ b/sdext/source/presenter/PresenterSlideSorter.cxx @@ -426,7 +426,6 @@ void PresenterSlideSorter::SetActiveState (const bool bIsActive) //----- lang::XEventListener -------------------------------------------------- void SAL_CALL PresenterSlideSorter::disposing (const lang::EventObject& rEventObject) - throw (RuntimeException, std::exception) { if (rEventObject.Source == mxWindow) { @@ -451,7 +450,6 @@ void SAL_CALL PresenterSlideSorter::disposing (const lang::EventObject& rEventOb //----- XWindowListener ------------------------------------------------------- void SAL_CALL PresenterSlideSorter::windowResized (const awt::WindowEvent& rEvent) - throw (uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -460,14 +458,12 @@ void SAL_CALL PresenterSlideSorter::windowResized (const awt::WindowEvent& rEven } void SAL_CALL PresenterSlideSorter::windowMoved (const awt::WindowEvent& rEvent) - throw (uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); } void SAL_CALL PresenterSlideSorter::windowShown (const lang::EventObject& rEvent) - throw (uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -476,7 +472,6 @@ void SAL_CALL PresenterSlideSorter::windowShown (const lang::EventObject& rEvent } void SAL_CALL PresenterSlideSorter::windowHidden (const lang::EventObject& rEvent) - throw (uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -485,7 +480,6 @@ void SAL_CALL PresenterSlideSorter::windowHidden (const lang::EventObject& rEven //----- XPaintListener -------------------------------------------------------- void SAL_CALL PresenterSlideSorter::windowPaint (const css::awt::PaintEvent& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; @@ -503,7 +497,6 @@ void SAL_CALL PresenterSlideSorter::windowPaint (const css::awt::PaintEvent& rEv //----- XMouseListener -------------------------------------------------------- void SAL_CALL PresenterSlideSorter::mousePressed (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) { css::awt::MouseEvent rTemp =rEvent; /// check whether RTL interface or not @@ -516,7 +509,6 @@ void SAL_CALL PresenterSlideSorter::mousePressed (const css::awt::MouseEvent& rE } void SAL_CALL PresenterSlideSorter::mouseReleased (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) { css::awt::MouseEvent rTemp =rEvent; /// check whether RTL interface or not @@ -547,13 +539,11 @@ void SAL_CALL PresenterSlideSorter::mouseReleased (const css::awt::MouseEvent& r } void SAL_CALL PresenterSlideSorter::mouseEntered (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) { (void)rEvent; } void SAL_CALL PresenterSlideSorter::mouseExited (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) { (void)rEvent; mnSlideIndexMousePressed = -1; @@ -564,7 +554,6 @@ void SAL_CALL PresenterSlideSorter::mouseExited (const css::awt::MouseEvent& rEv //----- XMouseMotionListener -------------------------------------------------- void SAL_CALL PresenterSlideSorter::mouseMoved (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) { if (mpMouseOverManager.get() != nullptr) { @@ -594,7 +583,6 @@ void SAL_CALL PresenterSlideSorter::mouseMoved (const css::awt::MouseEvent& rEve } void SAL_CALL PresenterSlideSorter::mouseDragged (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) { (void)rEvent; } @@ -602,14 +590,12 @@ void SAL_CALL PresenterSlideSorter::mouseDragged (const css::awt::MouseEvent& rE //----- XResourceId ----------------------------------------------------------- Reference<XResourceId> SAL_CALL PresenterSlideSorter::getResourceId() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); return mxViewId; } sal_Bool SAL_CALL PresenterSlideSorter::isAnchorOnly() - throw (RuntimeException, std::exception) { return false; } @@ -618,7 +604,6 @@ sal_Bool SAL_CALL PresenterSlideSorter::isAnchorOnly() void SAL_CALL PresenterSlideSorter::propertyChange ( const css::beans::PropertyChangeEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) { (void)rEvent; } @@ -627,7 +612,6 @@ void SAL_CALL PresenterSlideSorter::propertyChange ( void SAL_CALL PresenterSlideSorter::notifyPreviewCreation ( sal_Int32 nSlideIndex) - throw(css::uno::RuntimeException, std::exception) { OSL_ASSERT(mpLayout.get()!=nullptr); @@ -638,7 +622,6 @@ void SAL_CALL PresenterSlideSorter::notifyPreviewCreation ( //----- XDrawView ------------------------------------------------------------- void SAL_CALL PresenterSlideSorter::setCurrentPage (const Reference<drawing::XDrawPage>& rxSlide) - throw (RuntimeException, std::exception) { (void)rxSlide; @@ -670,7 +653,6 @@ void SAL_CALL PresenterSlideSorter::setCurrentPage (const Reference<drawing::XDr } Reference<drawing::XDrawPage> SAL_CALL PresenterSlideSorter::getCurrentPage() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); return nullptr; @@ -1108,7 +1090,6 @@ bool PresenterSlideSorter::ProvideCanvas() } void PresenterSlideSorter::ThrowIfDisposed() - throw (lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) { diff --git a/sdext/source/presenter/PresenterSlideSorter.hxx b/sdext/source/presenter/PresenterSlideSorter.hxx index 3d5d4d82ce3e..021786efd2e4 100644 --- a/sdext/source/presenter/PresenterSlideSorter.hxx +++ b/sdext/source/presenter/PresenterSlideSorter.hxx @@ -77,78 +77,60 @@ public: // lang::XEventListener virtual void SAL_CALL - disposing (const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException, std::exception) override; + disposing (const css::lang::EventObject& rEventObject) override; // XWindowListener - virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) override; - virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) override; - virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) override; - virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) override; // XPaintListener - virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) override; // XMouseListener - virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) override; - virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) override; - virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) override; - virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) override; // XMouseMotionListener - virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) override; - virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) override; // XResourceId - virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() override; - virtual sal_Bool SAL_CALL isAnchorOnly() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isAnchorOnly() override; // XPropertyChangeListener virtual void SAL_CALL propertyChange ( - const css::beans::PropertyChangeEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) override; + const css::beans::PropertyChangeEvent& rEvent) override; // XSlidePreviewCacheListener virtual void SAL_CALL notifyPreviewCreation ( - sal_Int32 nSlideIndex) - throw(css::uno::RuntimeException, std::exception) override; + sal_Int32 nSlideIndex) override; // XDrawView virtual void SAL_CALL setCurrentPage ( - const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) override; - virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() override; private: css::uno::Reference<css::uno::XComponentContext> mxComponentContext; @@ -201,8 +183,7 @@ private: /** @throws css::lang::DisposedException when the object has already been disposed. */ - void ThrowIfDisposed() - throw (css::lang::DisposedException); + void ThrowIfDisposed(); }; } } // end of namespace ::sdext::presenter diff --git a/sdext/source/presenter/PresenterSpritePane.cxx b/sdext/source/presenter/PresenterSpritePane.cxx index f873af85fa71..f951258cd053 100644 --- a/sdext/source/presenter/PresenterSpritePane.cxx +++ b/sdext/source/presenter/PresenterSpritePane.cxx @@ -62,14 +62,12 @@ void PresenterSpritePane::disposing() //----- XPane ----------------------------------------------------------------- Reference<awt::XWindow> SAL_CALL PresenterSpritePane::getWindow() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); return mxContentWindow; } Reference<rendering::XCanvas> SAL_CALL PresenterSpritePane::getCanvas() - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -82,7 +80,6 @@ Reference<rendering::XCanvas> SAL_CALL PresenterSpritePane::getCanvas() //----- XWindowListener ------------------------------------------------------- void SAL_CALL PresenterSpritePane::windowResized (const awt::WindowEvent& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; PresenterPaneBase::windowResized(rEvent); @@ -93,7 +90,6 @@ void SAL_CALL PresenterSpritePane::windowResized (const awt::WindowEvent& rEvent } void SAL_CALL PresenterSpritePane::windowMoved (const awt::WindowEvent& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; PresenterPaneBase::windowMoved(rEvent); @@ -105,7 +101,6 @@ void SAL_CALL PresenterSpritePane::windowMoved (const awt::WindowEvent& rEvent) } void SAL_CALL PresenterSpritePane::windowShown (const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; PresenterPaneBase::windowShown(rEvent); @@ -121,7 +116,6 @@ void SAL_CALL PresenterSpritePane::windowShown (const lang::EventObject& rEvent) } void SAL_CALL PresenterSpritePane::windowHidden (const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; PresenterPaneBase::windowHidden(rEvent); @@ -134,7 +128,6 @@ void SAL_CALL PresenterSpritePane::windowHidden (const lang::EventObject& rEvent //----- XPaintListener -------------------------------------------------------- void SAL_CALL PresenterSpritePane::windowPaint (const awt::PaintEvent& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); diff --git a/sdext/source/presenter/PresenterSpritePane.hxx b/sdext/source/presenter/PresenterSpritePane.hxx index 859f9dc9501a..e65ea98a9148 100644 --- a/sdext/source/presenter/PresenterSpritePane.hxx +++ b/sdext/source/presenter/PresenterSpritePane.hxx @@ -61,30 +61,23 @@ public: // XPane - virtual css::uno::Reference<css::awt::XWindow> SAL_CALL getWindow() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::awt::XWindow> SAL_CALL getWindow() override; - virtual css::uno::Reference<css::rendering::XCanvas> SAL_CALL getCanvas() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::rendering::XCanvas> SAL_CALL getCanvas() override; // XWindowListener - virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) override; - virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) override; - virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) override; - virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) override; // XPaintListener - virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) override; private: css::uno::Reference<css::awt::XWindow> mxParentWindow; diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx index 093f7548ffd7..477dafda5c54 100644 --- a/sdext/source/presenter/PresenterTimer.cxx +++ b/sdext/source/presenter/PresenterTimer.cxx @@ -488,7 +488,6 @@ void PresenterClockTimer::CheckCurrentTime (const TimeValue& rCurrentTime) //----- XCallback ------------------------------------------------------------- void SAL_CALL PresenterClockTimer::notify (const css::uno::Any& rUserData) - throw (css::uno::RuntimeException, std::exception) { (void)rUserData; diff --git a/sdext/source/presenter/PresenterTimer.hxx b/sdext/source/presenter/PresenterTimer.hxx index 6b6ce0eef029..903a7ed5320d 100644 --- a/sdext/source/presenter/PresenterTimer.hxx +++ b/sdext/source/presenter/PresenterTimer.hxx @@ -95,8 +95,7 @@ public: // XCallback - virtual void SAL_CALL notify (const css::uno::Any& rUserData) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL notify (const css::uno::Any& rUserData) override; private: static ::rtl::Reference<PresenterClockTimer> mpInstance; diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index fbd1694abcd9..42823bbedbab 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -160,18 +160,15 @@ namespace { // lang::XEventListener - virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) override; // document::XEventListener - virtual void SAL_CALL notifyEvent (const css::document::EventObject& rEvent) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL notifyEvent (const css::document::EventObject& rEvent) override; // frame::XStatusListener - virtual void SAL_CALL statusChanged (const css::frame::FeatureStateEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL statusChanged (const css::frame::FeatureStateEvent& rEvent) override; protected: ::rtl::Reference<PresenterToolBar> mpToolBar; @@ -219,8 +216,7 @@ namespace { // lang::XEventListener - virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) override; protected: virtual awt::Size CreateBoundingSize ( @@ -492,7 +488,6 @@ const Reference<XComponentContext>& PresenterToolBar::GetComponentContext() cons //----- lang::XEventListener ------------------------------------------------- void SAL_CALL PresenterToolBar::disposing (const lang::EventObject& rEventObject) - throw (RuntimeException, std::exception) { if (rEventObject.Source == mxWindow) mxWindow = nullptr; @@ -501,34 +496,29 @@ void SAL_CALL PresenterToolBar::disposing (const lang::EventObject& rEventObject //----- XWindowListener ------------------------------------------------------- void SAL_CALL PresenterToolBar::windowResized (const awt::WindowEvent& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; mbIsLayoutPending = true; } void SAL_CALL PresenterToolBar::windowMoved (const awt::WindowEvent& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; } void SAL_CALL PresenterToolBar::windowShown (const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; mbIsLayoutPending = true; } void SAL_CALL PresenterToolBar::windowHidden (const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; } //----- XPaintListener -------------------------------------------------------- void SAL_CALL PresenterToolBar::windowPaint (const css::awt::PaintEvent& rEvent) - throw (RuntimeException, std::exception) { if ( ! mxCanvas.is()) return; @@ -553,28 +543,24 @@ void SAL_CALL PresenterToolBar::windowPaint (const css::awt::PaintEvent& rEvent) //----- XMouseListener -------------------------------------------------------- void SAL_CALL PresenterToolBar::mousePressed (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); CheckMouseOver(rEvent, true, true); } void SAL_CALL PresenterToolBar::mouseReleased (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); CheckMouseOver(rEvent, true); } void SAL_CALL PresenterToolBar::mouseEntered (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); CheckMouseOver(rEvent, true); } void SAL_CALL PresenterToolBar::mouseExited (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); CheckMouseOver(rEvent, false); @@ -583,14 +569,12 @@ void SAL_CALL PresenterToolBar::mouseExited (const css::awt::MouseEvent& rEvent) //----- XMouseMotionListener -------------------------------------------------- void SAL_CALL PresenterToolBar::mouseMoved (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); CheckMouseOver(rEvent, true); } void SAL_CALL PresenterToolBar::mouseDragged (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); (void)rEvent; @@ -599,7 +583,6 @@ void SAL_CALL PresenterToolBar::mouseDragged (const css::awt::MouseEvent& rEvent //----- XDrawView ------------------------------------------------------------- void SAL_CALL PresenterToolBar::setCurrentPage (const Reference<drawing::XDrawPage>& rxSlide) - throw (RuntimeException, std::exception) { if (rxSlide != mxCurrentSlide) { @@ -609,7 +592,6 @@ void SAL_CALL PresenterToolBar::setCurrentPage (const Reference<drawing::XDrawPa } Reference<drawing::XDrawPage> SAL_CALL PresenterToolBar::getCurrentPage() - throw (RuntimeException, std::exception) { return mxCurrentSlide; } @@ -1051,7 +1033,6 @@ void PresenterToolBar::CheckMouseOver ( } void PresenterToolBar::ThrowIfDisposed() const - throw (css::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) { @@ -1144,7 +1125,6 @@ const ::rtl::Reference<PresenterToolBar>& PresenterToolBarView::GetPresenterTool //----- XPaintListener -------------------------------------------------------- void SAL_CALL PresenterToolBarView::windowPaint (const css::awt::PaintEvent& rEvent) - throw (RuntimeException, std::exception) { awt::Rectangle aWindowBox (mxWindow->getPosSize()); mpPresenterController->GetCanvasHelper()->Paint( @@ -1158,7 +1138,6 @@ void SAL_CALL PresenterToolBarView::windowPaint (const css::awt::PaintEvent& rEv //----- lang::XEventListener ------------------------------------------------- void SAL_CALL PresenterToolBarView::disposing (const lang::EventObject& rEventObject) - throw (RuntimeException, std::exception) { if (rEventObject.Source == mxWindow) mxWindow = nullptr; @@ -1167,13 +1146,11 @@ void SAL_CALL PresenterToolBarView::disposing (const lang::EventObject& rEventOb //----- XResourceId ----------------------------------------------------------- Reference<XResourceId> SAL_CALL PresenterToolBarView::getResourceId() - throw (RuntimeException, std::exception) { return mxViewId; } sal_Bool SAL_CALL PresenterToolBarView::isAnchorOnly() - throw (RuntimeException, std::exception) { return false; } @@ -1181,7 +1158,6 @@ sal_Bool SAL_CALL PresenterToolBarView::isAnchorOnly() //----- XDrawView ------------------------------------------------------------- void SAL_CALL PresenterToolBarView::setCurrentPage (const Reference<drawing::XDrawPage>& rxSlide) - throw (RuntimeException, std::exception) { Reference<drawing::XDrawView> xToolBar (static_cast<XWeak*>(mpToolBar.get()), UNO_QUERY); if (xToolBar.is()) @@ -1189,7 +1165,6 @@ void SAL_CALL PresenterToolBarView::setCurrentPage (const Reference<drawing::XDr } Reference<drawing::XDrawPage> SAL_CALL PresenterToolBarView::getCurrentPage() - throw (RuntimeException, std::exception) { return nullptr; } @@ -1362,7 +1337,6 @@ void Element::UpdateState() //----- lang::XEventListener -------------------------------------------------- void SAL_CALL Element::disposing (const css::lang::EventObject& rEvent) - throw(css::uno::RuntimeException, std::exception) { (void)rEvent; } @@ -1370,7 +1344,6 @@ void SAL_CALL Element::disposing (const css::lang::EventObject& rEvent) //----- document::XEventListener ---------------------------------------------- void SAL_CALL Element::notifyEvent (const css::document::EventObject& rEvent) - throw(css::uno::RuntimeException, std::exception) { (void)rEvent; UpdateState(); @@ -1379,7 +1352,6 @@ void SAL_CALL Element::notifyEvent (const css::document::EventObject& rEvent) //----- frame::XStatusListener ------------------------------------------------ void SAL_CALL Element::statusChanged (const css::frame::FeatureStateEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) { bool bIsSelected (mbIsSelected); bool bIsEnabled (rEvent.IsEnabled); @@ -1613,7 +1585,6 @@ PresenterBitmapDescriptor::Mode Button::GetMode() const //----- lang::XEventListener -------------------------------------------------- void SAL_CALL Button::disposing (const css::lang::EventObject& rEvent) - throw(css::uno::RuntimeException, std::exception) { (void)rEvent; mbIsListenerRegistered = false; diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx index b4b83b8dd765..3bd2cbcac39c 100644 --- a/sdext/source/presenter/PresenterToolBar.hxx +++ b/sdext/source/presenter/PresenterToolBar.hxx @@ -103,58 +103,44 @@ public: // lang::XEventListener virtual void SAL_CALL - disposing (const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException, std::exception) override; + disposing (const css::lang::EventObject& rEventObject) override; // XWindowListener - virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) override; - virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) override; - virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) override; - virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) override; // XPaintListener - virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) override; // XMouseListener - virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) override; - virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) override; - virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) override; - virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) override; // XMouseMotionListener - virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) override; - virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) override; // XDrawView virtual void SAL_CALL setCurrentPage ( - const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) override; - virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() override; class Context; @@ -210,8 +196,7 @@ private: /** @throws css::lang::DisposedException when the object has already been disposed. */ - void ThrowIfDisposed() const - throw (css::lang::DisposedException); + void ThrowIfDisposed() const; }; /** View for the PresenterToolBar. @@ -236,31 +221,25 @@ public: // XPaintListener - virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) override; // lang::XEventListener virtual void SAL_CALL - disposing (const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException, std::exception) override; + disposing (const css::lang::EventObject& rEventObject) override; // XResourceId - virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() override; - virtual sal_Bool SAL_CALL isAnchorOnly() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isAnchorOnly() override; // XDrawView virtual void SAL_CALL setCurrentPage ( - const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) override; - virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() override; private: // css::uno::Reference<css::uno::XComponentContext> mxComponentContext; diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx index 67654127f465..912bc1bab0e0 100644 --- a/sdext/source/presenter/PresenterViewFactory.cxx +++ b/sdext/source/presenter/PresenterViewFactory.cxx @@ -74,8 +74,7 @@ public: } virtual void SAL_CALL setCurrentPage ( - const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) - throw (css::uno::RuntimeException, std::exception) override + const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) override { Reference<presentation::XSlideShowController> xSlideShowController ( mpPresenterController->GetSlideShowController()); @@ -179,7 +178,6 @@ PresenterViewFactory::~PresenterViewFactory() } void SAL_CALL PresenterViewFactory::disposing() - throw (RuntimeException) { if (mxConfigurationController.is()) mxConfigurationController->removeResourceFactoryForReference(this); @@ -210,7 +208,6 @@ void SAL_CALL PresenterViewFactory::disposing() Reference<XResource> SAL_CALL PresenterViewFactory::createResource ( const Reference<XResourceId>& rxViewId) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -236,7 +233,6 @@ Reference<XResource> SAL_CALL PresenterViewFactory::createResource ( } void SAL_CALL PresenterViewFactory::releaseResource (const Reference<XResource>& rxView) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -515,7 +511,6 @@ Reference<XView> PresenterViewFactory::CreateHelpView( } void PresenterViewFactory::ThrowIfDisposed() const - throw (css::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) { diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx index b83c7790a592..f699c7b1b2ba 100644 --- a/sdext/source/presenter/PresenterViewFactory.hxx +++ b/sdext/source/presenter/PresenterViewFactory.hxx @@ -96,20 +96,17 @@ public: const ::rtl::Reference<PresenterController>& rpPresenterController); virtual ~PresenterViewFactory() override; - virtual void SAL_CALL disposing() - throw (css::uno::RuntimeException) override; + virtual void SAL_CALL disposing() override; // XResourceFactory virtual css::uno::Reference<css::drawing::framework::XResource> SAL_CALL createResource ( - const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId) override; virtual void SAL_CALL releaseResource ( - const css::uno::Reference<css::drawing::framework::XResource>& rxPane) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference<css::drawing::framework::XResource>& rxPane) override; private: css::uno::Reference<css::uno::XComponentContext> mxComponentContext; @@ -157,7 +154,7 @@ private: const css::uno::Reference<css::drawing::framework::XPane>& rxAnchorPane); /// @throws css::lang::DisposedException - void ThrowIfDisposed() const throw (css::lang::DisposedException); + void ThrowIfDisposed() const; }; } } diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx index 7907ae25b691..158049d9a24b 100644 --- a/sdext/source/presenter/PresenterWindowManager.cxx +++ b/sdext/source/presenter/PresenterWindowManager.cxx @@ -216,7 +216,6 @@ void PresenterWindowManager::SetPaneBorderPainter ( //----- XWindowListener ------------------------------------------------------- void SAL_CALL PresenterWindowManager::windowResized (const awt::WindowEvent& rEvent) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (rEvent.Source == mxParentWindow) @@ -237,7 +236,6 @@ void SAL_CALL PresenterWindowManager::windowResized (const awt::WindowEvent& rEv } void SAL_CALL PresenterWindowManager::windowMoved (const awt::WindowEvent& rEvent) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (rEvent.Source != mxParentWindow) @@ -251,13 +249,11 @@ void SAL_CALL PresenterWindowManager::windowMoved (const awt::WindowEvent& rEven } void SAL_CALL PresenterWindowManager::windowShown (const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; } void SAL_CALL PresenterWindowManager::windowHidden (const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { (void)rEvent; } @@ -265,7 +261,6 @@ void SAL_CALL PresenterWindowManager::windowHidden (const lang::EventObject& rEv //----- XPaintListener -------------------------------------------------------- void SAL_CALL PresenterWindowManager::windowPaint (const awt::PaintEvent& rEvent) - throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -298,14 +293,12 @@ void SAL_CALL PresenterWindowManager::windowPaint (const awt::PaintEvent& rEvent //----- XMouseListener -------------------------------------------------------- void SAL_CALL PresenterWindowManager::mousePressed (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) { (void)rEvent; mbIsMouseClickPending = true; } void SAL_CALL PresenterWindowManager::mouseReleased (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) { if (mbIsMouseClickPending) { @@ -315,14 +308,12 @@ void SAL_CALL PresenterWindowManager::mouseReleased (const css::awt::MouseEvent& } void SAL_CALL PresenterWindowManager::mouseEntered (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) { (void)rEvent; mbIsMouseClickPending = false; } void SAL_CALL PresenterWindowManager::mouseExited (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) { (void)rEvent; mbIsMouseClickPending = false; @@ -331,13 +322,11 @@ void SAL_CALL PresenterWindowManager::mouseExited (const css::awt::MouseEvent& r //----- XFocusListener -------------------------------------------------------- void SAL_CALL PresenterWindowManager::focusGained (const css::awt::FocusEvent& /*rEvent*/) - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); } void SAL_CALL PresenterWindowManager::focusLost (const css::awt::FocusEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); (void)rEvent; @@ -346,7 +335,6 @@ void SAL_CALL PresenterWindowManager::focusLost (const css::awt::FocusEvent& rEv //----- XEventListener -------------------------------------------------------- void SAL_CALL PresenterWindowManager::disposing (const lang::EventObject& rEvent) - throw (RuntimeException, std::exception) { if (rEvent.Source == mxParentWindow) mxParentWindow = nullptr; @@ -1117,7 +1105,6 @@ void PresenterWindowManager::Update() } void PresenterWindowManager::ThrowIfDisposed() const - throw (css::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) { diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx index 26bc4f701cf6..64d850386f35 100644 --- a/sdext/source/presenter/PresenterWindowManager.hxx +++ b/sdext/source/presenter/PresenterWindowManager.hxx @@ -114,50 +114,38 @@ public: // XWindowListener - virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) override; - virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) override; - virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) override; - virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) override; // XPaintListener - virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) override; // XMouseListener - virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) override; - virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) override; - virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) override; - virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) override; // XFocusListener - virtual void SAL_CALL focusGained (const css::awt::FocusEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL focusGained (const css::awt::FocusEvent& rEvent) override; - virtual void SAL_CALL focusLost (const css::awt::FocusEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL focusLost (const css::awt::FocusEvent& rEvent) override; // XEventListener virtual void SAL_CALL disposing ( - const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& rEvent) override; private: css::uno::Reference<css::uno::XComponentContext> mxComponentContext; @@ -213,7 +201,7 @@ private: void NotifyDisposing(); /// @throws css::lang::DisposedException - void ThrowIfDisposed() const throw (css::lang::DisposedException); + void ThrowIfDisposed() const; }; } } |