diff options
Diffstat (limited to 'framework/inc/helper')
| -rw-r--r-- | framework/inc/helper/dockingareadefaultacceptor.hxx | 6 | ||||
| -rw-r--r-- | framework/inc/helper/mischelper.hxx | 18 | ||||
| -rw-r--r-- | framework/inc/helper/ocomponentaccess.hxx | 6 | ||||
| -rw-r--r-- | framework/inc/helper/ocomponentenumeration.hxx | 6 | ||||
| -rw-r--r-- | framework/inc/helper/oframes.hxx | 14 | ||||
| -rw-r--r-- | framework/inc/helper/persistentwindowstate.hxx | 6 | ||||
| -rw-r--r-- | framework/inc/helper/propertysetcontainer.hxx | 16 | ||||
| -rw-r--r-- | framework/inc/helper/statusindicator.hxx | 10 | ||||
| -rw-r--r-- | framework/inc/helper/statusindicatorfactory.hxx | 12 | ||||
| -rw-r--r-- | framework/inc/helper/tagwindowasmodified.hxx | 8 | ||||
| -rw-r--r-- | framework/inc/helper/titlebarupdate.hxx | 8 | ||||
| -rw-r--r-- | framework/inc/helper/uiconfigelementwrapperbase.hxx | 40 | ||||
| -rw-r--r-- | framework/inc/helper/uielementwrapperbase.hxx | 26 | ||||
| -rw-r--r-- | framework/inc/helper/vclstatusindicator.hxx | 10 |
14 files changed, 93 insertions, 93 deletions
diff --git a/framework/inc/helper/dockingareadefaultacceptor.hxx b/framework/inc/helper/dockingareadefaultacceptor.hxx index 81a57cf197eb..e14c1071cc3a 100644 --- a/framework/inc/helper/dockingareadefaultacceptor.hxx +++ b/framework/inc/helper/dockingareadefaultacceptor.hxx @@ -68,9 +68,9 @@ class DockingAreaDefaultAcceptor : private ThreadHelpBase // XDockingAreaAcceptor //--------------------------------------------------------------------------------------------------------- - virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getContainerWindow() throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL requestDockingAreaSpace( const css::awt::Rectangle& RequestedSpace ) throw (css::uno::RuntimeException); - virtual void SAL_CALL setDockingAreaSpace( const css::awt::Rectangle& BorderSpace ) throw (css::uno::RuntimeException); + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getContainerWindow() throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL requestDockingAreaSpace( const css::awt::Rectangle& RequestedSpace ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDockingAreaSpace( const css::awt::Rectangle& BorderSpace ) throw (css::uno::RuntimeException, std::exception); //------------------------------------------------------------------------------------------------------------- diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx index 557e56c184ae..15c87c3d6b5f 100644 --- a/framework/inc/helper/mischelper.hxx +++ b/framework/inc/helper/mischelper.hxx @@ -176,7 +176,7 @@ class WeakContainerListener : public ::cppu::WeakImplHelper1<com::sun::star::con // container.XContainerListener virtual void SAL_CALL elementInserted(const com::sun::star::container::ContainerEvent& rEvent) - throw(com::sun::star::uno::RuntimeException) + throw(com::sun::star::uno::RuntimeException, std::exception) { com::sun::star::uno::Reference<com::sun::star::container::XContainerListener> xOwner(mxOwner.get(), com::sun::star::uno::UNO_QUERY); @@ -185,7 +185,7 @@ class WeakContainerListener : public ::cppu::WeakImplHelper1<com::sun::star::con } virtual void SAL_CALL elementRemoved(const com::sun::star::container::ContainerEvent& rEvent) - throw(com::sun::star::uno::RuntimeException) + throw(com::sun::star::uno::RuntimeException, std::exception) { com::sun::star::uno::Reference<com::sun::star::container::XContainerListener> xOwner(mxOwner.get(), com::sun::star::uno::UNO_QUERY); @@ -194,7 +194,7 @@ class WeakContainerListener : public ::cppu::WeakImplHelper1<com::sun::star::con } virtual void SAL_CALL elementReplaced(const com::sun::star::container::ContainerEvent& rEvent) - throw(com::sun::star::uno::RuntimeException) + throw(com::sun::star::uno::RuntimeException, std::exception) { com::sun::star::uno::Reference<com::sun::star::container::XContainerListener> xOwner(mxOwner.get(), com::sun::star::uno::UNO_QUERY); @@ -204,7 +204,7 @@ class WeakContainerListener : public ::cppu::WeakImplHelper1<com::sun::star::con // lang.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) { com::sun::star::uno::Reference<com::sun::star::container::XContainerListener> xOwner(mxOwner.get(), com::sun::star::uno::UNO_QUERY); @@ -231,7 +231,7 @@ class WeakChangesListener : public ::cppu::WeakImplHelper1<com::sun::star::util: // util.XChangesListener virtual void SAL_CALL changesOccurred(const com::sun::star::util::ChangesEvent& rEvent) - throw(com::sun::star::uno::RuntimeException) + throw(com::sun::star::uno::RuntimeException, std::exception) { com::sun::star::uno::Reference<com::sun::star::util::XChangesListener> xOwner(mxOwner.get(), com::sun::star::uno::UNO_QUERY); @@ -241,7 +241,7 @@ class WeakChangesListener : public ::cppu::WeakImplHelper1<com::sun::star::util: // lang.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) { com::sun::star::uno::Reference<com::sun::star::util::XChangesListener> xOwner(mxOwner.get(), com::sun::star::uno::UNO_QUERY); @@ -268,7 +268,7 @@ class WeakEventListener : public ::cppu::WeakImplHelper1<com::sun::star::lang::X // lang.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) { com::sun::star::uno::Reference<com::sun::star::lang::XEventListener> xOwner(mxOwner.get(), com::sun::star::uno::UNO_QUERY); @@ -294,7 +294,7 @@ class WeakDocumentEventListener : public ::cppu::WeakImplHelper1<com::sun::star: } virtual void SAL_CALL notifyEvent(const com::sun::star::document::EventObject& rEvent) - throw(com::sun::star::uno::RuntimeException) + throw(com::sun::star::uno::RuntimeException, std::exception) { com::sun::star::uno::Reference<com::sun::star::document::XEventListener> xOwner(mxOwner.get(), com::sun::star::uno::UNO_QUERY); @@ -305,7 +305,7 @@ class WeakDocumentEventListener : public ::cppu::WeakImplHelper1<com::sun::star: // lang.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) { com::sun::star::uno::Reference<com::sun::star::document::XEventListener> xOwner(mxOwner.get(), com::sun::star::uno::UNO_QUERY); diff --git a/framework/inc/helper/ocomponentaccess.hxx b/framework/inc/helper/ocomponentaccess.hxx index 59b47eaccaa3..306686f37a74 100644 --- a/framework/inc/helper/ocomponentaccess.hxx +++ b/framework/inc/helper/ocomponentaccess.hxx @@ -105,7 +105,7 @@ class OComponentAccess : private ThreadHelpBase , // M @onerror - *//*-*****************************************************************************************************/ - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw( css::uno::RuntimeException ); + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw( css::uno::RuntimeException, std::exception ); //--------------------------------------------------------------------------------------------------------- // XElementAccess @@ -124,7 +124,7 @@ class OComponentAccess : private ThreadHelpBase , // M @onerror - *//*-*****************************************************************************************************/ - virtual css::uno::Type SAL_CALL getElementType() throw( css::uno::RuntimeException ); + virtual css::uno::Type SAL_CALL getElementType() throw( css::uno::RuntimeException, std::exception ); /*-****************************************************************************************************//** @short get state of componentlist of enumeration. @@ -139,7 +139,7 @@ class OComponentAccess : private ThreadHelpBase , // M @onerror - *//*-*****************************************************************************************************/ - virtual sal_Bool SAL_CALL hasElements() throw( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasElements() throw( css::uno::RuntimeException, std::exception ); //------------------------------------------------------------------------------------------------------------- // protected methods diff --git a/framework/inc/helper/ocomponentenumeration.hxx b/framework/inc/helper/ocomponentenumeration.hxx index 59d31b204391..e40b60203a06 100644 --- a/framework/inc/helper/ocomponentenumeration.hxx +++ b/framework/inc/helper/ocomponentenumeration.hxx @@ -97,7 +97,7 @@ class OComponentEnumeration : public ThreadHelpBase , @onerror - *//*-*****************************************************************************************************/ - virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ); //--------------------------------------------------------------------------------------------------------- // XEnumeration @@ -118,7 +118,7 @@ class OComponentEnumeration : public ThreadHelpBase , (List is emtpy and there no accessible elements ...) *//*-*****************************************************************************************************/ - virtual sal_Bool SAL_CALL hasMoreElements() throw( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasMoreElements() throw( css::uno::RuntimeException, std::exception ); /*-****************************************************************************************************//** @short give the next element, if some exist @@ -134,7 +134,7 @@ class OComponentEnumeration : public ThreadHelpBase , virtual css::uno::Any SAL_CALL nextElement() throw( css::container::NoSuchElementException , css::lang::WrappedTargetException , - css::uno::RuntimeException ); + css::uno::RuntimeException, std::exception ); //------------------------------------------------------------------------------------------------------------- // protected methods diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx index 0ab0c3032dc6..89d2512235ad 100644 --- a/framework/inc/helper/oframes.hxx +++ b/framework/inc/helper/oframes.hxx @@ -90,7 +90,7 @@ class OFrames : private ThreadHelpBase , // Must be the first of base @onerror We do nothing in release or throw an assert in debug version. *//*-*****************************************************************************************************/ - virtual void SAL_CALL append( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL append( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException, std::exception ); /*-****************************************************************************************************//** @short remove frame from container @@ -104,7 +104,7 @@ class OFrames : private ThreadHelpBase , // Must be the first of base @onerror We do nothing in release or throw an assert in debug version. *//*-*****************************************************************************************************/ - virtual void SAL_CALL remove( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL remove( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException, std::exception ); /*-****************************************************************************************************//** @short return list of all applicable frames for given flags @@ -117,7 +117,7 @@ class OFrames : private ThreadHelpBase , // Must be the first of base @onerror An empty list is returned. *//*-*****************************************************************************************************/ - virtual css::uno::Sequence< css::uno::Reference< css::frame::XFrame > > SAL_CALL queryFrames( sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException ); + virtual css::uno::Sequence< css::uno::Reference< css::frame::XFrame > > SAL_CALL queryFrames( sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException, std::exception ); // XIndexAccess @@ -134,7 +134,7 @@ class OFrames : private ThreadHelpBase , // Must be the first of base @onerror If a lock is set, we return 0 for prevent further access! *//*-*****************************************************************************************************/ - virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException ); + virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception ); /*-****************************************************************************************************//** @short get specified container item by index @@ -152,7 +152,7 @@ class OFrames : private ThreadHelpBase , // Must be the first of base *//*-*****************************************************************************************************/ virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) throw( css::lang::IndexOutOfBoundsException , css::lang::WrappedTargetException , - css::uno::RuntimeException ); + css::uno::RuntimeException, std::exception ); // XElementAccess @@ -168,7 +168,7 @@ class OFrames : private ThreadHelpBase , // Must be the first of base @onerror - *//*-*****************************************************************************************************/ - virtual css::uno::Type SAL_CALL getElementType() throw( css::uno::RuntimeException ); + virtual css::uno::Type SAL_CALL getElementType() throw( css::uno::RuntimeException, std::exception ); /*-****************************************************************************************************//** @short get fill state of current container @@ -183,7 +183,7 @@ class OFrames : private ThreadHelpBase , // Must be the first of base @onerror We return sal_False. *//*-*****************************************************************************************************/ - virtual sal_Bool SAL_CALL hasElements() throw( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasElements() throw( css::uno::RuntimeException, std::exception ); protected: diff --git a/framework/inc/helper/persistentwindowstate.hxx b/framework/inc/helper/persistentwindowstate.hxx index 09ede334a785..d9dd42b5760d 100644 --- a/framework/inc/helper/persistentwindowstate.hxx +++ b/framework/inc/helper/persistentwindowstate.hxx @@ -91,17 +91,17 @@ class PersistentWindowState : // baseclasses (order necessary for right initia // XInitialization virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); //____________________________ // XFrameActionListener virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); //____________________________ // XEventListener virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); //________________________________ // helper diff --git a/framework/inc/helper/propertysetcontainer.hxx b/framework/inc/helper/propertysetcontainer.hxx index dfe4cc6bd6c5..9675be82b5df 100644 --- a/framework/inc/helper/propertysetcontainer.hxx +++ b/framework/inc/helper/propertysetcontainer.hxx @@ -43,37 +43,37 @@ class FWE_DLLPUBLIC PropertySetContainer : public com::sun::star::container::XIn // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire() throw (); virtual void SAL_CALL release() throw (); // XIndexContainer virtual void SAL_CALL insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeByIndex( sal_Int32 Index ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // XIndexReplace virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // XIndexAccess virtual sal_Int32 SAL_CALL getCount() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return ::getCppuType((com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >*)0); } virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: typedef std::vector< com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > > PropertySetVector; diff --git a/framework/inc/helper/statusindicator.hxx b/framework/inc/helper/statusindicator.hxx index 88bac3b1709d..c7f59a76ae5b 100644 --- a/framework/inc/helper/statusindicator.hxx +++ b/framework/inc/helper/statusindicator.hxx @@ -101,19 +101,19 @@ class StatusIndicator : private ThreadHelpBase // Order of base // XStatusIndicator virtual void SAL_CALL start(const OUString& sText , sal_Int32 nRange) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL end() - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL reset() - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL setText(const OUString& sText) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL setValue(sal_Int32 nValue) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); }; // class StatusIndicator diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx index f97cadbe4dc2..37300bba9fd8 100644 --- a/framework/inc/helper/statusindicatorfactory.hxx +++ b/framework/inc/helper/statusindicatorfactory.hxx @@ -209,19 +209,19 @@ class StatusIndicatorFactory : private ThreadHelpBase StatusIndicatorFactory(const css::uno::Reference< css::uno::XComponentContext >& xContext); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.StatusIndicatorFactory"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.task.StatusIndicatorFactory"); @@ -232,17 +232,17 @@ class StatusIndicatorFactory : private ThreadHelpBase // XInitialization virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); //--------------------------------------- // XStatusIndicatorFactory virtual css::uno::Reference< css::task::XStatusIndicator > SAL_CALL createStatusIndicator() - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); //--------------------------------------- // XUpdatable virtual void SAL_CALL update() - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); //--------------------------------------- // similar (XStatusIndicator) diff --git a/framework/inc/helper/tagwindowasmodified.hxx b/framework/inc/helper/tagwindowasmodified.hxx index 53c75608a270..0c92ef0086d4 100644 --- a/framework/inc/helper/tagwindowasmodified.hxx +++ b/framework/inc/helper/tagwindowasmodified.hxx @@ -89,22 +89,22 @@ class TagWindowAsModified : // baseclasses (order necessary for right initiali // XInitialization virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); //____________________________ // XModifyListener virtual void SAL_CALL modified(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); //____________________________ // XFrameActionListener virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); //____________________________ // XEventListener virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); private: diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx index a9bd84d1824e..bfc0dbf6101d 100644 --- a/framework/inc/helper/titlebarupdate.hxx +++ b/framework/inc/helper/titlebarupdate.hxx @@ -94,22 +94,22 @@ class TitleBarUpdate : // baseclasses (order necessary for right initialization! // XInitialization virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); //____________________________ // XFrameActionListener virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); //____________________________ // XTitleChangeListener virtual void SAL_CALL titleChanged(const css::frame::TitleChangedEvent& aEvent) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); //____________________________ // XEventListener virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); //________________________________ // helper diff --git a/framework/inc/helper/uiconfigelementwrapperbase.hxx b/framework/inc/helper/uiconfigelementwrapperbase.hxx index 1c13f14e50bf..60b4594da468 100644 --- a/framework/inc/helper/uiconfigelementwrapperbase.hxx +++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx @@ -67,41 +67,41 @@ class UIConfigElementWrapperBase : protected ThreadHelpBase { OWeakObject::acquire(); } virtual void SAL_CALL release() throw () { OWeakObject::release(); } - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) = 0; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) = 0; + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); // XUIElementSettings - virtual void SAL_CALL updateSettings() throw (::com::sun::star::uno::RuntimeException) = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getSettings( sal_Bool bWriteable ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setSettings( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& UISettings ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateSettings() throw (::com::sun::star::uno::RuntimeException, std::exception) = 0; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getSettings( sal_Bool bWriteable ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setSettings( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& UISettings ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XUIElement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException) = 0; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException, std::exception) = 0; // XUpdatable - virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception); // XUIConfigurationListener - virtual void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XEventListener using cppu::OPropertySetHelper::disposing; - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); //------------------------------------------------------------------------------------------------------------- // protected methods @@ -114,12 +114,12 @@ class UIConfigElementWrapperBase : protected ThreadHelpBase sal_Int32 nHandle , const com::sun::star::uno::Any& aValue ) throw( com::sun::star::lang::IllegalArgumentException ); virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , - const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception ); + const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception, std::exception ); using cppu::OPropertySetHelper::getFastPropertyValue; virtual void SAL_CALL getFastPropertyValue( com::sun::star::uno::Any& aValue , sal_Int32 nHandle ) const; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); - virtual ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void impl_fillNewData(); diff --git a/framework/inc/helper/uielementwrapperbase.hxx b/framework/inc/helper/uielementwrapperbase.hxx index cf3aeff9288b..ab91b1c3e5bb 100644 --- a/framework/inc/helper/uielementwrapperbase.hxx +++ b/framework/inc/helper/uielementwrapperbase.hxx @@ -61,27 +61,27 @@ class UIElementWrapperBase : protected ThreadHelpBase { OWeakObject::acquire(); } virtual void SAL_CALL release() throw () { OWeakObject::release(); } - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) = 0; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) = 0; + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); // XUpdatable - virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception); // XUIElement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException) = 0; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getResourceURL() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException, std::exception) = 0; //------------------------------------------------------------------------------------------------------------- // protected methods @@ -94,12 +94,12 @@ class UIElementWrapperBase : protected ThreadHelpBase sal_Int32 nHandle , const com::sun::star::uno::Any& aValue ) throw( com::sun::star::lang::IllegalArgumentException ); virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , - const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception ); + const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception, std::exception ); using cppu::OPropertySetHelper::getFastPropertyValue; virtual void SAL_CALL getFastPropertyValue( com::sun::star::uno::Any& aValue , sal_Int32 nHandle ) const; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); - virtual ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException, std::exception); static const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor(); diff --git a/framework/inc/helper/vclstatusindicator.hxx b/framework/inc/helper/vclstatusindicator.hxx index 9db9aa6119e3..1fdc17a85f43 100644 --- a/framework/inc/helper/vclstatusindicator.hxx +++ b/framework/inc/helper/vclstatusindicator.hxx @@ -81,19 +81,19 @@ class VCLStatusIndicator : private ThreadHelpBase, // must be the first real bas /// XStatusIndicator virtual void SAL_CALL start(const OUString& sText , sal_Int32 nRange) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL reset() - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL end() - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL setText(const OUString& sText) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL setValue(sal_Int32 nValue) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); //------------------------------------------- // helper |