summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/inc/sbamultiplex.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source/ui/inc/sbamultiplex.hxx')
-rw-r--r--dbaccess/source/ui/inc/sbamultiplex.hxx36
1 files changed, 18 insertions, 18 deletions
diff --git a/dbaccess/source/ui/inc/sbamultiplex.hxx b/dbaccess/source/ui/inc/sbamultiplex.hxx
index 8499f65be39a..02178ee4d615 100644
--- a/dbaccess/source/ui/inc/sbamultiplex.hxx
+++ b/dbaccess/source/ui/inc/sbamultiplex.hxx
@@ -71,16 +71,16 @@ namespace dbaui
::osl::Mutex& rMutex); \
DECLARE_UNO3_DEFAULTS(classname, OSbaWeakSubObject); \
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( \
- const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); \
+ const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception); \
\
/* ::com::sun::star::lang::XEventListener */ \
- virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(::com::sun::star::uno::RuntimeException); \
+ virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(::com::sun::star::uno::RuntimeException, std::exception); \
#define DECLARE_MULTIPLEXER_VOID_METHOD(methodname, eventtype) \
- virtual void SAL_CALL methodname(const eventtype& e) throw (::com::sun::star::uno::RuntimeException); \
+ virtual void SAL_CALL methodname(const eventtype& e) throw (::com::sun::star::uno::RuntimeException, std::exception); \
#define DECLARE_MULTIPLEXER_BOOL_METHOD(methodname, eventtype) \
- virtual sal_Bool SAL_CALL methodname(const eventtype& e) throw (::com::sun::star::uno::RuntimeException); \
+ virtual sal_Bool SAL_CALL methodname(const eventtype& e) throw (::com::sun::star::uno::RuntimeException, std::exception); \
#define END_DECLARE_LISTENER_MULTIPLEXER() \
/* resolve ambiguity : both OWeakObject and OInterfaceContainerHelper have these memory operators */ \
@@ -99,7 +99,7 @@ namespace dbaui
} \
\
::com::sun::star::uno::Any SAL_CALL classname::queryInterface( \
- const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException) \
+ const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) \
{ \
::com::sun::star::uno::Any aReturn = \
OSbaWeakSubObject::queryInterface(_rType); \
@@ -111,12 +111,12 @@ namespace dbaui
\
return aReturn; \
} \
- void SAL_CALL classname::disposing(const ::com::sun::star::lang::EventObject& ) throw(::com::sun::star::uno::RuntimeException)\
+ void SAL_CALL classname::disposing(const ::com::sun::star::lang::EventObject& ) throw(::com::sun::star::uno::RuntimeException, std::exception)\
{ \
} \
#define IMPLEMENT_LISTENER_MULTIPLEXER_VOID_METHOD(classname, listenerclass, methodname, eventtype) \
- void SAL_CALL classname::methodname(const eventtype& e) throw (::com::sun::star::uno::RuntimeException) \
+ void SAL_CALL classname::methodname(const eventtype& e) throw (::com::sun::star::uno::RuntimeException, std::exception) \
{ \
eventtype aMulti(e); \
aMulti.Source = &m_rParent; \
@@ -126,7 +126,7 @@ namespace dbaui
} \
#define IMPLEMENT_LISTENER_MULTIPLEXER_BOOL_METHOD(classname, listenerclass, methodname, eventtype) \
- sal_Bool SAL_CALL classname::methodname(const eventtype& e) throw (::com::sun::star::uno::RuntimeException) \
+ sal_Bool SAL_CALL classname::methodname(const eventtype& e) throw (::com::sun::star::uno::RuntimeException, std::exception) \
{ \
eventtype aMulti(e); \
aMulti.Source = &m_rParent; \
@@ -139,7 +139,7 @@ namespace dbaui
// helper for classes which do event multiplexing
#define IMPLEMENT_LISTENER_ADMINISTRATION(classname, listenernamespace, listenerdesc, multiplexer, braodcasterclass, broadcaster) \
- void SAL_CALL classname::add##listenerdesc(const ::com::sun::star::uno::Reference< ::com::sun::star::listenernamespace::X##listenerdesc >& l) throw(::com::sun::star::uno::RuntimeException)\
+ void SAL_CALL classname::add##listenerdesc(const ::com::sun::star::uno::Reference< ::com::sun::star::listenernamespace::X##listenerdesc >& l) throw(::com::sun::star::uno::RuntimeException, std::exception)\
{ \
multiplexer.addInterface(l); \
if (multiplexer.getLength() == 1) \
@@ -149,7 +149,7 @@ namespace dbaui
xBroadcaster->add##listenerdesc(&multiplexer); \
} \
} \
- void SAL_CALL classname::remove##listenerdesc(const ::com::sun::star::uno::Reference< ::com::sun::star::listenernamespace::X##listenerdesc >& l) throw(::com::sun::star::uno::RuntimeException)\
+ void SAL_CALL classname::remove##listenerdesc(const ::com::sun::star::uno::Reference< ::com::sun::star::listenernamespace::X##listenerdesc >& l) throw(::com::sun::star::uno::RuntimeException, std::exception)\
{ \
if (multiplexer.getLength() == 1) \
{ \
@@ -192,10 +192,10 @@ namespace dbaui
classname( ::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex ); \
DECLARE_UNO3_DEFAULTS(classname, OSbaWeakSubObject); \
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( \
- const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); \
+ const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception); \
\
/* ::com::sun::star::lang::XEventListener */ \
- virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(::com::sun::star::uno::RuntimeException); \
+ virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(::com::sun::star::uno::RuntimeException, std::exception); \
\
virtual void SAL_CALL methodname(const eventtype& e) throw exceptions; \
\
@@ -223,7 +223,7 @@ namespace dbaui
} \
\
::com::sun::star::uno::Any SAL_CALL classname::queryInterface( \
- const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException) \
+ const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) \
{ \
::com::sun::star::uno::Any aReturn = \
OSbaWeakSubObject::queryInterface(_rType); \
@@ -235,7 +235,7 @@ namespace dbaui
\
return aReturn; \
} \
- void SAL_CALL classname::disposing(const ::com::sun::star::lang::EventObject& ) throw(::com::sun::star::uno::RuntimeException)\
+ void SAL_CALL classname::disposing(const ::com::sun::star::lang::EventObject& ) throw(::com::sun::star::uno::RuntimeException, std::exception)\
{ \
} \
\
@@ -295,7 +295,7 @@ namespace dbaui
// helper for classes which do property event multiplexing
#define IMPLEMENT_PROPERTY_LISTENER_ADMINISTRATION(classname, listenerdesc, multiplexer, braodcasterclass, broadcaster) \
- void SAL_CALL classname::add##listenerdesc(const OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::X##listenerdesc >& l ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)\
+ void SAL_CALL classname::add##listenerdesc(const OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::X##listenerdesc >& l ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception)\
{ \
multiplexer.addInterface(rName, l); \
if (multiplexer.getOverallLen() == 1) \
@@ -305,7 +305,7 @@ namespace dbaui
xBroadcaster->add##listenerdesc(OUString(), &multiplexer); \
} \
} \
- void SAL_CALL classname::remove##listenerdesc(const OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::X##listenerdesc >& l ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)\
+ void SAL_CALL classname::remove##listenerdesc(const OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::X##listenerdesc >& l ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception)\
{ \
if (multiplexer.getOverallLen() == 1) \
{ \
@@ -388,10 +388,10 @@ namespace dbaui
END_DECLARE_LISTENER_MULTIPLEXER()
// ::com::sun::star::beans::XPropertyChangeListener
- DECLARE_PROPERTY_MULTIPLEXER(SbaXPropertyChangeMultiplexer, ::com::sun::star::beans::XPropertyChangeListener, propertyChange, ::com::sun::star::beans::PropertyChangeEvent, (::com::sun::star::uno::RuntimeException))
+ DECLARE_PROPERTY_MULTIPLEXER(SbaXPropertyChangeMultiplexer, ::com::sun::star::beans::XPropertyChangeListener, propertyChange, ::com::sun::star::beans::PropertyChangeEvent, (::com::sun::star::uno::RuntimeException, std::exception))
// ::com::sun::star::beans::XVetoableChangeListener
- DECLARE_PROPERTY_MULTIPLEXER(SbaXVetoableChangeMultiplexer, ::com::sun::star::beans::XVetoableChangeListener, vetoableChange, ::com::sun::star::beans::PropertyChangeEvent, (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException))
+ DECLARE_PROPERTY_MULTIPLEXER(SbaXVetoableChangeMultiplexer, ::com::sun::star::beans::XVetoableChangeListener, vetoableChange, ::com::sun::star::beans::PropertyChangeEvent, (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception))
// ::com::sun::star::beans::XPropertiesChangeListener
BEGIN_DECLARE_LISTENER_MULTIPLEXER(SbaXPropertiesChangeMultiplexer, ::com::sun::star::beans::XPropertiesChangeListener)