summaryrefslogtreecommitdiff
path: root/framework/source/uielement/generictoolbarcontroller.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-02-25 21:31:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-02-26 18:22:20 +0100
commit5e21a413c788f839a66d9e4c14e745ed18058db8 (patch)
treed4451246461346a425ad6f796e08bf1514cdd942 /framework/source/uielement/generictoolbarcontroller.cxx
parent6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff)
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'framework/source/uielement/generictoolbarcontroller.cxx')
-rw-r--r--framework/source/uielement/generictoolbarcontroller.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index 61cfb09a96fd..f5fdc40b13ba 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -120,7 +120,7 @@ GenericToolbarController::~GenericToolbarController()
}
void SAL_CALL GenericToolbarController::dispose()
-throw ( RuntimeException )
+throw ( RuntimeException, std::exception )
{
SolarMutexGuard aSolarMutexGuard;
@@ -131,7 +131,7 @@ throw ( RuntimeException )
}
void SAL_CALL GenericToolbarController::execute( sal_Int16 KeyModifier )
-throw ( RuntimeException )
+throw ( RuntimeException, std::exception )
{
Reference< XDispatch > xDispatch;
Reference< XURLTransformer > xURLTransformer;
@@ -178,7 +178,7 @@ throw ( RuntimeException )
}
void GenericToolbarController::statusChanged( const FeatureStateEvent& Event )
-throw ( RuntimeException )
+throw ( RuntimeException, std::exception )
{
SolarMutexGuard aSolarMutexGuard;
@@ -338,13 +338,13 @@ Toolbarmenu::~Toolbarmenu()
OSL_TRACE("**** destructing Toolbarmenu 0x%x", this );
}
-void SAL_CALL MenuToolbarController::click() throw (RuntimeException)
+void SAL_CALL MenuToolbarController::click() throw (RuntimeException, std::exception)
{
createPopupWindow();
}
Reference< XWindow > SAL_CALL
-MenuToolbarController::createPopupWindow() throw (::com::sun::star::uno::RuntimeException)
+MenuToolbarController::createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception)
{
if ( !pMenu )
{