diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-25 21:31:58 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-26 18:22:20 +0100 |
| commit | 5e21a413c788f839a66d9e4c14e745ed18058db8 (patch) | |
| tree | d4451246461346a425ad6f796e08bf1514cdd942 /sdext/source | |
| parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) | |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'sdext/source')
62 files changed, 645 insertions, 645 deletions
diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx index 11c14e713268..787d4f235c51 100644 --- a/sdext/source/minimizer/informationdialog.cxx +++ b/sdext/source/minimizer/informationdialog.cxx @@ -361,7 +361,7 @@ sal_Bool InformationDialog::execute() void OKActionListener::actionPerformed( const ActionEvent& rEvent ) - throw ( com::sun::star::uno::RuntimeException ) + throw ( com::sun::star::uno::RuntimeException, std::exception ) { if ( rEvent.ActionCommand == "button" ) { @@ -369,7 +369,7 @@ void OKActionListener::actionPerformed( const ActionEvent& rEvent ) } } void OKActionListener::disposing( const ::com::sun::star::lang::EventObject& /* Source */ ) - throw ( com::sun::star::uno::RuntimeException ) + throw ( com::sun::star::uno::RuntimeException, std::exception ) { } diff --git a/sdext/source/minimizer/informationdialog.hxx b/sdext/source/minimizer/informationdialog.hxx index cba2be5080a4..42427105f6e5 100644 --- a/sdext/source/minimizer/informationdialog.hxx +++ b/sdext/source/minimizer/informationdialog.hxx @@ -79,8 +79,8 @@ class OKActionListener : public ::cppu::WeakImplHelper1< com::sun::star::awt::XA public: OKActionListener( InformationDialog& rInformationDialog ) : mrInformationDialog( rInformationDialog ){}; - virtual void SAL_CALL actionPerformed( const ::com::sun::star::awt::ActionEvent& Event ) throw ( com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actionPerformed( const ::com::sun::star::awt::ActionEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException, std::exception); private: InformationDialog& mrInformationDialog; diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx index 4aea11c751b6..cf93265292db 100644 --- a/sdext/source/minimizer/optimizerdialog.cxx +++ b/sdext/source/minimizer/optimizerdialog.cxx @@ -364,7 +364,7 @@ void OptimizerDialog::UpdateStatus( const com::sun::star::uno::Sequence< com::su void ItemListener::itemStateChanged( const ItemEvent& Event ) - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { try { @@ -492,14 +492,14 @@ void ItemListener::itemStateChanged( const ItemEvent& Event ) } } void ItemListener::disposing( const ::com::sun::star::lang::EventObject& /* Source */ ) - throw ( com::sun::star::uno::RuntimeException ) + throw ( com::sun::star::uno::RuntimeException, std::exception ) { } void ActionListener::actionPerformed( const ActionEvent& rEvent ) - throw ( com::sun::star::uno::RuntimeException ) + throw ( com::sun::star::uno::RuntimeException, std::exception ) { switch( TKGet( rEvent.ActionCommand ) ) { @@ -642,14 +642,14 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent ) } } void ActionListener::disposing( const ::com::sun::star::lang::EventObject& /* Source */ ) - throw ( com::sun::star::uno::RuntimeException ) + throw ( com::sun::star::uno::RuntimeException, std::exception ) { } void ActionListenerListBox0Pg0::actionPerformed( const ActionEvent& rEvent ) - throw ( com::sun::star::uno::RuntimeException ) + throw ( com::sun::star::uno::RuntimeException, std::exception ) { if ( !rEvent.ActionCommand.isEmpty() ) { @@ -661,14 +661,14 @@ void ActionListenerListBox0Pg0::actionPerformed( const ActionEvent& rEvent ) mrOptimizerDialog.UpdateControlStates(); } void ActionListenerListBox0Pg0::disposing( const ::com::sun::star::lang::EventObject& /* Source */ ) - throw ( com::sun::star::uno::RuntimeException ) + throw ( com::sun::star::uno::RuntimeException, std::exception ) { } void TextListenerFormattedField0Pg1::textChanged( const TextEvent& /* rEvent */ ) - throw ( com::sun::star::uno::RuntimeException ) + throw ( com::sun::star::uno::RuntimeException, std::exception ) { double fDouble = 0; Any aAny = mrOptimizerDialog.getControlProperty( "FormattedField0Pg1", "EffectiveValue" ); @@ -676,14 +676,14 @@ void TextListenerFormattedField0Pg1::textChanged( const TextEvent& /* rEvent */ mrOptimizerDialog.SetConfigProperty( TK_JPEGQuality, Any( (sal_Int32)fDouble ) ); } void TextListenerFormattedField0Pg1::disposing( const ::com::sun::star::lang::EventObject& /* Source */ ) - throw ( com::sun::star::uno::RuntimeException ) + throw ( com::sun::star::uno::RuntimeException, std::exception ) { } void TextListenerComboBox0Pg1::textChanged( const TextEvent& /* rEvent */ ) - throw ( com::sun::star::uno::RuntimeException ) + throw ( com::sun::star::uno::RuntimeException, std::exception ) { OUString aString; Any aAny = mrOptimizerDialog.getControlProperty( "ComboBox0Pg1", "Text" ); @@ -705,14 +705,14 @@ void TextListenerComboBox0Pg1::textChanged( const TextEvent& /* rEvent */ ) } } void TextListenerComboBox0Pg1::disposing( const ::com::sun::star::lang::EventObject& /* Source */ ) - throw ( com::sun::star::uno::RuntimeException ) + throw ( com::sun::star::uno::RuntimeException, std::exception ) { } void SpinListenerFormattedField0Pg1::up( const SpinEvent& /* rEvent */ ) - throw ( com::sun::star::uno::RuntimeException ) + throw ( com::sun::star::uno::RuntimeException, std::exception ) { double fDouble; Any aAny = mrOptimizerDialog.getControlProperty( "FormattedField0Pg1", "EffectiveValue" ); @@ -726,7 +726,7 @@ void SpinListenerFormattedField0Pg1::up( const SpinEvent& /* rEvent */ ) } } void SpinListenerFormattedField0Pg1::down( const SpinEvent& /* rEvent */ ) - throw ( com::sun::star::uno::RuntimeException ) + throw ( com::sun::star::uno::RuntimeException, std::exception ) { double fDouble; Any aAny = mrOptimizerDialog.getControlProperty( "FormattedField0Pg1", "EffectiveValue" ); @@ -740,19 +740,19 @@ void SpinListenerFormattedField0Pg1::down( const SpinEvent& /* rEvent */ ) } } void SpinListenerFormattedField0Pg1::first( const SpinEvent& /* rEvent */ ) - throw ( com::sun::star::uno::RuntimeException ) + throw ( com::sun::star::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 ( com::sun::star::uno::RuntimeException ) + throw ( com::sun::star::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 ::com::sun::star::lang::EventObject& /* Source */ ) - throw ( com::sun::star::uno::RuntimeException ) + throw ( com::sun::star::uno::RuntimeException, std::exception ) { } @@ -765,14 +765,14 @@ void HelpCloseListener::removeCloseListener( const Reference < XCloseListener >& { } void HelpCloseListener::queryClosing( const EventObject&, sal_Bool /* bDeliverOwnership */ ) - throw ( RuntimeException, CloseVetoException ) + throw ( RuntimeException, CloseVetoException, std::exception ) { } void HelpCloseListener::notifyClosing( const EventObject& ) - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { } -void HelpCloseListener::disposing( const EventObject& ) throw ( RuntimeException ) +void HelpCloseListener::disposing( const EventObject& ) throw ( RuntimeException, std::exception ) { mrXFrame = NULL; } diff --git a/sdext/source/minimizer/optimizerdialog.hxx b/sdext/source/minimizer/optimizerdialog.hxx index 3ccce0b3759b..b77400c4497a 100644 --- a/sdext/source/minimizer/optimizerdialog.hxx +++ b/sdext/source/minimizer/optimizerdialog.hxx @@ -134,8 +134,8 @@ class ItemListener : public ::cppu::WeakImplHelper1< com::sun::star::awt::XItemL public: ItemListener( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){}; - virtual void SAL_CALL itemStateChanged( const ::com::sun::star::awt::ItemEvent& Event ) throw ( com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException); + virtual void SAL_CALL itemStateChanged( const ::com::sun::star::awt::ItemEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException, std::exception); private: OptimizerDialog& mrOptimizerDialog; @@ -148,8 +148,8 @@ class ActionListener : public ::cppu::WeakImplHelper1< com::sun::star::awt::XAct public: ActionListener( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){}; - virtual void SAL_CALL actionPerformed( const ::com::sun::star::awt::ActionEvent& Event ) throw ( com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actionPerformed( const ::com::sun::star::awt::ActionEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException, std::exception); private: OptimizerDialog& mrOptimizerDialog; @@ -162,8 +162,8 @@ class ActionListenerListBox0Pg0 : public ::cppu::WeakImplHelper1< com::sun::star public: ActionListenerListBox0Pg0( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){}; - virtual void SAL_CALL actionPerformed( const ::com::sun::star::awt::ActionEvent& Event ) throw ( com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException); + virtual void SAL_CALL actionPerformed( const ::com::sun::star::awt::ActionEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException, std::exception); private: OptimizerDialog& mrOptimizerDialog; @@ -176,8 +176,8 @@ class TextListenerFormattedField0Pg1 : public ::cppu::WeakImplHelper1< com::sun: public: TextListenerFormattedField0Pg1( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){}; - virtual void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& Event ) throw ( com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException); + virtual void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException, std::exception); private: OptimizerDialog& mrOptimizerDialog; @@ -190,8 +190,8 @@ class TextListenerComboBox0Pg1 : public ::cppu::WeakImplHelper1< com::sun::star: public: TextListenerComboBox0Pg1( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){}; - virtual void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& Event ) throw ( com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException); + virtual void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException, std::exception); private: OptimizerDialog& mrOptimizerDialog; @@ -204,11 +204,11 @@ class SpinListenerFormattedField0Pg1 : public ::cppu::WeakImplHelper1< com::sun: public: SpinListenerFormattedField0Pg1( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){}; - virtual void SAL_CALL up( const ::com::sun::star::awt::SpinEvent& Event ) throw ( com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL down( const ::com::sun::star::awt::SpinEvent& Event ) throw ( com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL first( const ::com::sun::star::awt::SpinEvent& Event ) throw ( com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL last( const ::com::sun::star::awt::SpinEvent& Event ) throw ( com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException); + virtual void SAL_CALL up( const ::com::sun::star::awt::SpinEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL down( const ::com::sun::star::awt::SpinEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL first( const ::com::sun::star::awt::SpinEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL last( const ::com::sun::star::awt::SpinEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException, std::exception); private: OptimizerDialog& mrOptimizerDialog; @@ -223,9 +223,9 @@ public: virtual void SAL_CALL addCloseListener(const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& ) throw( com::sun::star::uno::RuntimeException ); virtual void SAL_CALL removeCloseListener( const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& xListener ) throw( com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL notifyClosing( const com::sun::star::lang::EventObject& aEvent ) throw (com::sun::star::uno::RuntimeException) ; - virtual void SAL_CALL queryClosing( const com::sun::star::lang::EventObject& aEvent, sal_Bool bDeliverOwnership ) throw (com::sun::star::uno::RuntimeException, com::sun::star::util::CloseVetoException) ; - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& aEvent ) throw (com::sun::star::uno::RuntimeException) ; + virtual void SAL_CALL notifyClosing( const com::sun::star::lang::EventObject& aEvent ) throw (com::sun::star::uno::RuntimeException, std::exception) ; + virtual void SAL_CALL queryClosing( const com::sun::star::lang::EventObject& aEvent, sal_Bool bDeliverOwnership ) throw (com::sun::star::uno::RuntimeException, com::sun::star::util::CloseVetoException, std::exception) ; + virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& aEvent ) throw (com::sun::star::uno::RuntimeException, std::exception) ; private: diff --git a/sdext/source/minimizer/pppoptimizer.cxx b/sdext/source/minimizer/pppoptimizer.cxx index 0a88b4728792..362252711031 100644 --- a/sdext/source/minimizer/pppoptimizer.cxx +++ b/sdext/source/minimizer/pppoptimizer.cxx @@ -52,7 +52,7 @@ PPPOptimizer::~PPPOptimizer() Reference< com::sun::star::frame::XDispatch > SAL_CALL PPPOptimizer::queryDispatch( - const URL& aURL, const OUString& /* aTargetFrameName */, sal_Int32 /* nSearchFlags */ ) throw( RuntimeException ) + const URL& aURL, const OUString& /* aTargetFrameName */, sal_Int32 /* nSearchFlags */ ) throw( RuntimeException, std::exception ) { Reference < XDispatch > xRet; if ( aURL.Protocol.equalsAscii( "vnd.com.sun.star.comp.PPPOptimizer:" ) ) @@ -66,7 +66,7 @@ Reference< com::sun::star::frame::XDispatch > SAL_CALL PPPOptimizer::queryDispat Sequence< Reference< com::sun::star::frame::XDispatch > > SAL_CALL PPPOptimizer::queryDispatches( - const Sequence< com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw( RuntimeException ) + const Sequence< com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw( RuntimeException, std::exception ) { Sequence< Reference< com::sun::star::frame::XDispatch> > aReturn( aDescripts.getLength() ); Reference< com::sun::star::frame::XDispatch>* pReturn = aReturn.getArray(); @@ -83,7 +83,7 @@ Sequence< Reference< com::sun::star::frame::XDispatch > > SAL_CALL PPPOptimizer: void SAL_CALL PPPOptimizer::dispatch( const URL& rURL, const Sequence< PropertyValue >& lArguments ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if ( mxController.is() && rURL.Protocol.equalsAscii( "vnd.com.sun.star.comp.PPPOptimizer:" ) ) { @@ -107,7 +107,7 @@ void SAL_CALL PPPOptimizer::dispatch( const URL& rURL, const Sequence< PropertyV void SAL_CALL PPPOptimizer::addStatusListener( const Reference< XStatusListener >&, const URL& ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { // TODO OSL_FAIL( "PPPOptimizer::addStatusListener()\nNot implemented yet!" ); @@ -115,7 +115,7 @@ void SAL_CALL PPPOptimizer::addStatusListener( const Reference< XStatusListener void SAL_CALL PPPOptimizer::removeStatusListener( const Reference< XStatusListener >&, const URL& ) - throw( RuntimeException ) + 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 4f0de1fb411f..5c6dd9dadf43 100644 --- a/sdext/source/minimizer/pppoptimizer.hxx +++ b/sdext/source/minimizer/pppoptimizer.hxx @@ -48,22 +48,22 @@ public: // XDispatchProvider virtual com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( - const com::sun::star::uno::Sequence< com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw( com::sun::star::uno::RuntimeException ); + const com::sun::star::uno::Sequence< com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw( com::sun::star::uno::RuntimeException, std::exception ); // XDispatch virtual void SAL_CALL dispatch( const com::sun::star::util::URL& aURL, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& lArguments ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL addStatusListener( const com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener >& xListener, const com::sun::star::util::URL& aURL ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeStatusListener( const com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener >& xListener, const com::sun::star::util::URL& aURL ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); static sal_Int64 GetFileSize( const OUString& rURL ); }; diff --git a/sdext/source/minimizer/pppoptimizerdialog.cxx b/sdext/source/minimizer/pppoptimizerdialog.cxx index 479896de1dfd..57f21930e39c 100644 --- a/sdext/source/minimizer/pppoptimizerdialog.cxx +++ b/sdext/source/minimizer/pppoptimizerdialog.cxx @@ -43,7 +43,7 @@ PPPOptimizerDialog::~PPPOptimizerDialog() } void SAL_CALL PPPOptimizerDialog::initialize( const Sequence< Any >& aArguments ) - throw ( Exception, RuntimeException ) + throw ( Exception, RuntimeException, std::exception ) { if( aArguments.getLength() != 1 ) throw IllegalArgumentException(); @@ -54,25 +54,25 @@ void SAL_CALL PPPOptimizerDialog::initialize( const Sequence< Any >& aArguments } OUString SAL_CALL PPPOptimizerDialog::getImplementationName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return PPPOptimizerDialog_getImplementationName(); } sal_Bool SAL_CALL PPPOptimizerDialog::supportsService( const OUString& ServiceName ) - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL PPPOptimizerDialog::getSupportedServiceNames() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return PPPOptimizerDialog_getSupportedServiceNames(); } Reference< com::sun::star::frame::XDispatch > SAL_CALL PPPOptimizerDialog::queryDispatch( - const URL& aURL, const OUString& /* aTargetFrameName */, sal_Int32 /* nSearchFlags */ ) throw( RuntimeException ) + const URL& aURL, const OUString& /* aTargetFrameName */, sal_Int32 /* nSearchFlags */ ) throw( RuntimeException, std::exception ) { Reference < XDispatch > xRet; if ( aURL.Protocol.equalsAscii( "vnd.com.sun.star.comp.PresentationMinimizer:" ) ) @@ -82,7 +82,7 @@ Reference< com::sun::star::frame::XDispatch > SAL_CALL PPPOptimizerDialog::query } Sequence< Reference< com::sun::star::frame::XDispatch > > SAL_CALL PPPOptimizerDialog::queryDispatches( - const Sequence< com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw( RuntimeException ) + const Sequence< com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw( RuntimeException, std::exception ) { Sequence< Reference< com::sun::star::frame::XDispatch> > aReturn( aDescripts.getLength() ); Reference< com::sun::star::frame::XDispatch>* pReturn = aReturn.getArray(); @@ -96,7 +96,7 @@ Sequence< Reference< com::sun::star::frame::XDispatch > > SAL_CALL PPPOptimizerD void SAL_CALL PPPOptimizerDialog::dispatch( const URL& rURL, const Sequence< PropertyValue >& rArguments ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if ( mxController.is() && rURL.Protocol.equalsAscii( "vnd.com.sun.star.comp.PresentationMinimizer:" ) ) @@ -143,14 +143,14 @@ void SAL_CALL PPPOptimizerDialog::dispatch( const URL& rURL, } void SAL_CALL PPPOptimizerDialog::addStatusListener( const Reference< XStatusListener >&, const URL& ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { // TODO // OSL_FAIL( "PPPOptimizerDialog::addStatusListener()\nNot implemented yet!" ); } void SAL_CALL PPPOptimizerDialog::removeStatusListener( const Reference< XStatusListener >&, const URL& ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { // TODO // OSL_FAIL( "PPPOptimizerDialog::removeStatusListener()\nNot implemented yet!" ); diff --git a/sdext/source/minimizer/pppoptimizerdialog.hxx b/sdext/source/minimizer/pppoptimizerdialog.hxx index 5aaa4c4d1e55..c8a563686cce 100644 --- a/sdext/source/minimizer/pppoptimizerdialog.hxx +++ b/sdext/source/minimizer/pppoptimizerdialog.hxx @@ -58,37 +58,37 @@ public: // XInitialization void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) - throw( com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception ); // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XDispatchProvider virtual com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( - const com::sun::star::uno::Sequence< com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw( com::sun::star::uno::RuntimeException ); + const com::sun::star::uno::Sequence< com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw( com::sun::star::uno::RuntimeException, std::exception ); // XDispatch virtual void SAL_CALL dispatch( const com::sun::star::util::URL& aURL, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& lArguments ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL addStatusListener( const com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener >& xListener, const com::sun::star::util::URL& aURL ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeStatusListener( const com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener >& xListener, const com::sun::star::util::URL& aURL ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); }; OUString PPPOptimizerDialog_getImplementationName(); diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx index b069157016c1..b412294ba51e 100644 --- a/sdext/source/pdfimport/filterdet.cxx +++ b/sdext/source/pdfimport/filterdet.cxx @@ -189,7 +189,7 @@ PDFDetector::PDFDetector( const uno::Reference< uno::XComponentContext >& xConte {} // XExtendedFilterDetection -OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue >& rFilterData ) throw( uno::RuntimeException ) +OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue >& rFilterData ) throw( uno::RuntimeException, std::exception ) { osl::MutexGuard const guard( m_aMutex ); bool bSuccess = false; diff --git a/sdext/source/pdfimport/filterdet.hxx b/sdext/source/pdfimport/filterdet.hxx index 997a4f380b88..f883afa5883b 100644 --- a/sdext/source/pdfimport/filterdet.hxx +++ b/sdext/source/pdfimport/filterdet.hxx @@ -50,7 +50,7 @@ public: // XExtendedFilterDetection virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& io_rDescriptor ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx index 6e7d0040b725..0e0d58622da4 100644 --- a/sdext/source/pdfimport/misc/pwdinteract.cxx +++ b/sdext/source/pdfimport/misc/pwdinteract.cxx @@ -57,15 +57,15 @@ public: explicit PDFPasswordRequest(bool bFirstTry, const OUString& rName); // XInteractionRequest - virtual uno::Any SAL_CALL getRequest( ) throw (uno::RuntimeException); - virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations( ) throw (uno::RuntimeException); + virtual uno::Any SAL_CALL getRequest( ) throw (uno::RuntimeException, std::exception); + virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations( ) throw (uno::RuntimeException, std::exception); // XInteractionPassword - virtual void SAL_CALL setPassword( const OUString& rPwd ) throw (uno::RuntimeException); - virtual OUString SAL_CALL getPassword() throw (uno::RuntimeException); + virtual void SAL_CALL setPassword( const OUString& rPwd ) throw (uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getPassword() throw (uno::RuntimeException, std::exception); // XInteractionContinuation - virtual void SAL_CALL select() throw (uno::RuntimeException); + virtual void SAL_CALL select() throw (uno::RuntimeException, std::exception); 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) +uno::Any PDFPasswordRequest::getRequest() throw (uno::RuntimeException, std::exception) { return m_aRequest; } -uno::Sequence< uno::Reference< task::XInteractionContinuation > > PDFPasswordRequest::getContinuations() throw (uno::RuntimeException) +uno::Sequence< uno::Reference< task::XInteractionContinuation > > PDFPasswordRequest::getContinuations() throw (uno::RuntimeException, std::exception) { uno::Sequence< uno::Reference< task::XInteractionContinuation > > aRet( 1 ); aRet[0] = this; return aRet; } -void PDFPasswordRequest::setPassword( const OUString& rPwd ) throw (uno::RuntimeException) +void PDFPasswordRequest::setPassword( const OUString& rPwd ) throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); m_aPassword = rPwd; } -OUString PDFPasswordRequest::getPassword() throw (uno::RuntimeException) +OUString PDFPasswordRequest::getPassword() throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); return m_aPassword; } -void PDFPasswordRequest::select() throw (uno::RuntimeException) +void PDFPasswordRequest::select() throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); @@ -129,7 +129,7 @@ public: private: virtual ~UnsupportedEncryptionFormatRequest() {} - virtual uno::Any SAL_CALL getRequest() throw (uno::RuntimeException) { + virtual uno::Any SAL_CALL getRequest() throw (uno::RuntimeException, std::exception) { return uno::makeAny( task::ErrorCodeRequest( OUString(), uno::Reference< uno::XInterface >(), @@ -139,7 +139,7 @@ private: } virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > - SAL_CALL getContinuations() throw (uno::RuntimeException) { + SAL_CALL getContinuations() throw (uno::RuntimeException, std::exception) { return uno::Sequence< uno::Reference< task::XInteractionContinuation > >(); } diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx index 964f30bfd2ff..6899fc50bed4 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 ) +sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::PropertyValue >& rFilterData ) throw( uno::RuntimeException, std::exception ) { sal_Bool bRet = sal_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() +void SAL_CALL PDFIHybridAdaptor::cancel() throw(std::exception) { } //XImporter -void SAL_CALL PDFIHybridAdaptor::setTargetDocument( const uno::Reference< lang::XComponent >& xDocument ) throw( lang::IllegalArgumentException ) +void SAL_CALL PDFIHybridAdaptor::setTargetDocument( const uno::Reference< lang::XComponent >& xDocument ) throw( lang::IllegalArgumentException, std::exception ) { SAL_INFO("sdext.pdfimport", "PDFIAdaptor::setTargetDocument" ); m_xModel = uno::Reference< frame::XModel >( xDocument, uno::UNO_QUERY ); @@ -263,7 +263,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 ) + const uno::Sequence< OUString >& /*rUserData*/ ) throw( uno::RuntimeException, std::exception ) { // get the InputStream carrying the PDF content uno::Reference< io::XInputStream > xInput; @@ -301,7 +301,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 ) +void SAL_CALL PDFIRawAdaptor::setTargetDocument( const uno::Reference< lang::XComponent >& xDocument ) throw( lang::IllegalArgumentException, std::exception ) { SAL_INFO("sdext.pdfimport", "PDFIAdaptor::setTargetDocument" ); m_xModel = uno::Reference< frame::XModel >( xDocument, uno::UNO_QUERY ); diff --git a/sdext/source/pdfimport/pdfiadaptor.hxx b/sdext/source/pdfimport/pdfiadaptor.hxx index b5ad42013cf5..7b99f179e756 100644 --- a/sdext/source/pdfimport/pdfiadaptor.hxx +++ b/sdext/source/pdfimport/pdfiadaptor.hxx @@ -57,12 +57,12 @@ namespace pdfi ::com::sun::star::uno::XComponentContext >& xContext ); // XFilter - virtual sal_Bool SAL_CALL filter( const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rFilterData ) throw(com::sun::star::uno::RuntimeException); - virtual void SAL_CALL cancel() throw(); + virtual sal_Bool SAL_CALL filter( const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rFilterData ) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL cancel() throw(std::exception); // XImporter virtual void SAL_CALL setTargetDocument( const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xDocument ) - throw( com::sun::star::lang::IllegalArgumentException ); + throw( com::sun::star::lang::IllegalArgumentException, std::exception ); }; @@ -119,11 +119,11 @@ namespace pdfi // XImportFilter virtual sal_Bool SAL_CALL importer( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rSourceData, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& rHdl, - const com::sun::star::uno::Sequence< OUString >& rUserData ) throw( com::sun::star::uno::RuntimeException ); + const com::sun::star::uno::Sequence< OUString >& rUserData ) throw( com::sun::star::uno::RuntimeException, std::exception ); // XImporter virtual void SAL_CALL setTargetDocument( const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xDocument ) - throw( com::sun::star::lang::IllegalArgumentException ); + throw( com::sun::star::lang::IllegalArgumentException, std::exception ); }; } diff --git a/sdext/source/pdfimport/sax/saxattrlist.cxx b/sdext/source/pdfimport/sax/saxattrlist.cxx index 056dfcbdb342..f42a70369c05 100644 --- a/sdext/source/pdfimport/sax/saxattrlist.cxx +++ b/sdext/source/pdfimport/sax/saxattrlist.cxx @@ -55,37 +55,37 @@ namespace { } } -sal_Int16 SAL_CALL SaxAttrList::getLength() throw() +sal_Int16 SAL_CALL SaxAttrList::getLength() throw(std::exception) { return sal_Int16(m_aAttributes.size()); } -OUString SAL_CALL SaxAttrList::getNameByIndex( sal_Int16 i_nIndex ) throw() +OUString SAL_CALL SaxAttrList::getNameByIndex( sal_Int16 i_nIndex ) throw(std::exception) { 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() +OUString SAL_CALL SaxAttrList::getTypeByIndex( sal_Int16 i_nIndex) throw(std::exception) { return (i_nIndex < sal_Int16(m_aAttributes.size())) ? getCDATAString() : OUString(); } -OUString SAL_CALL SaxAttrList::getTypeByName( const OUString& i_rName ) throw() +OUString SAL_CALL SaxAttrList::getTypeByName( const OUString& i_rName ) throw(std::exception) { return (m_aIndexMap.find( i_rName ) != m_aIndexMap.end()) ? getCDATAString() : OUString(); } -OUString SAL_CALL SaxAttrList::getValueByIndex( sal_Int16 i_nIndex ) throw() +OUString SAL_CALL SaxAttrList::getValueByIndex( sal_Int16 i_nIndex ) throw(std::exception) { 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() +OUString SAL_CALL SaxAttrList::getValueByName(const OUString& i_rName) throw(std::exception) { boost::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(); } -com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL SaxAttrList::createClone() throw() +com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL SaxAttrList::createClone() throw(std::exception) { return new SaxAttrList( *this ); } diff --git a/sdext/source/pdfimport/sax/saxattrlist.hxx b/sdext/source/pdfimport/sax/saxattrlist.hxx index 2e8fe32f4bf3..92eff9ed3435 100644 --- a/sdext/source/pdfimport/sax/saxattrlist.hxx +++ b/sdext/source/pdfimport/sax/saxattrlist.hxx @@ -53,15 +53,15 @@ namespace pdfi virtual ~SaxAttrList(); // ::com::sun::star::xml::sax::XAttributeList - virtual sal_Int16 SAL_CALL getLength() throw(); - virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw(); - virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw(); - virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw(); - virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw(); - virtual OUString SAL_CALL getValueByName(const OUString& aName) throw(); + virtual sal_Int16 SAL_CALL getLength() throw(std::exception); + virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw(std::exception); + virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw(std::exception); + virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw(std::exception); + virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw(std::exception); + virtual OUString SAL_CALL getValueByName(const OUString& aName) throw(std::exception); // ::com::sun::star::util::XCloneable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw(std::exception); }; } diff --git a/sdext/source/pdfimport/test/outputwrap.hxx b/sdext/source/pdfimport/test/outputwrap.hxx index ba668873b4ec..40b2e2b825b2 100644 --- a/sdext/source/pdfimport/test/outputwrap.hxx +++ b/sdext/source/pdfimport/test/outputwrap.hxx @@ -43,18 +43,18 @@ typedef ::cppu::WeakComponentImplHelper1< maFile.open(osl_File_OpenFlag_Create|osl_File_OpenFlag_Write); } - virtual void SAL_CALL writeBytes( const com::sun::star::uno::Sequence< ::sal_Int8 >& aData ) throw (com::sun::star::io::NotConnectedException,com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException) + virtual void SAL_CALL writeBytes( const com::sun::star::uno::Sequence< ::sal_Int8 >& aData ) throw (com::sun::star::io::NotConnectedException,com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception) { sal_uInt64 nBytesWritten(0); maFile.write(aData.getConstArray(),aData.getLength(),nBytesWritten); } - virtual void SAL_CALL flush() throw (com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException) + virtual void SAL_CALL flush() throw (com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception) { } - virtual void SAL_CALL closeOutput() throw (com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException) + virtual void SAL_CALL closeOutput() throw (com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception) { maFile.close(); } diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index 8b93a27fbe1c..01e997a2b76f 100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -98,115 +98,115 @@ public: //----- XComponent --------------------------------------------------- - virtual void SAL_CALL dispose()throw (cssu::RuntimeException) + virtual void SAL_CALL dispose()throw (cssu::RuntimeException, std::exception) { WeakComponentImplHelperBase::dispose(); } - virtual void SAL_CALL addEventListener(const cssu::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (cssu::RuntimeException) + virtual void SAL_CALL addEventListener(const cssu::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (cssu::RuntimeException, std::exception) { WeakComponentImplHelperBase::addEventListener(xListener); } - virtual void SAL_CALL removeEventListener(const cssu::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (cssu::RuntimeException) + virtual void SAL_CALL removeEventListener(const cssu::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (cssu::RuntimeException, std::exception) { WeakComponentImplHelperBase::removeEventListener(xListener); } //----- XAccessible ------------------------------------------------------- virtual cssu::Reference<cssa::XAccessibleContext> SAL_CALL getAccessibleContext (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); //----- XAccessibleContext ---------------------------------------------- virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual cssu::Reference< cssa::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException); + throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception); virtual cssu::Reference< cssa::XAccessible> SAL_CALL getAccessibleParent (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual sal_Int16 SAL_CALL getAccessibleRole (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual OUString SAL_CALL getAccessibleDescription (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual OUString SAL_CALL getAccessibleName (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual cssu::Reference<cssa::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual cssu::Reference<cssa::XAccessibleStateSet> SAL_CALL getAccessibleStateSet (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual css::lang::Locale SAL_CALL getLocale (void) throw (cssu::RuntimeException, - cssa::IllegalAccessibleComponentStateException); + cssa::IllegalAccessibleComponentStateException, std::exception); //----- XAccessibleComponent -------------------------------------------- virtual sal_Bool SAL_CALL containsPoint ( const css::awt::Point& aPoint) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual cssu::Reference<cssa::XAccessible> SAL_CALL getAccessibleAtPoint ( const css::awt::Point& aPoint) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual css::awt::Rectangle SAL_CALL getBounds (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual css::awt::Point SAL_CALL getLocation (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual css::awt::Point SAL_CALL getLocationOnScreen (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual css::awt::Size SAL_CALL getSize (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual void SAL_CALL grabFocus (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getForeground (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getBackground (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); //----- XAccessibleEventBroadcaster -------------------------------------- virtual void SAL_CALL addAccessibleEventListener ( const cssu::Reference<cssa::XAccessibleEventListener>& rxListener) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual void SAL_CALL removeAccessibleEventListener ( const cssu::Reference<cssa::XAccessibleEventListener>& rxListener) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); //----- XWindowListener --------------------------------------------------- virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); //----- XEventListener ---------------------------------------------------- virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); protected: OUString msName; @@ -258,16 +258,16 @@ public: //----- XAccessibleStateSet ----------------------------------------------- virtual sal_Bool SAL_CALL isEmpty (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual sal_Bool SAL_CALL contains (sal_Int16 nState) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual sal_Bool SAL_CALL containsAll (const cssu::Sequence<sal_Int16>& rStateSet) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual cssu::Sequence<sal_Int16> SAL_CALL getStates (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); private: const sal_Int32 mnStateSet; @@ -296,16 +296,16 @@ public: //----- XAccessibleRelationSet -------------------------------------------- virtual sal_Int32 SAL_CALL getRelationCount (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual AccessibleRelation SAL_CALL getRelation (sal_Int32 nIndex) - throw (cssu::RuntimeException, css::lang::IndexOutOfBoundsException); + throw (cssu::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception); virtual sal_Bool SAL_CALL containsRelation (sal_Int16 nRelationType) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual AccessibleRelation SAL_CALL getRelationByType (sal_Int16 nRelationType) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); private: ::std::vector<AccessibleRelation> maRelations; @@ -337,77 +337,77 @@ public: virtual cssu::Reference<cssa::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); //----- XAccessibleText --------------------------------------------------- virtual sal_Int32 SAL_CALL getCaretPosition (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual sal_Bool SAL_CALL setCaretPosition (sal_Int32 nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, cssu::RuntimeException); + throw (::com::sun::star::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception); virtual sal_Unicode SAL_CALL getCharacter (sal_Int32 nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, cssu::RuntimeException); + throw (::com::sun::star::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception); virtual cssu::Sequence<css::beans::PropertyValue> SAL_CALL getCharacterAttributes ( ::sal_Int32 nIndex, const cssu::Sequence<OUString>& rRequestedAttributes) - throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException); + throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception); virtual css::awt::Rectangle SAL_CALL getCharacterBounds (sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException); + throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getCharacterCount (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getIndexAtPoint (const css::awt::Point& rPoint) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual OUString SAL_CALL getSelectedText (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getSelectionStart (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getSelectionEnd (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual sal_Bool SAL_CALL setSelection (sal_Int32 nStartIndex, sal_Int32 nEndIndex) - throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException); + throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception); virtual OUString SAL_CALL getText (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual OUString SAL_CALL getTextRange ( sal_Int32 nStartIndex, sal_Int32 nEndIndex) - throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException); + throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception); virtual cssa::TextSegment SAL_CALL getTextAtIndex ( sal_Int32 nIndex, sal_Int16 nTextType) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, - cssu::RuntimeException); + cssu::RuntimeException, std::exception); virtual cssa::TextSegment SAL_CALL getTextBeforeIndex ( sal_Int32 nIndex, sal_Int16 nTextType) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, - cssu::RuntimeException); + cssu::RuntimeException, std::exception); virtual cssa::TextSegment SAL_CALL getTextBehindIndex ( sal_Int32 nIndex, sal_Int16 nTextType) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, - cssu::RuntimeException); + cssu::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL copyText (sal_Int32 nStartIndex, sal_Int32 nEndIndex) - throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException); + throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception); protected: virtual awt::Point GetRelativeLocation (void); @@ -743,7 +743,7 @@ void SAL_CALL PresenterAccessible::disposing (void) //----- XAccessible ----------------------------------------------------------- Reference<XAccessibleContext> SAL_CALL PresenterAccessible::getAccessibleContext (void) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { if ( ! mpAccessibleConsole.is()) { @@ -767,7 +767,7 @@ Reference<XAccessibleContext> SAL_CALL PresenterAccessible::getAccessibleContext //----- XFocusListener ---------------------------------------------------- void SAL_CALL PresenterAccessible::focusGained (const css::awt::FocusEvent& rEvent) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { (void)rEvent; SAL_INFO("sdext.presenter", OSL_THIS_FUNC << ": PresenterAccessible::focusGained at " << this @@ -776,7 +776,7 @@ void SAL_CALL PresenterAccessible::focusGained (const css::awt::FocusEvent& rEve } void SAL_CALL PresenterAccessible::focusLost (const css::awt::FocusEvent& rEvent) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { (void)rEvent; SAL_INFO("sdext.presenter", OSL_THIS_FUNC << ": PresenterAccessible::focusLost at " << this); @@ -786,7 +786,7 @@ void SAL_CALL PresenterAccessible::focusLost (const css::awt::FocusEvent& rEvent //----- XEventListener ---------------------------------------------------- void SAL_CALL PresenterAccessible::disposing (const css::lang::EventObject& rEvent) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { if (rEvent.Source == mxMainWindow) mxMainWindow = NULL; @@ -795,7 +795,7 @@ void SAL_CALL PresenterAccessible::disposing (const css::lang::EventObject& rEve //----- XInitialize ----------------------------------------------------------- void SAL_CALL PresenterAccessible::initialize (const cssu::Sequence<cssu::Any>& rArguments) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { if (rArguments.getLength() >= 1) { @@ -875,7 +875,7 @@ void SAL_CALL PresenterAccessible::AccessibleObject::disposing (void) Reference<XAccessibleContext> SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleContext (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -885,7 +885,7 @@ Reference<XAccessibleContext> SAL_CALL //----- XAccessibleContext ---------------------------------------------- sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleChildCount (void) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -896,7 +896,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleChildCoun Reference<XAccessible> SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleChild (sal_Int32 nIndex) - throw (lang::IndexOutOfBoundsException, RuntimeException) + throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception) { ThrowIfDisposed(); @@ -908,7 +908,7 @@ Reference<XAccessible> SAL_CALL Reference<XAccessible> SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleParent (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -917,7 +917,7 @@ Reference<XAccessible> SAL_CALL sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleIndexInParent (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -939,7 +939,7 @@ sal_Int32 SAL_CALL sal_Int16 SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleRole (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -948,7 +948,7 @@ sal_Int16 SAL_CALL OUString SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleDescription (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -957,7 +957,7 @@ OUString SAL_CALL OUString SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleName (void) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -966,7 +966,7 @@ OUString SAL_CALL Reference<XAccessibleRelationSet> SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleRelationSet (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -975,7 +975,7 @@ Reference<XAccessibleRelationSet> SAL_CALL Reference<XAccessibleStateSet> SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleStateSet (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -985,7 +985,7 @@ Reference<XAccessibleStateSet> SAL_CALL lang::Locale SAL_CALL PresenterAccessible::AccessibleObject::getLocale (void) throw (RuntimeException, - IllegalAccessibleComponentStateException) + IllegalAccessibleComponentStateException, std::exception) { ThrowIfDisposed(); @@ -1002,7 +1002,7 @@ lang::Locale SAL_CALL sal_Bool SAL_CALL PresenterAccessible::AccessibleObject::containsPoint ( const awt::Point& rPoint) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1020,7 +1020,7 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleObject::containsPoint ( Reference<XAccessible> SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleAtPoint (const awt::Point& rPoint) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rPoint; ThrowIfDisposed(); @@ -1029,7 +1029,7 @@ Reference<XAccessible> SAL_CALL } awt::Rectangle SAL_CALL PresenterAccessible::AccessibleObject::getBounds (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1042,7 +1042,7 @@ awt::Rectangle SAL_CALL PresenterAccessible::AccessibleObject::getBounds (void) } awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocation (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1052,7 +1052,7 @@ awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocation (void) } awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocationOnScreen (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1065,7 +1065,7 @@ awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocationOnScreen ( } awt::Size SAL_CALL PresenterAccessible::AccessibleObject::getSize (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1075,7 +1075,7 @@ awt::Size SAL_CALL PresenterAccessible::AccessibleObject::getSize (void) } void SAL_CALL PresenterAccessible::AccessibleObject::grabFocus (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (mxBorderWindow.is()) @@ -1085,7 +1085,7 @@ void SAL_CALL PresenterAccessible::AccessibleObject::grabFocus (void) } sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getForeground (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1093,7 +1093,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getForeground (void) } sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getBackground (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1104,7 +1104,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getBackground (void) void SAL_CALL PresenterAccessible::AccessibleObject::addAccessibleEventListener ( const Reference<XAccessibleEventListener>& rxListener) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (rxListener.is()) { @@ -1124,7 +1124,7 @@ void SAL_CALL PresenterAccessible::AccessibleObject::addAccessibleEventListener void SAL_CALL PresenterAccessible::AccessibleObject::removeAccessibleEventListener ( const Reference<XAccessibleEventListener>& rxListener) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (rxListener.is()) @@ -1139,7 +1139,7 @@ void SAL_CALL PresenterAccessible::AccessibleObject::removeAccessibleEventListen void SAL_CALL PresenterAccessible::AccessibleObject::windowResized ( const css::awt::WindowEvent& rEvent) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { (void)rEvent; @@ -1148,7 +1148,7 @@ void SAL_CALL PresenterAccessible::AccessibleObject::windowResized ( void SAL_CALL PresenterAccessible::AccessibleObject::windowMoved ( const css::awt::WindowEvent& rEvent) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { (void)rEvent; @@ -1157,7 +1157,7 @@ void SAL_CALL PresenterAccessible::AccessibleObject::windowMoved ( void SAL_CALL PresenterAccessible::AccessibleObject::windowShown ( const css::lang::EventObject& rEvent) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { (void)rEvent; UpdateStateSet(); @@ -1165,7 +1165,7 @@ void SAL_CALL PresenterAccessible::AccessibleObject::windowShown ( void SAL_CALL PresenterAccessible::AccessibleObject::windowHidden ( const css::lang::EventObject& rEvent) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { (void)rEvent; UpdateStateSet(); @@ -1174,7 +1174,7 @@ void SAL_CALL PresenterAccessible::AccessibleObject::windowHidden ( //----- XEventListener -------------------------------------------------------- void SAL_CALL PresenterAccessible::AccessibleObject::disposing (const css::lang::EventObject& rEvent) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { if (rEvent.Source == mxContentWindow) { @@ -1413,19 +1413,19 @@ sal_uInt32 AccessibleStateSet::GetStateMask (const sal_Int16 nState) //----- XAccessibleStateSet --------------------------------------------------- sal_Bool SAL_CALL AccessibleStateSet::isEmpty (void) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { return mnStateSet==0; } sal_Bool SAL_CALL AccessibleStateSet::contains (sal_Int16 nState) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { return (mnStateSet & GetStateMask(nState)) != 0; } sal_Bool SAL_CALL AccessibleStateSet::containsAll (const cssu::Sequence<sal_Int16>& rStateSet) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { for (sal_Int32 nIndex=0,nCount=rStateSet.getLength(); nIndex<nCount; ++nIndex) { @@ -1436,7 +1436,7 @@ sal_Bool SAL_CALL AccessibleStateSet::containsAll (const cssu::Sequence<sal_Int1 } cssu::Sequence<sal_Int16> SAL_CALL AccessibleStateSet::getStates (void) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { ::std::vector<sal_Int16> aStates; aStates.reserve(sizeof(mnStateSet)*8); @@ -1471,13 +1471,13 @@ void AccessibleRelationSet::AddRelation ( //----- XAccessibleRelationSet ------------------------------------------------ sal_Int32 SAL_CALL AccessibleRelationSet::getRelationCount (void) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { return maRelations.size(); } AccessibleRelation SAL_CALL AccessibleRelationSet::getRelation (sal_Int32 nIndex) - throw (cssu::RuntimeException, css::lang::IndexOutOfBoundsException) + throw (cssu::RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) { if (nIndex<0 && sal_uInt32(nIndex)>=maRelations.size()) return AccessibleRelation(); @@ -1486,7 +1486,7 @@ AccessibleRelation SAL_CALL AccessibleRelationSet::getRelation (sal_Int32 nIndex } sal_Bool SAL_CALL AccessibleRelationSet::containsRelation (sal_Int16 nRelationType) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { for (::std::vector<AccessibleRelation>::const_iterator iRelation(maRelations.begin()); iRelation!=maRelations.end(); @@ -1499,7 +1499,7 @@ sal_Bool SAL_CALL AccessibleRelationSet::containsRelation (sal_Int16 nRelationTy } AccessibleRelation SAL_CALL AccessibleRelationSet::getRelationByType (sal_Int16 nRelationType) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { for (::std::vector<AccessibleRelation>::const_iterator iRelation(maRelations.begin()); iRelation!=maRelations.end(); @@ -1533,7 +1533,7 @@ PresenterAccessible::AccessibleParagraph::~AccessibleParagraph (void) Reference<XAccessibleRelationSet> SAL_CALL PresenterAccessible::AccessibleParagraph::getAccessibleRelationSet (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1562,7 +1562,7 @@ Reference<XAccessibleRelationSet> SAL_CALL //----- XAccessibleText ------------------------------------------------------- sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCaretPosition (void) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1574,7 +1574,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCaretPosition (v } sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setCaretPosition (sal_Int32 nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, cssu::RuntimeException) + throw (::com::sun::star::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1588,7 +1588,7 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setCaretPosition (sa } sal_Unicode SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacter (sal_Int32 nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, cssu::RuntimeException) + throw (::com::sun::star::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1601,7 +1601,7 @@ Sequence<css::beans::PropertyValue> SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterAttributes ( ::sal_Int32 nIndex, const cssu::Sequence<OUString>& rRequestedAttributes) - throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException) + throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1626,7 +1626,7 @@ Sequence<css::beans::PropertyValue> SAL_CALL awt::Rectangle SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterBounds ( sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException) + throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1653,7 +1653,7 @@ awt::Rectangle SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterBo } sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterCount (void) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1666,7 +1666,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterCount ( sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getIndexAtPoint ( const css::awt::Point& rPoint) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1678,7 +1678,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getIndexAtPoint ( } OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectedText (void) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1686,7 +1686,7 @@ OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectedText (voi } sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionStart (void) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1694,7 +1694,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionStart ( } sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionEnd (void) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1704,7 +1704,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionEnd (vo sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setSelection ( sal_Int32 nStartIndex, sal_Int32 nEndIndex) - throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException) + throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception) { (void)nEndIndex; ThrowIfDisposed(); @@ -1713,7 +1713,7 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setSelection ( } OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getText (void) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1727,7 +1727,7 @@ OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getText (void) OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getTextRange ( sal_Int32 nLocalStartIndex, sal_Int32 nLocalEndIndex) - throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException) + throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1747,7 +1747,7 @@ TextSegment SAL_CALL PresenterAccessible::AccessibleParagraph::getTextAtIndex ( sal_Int16 nTextType) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, - cssu::RuntimeException) + cssu::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1763,7 +1763,7 @@ TextSegment SAL_CALL PresenterAccessible::AccessibleParagraph::getTextBeforeInde sal_Int16 nTextType) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, - cssu::RuntimeException) + cssu::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1779,7 +1779,7 @@ TextSegment SAL_CALL PresenterAccessible::AccessibleParagraph::getTextBehindInde sal_Int16 nTextType) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, - cssu::RuntimeException) + cssu::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1793,7 +1793,7 @@ TextSegment SAL_CALL PresenterAccessible::AccessibleParagraph::getTextBehindInde sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::copyText ( sal_Int32 nStartIndex, sal_Int32 nEndIndex) - throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException) + throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException, std::exception) { ThrowIfDisposed(); diff --git a/sdext/source/presenter/PresenterAccessibility.hxx b/sdext/source/presenter/PresenterAccessibility.hxx index b877196cc4c2..666db78b0244 100644 --- a/sdext/source/presenter/PresenterAccessibility.hxx +++ b/sdext/source/presenter/PresenterAccessibility.hxx @@ -80,25 +80,25 @@ public: virtual cssu::Reference<cssa::XAccessibleContext> SAL_CALL getAccessibleContext (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); //----- XFocusListener ---------------------------------------------------- virtual void SAL_CALL focusGained (const css::awt::FocusEvent& rEvent) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual void SAL_CALL focusLost (const css::awt::FocusEvent& rEvent) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); //----- XEventListener ---------------------------------------------------- virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); //----- XInitialization --------------------------------------------------- virtual void SAL_CALL initialize (const cssu::Sequence<cssu::Any>& rArguments) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); class AccessibleObject; class AccessibleParagraph; diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx index 9b916ba58ead..c7696bb8cd32 100644 --- a/sdext/source/presenter/PresenterButton.cxx +++ b/sdext/source/presenter/PresenterButton.cxx @@ -232,28 +232,28 @@ css::geometry::IntegerSize2D PresenterButton::GetSize (void) //----- XWindowListener ------------------------------------------------------- void SAL_CALL PresenterButton::windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); } void SAL_CALL PresenterButton::windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); } void SAL_CALL PresenterButton::windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); } void SAL_CALL PresenterButton::windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -262,7 +262,7 @@ 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) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); if (mxWindow.is() && mxCanvas.is()) @@ -295,7 +295,7 @@ 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) + throw(css::uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -303,7 +303,7 @@ void SAL_CALL PresenterButton::mousePressed (const css::awt::MouseEvent& rEvent) } void SAL_CALL PresenterButton::mouseReleased (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -319,7 +319,7 @@ void SAL_CALL PresenterButton::mouseReleased (const css::awt::MouseEvent& rEvent } void SAL_CALL PresenterButton::mouseEntered (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -328,7 +328,7 @@ void SAL_CALL PresenterButton::mouseEntered (const css::awt::MouseEvent& rEvent) } void SAL_CALL PresenterButton::mouseExited (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -339,14 +339,14 @@ 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) + throw (css::uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); } void SAL_CALL PresenterButton::mouseDragged (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -355,7 +355,7 @@ 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) + throw (css::uno::RuntimeException, std::exception) { if (rEvent.Source == mxWindow) mxWindow = NULL; diff --git a/sdext/source/presenter/PresenterButton.hxx b/sdext/source/presenter/PresenterButton.hxx index d89a2b76b7e0..24ca2a08389a 100644 --- a/sdext/source/presenter/PresenterButton.hxx +++ b/sdext/source/presenter/PresenterButton.hxx @@ -77,47 +77,47 @@ public: // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XMouseListener virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // XMouseMotionListener virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); private: ::rtl::Reference<PresenterController> mpPresenterController; diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx index 37d7bbb908bb..fa77685bf8ee 100644 --- a/sdext/source/presenter/PresenterController.cxx +++ b/sdext/source/presenter/PresenterController.cxx @@ -701,7 +701,7 @@ void PresenterController::RequestViews ( void SAL_CALL PresenterController::notifyConfigurationChange ( const ConfigurationChangeEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -784,7 +784,7 @@ void SAL_CALL PresenterController::notifyConfigurationChange ( void SAL_CALL PresenterController::disposing ( const lang::EventObject& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (rEvent.Source == mxController) mxController = NULL; @@ -800,7 +800,7 @@ void SAL_CALL PresenterController::disposing ( void SAL_CALL PresenterController::frameAction ( const frame::FrameActionEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (rEvent.Action == frame::FrameAction_FRAME_ACTIVATED) { @@ -812,7 +812,7 @@ void SAL_CALL PresenterController::frameAction ( //----- XKeyListener ---------------------------------------------------------- void SAL_CALL PresenterController::keyPressed (const awt::KeyEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { // Tell all views about the unhandled key event. PresenterPaneContainer::PaneList::const_iterator iPane; @@ -828,7 +828,7 @@ void SAL_CALL PresenterController::keyPressed (const awt::KeyEvent& rEvent) } void SAL_CALL PresenterController::keyReleased (const awt::KeyEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (rEvent.Source != mxMainWindow) return; @@ -1026,13 +1026,13 @@ void PresenterController::HandleNumericKeyPress ( //----- XFocusListener -------------------------------------------------------- void SAL_CALL PresenterController::focusGained (const css::awt::FocusEvent& rEvent) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { (void)rEvent; } void SAL_CALL PresenterController::focusLost (const css::awt::FocusEvent& rEvent) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { (void)rEvent; } @@ -1040,7 +1040,7 @@ 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) + throw (css::uno::RuntimeException, std::exception) { (void)rEvent; if (mxMainWindow.is()) @@ -1048,19 +1048,19 @@ void SAL_CALL PresenterController::mousePressed (const css::awt::MouseEvent& rEv } void SAL_CALL PresenterController::mouseReleased (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { (void)rEvent; } void SAL_CALL PresenterController::mouseEntered (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { (void)rEvent; } void SAL_CALL PresenterController::mouseExited (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { (void)rEvent; } @@ -1068,13 +1068,13 @@ 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) + throw (css::uno::RuntimeException, std::exception) { (void)rEvent; } void SAL_CALL PresenterController::mouseDragged (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { (void)rEvent; } diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx index 03991ccf47bd..081d5b3074be 100644 --- a/sdext/source/presenter/PresenterController.hxx +++ b/sdext/source/presenter/PresenterController.hxx @@ -138,55 +138,55 @@ public: virtual void SAL_CALL notifyConfigurationChange ( const com::sun::star::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); // XEventListener virtual void SAL_CALL disposing ( const com::sun::star::lang::EventObject& rEvent) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); // XFrameActionListener virtual void SAL_CALL frameAction ( const css::frame::FrameActionEvent& rEvent) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); // XKeyListener virtual void SAL_CALL keyPressed (const css::awt::KeyEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL keyReleased (const css::awt::KeyEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XFocusListener virtual void SAL_CALL focusGained (const css::awt::FocusEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL focusLost (const css::awt::FocusEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XMouseListener virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XMouseMotionListener virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); 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 d9ba2009158a..664f460056fd 100644 --- a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx +++ b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx @@ -63,14 +63,14 @@ void SAL_CALL PresenterCurrentSlideObserver::disposing (void) void SAL_CALL PresenterCurrentSlideObserver::beginEvent ( const Reference<animations::XAnimationNode>& rNode) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { (void)rNode; } void SAL_CALL PresenterCurrentSlideObserver::endEvent ( const Reference<animations::XAnimationNode>& rNode) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { (void)rNode; } @@ -78,23 +78,23 @@ void SAL_CALL PresenterCurrentSlideObserver::endEvent ( void SAL_CALL PresenterCurrentSlideObserver::repeat ( const css::uno::Reference<css::animations::XAnimationNode>& rNode, sal_Int32) - throw (com::sun::star::uno::RuntimeException) + throw (com::sun::star::uno::RuntimeException, std::exception) { (void)rNode; } void SAL_CALL PresenterCurrentSlideObserver::paused (void) - throw (com::sun::star::uno::RuntimeException) + throw (com::sun::star::uno::RuntimeException, std::exception) { } void SAL_CALL PresenterCurrentSlideObserver::resumed (void) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { } void SAL_CALL PresenterCurrentSlideObserver::slideEnded (sal_Bool bReverse) - throw (css::uno::RuntimeException) + 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 +106,24 @@ void SAL_CALL PresenterCurrentSlideObserver::slideEnded (sal_Bool bReverse) } void SAL_CALL PresenterCurrentSlideObserver::hyperLinkClicked (const OUString &) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { } void SAL_CALL PresenterCurrentSlideObserver::slideTransitionStarted (void) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { if( mpPresenterController.is() ) mpPresenterController->UpdateCurrentSlide(0); } void SAL_CALL PresenterCurrentSlideObserver::slideTransitionEnded (void) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { } void SAL_CALL PresenterCurrentSlideObserver::slideAnimationsEnded (void) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { } @@ -131,7 +131,7 @@ void SAL_CALL PresenterCurrentSlideObserver::slideAnimationsEnded (void) void SAL_CALL PresenterCurrentSlideObserver::disposing ( const lang::EventObject& rEvent) - throw (RuntimeException) + 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 cddb6d64af02..10ebaddb7ce7 100644 --- a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx +++ b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx @@ -57,23 +57,23 @@ public: virtual void SAL_CALL disposing (void); // XSlideShowListener - virtual void SAL_CALL paused( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL resumed( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL slideTransitionStarted( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL slideTransitionEnded( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL slideAnimationsEnded( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL hyperLinkClicked( const OUString& hyperLink ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL paused( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL resumed( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL slideTransitionStarted( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL slideTransitionEnded( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL slideAnimationsEnded( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL hyperLinkClicked( const OUString& hyperLink ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAnimationListener - virtual void SAL_CALL beginEvent( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& Node ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL endEvent( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& Node ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL repeat( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& Node, ::sal_Int32 Repeat ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL beginEvent( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& Node ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL endEvent( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& Node ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL repeat( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& Node, ::sal_Int32 Repeat ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XEventListener virtual void SAL_CALL disposing ( const com::sun::star::lang::EventObject& rEvent) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); private: ::rtl::Reference<PresenterController> mpPresenterController; diff --git a/sdext/source/presenter/PresenterFrameworkObserver.cxx b/sdext/source/presenter/PresenterFrameworkObserver.cxx index 782742bf20ea..e2bdcef71250 100644 --- a/sdext/source/presenter/PresenterFrameworkObserver.cxx +++ b/sdext/source/presenter/PresenterFrameworkObserver.cxx @@ -100,7 +100,7 @@ void PresenterFrameworkObserver::Shutdown (void) } void SAL_CALL PresenterFrameworkObserver::disposing (const lang::EventObject& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if ( ! rEvent.Source.is()) return; @@ -115,7 +115,7 @@ void SAL_CALL PresenterFrameworkObserver::disposing (const lang::EventObject& rE void SAL_CALL PresenterFrameworkObserver::notifyConfigurationChange ( const ConfigurationChangeEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { bool bDispose(false); diff --git a/sdext/source/presenter/PresenterFrameworkObserver.hxx b/sdext/source/presenter/PresenterFrameworkObserver.hxx index 66b9f141dc2b..24e017f59c9b 100644 --- a/sdext/source/presenter/PresenterFrameworkObserver.hxx +++ b/sdext/source/presenter/PresenterFrameworkObserver.hxx @@ -51,10 +51,10 @@ public: virtual void SAL_CALL disposing (void); virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL notifyConfigurationChange ( const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); private: OUString msEventType; diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx index 782f820cc4a7..ae255b65ddda 100644 --- a/sdext/source/presenter/PresenterHelpView.cxx +++ b/sdext/source/presenter/PresenterHelpView.cxx @@ -209,7 +209,7 @@ void SAL_CALL PresenterHelpView::disposing (void) //----- lang::XEventListener -------------------------------------------------- void SAL_CALL PresenterHelpView::disposing (const lang::EventObject& rEventObject) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (rEventObject.Source == mxCanvas) { @@ -225,7 +225,7 @@ void SAL_CALL PresenterHelpView::disposing (const lang::EventObject& rEventObjec //----- XWindowListener ------------------------------------------------------- void SAL_CALL PresenterHelpView::windowResized (const awt::WindowEvent& rEvent) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -233,14 +233,14 @@ void SAL_CALL PresenterHelpView::windowResized (const awt::WindowEvent& rEvent) } void SAL_CALL PresenterHelpView::windowMoved (const awt::WindowEvent& rEvent) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); } void SAL_CALL PresenterHelpView::windowShown (const lang::EventObject& rEvent) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -248,7 +248,7 @@ void SAL_CALL PresenterHelpView::windowShown (const lang::EventObject& rEvent) } void SAL_CALL PresenterHelpView::windowHidden (const lang::EventObject& rEvent) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -257,7 +257,7 @@ void SAL_CALL PresenterHelpView::windowHidden (const lang::EventObject& rEvent) //----- XPaintListener -------------------------------------------------------- void SAL_CALL PresenterHelpView::windowPaint (const css::awt::PaintEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { Paint(rEvent.UpdateRect); } @@ -450,14 +450,14 @@ void PresenterHelpView::CheckFontSize (void) //----- XResourceId ----------------------------------------------------------- Reference<XResourceId> SAL_CALL PresenterHelpView::getResourceId (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); return mxViewId; } sal_Bool SAL_CALL PresenterHelpView::isAnchorOnly (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return false; } diff --git a/sdext/source/presenter/PresenterHelpView.hxx b/sdext/source/presenter/PresenterHelpView.hxx index 015f03dbebd2..8bcaba565c68 100644 --- a/sdext/source/presenter/PresenterHelpView.hxx +++ b/sdext/source/presenter/PresenterHelpView.hxx @@ -63,34 +63,34 @@ public: virtual void SAL_CALL disposing (const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XResourceId virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isAnchorOnly (void) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); private: class TextContainer; diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx index a1d9af939d99..2ccc71e4d408 100644 --- a/sdext/source/presenter/PresenterNotesView.cxx +++ b/sdext/source/presenter/PresenterNotesView.cxx @@ -283,7 +283,7 @@ void PresenterNotesView::SetSlide (const Reference<drawing::XDrawPage>& rxNotesP //----- lang::XEventListener ------------------------------------------------- void SAL_CALL PresenterNotesView::disposing (const lang::EventObject& rEventObject) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (rEventObject.Source == mxParentWindow) mxParentWindow = NULL; @@ -292,26 +292,26 @@ void SAL_CALL PresenterNotesView::disposing (const lang::EventObject& rEventObje //----- XWindowListener ------------------------------------------------------- void SAL_CALL PresenterNotesView::windowResized (const awt::WindowEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; Layout(); } void SAL_CALL PresenterNotesView::windowMoved (const awt::WindowEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; } void SAL_CALL PresenterNotesView::windowShown (const lang::EventObject& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; } void SAL_CALL PresenterNotesView::windowHidden (const lang::EventObject& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; } @@ -319,7 +319,7 @@ void SAL_CALL PresenterNotesView::windowHidden (const lang::EventObject& rEvent) //----- XPaintListener -------------------------------------------------------- void SAL_CALL PresenterNotesView::windowPaint (const awt::PaintEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -333,13 +333,13 @@ void SAL_CALL PresenterNotesView::windowPaint (const awt::PaintEvent& rEvent) //----- XResourceId ----------------------------------------------------------- Reference<XResourceId> SAL_CALL PresenterNotesView::getResourceId (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return mxViewId; } sal_Bool SAL_CALL PresenterNotesView::isAnchorOnly (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return false; } @@ -347,7 +347,7 @@ sal_Bool SAL_CALL PresenterNotesView::isAnchorOnly (void) //----- XDrawView ------------------------------------------------------------- void SAL_CALL PresenterNotesView::setCurrentPage (const Reference<drawing::XDrawPage>& rxSlide) - throw (RuntimeException) + throw (RuntimeException, std::exception) { // Get the associated notes page. mxCurrentNotesPage = NULL; @@ -365,7 +365,7 @@ void SAL_CALL PresenterNotesView::setCurrentPage (const Reference<drawing::XDraw } Reference<drawing::XDrawPage> SAL_CALL PresenterNotesView::getCurrentPage (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return NULL; } @@ -373,7 +373,7 @@ Reference<drawing::XDrawPage> SAL_CALL PresenterNotesView::getCurrentPage (void) //----- XKeyListener ---------------------------------------------------------- void SAL_CALL PresenterNotesView::keyPressed (const awt::KeyEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { switch (rEvent.KeyCode) { @@ -415,7 +415,7 @@ void SAL_CALL PresenterNotesView::keyPressed (const awt::KeyEvent& rEvent) } void SAL_CALL PresenterNotesView::keyReleased (const awt::KeyEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; } diff --git a/sdext/source/presenter/PresenterNotesView.hxx b/sdext/source/presenter/PresenterNotesView.hxx index d2d1ae6982a1..7d10b72eb468 100644 --- a/sdext/source/presenter/PresenterNotesView.hxx +++ b/sdext/source/presenter/PresenterNotesView.hxx @@ -91,50 +91,50 @@ public: virtual void SAL_CALL disposing (const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XResourceId virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isAnchorOnly (void) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); // XDrawView virtual void SAL_CALL setCurrentPage ( const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XKeyListener virtual void SAL_CALL keyPressed (const css::awt::KeyEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL keyReleased (const css::awt::KeyEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); private: css::uno::Reference<css::drawing::framework::XResourceId> mxViewId; diff --git a/sdext/source/presenter/PresenterPane.cxx b/sdext/source/presenter/PresenterPane.cxx index fab3c5415654..18a099e6ab49 100644 --- a/sdext/source/presenter/PresenterPane.cxx +++ b/sdext/source/presenter/PresenterPane.cxx @@ -56,14 +56,14 @@ PresenterPane::~PresenterPane (void) //----- XPane ----------------------------------------------------------------- Reference<awt::XWindow> SAL_CALL PresenterPane::getWindow (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); return mxContentWindow; } Reference<rendering::XCanvas> SAL_CALL PresenterPane::getCanvas (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); return mxContentCanvas; @@ -72,7 +72,7 @@ Reference<rendering::XCanvas> SAL_CALL PresenterPane::getCanvas (void) //----- XWindowListener ------------------------------------------------------- void SAL_CALL PresenterPane::windowResized (const awt::WindowEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; PresenterPaneBase::windowResized(rEvent); @@ -87,7 +87,7 @@ void SAL_CALL PresenterPane::windowResized (const awt::WindowEvent& rEvent) } void SAL_CALL PresenterPane::windowMoved (const awt::WindowEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; PresenterPaneBase::windowMoved(rEvent); @@ -101,7 +101,7 @@ void SAL_CALL PresenterPane::windowMoved (const awt::WindowEvent& rEvent) } void SAL_CALL PresenterPane::windowShown (const lang::EventObject& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; PresenterPaneBase::windowShown(rEvent); @@ -119,7 +119,7 @@ void SAL_CALL PresenterPane::windowShown (const lang::EventObject& rEvent) } void SAL_CALL PresenterPane::windowHidden (const lang::EventObject& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; PresenterPaneBase::windowHidden(rEvent); @@ -131,7 +131,7 @@ void SAL_CALL PresenterPane::windowHidden (const lang::EventObject& rEvent) //----- XPaintListener -------------------------------------------------------- void SAL_CALL PresenterPane::windowPaint (const awt::PaintEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); diff --git a/sdext/source/presenter/PresenterPane.hxx b/sdext/source/presenter/PresenterPane.hxx index 89ea3b99b89f..a6f6a2b3d2ac 100644 --- a/sdext/source/presenter/PresenterPane.hxx +++ b/sdext/source/presenter/PresenterPane.hxx @@ -58,29 +58,29 @@ public: // XPane css::uno::Reference<css::awt::XWindow> SAL_CALL getWindow (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); css::uno::Reference<css::rendering::XCanvas> SAL_CALL getCanvas (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); 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 87a6831b2463..3c0b103666d5 100644 --- a/sdext/source/presenter/PresenterPaneBase.cxx +++ b/sdext/source/presenter/PresenterPaneBase.cxx @@ -164,7 +164,7 @@ awt::Point PresenterPaneBase::GetCalloutAnchor (void) const //----- XInitialization ------------------------------------------------------- void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments) - throw (Exception, RuntimeException) + throw (Exception, RuntimeException, std::exception) { ThrowIfDisposed(); @@ -261,14 +261,14 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments) //----- XResourceId ----------------------------------------------------------- Reference<XResourceId> SAL_CALL PresenterPaneBase::getResourceId (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); return mxPaneId; } sal_Bool SAL_CALL PresenterPaneBase::isAnchorOnly (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return true; } @@ -276,28 +276,28 @@ sal_Bool SAL_CALL PresenterPaneBase::isAnchorOnly (void) //----- XWindowListener ------------------------------------------------------- void SAL_CALL PresenterPaneBase::windowResized (const awt::WindowEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); } void SAL_CALL PresenterPaneBase::windowMoved (const awt::WindowEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); } void SAL_CALL PresenterPaneBase::windowShown (const lang::EventObject& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); } void SAL_CALL PresenterPaneBase::windowHidden (const lang::EventObject& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -306,7 +306,7 @@ void SAL_CALL PresenterPaneBase::windowHidden (const lang::EventObject& rEvent) //----- lang::XEventListener -------------------------------------------------- void SAL_CALL PresenterPaneBase::disposing (const lang::EventObject& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (rEvent.Source == mxBorderWindow) { diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx index ca0c0ea6a0aa..76df877f48dd 100644 --- a/sdext/source/presenter/PresenterPaneBase.hxx +++ b/sdext/source/presenter/PresenterPaneBase.hxx @@ -83,34 +83,34 @@ public: // XInitialization virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) - throw (css::uno::Exception, css::uno::RuntimeException); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception); // XResourceId virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isAnchorOnly (void) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); protected: ::rtl::Reference<PresenterController> mpPresenterController; diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx index f72384ac792f..6d494cd9e889 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx @@ -175,7 +175,7 @@ awt::Rectangle SAL_CALL PresenterPaneBorderPainter::addBorder ( const OUString& rsPaneBorderStyleName, const css::awt::Rectangle& rRectangle, drawing::framework::BorderType eBorderType) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -188,7 +188,7 @@ awt::Rectangle SAL_CALL PresenterPaneBorderPainter::removeBorder ( const OUString& rsPaneBorderStyleName, const css::awt::Rectangle& rRectangle, drawing::framework::BorderType eBorderType) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -203,7 +203,7 @@ void SAL_CALL PresenterPaneBorderPainter::paintBorder ( const css::awt::Rectangle& rOuterBorderRectangle, const css::awt::Rectangle& rRepaintArea, const OUString& rsTitle) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -239,7 +239,7 @@ void SAL_CALL PresenterPaneBorderPainter::paintBorderWithCallout ( const css::awt::Rectangle& rRepaintArea, const OUString& rsTitle, const css::awt::Point& rCalloutAnchor) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -271,7 +271,7 @@ void SAL_CALL PresenterPaneBorderPainter::paintBorderWithCallout ( awt::Point SAL_CALL PresenterPaneBorderPainter::getCalloutOffset ( const OUString& rsPaneBorderStyleName) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); ProvideTheme(); diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.hxx b/sdext/source/presenter/PresenterPaneBorderPainter.hxx index f70ec1e1d1c1..bc4de31c77c7 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.hxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.hxx @@ -94,13 +94,13 @@ public: const OUString& rsPaneBorderStyleName, const css::awt::Rectangle& rRectangle, css::drawing::framework::BorderType eBorderType) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual css::awt::Rectangle SAL_CALL removeBorder ( const OUString& rsPaneBorderStyleName, const css::awt::Rectangle& rRectangle, css::drawing::framework::BorderType eBorderType) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL paintBorder ( const OUString& rsPaneBorderStyleName, @@ -108,7 +108,7 @@ public: const css::awt::Rectangle& rOuterBorderRectangle, const css::awt::Rectangle& rRepaintArea, const OUString& rsTitle) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL paintBorderWithCallout ( const OUString& rsPaneBorderStyleName, @@ -117,11 +117,11 @@ public: const css::awt::Rectangle& rRepaintArea, const OUString& rsTitle, const css::awt::Point& rCalloutAnchor) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual css::awt::Point SAL_CALL getCalloutOffset ( const OUString& rsPaneBorderStyleName) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); private: css::uno::Reference<css::uno::XComponentContext> mxContext; diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx index c8de7bfbdab3..6eb6e3b2143b 100644 --- a/sdext/source/presenter/PresenterPaneContainer.cxx +++ b/sdext/source/presenter/PresenterPaneContainer.cxx @@ -361,7 +361,7 @@ void PresenterPaneContainer::ToTop (const SharedPaneDescriptor& rpDescriptor) void SAL_CALL PresenterPaneContainer::disposing ( const com::sun::star::lang::EventObject& rEvent) - throw (com::sun::star::uno::RuntimeException) + throw (com::sun::star::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 8b9cdeed3408..ea79d9bdfc7e 100644 --- a/sdext/source/presenter/PresenterPaneContainer.hxx +++ b/sdext/source/presenter/PresenterPaneContainer.hxx @@ -173,7 +173,7 @@ public: virtual void SAL_CALL disposing ( const com::sun::star::lang::EventObject& rEvent) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); private: css::uno::Reference<css::drawing::XPresenterHelper> mxPresenterHelper; diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx index c7799ca2d8e4..880ff3d573b0 100644 --- a/sdext/source/presenter/PresenterPaneFactory.cxx +++ b/sdext/source/presenter/PresenterPaneFactory.cxx @@ -142,7 +142,7 @@ void SAL_CALL PresenterPaneFactory::disposing (void) Reference<XResource> SAL_CALL PresenterPaneFactory::createResource ( const Reference<XResourceId>& rxPaneId) - throw (RuntimeException, IllegalArgumentException, WrappedTargetException) + throw (RuntimeException, IllegalArgumentException, WrappedTargetException, std::exception) { ThrowIfDisposed(); @@ -182,7 +182,7 @@ Reference<XResource> SAL_CALL PresenterPaneFactory::createResource ( } void SAL_CALL PresenterPaneFactory::releaseResource (const Reference<XResource>& rxResource) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); diff --git a/sdext/source/presenter/PresenterPaneFactory.hxx b/sdext/source/presenter/PresenterPaneFactory.hxx index 891a78c3ddc4..2b375e6ae440 100644 --- a/sdext/source/presenter/PresenterPaneFactory.hxx +++ b/sdext/source/presenter/PresenterPaneFactory.hxx @@ -88,13 +88,13 @@ public: SAL_CALL createResource ( const ::com::sun::star::uno::Reference< com::sun::star::drawing::framework::XResourceId>& rxPaneId) - throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException); + throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, std::exception); virtual void SAL_CALL releaseResource ( const ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResource>& rxPane) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: css::uno::WeakReference<css::uno::XComponentContext> mxComponentContextWeak; diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx index 66720aea00a7..75613d59a825 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.cxx +++ b/sdext/source/presenter/PresenterProtocolHandler.cxx @@ -193,27 +193,27 @@ public: virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence<css::beans::PropertyValue>& rArguments) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL addStatusListener( const css::uno::Reference<css::frame::XStatusListener>& rxListener, const css::util::URL& rURL) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeStatusListener ( const css::uno::Reference<css::frame::XStatusListener>& rxListener, const css::util::URL& rURL) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // document::XEventListener virtual void SAL_CALL notifyEvent (const css::document::EventObject& rEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); private: OUString msURLPath; @@ -270,7 +270,7 @@ void SAL_CALL PresenterProtocolHandler::disposing (void) //----- XInitialize ----------------------------------------------------------- void SAL_CALL PresenterProtocolHandler::initialize (const Sequence<Any>& aArguments) - throw (Exception, RuntimeException) + throw (Exception, RuntimeException, std::exception) { ThrowIfDisposed(); if (aArguments.getLength() > 0) @@ -296,7 +296,7 @@ Reference<frame::XDispatch> SAL_CALL PresenterProtocolHandler::queryDispatch ( const css::util::URL& rURL, const OUString& rsTargetFrameName, sal_Int32 nSearchFlags) - throw(RuntimeException) + throw(RuntimeException, std::exception) { (void)rsTargetFrameName; (void)nSearchFlags; @@ -314,7 +314,7 @@ Reference<frame::XDispatch> SAL_CALL PresenterProtocolHandler::queryDispatch ( Sequence<Reference<frame::XDispatch> > SAL_CALL PresenterProtocolHandler::queryDispatches( const Sequence<frame::DispatchDescriptor>& rDescriptors) - throw(RuntimeException) + throw(RuntimeException, std::exception) { (void)rDescriptors; ThrowIfDisposed(); @@ -422,7 +422,7 @@ void PresenterProtocolHandler::Dispatch::disposing (void) void SAL_CALL PresenterProtocolHandler::Dispatch::dispatch( const css::util::URL& rURL, const css::uno::Sequence<css::beans::PropertyValue>& rArguments) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { (void)rArguments; ThrowIfDisposed(); @@ -443,7 +443,7 @@ 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) + throw(css::uno::RuntimeException, std::exception) { if (rURL.Path == msURLPath) { @@ -463,7 +463,7 @@ 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) + throw(css::uno::RuntimeException, std::exception) { if (rURL.Path == msURLPath) { @@ -495,7 +495,7 @@ void PresenterProtocolHandler::Dispatch::ThrowIfDisposed (void) const void SAL_CALL PresenterProtocolHandler::Dispatch::notifyEvent ( const css::document::EventObject& rEvent) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { (void)rEvent; @@ -505,7 +505,7 @@ void SAL_CALL PresenterProtocolHandler::Dispatch::notifyEvent ( //----- lang::XEventListener -------------------------------------------------- void SAL_CALL PresenterProtocolHandler::Dispatch::disposing (const css::lang::EventObject& rEvent) - throw(css::uno::RuntimeException) + 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 77423f0b2145..bfea03f9bdbd 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.hxx +++ b/sdext/source/presenter/PresenterProtocolHandler.hxx @@ -59,7 +59,7 @@ public: virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& aArguments) - throw (css::uno::Exception, css::uno::RuntimeException); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception); // XDispatchProvider @@ -68,12 +68,12 @@ public: const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); 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); + throw(css::uno::RuntimeException, std::exception); private: class Dispatch; diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index bf663c05766b..f0f8bc4943f6 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); + virtual void SAL_CALL notifyEvent( const css::document::EventObject& Event ) throw (css::uno::RuntimeException, std::exception); // XEventListener - virtual void SAL_CALL disposing ( const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException); + virtual void SAL_CALL disposing ( const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException, std::exception); private: css::uno::Reference<css::frame::XModel2 > mxModel; @@ -128,7 +128,7 @@ void SAL_CALL PresenterScreenJob::disposing (void) Any SAL_CALL PresenterScreenJob::execute( const Sequence< beans::NamedValue >& Arguments ) - throw (lang::IllegalArgumentException, Exception, RuntimeException) + throw (lang::IllegalArgumentException, Exception, RuntimeException, std::exception) { Sequence< beans::NamedValue > lEnv; @@ -213,7 +213,7 @@ void SAL_CALL PresenterScreenListener::disposing (void) // document::XEventListener -void SAL_CALL PresenterScreenListener::notifyEvent( const css::document::EventObject& Event ) throw (css::uno::RuntimeException) +void SAL_CALL PresenterScreenListener::notifyEvent( const css::document::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -236,7 +236,7 @@ void SAL_CALL PresenterScreenListener::notifyEvent( const css::document::EventOb // XEventListener void SAL_CALL PresenterScreenListener::disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { (void)rEvent; @@ -320,7 +320,7 @@ void SAL_CALL PresenterScreen::disposing (void) //----- XEventListener -------------------------------------------------------- void SAL_CALL PresenterScreen::disposing (const lang::EventObject& /*rEvent*/) - throw (RuntimeException) + throw (RuntimeException, std::exception) { mxSlideShowControllerWeak = WeakReference<presentation::XSlideShowController>(); RequestShutdownPresenterScreen(); diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx index cb1c88738c70..13a145f51c7c 100644 --- a/sdext/source/presenter/PresenterScreen.hxx +++ b/sdext/source/presenter/PresenterScreen.hxx @@ -74,7 +74,7 @@ public: const css::uno::Sequence<css::beans::NamedValue >& Arguments) throw (css::lang::IllegalArgumentException, css::uno::Exception, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); private: PresenterScreenJob (const css::uno::Reference<css::uno::XComponentContext>& rxContext); @@ -125,7 +125,7 @@ public: // XEventListener - virtual void SAL_CALL disposing ( const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException); + virtual void SAL_CALL disposing ( const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException, std::exception); private: css::uno::Reference<css::frame::XModel2 > mxModel; diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx index 9f88364ec170..0aa33f2f3571 100644 --- a/sdext/source/presenter/PresenterScrollBar.cxx +++ b/sdext/source/presenter/PresenterScrollBar.cxx @@ -341,25 +341,25 @@ void PresenterScrollBar::Paint ( //----- XWindowListener ------------------------------------------------------- void SAL_CALL PresenterScrollBar::windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { (void)rEvent; } void SAL_CALL PresenterScrollBar::windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { (void)rEvent; } void SAL_CALL PresenterScrollBar::windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { (void)rEvent; } void SAL_CALL PresenterScrollBar::windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { (void)rEvent; } @@ -367,7 +367,7 @@ 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) + throw (css::uno::RuntimeException, std::exception) { if (mxWindow.is()) { @@ -386,7 +386,7 @@ 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) + throw(css::uno::RuntimeException, std::exception) { maDragAnchor.X = rEvent.X; maDragAnchor.Y = rEvent.Y; @@ -396,7 +396,7 @@ void SAL_CALL PresenterScrollBar::mousePressed (const css::awt::MouseEvent& rEve } void SAL_CALL PresenterScrollBar::mouseReleased (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { (void)rEvent; @@ -407,13 +407,13 @@ void SAL_CALL PresenterScrollBar::mouseReleased (const css::awt::MouseEvent& rEv } void SAL_CALL PresenterScrollBar::mouseEntered (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { (void)rEvent; } void SAL_CALL PresenterScrollBar::mouseExited (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { (void)rEvent; if (meMouseMoveArea != None) @@ -431,7 +431,7 @@ 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) + throw (css::uno::RuntimeException, std::exception) { const Area eArea (GetArea(rEvent.X, rEvent.Y)); if (eArea != meMouseMoveArea) @@ -468,7 +468,7 @@ 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) + throw (css::uno::RuntimeException, std::exception) { if (rEvent.Source == mxWindow) mxWindow = NULL; diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx index 227bf592330f..8f4765bbfce3 100644 --- a/sdext/source/presenter/PresenterScrollBar.hxx +++ b/sdext/source/presenter/PresenterScrollBar.hxx @@ -114,47 +114,47 @@ public: // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XMouseListener virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // XMouseMotionListener virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) throw (css::uno::RuntimeException, std::exception); // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); 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 55c040d41ae8..b5ed609b6a7e 100644 --- a/sdext/source/presenter/PresenterSlidePreview.cxx +++ b/sdext/source/presenter/PresenterSlidePreview.cxx @@ -128,13 +128,13 @@ void SAL_CALL PresenterSlidePreview::disposing (void) //----- XResourceId ----------------------------------------------------------- Reference<XResourceId> SAL_CALL PresenterSlidePreview::getResourceId (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return mxViewId; } sal_Bool SAL_CALL PresenterSlidePreview::isAnchorOnly (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return false; } @@ -142,7 +142,7 @@ sal_Bool SAL_CALL PresenterSlidePreview::isAnchorOnly (void) //----- XWindowListener ------------------------------------------------------- void SAL_CALL PresenterSlidePreview::windowResized (const awt::WindowEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -151,13 +151,13 @@ void SAL_CALL PresenterSlidePreview::windowResized (const awt::WindowEvent& rEve } void SAL_CALL PresenterSlidePreview::windowMoved (const awt::WindowEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; } void SAL_CALL PresenterSlidePreview::windowShown (const lang::EventObject& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -166,7 +166,7 @@ void SAL_CALL PresenterSlidePreview::windowShown (const lang::EventObject& rEven } void SAL_CALL PresenterSlidePreview::windowHidden (const lang::EventObject& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; } @@ -174,7 +174,7 @@ void SAL_CALL PresenterSlidePreview::windowHidden (const lang::EventObject& rEve //----- XPaintListener -------------------------------------------------------- void SAL_CALL PresenterSlidePreview::windowPaint (const awt::PaintEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -190,7 +190,7 @@ void SAL_CALL PresenterSlidePreview::windowPaint (const awt::PaintEvent& rEvent) //----- lang::XEventListener -------------------------------------------------- void SAL_CALL PresenterSlidePreview::disposing (const lang::EventObject& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (rEvent.Source == mxWindow) { @@ -203,7 +203,7 @@ void SAL_CALL PresenterSlidePreview::disposing (const lang::EventObject& rEvent) //----- XDrawView ------------------------------------------------------------- void SAL_CALL PresenterSlidePreview::setCurrentPage (const Reference<drawing::XDrawPage>& rxSlide) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); ::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex()); @@ -211,7 +211,7 @@ void SAL_CALL PresenterSlidePreview::setCurrentPage (const Reference<drawing::XD } Reference<drawing::XDrawPage> SAL_CALL PresenterSlidePreview::getCurrentPage (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); return NULL; diff --git a/sdext/source/presenter/PresenterSlidePreview.hxx b/sdext/source/presenter/PresenterSlidePreview.hxx index 97bd2b49b061..34768eefe99b 100644 --- a/sdext/source/presenter/PresenterSlidePreview.hxx +++ b/sdext/source/presenter/PresenterSlidePreview.hxx @@ -72,42 +72,42 @@ public: // XResourceId virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isAnchorOnly (void) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XDrawView virtual void SAL_CALL setCurrentPage ( const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); protected: ::rtl::Reference<PresenterController> mpPresenterController; diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx index a230cb82381a..2a2b9909d125 100644 --- a/sdext/source/presenter/PresenterSlideShowView.cxx +++ b/sdext/source/presenter/PresenterSlideShowView.cxx @@ -255,7 +255,7 @@ void PresenterSlideShowView::disposing (void) void SAL_CALL PresenterSlideShowView::setCurrentPage ( const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { mxCurrentSlide = rxSlide; if (mpPresenterController.get() != NULL @@ -297,7 +297,7 @@ void SAL_CALL PresenterSlideShowView::setCurrentPage ( } css::uno::Reference<css::drawing::XDrawPage> SAL_CALL PresenterSlideShowView::getCurrentPage (void) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return mxCurrentSlide; } @@ -316,7 +316,7 @@ void PresenterSlideShowView::ReleaseView (void) //----- XSlideShowView -------------------------------------------------------- Reference<rendering::XSpriteCanvas> SAL_CALL PresenterSlideShowView::getCanvas (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -324,7 +324,7 @@ Reference<rendering::XSpriteCanvas> SAL_CALL PresenterSlideShowView::getCanvas ( } void SAL_CALL PresenterSlideShowView::clear (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); mbIsForcedPaintPending = false; @@ -352,7 +352,7 @@ void SAL_CALL PresenterSlideShowView::clear (void) } geometry::AffineMatrix2D SAL_CALL PresenterSlideShowView::getTransformation (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -379,7 +379,7 @@ geometry::AffineMatrix2D SAL_CALL PresenterSlideShowView::getTransformation (voi } geometry::IntegerSize2D SAL_CALL PresenterSlideShowView::getTranslationOffset(void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); return geometry::IntegerSize2D(0,0); @@ -387,7 +387,7 @@ geometry::IntegerSize2D SAL_CALL PresenterSlideShowView::getTranslationOffset(vo void SAL_CALL PresenterSlideShowView::addTransformationChangedListener( const Reference<util::XModifyListener>& rxListener) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); maBroadcaster.addListener( @@ -397,7 +397,7 @@ void SAL_CALL PresenterSlideShowView::addTransformationChangedListener( void SAL_CALL PresenterSlideShowView::removeTransformationChangedListener( const Reference<util::XModifyListener>& rxListener) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); maBroadcaster.removeListener( @@ -407,7 +407,7 @@ void SAL_CALL PresenterSlideShowView::removeTransformationChangedListener( void SAL_CALL PresenterSlideShowView::addPaintListener( const Reference<awt::XPaintListener>& rxListener) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); maBroadcaster.addListener( @@ -417,7 +417,7 @@ void SAL_CALL PresenterSlideShowView::addPaintListener( void SAL_CALL PresenterSlideShowView::removePaintListener( const Reference<awt::XPaintListener>& rxListener) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); maBroadcaster.removeListener( @@ -427,7 +427,7 @@ void SAL_CALL PresenterSlideShowView::removePaintListener( void SAL_CALL PresenterSlideShowView::addMouseListener( const Reference<awt::XMouseListener>& rxListener) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); maBroadcaster.addListener( @@ -437,7 +437,7 @@ void SAL_CALL PresenterSlideShowView::addMouseListener( void SAL_CALL PresenterSlideShowView::removeMouseListener( const Reference<awt::XMouseListener>& rxListener) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); maBroadcaster.removeListener( @@ -447,7 +447,7 @@ void SAL_CALL PresenterSlideShowView::removeMouseListener( void SAL_CALL PresenterSlideShowView::addMouseMotionListener( const Reference<awt::XMouseMotionListener>& rxListener) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); maBroadcaster.addListener( @@ -457,7 +457,7 @@ void SAL_CALL PresenterSlideShowView::addMouseMotionListener( void SAL_CALL PresenterSlideShowView::removeMouseMotionListener( const Reference<awt::XMouseMotionListener>& rxListener) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); maBroadcaster.removeListener( @@ -466,7 +466,7 @@ void SAL_CALL PresenterSlideShowView::removeMouseMotionListener( } void SAL_CALL PresenterSlideShowView::setMouseCursor(::sal_Int16 nPointerShape) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -486,7 +486,7 @@ void SAL_CALL PresenterSlideShowView::setMouseCursor(::sal_Int16 nPointerShape) } } -awt::Rectangle SAL_CALL PresenterSlideShowView::getCanvasArea( ) throw (RuntimeException) +awt::Rectangle SAL_CALL PresenterSlideShowView::getCanvasArea( ) throw (RuntimeException, std::exception) { if( mxViewWindow.is() && mxTopPane.is() ) return mxPresenterHelper->getWindowExtentsRelative( mxViewWindow, mxTopPane->getWindow() ); @@ -501,7 +501,7 @@ awt::Rectangle SAL_CALL PresenterSlideShowView::getCanvasArea( ) throw (Runtime //----- lang::XEventListener -------------------------------------------------- void SAL_CALL PresenterSlideShowView::disposing (const lang::EventObject& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (rEvent.Source == mxViewWindow) mxViewWindow = NULL; @@ -512,7 +512,7 @@ void SAL_CALL PresenterSlideShowView::disposing (const lang::EventObject& rEvent //----- XPaintListener -------------------------------------------------------- void SAL_CALL PresenterSlideShowView::windowPaint (const awt::PaintEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { // Deactivated views must not be painted. if ( ! mbIsPresenterViewActive) @@ -533,7 +533,7 @@ void SAL_CALL PresenterSlideShowView::windowPaint (const awt::PaintEvent& rEvent //----- XMouseListener -------------------------------------------------------- void SAL_CALL PresenterSlideShowView::mousePressed (const awt::MouseEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { awt::MouseEvent aEvent (rEvent); aEvent.Source = static_cast<XWeak*>(this); @@ -553,7 +553,7 @@ void SAL_CALL PresenterSlideShowView::mousePressed (const awt::MouseEvent& rEven } void SAL_CALL PresenterSlideShowView::mouseReleased (const awt::MouseEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { awt::MouseEvent aEvent (rEvent); aEvent.Source = static_cast<XWeak*>(this); @@ -566,7 +566,7 @@ void SAL_CALL PresenterSlideShowView::mouseReleased (const awt::MouseEvent& rEve } void SAL_CALL PresenterSlideShowView::mouseEntered (const awt::MouseEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { awt::MouseEvent aEvent (rEvent); aEvent.Source = static_cast<XWeak*>(this); @@ -579,7 +579,7 @@ void SAL_CALL PresenterSlideShowView::mouseEntered (const awt::MouseEvent& rEven } void SAL_CALL PresenterSlideShowView::mouseExited (const awt::MouseEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { awt::MouseEvent aEvent (rEvent); aEvent.Source = static_cast<XWeak*>(this); @@ -594,7 +594,7 @@ void SAL_CALL PresenterSlideShowView::mouseExited (const awt::MouseEvent& rEvent //----- XMouseMotionListener -------------------------------------------------- void SAL_CALL PresenterSlideShowView::mouseDragged (const awt::MouseEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { awt::MouseEvent aEvent (rEvent); aEvent.Source = static_cast<XWeak*>(this); @@ -607,7 +607,7 @@ void SAL_CALL PresenterSlideShowView::mouseDragged (const awt::MouseEvent& rEven } void SAL_CALL PresenterSlideShowView::mouseMoved (const awt::MouseEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { awt::MouseEvent aEvent (rEvent); aEvent.Source = static_cast<XWeak*>(this); @@ -622,7 +622,7 @@ void SAL_CALL PresenterSlideShowView::mouseMoved (const awt::MouseEvent& rEvent) //----- XWindowListener ------------------------------------------------------- void SAL_CALL PresenterSlideShowView::windowResized (const awt::WindowEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; @@ -633,7 +633,7 @@ void SAL_CALL PresenterSlideShowView::windowResized (const awt::WindowEvent& rEv } void SAL_CALL PresenterSlideShowView::windowMoved (const awt::WindowEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; if ( ! mbIsPaintPending) @@ -641,14 +641,14 @@ void SAL_CALL PresenterSlideShowView::windowMoved (const awt::WindowEvent& rEven } void SAL_CALL PresenterSlideShowView::windowShown (const lang::EventObject& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; Resize(); } void SAL_CALL PresenterSlideShowView::windowHidden (const lang::EventObject& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; } @@ -656,13 +656,13 @@ void SAL_CALL PresenterSlideShowView::windowHidden (const lang::EventObject& rEv //----- XView ----------------------------------------------------------------- Reference<XResourceId> SAL_CALL PresenterSlideShowView::getResourceId (void) - throw(RuntimeException) + throw(RuntimeException, std::exception) { return mxViewId; } sal_Bool SAL_CALL PresenterSlideShowView::isAnchorOnly (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return false; } diff --git a/sdext/source/presenter/PresenterSlideShowView.hxx b/sdext/source/presenter/PresenterSlideShowView.hxx index 5d6b9b1b186a..8f9d6d5d2a8e 100644 --- a/sdext/source/presenter/PresenterSlideShowView.hxx +++ b/sdext/source/presenter/PresenterSlideShowView.hxx @@ -82,123 +82,123 @@ public: virtual css::uno::Reference< css::rendering::XSpriteCanvas > SAL_CALL getCanvas (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL clear (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::geometry::AffineMatrix2D SAL_CALL getTransformation (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual ::com::sun::star::geometry::IntegerSize2D SAL_CALL getTranslationOffset(void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL addTransformationChangedListener( const css::uno::Reference< css::util::XModifyListener >& xListener) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeTransformationChangedListener( const css::uno::Reference< css::util::XModifyListener >& xListener) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setMouseCursor(::sal_Int16 nPointerShape) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual ::com::sun::star::awt::Rectangle SAL_CALL getCanvasArea( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XMouseListener virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XMouseMotionListener virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XView virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isAnchorOnly (void) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); // XDrawView virtual void SAL_CALL setCurrentPage ( const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // CachablePresenterView diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx index a330949aeb9b..6611712c7ff9 100644 --- a/sdext/source/presenter/PresenterSlideSorter.cxx +++ b/sdext/source/presenter/PresenterSlideSorter.cxx @@ -431,7 +431,7 @@ void PresenterSlideSorter::SetActiveState (const bool bIsActive) //----- lang::XEventListener -------------------------------------------------- void SAL_CALL PresenterSlideSorter::disposing (const lang::EventObject& rEventObject) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (rEventObject.Source == mxWindow) { @@ -456,7 +456,7 @@ void SAL_CALL PresenterSlideSorter::disposing (const lang::EventObject& rEventOb //----- XWindowListener ------------------------------------------------------- void SAL_CALL PresenterSlideSorter::windowResized (const awt::WindowEvent& rEvent) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -465,14 +465,14 @@ void SAL_CALL PresenterSlideSorter::windowResized (const awt::WindowEvent& rEven } void SAL_CALL PresenterSlideSorter::windowMoved (const awt::WindowEvent& rEvent) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); } void SAL_CALL PresenterSlideSorter::windowShown (const lang::EventObject& rEvent) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -481,7 +481,7 @@ void SAL_CALL PresenterSlideSorter::windowShown (const lang::EventObject& rEvent } void SAL_CALL PresenterSlideSorter::windowHidden (const lang::EventObject& rEvent) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); @@ -490,7 +490,7 @@ void SAL_CALL PresenterSlideSorter::windowHidden (const lang::EventObject& rEven //----- XPaintListener -------------------------------------------------------- void SAL_CALL PresenterSlideSorter::windowPaint (const css::awt::PaintEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; @@ -508,7 +508,7 @@ 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) + throw(css::uno::RuntimeException, std::exception) { css::awt::MouseEvent rTemp =rEvent; /// check whether RTL interface or not @@ -521,7 +521,7 @@ void SAL_CALL PresenterSlideSorter::mousePressed (const css::awt::MouseEvent& rE } void SAL_CALL PresenterSlideSorter::mouseReleased (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { css::awt::MouseEvent rTemp =rEvent; /// check whether RTL interface or not @@ -552,13 +552,13 @@ void SAL_CALL PresenterSlideSorter::mouseReleased (const css::awt::MouseEvent& r } void SAL_CALL PresenterSlideSorter::mouseEntered (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { (void)rEvent; } void SAL_CALL PresenterSlideSorter::mouseExited (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { (void)rEvent; mnSlideIndexMousePressed = -1; @@ -569,7 +569,7 @@ 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) + throw (css::uno::RuntimeException, std::exception) { if (mpMouseOverManager.get() != NULL) { @@ -599,7 +599,7 @@ void SAL_CALL PresenterSlideSorter::mouseMoved (const css::awt::MouseEvent& rEve } void SAL_CALL PresenterSlideSorter::mouseDragged (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { (void)rEvent; } @@ -607,14 +607,14 @@ void SAL_CALL PresenterSlideSorter::mouseDragged (const css::awt::MouseEvent& rE //----- XResourceId ----------------------------------------------------------- Reference<XResourceId> SAL_CALL PresenterSlideSorter::getResourceId (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); return mxViewId; } sal_Bool SAL_CALL PresenterSlideSorter::isAnchorOnly (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return false; } @@ -623,7 +623,7 @@ sal_Bool SAL_CALL PresenterSlideSorter::isAnchorOnly (void) void SAL_CALL PresenterSlideSorter::propertyChange ( const css::beans::PropertyChangeEvent& rEvent) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { (void)rEvent; } @@ -632,7 +632,7 @@ void SAL_CALL PresenterSlideSorter::propertyChange ( void SAL_CALL PresenterSlideSorter::notifyPreviewCreation ( sal_Int32 nSlideIndex) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { OSL_ASSERT(mpLayout.get()!=NULL); @@ -643,7 +643,7 @@ void SAL_CALL PresenterSlideSorter::notifyPreviewCreation ( //----- XDrawView ------------------------------------------------------------- void SAL_CALL PresenterSlideSorter::setCurrentPage (const Reference<drawing::XDrawPage>& rxSlide) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rxSlide; @@ -675,7 +675,7 @@ void SAL_CALL PresenterSlideSorter::setCurrentPage (const Reference<drawing::XDr } Reference<drawing::XDrawPage> SAL_CALL PresenterSlideSorter::getCurrentPage (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); return NULL; diff --git a/sdext/source/presenter/PresenterSlideSorter.hxx b/sdext/source/presenter/PresenterSlideSorter.hxx index c4bd9d558766..5570942de247 100644 --- a/sdext/source/presenter/PresenterSlideSorter.hxx +++ b/sdext/source/presenter/PresenterSlideSorter.hxx @@ -80,77 +80,77 @@ public: virtual void SAL_CALL disposing (const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XMouseListener virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // XMouseMotionListener virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XResourceId virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isAnchorOnly (void) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); // XPropertyChangeListener virtual void SAL_CALL propertyChange ( const css::beans::PropertyChangeEvent& rEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // XSlidePreviewCacheListener virtual void SAL_CALL notifyPreviewCreation ( sal_Int32 nSlideIndex) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // XDrawView virtual void SAL_CALL setCurrentPage ( const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); private: css::uno::Reference<css::uno::XComponentContext> mxComponentContext; diff --git a/sdext/source/presenter/PresenterSpritePane.cxx b/sdext/source/presenter/PresenterSpritePane.cxx index 099495bf0a83..ed7df848670a 100644 --- a/sdext/source/presenter/PresenterSpritePane.cxx +++ b/sdext/source/presenter/PresenterSpritePane.cxx @@ -62,14 +62,14 @@ void PresenterSpritePane::disposing (void) //----- XPane ----------------------------------------------------------------- Reference<awt::XWindow> SAL_CALL PresenterSpritePane::getWindow (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); return mxContentWindow; } Reference<rendering::XCanvas> SAL_CALL PresenterSpritePane::getCanvas (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -82,7 +82,7 @@ Reference<rendering::XCanvas> SAL_CALL PresenterSpritePane::getCanvas (void) //----- XWindowListener ------------------------------------------------------- void SAL_CALL PresenterSpritePane::windowResized (const awt::WindowEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; PresenterPaneBase::windowResized(rEvent); @@ -93,7 +93,7 @@ void SAL_CALL PresenterSpritePane::windowResized (const awt::WindowEvent& rEvent } void SAL_CALL PresenterSpritePane::windowMoved (const awt::WindowEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; PresenterPaneBase::windowMoved(rEvent); @@ -105,7 +105,7 @@ void SAL_CALL PresenterSpritePane::windowMoved (const awt::WindowEvent& rEvent) } void SAL_CALL PresenterSpritePane::windowShown (const lang::EventObject& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; PresenterPaneBase::windowShown(rEvent); @@ -121,7 +121,7 @@ void SAL_CALL PresenterSpritePane::windowShown (const lang::EventObject& rEvent) } void SAL_CALL PresenterSpritePane::windowHidden (const lang::EventObject& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; PresenterPaneBase::windowHidden(rEvent); @@ -134,7 +134,7 @@ void SAL_CALL PresenterSpritePane::windowHidden (const lang::EventObject& rEvent //----- XPaintListener -------------------------------------------------------- void SAL_CALL PresenterSpritePane::windowPaint (const awt::PaintEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; ThrowIfDisposed(); diff --git a/sdext/source/presenter/PresenterSpritePane.hxx b/sdext/source/presenter/PresenterSpritePane.hxx index 66a8c0dbee71..1526782c2eda 100644 --- a/sdext/source/presenter/PresenterSpritePane.hxx +++ b/sdext/source/presenter/PresenterSpritePane.hxx @@ -69,29 +69,29 @@ public: // XPane virtual css::uno::Reference<css::awt::XWindow> SAL_CALL getWindow (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference<css::rendering::XCanvas> SAL_CALL getCanvas (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); private: css::uno::Reference<css::awt::XWindow> mxParentWindow; diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx index f80e6eded6b5..27cf782c1cef 100644 --- a/sdext/source/presenter/PresenterTimer.cxx +++ b/sdext/source/presenter/PresenterTimer.cxx @@ -488,7 +488,7 @@ void PresenterClockTimer::CheckCurrentTime (const TimeValue& rCurrentTime) //----- XCallback ------------------------------------------------------------- void SAL_CALL PresenterClockTimer::notify (const css::uno::Any& rUserData) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { (void)rUserData; diff --git a/sdext/source/presenter/PresenterTimer.hxx b/sdext/source/presenter/PresenterTimer.hxx index 904ffbcfc05e..0092388bd0f1 100644 --- a/sdext/source/presenter/PresenterTimer.hxx +++ b/sdext/source/presenter/PresenterTimer.hxx @@ -94,7 +94,7 @@ public: // XCallback virtual void SAL_CALL notify (const css::uno::Any& rUserData) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); private: static ::rtl::Reference<PresenterClockTimer> mpInstance; diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index bf3fedae9e3b..a025ebf263f0 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -160,17 +160,17 @@ namespace { // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // document::XEventListener virtual void SAL_CALL notifyEvent (const css::document::EventObject& rEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // frame::XStatusListener virtual void SAL_CALL statusChanged (const css::frame::FeatureStateEvent& rEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); protected: ::rtl::Reference<PresenterToolBar> mpToolBar; @@ -220,7 +220,7 @@ namespace { // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); protected: virtual awt::Size CreateBoundingSize ( @@ -491,7 +491,7 @@ Reference<XComponentContext> PresenterToolBar::GetComponentContext (void) const //----- lang::XEventListener ------------------------------------------------- void SAL_CALL PresenterToolBar::disposing (const lang::EventObject& rEventObject) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (rEventObject.Source == mxWindow) mxWindow = NULL; @@ -500,34 +500,34 @@ void SAL_CALL PresenterToolBar::disposing (const lang::EventObject& rEventObject //----- XWindowListener ------------------------------------------------------- void SAL_CALL PresenterToolBar::windowResized (const awt::WindowEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; mbIsLayoutPending = true; } void SAL_CALL PresenterToolBar::windowMoved (const awt::WindowEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; } void SAL_CALL PresenterToolBar::windowShown (const lang::EventObject& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; mbIsLayoutPending = true; } void SAL_CALL PresenterToolBar::windowHidden (const lang::EventObject& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; } //----- XPaintListener -------------------------------------------------------- void SAL_CALL PresenterToolBar::windowPaint (const css::awt::PaintEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if ( ! mxCanvas.is()) return; @@ -552,28 +552,28 @@ 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) + 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) + throw(css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); CheckMouseOver(rEvent, true); } void SAL_CALL PresenterToolBar::mouseEntered (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); CheckMouseOver(rEvent, true); } void SAL_CALL PresenterToolBar::mouseExited (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); CheckMouseOver(rEvent, false); @@ -582,14 +582,14 @@ 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) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); CheckMouseOver(rEvent, true); } void SAL_CALL PresenterToolBar::mouseDragged (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); (void)rEvent; @@ -598,7 +598,7 @@ void SAL_CALL PresenterToolBar::mouseDragged (const css::awt::MouseEvent& rEvent //----- XDrawView ------------------------------------------------------------- void SAL_CALL PresenterToolBar::setCurrentPage (const Reference<drawing::XDrawPage>& rxSlide) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (rxSlide != mxCurrentSlide) { @@ -608,7 +608,7 @@ void SAL_CALL PresenterToolBar::setCurrentPage (const Reference<drawing::XDrawPa } Reference<drawing::XDrawPage> SAL_CALL PresenterToolBar::getCurrentPage (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return mxCurrentSlide; } @@ -1138,7 +1138,7 @@ void SAL_CALL PresenterToolBarView::disposing (void) //----- XPaintListener -------------------------------------------------------- void SAL_CALL PresenterToolBarView::windowPaint (const css::awt::PaintEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { awt::Rectangle aWindowBox (mxWindow->getPosSize()); mpPresenterController->GetCanvasHelper()->Paint( @@ -1152,7 +1152,7 @@ void SAL_CALL PresenterToolBarView::windowPaint (const css::awt::PaintEvent& rEv //----- lang::XEventListener ------------------------------------------------- void SAL_CALL PresenterToolBarView::disposing (const lang::EventObject& rEventObject) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (rEventObject.Source == mxWindow) mxWindow = NULL; @@ -1161,13 +1161,13 @@ void SAL_CALL PresenterToolBarView::disposing (const lang::EventObject& rEventOb //----- XResourceId ----------------------------------------------------------- Reference<XResourceId> SAL_CALL PresenterToolBarView::getResourceId (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return mxViewId; } sal_Bool SAL_CALL PresenterToolBarView::isAnchorOnly (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return false; } @@ -1175,7 +1175,7 @@ sal_Bool SAL_CALL PresenterToolBarView::isAnchorOnly (void) //----- XDrawView ------------------------------------------------------------- void SAL_CALL PresenterToolBarView::setCurrentPage (const Reference<drawing::XDrawPage>& rxSlide) - throw (RuntimeException) + throw (RuntimeException, std::exception) { Reference<drawing::XDrawView> xToolBar (static_cast<XWeak*>(mpToolBar.get()), UNO_QUERY); if (xToolBar.is()) @@ -1183,7 +1183,7 @@ void SAL_CALL PresenterToolBarView::setCurrentPage (const Reference<drawing::XDr } Reference<drawing::XDrawPage> SAL_CALL PresenterToolBarView::getCurrentPage (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return NULL; } @@ -1364,7 +1364,7 @@ void Element::UpdateState (void) //----- lang::XEventListener -------------------------------------------------- void SAL_CALL Element::disposing (const css::lang::EventObject& rEvent) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { (void)rEvent; } @@ -1372,7 +1372,7 @@ 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) + throw(css::uno::RuntimeException, std::exception) { (void)rEvent; UpdateState(); @@ -1381,7 +1381,7 @@ 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) + throw(css::uno::RuntimeException, std::exception) { bool bIsSelected (mbIsSelected); bool bIsEnabled (rEvent.IsEnabled); @@ -1619,7 +1619,7 @@ PresenterBitmapDescriptor::Mode Button::GetMode (void) const //----- lang::XEventListener -------------------------------------------------- void SAL_CALL Button::disposing (const css::lang::EventObject& rEvent) - throw(css::uno::RuntimeException) + 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 d001b8c06bb0..1cee3358b70e 100644 --- a/sdext/source/presenter/PresenterToolBar.hxx +++ b/sdext/source/presenter/PresenterToolBar.hxx @@ -106,57 +106,57 @@ public: virtual void SAL_CALL disposing (const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XMouseListener virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XMouseMotionListener virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XDrawView virtual void SAL_CALL setCurrentPage ( const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); class Context; @@ -241,30 +241,30 @@ public: // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XResourceId virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isAnchorOnly (void) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); // XDrawView virtual void SAL_CALL setCurrentPage ( const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); private: // css::uno::Reference<css::uno::XComponentContext> mxComponentContext; diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx index 37516d060290..8fed8d08567d 100644 --- a/sdext/source/presenter/PresenterViewFactory.cxx +++ b/sdext/source/presenter/PresenterViewFactory.cxx @@ -77,7 +77,7 @@ public: virtual ~NextSlidePreview (void) {} virtual void SAL_CALL setCurrentPage ( const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { Reference<presentation::XSlideShowController> xSlideShowController ( mpPresenterController->GetSlideShowController()); @@ -212,7 +212,7 @@ void SAL_CALL PresenterViewFactory::disposing (void) Reference<XResource> SAL_CALL PresenterViewFactory::createResource ( const Reference<XResourceId>& rxViewId) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -238,7 +238,7 @@ Reference<XResource> SAL_CALL PresenterViewFactory::createResource ( } void SAL_CALL PresenterViewFactory::releaseResource (const Reference<XResource>& rxView) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx index 52c7dac22468..6a083a7a021b 100644 --- a/sdext/source/presenter/PresenterViewFactory.hxx +++ b/sdext/source/presenter/PresenterViewFactory.hxx @@ -112,12 +112,12 @@ public: virtual css::uno::Reference<css::drawing::framework::XResource> SAL_CALL createResource ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL releaseResource ( const css::uno::Reference<css::drawing::framework::XResource>& rxPane) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); private: css::uno::Reference<css::uno::XComponentContext> mxComponentContext; diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx index ef578424e55b..89c15ef44b66 100644 --- a/sdext/source/presenter/PresenterWindowManager.cxx +++ b/sdext/source/presenter/PresenterWindowManager.cxx @@ -223,7 +223,7 @@ void PresenterWindowManager::SetPaneBorderPainter ( //----- XWindowListener ------------------------------------------------------- void SAL_CALL PresenterWindowManager::windowResized (const awt::WindowEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (rEvent.Source == mxParentWindow) @@ -244,7 +244,7 @@ void SAL_CALL PresenterWindowManager::windowResized (const awt::WindowEvent& rEv } void SAL_CALL PresenterWindowManager::windowMoved (const awt::WindowEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); if (rEvent.Source != mxParentWindow) @@ -258,13 +258,13 @@ void SAL_CALL PresenterWindowManager::windowMoved (const awt::WindowEvent& rEven } void SAL_CALL PresenterWindowManager::windowShown (const lang::EventObject& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; } void SAL_CALL PresenterWindowManager::windowHidden (const lang::EventObject& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { (void)rEvent; } @@ -272,7 +272,7 @@ void SAL_CALL PresenterWindowManager::windowHidden (const lang::EventObject& rEv //----- XPaintListener -------------------------------------------------------- void SAL_CALL PresenterWindowManager::windowPaint (const awt::PaintEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -305,14 +305,14 @@ void SAL_CALL PresenterWindowManager::windowPaint (const awt::PaintEvent& rEvent //----- XMouseListener -------------------------------------------------------- void SAL_CALL PresenterWindowManager::mousePressed (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { (void)rEvent; mbIsMouseClickPending = true; } void SAL_CALL PresenterWindowManager::mouseReleased (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { #ifndef ENABLE_PANE_RESIZING if (mbIsMouseClickPending) @@ -326,14 +326,14 @@ void SAL_CALL PresenterWindowManager::mouseReleased (const css::awt::MouseEvent& } void SAL_CALL PresenterWindowManager::mouseEntered (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { (void)rEvent; mbIsMouseClickPending = false; } void SAL_CALL PresenterWindowManager::mouseExited (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { (void)rEvent; mbIsMouseClickPending = false; @@ -342,7 +342,7 @@ 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) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); (void)rEvent; @@ -351,7 +351,7 @@ void SAL_CALL PresenterWindowManager::focusGained (const css::awt::FocusEvent& r } void SAL_CALL PresenterWindowManager::focusLost (const css::awt::FocusEvent& rEvent) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); (void)rEvent; @@ -360,7 +360,7 @@ void SAL_CALL PresenterWindowManager::focusLost (const css::awt::FocusEvent& rEv //----- XEventListener -------------------------------------------------------- void SAL_CALL PresenterWindowManager::disposing (const lang::EventObject& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (rEvent.Source == mxParentWindow) mxParentWindow = NULL; diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx index 668b6e539a57..83c148db1b43 100644 --- a/sdext/source/presenter/PresenterWindowManager.hxx +++ b/sdext/source/presenter/PresenterWindowManager.hxx @@ -117,49 +117,49 @@ public: // XWindowListener virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowShown (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL windowHidden (const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XPaintListener virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XMouseListener virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // XFocusListener virtual void SAL_CALL focusGained (const css::awt::FocusEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL focusLost (const css::awt::FocusEvent& rEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XEventListener virtual void SAL_CALL disposing ( const com::sun::star::lang::EventObject& rEvent) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); private: css::uno::Reference<css::uno::XComponentContext> mxComponentContext; |