summaryrefslogtreecommitdiff
path: root/framework/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-01-26 12:28:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-01-26 12:54:43 +0000
commite57ca02849c3d87142ff5ff9099a212e72b8139c (patch)
treebcce66b27261553c308779f3e8663a269ed3a671 /framework/source
parent8802ebd5172ec4bc412a59d136c82b77ab452281 (diff)
Remove dynamic exception specifications
...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at <https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html> "Dynamic Exception Specifications" for details. Most changes have been done automatically by the rewriting loplugin:dynexcspec (after enabling the rewriting mode, to be committed shortly). The way it only removes exception specs from declarations if it also sees a definition, it identified some dead declarations-w/o-definitions (that have been removed manually) and some cases where a definition appeared in multiple include files (which have also been cleaned up manually). There's also been cases of macro paramters (that were used to abstract over exception specs) that have become unused now (and been removed). Furthermore, some code needed to be cleaned up manually (avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no configurations available that would actually build that code. Missing @throws documentation has not been applied in such manual clean-up. Change-Id: I3408691256c9b0c12bc5332de976743626e13960 Reviewed-on: https://gerrit.libreoffice.org/33574 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'framework/source')
-rw-r--r--framework/source/accelerators/acceleratorconfiguration.cxx66
-rw-r--r--framework/source/accelerators/documentacceleratorconfiguration.cxx17
-rw-r--r--framework/source/accelerators/globalacceleratorconfiguration.cxx12
-rw-r--r--framework/source/accelerators/keymapping.cxx1
-rw-r--r--framework/source/accelerators/moduleacceleratorconfiguration.cxx12
-rw-r--r--framework/source/dispatch/closedispatcher.cxx6
-rw-r--r--framework/source/dispatch/dispatchdisabler.cxx22
-rw-r--r--framework/source/dispatch/dispatchinformationprovider.cxx2
-rw-r--r--framework/source/dispatch/dispatchprovider.cxx4
-rw-r--r--framework/source/dispatch/interceptionhelper.cxx5
-rw-r--r--framework/source/dispatch/loaddispatcher.cxx5
-rw-r--r--framework/source/dispatch/mailtodispatcher.cxx14
-rw-r--r--framework/source/dispatch/oxt_handler.cxx3
-rw-r--r--framework/source/dispatch/popupmenudispatcher.cxx14
-rw-r--r--framework/source/dispatch/servicehandler.cxx14
-rw-r--r--framework/source/dispatch/startmoduledispatcher.cxx6
-rw-r--r--framework/source/dispatch/systemexec.cxx12
-rw-r--r--framework/source/fwe/classes/actiontriggercontainer.cxx11
-rw-r--r--framework/source/fwe/classes/actiontriggerpropertyset.cxx14
-rw-r--r--framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx12
-rw-r--r--framework/source/fwe/classes/imagewrapper.cxx8
-rw-r--r--framework/source/fwe/classes/rootactiontriggercontainer.cxx24
-rw-r--r--framework/source/fwe/dispatch/interaction.cxx24
-rw-r--r--framework/source/fwe/helper/actiontriggerhelper.cxx6
-rw-r--r--framework/source/fwe/helper/documentundoguard.cxx48
-rw-r--r--framework/source/fwe/helper/propertysetcontainer.cxx7
-rw-r--r--framework/source/fwe/helper/titlehelper.cxx8
-rw-r--r--framework/source/fwe/interaction/preventduplicateinteraction.cxx3
-rw-r--r--framework/source/fwe/xml/menuconfiguration.cxx2
-rw-r--r--framework/source/fwe/xml/menudocumenthandler.cxx25
-rw-r--r--framework/source/fwe/xml/saxnamespacefilter.cxx8
-rw-r--r--framework/source/fwe/xml/statusbardocumenthandler.cxx12
-rw-r--r--framework/source/fwe/xml/toolboxdocumenthandler.cxx21
-rw-r--r--framework/source/fwe/xml/xmlnamespaces.cxx8
-rw-r--r--framework/source/fwi/threadhelp/transactionmanager.cxx4
-rw-r--r--framework/source/fwi/uielement/constitemcontainer.cxx14
-rw-r--r--framework/source/fwi/uielement/itemcontainer.cxx6
-rw-r--r--framework/source/fwi/uielement/rootitemcontainer.cxx17
-rw-r--r--framework/source/helper/dockingareadefaultacceptor.cxx6
-rw-r--r--framework/source/helper/ocomponentaccess.cxx6
-rw-r--r--framework/source/helper/ocomponentenumeration.cxx8
-rw-r--r--framework/source/helper/oframes.cxx16
-rw-r--r--framework/source/helper/persistentwindowstate.cxx4
-rw-r--r--framework/source/helper/statusindicator.cxx5
-rw-r--r--framework/source/helper/statusindicatorfactory.cxx4
-rw-r--r--framework/source/helper/tagwindowasmodified.cxx5
-rw-r--r--framework/source/helper/titlebarupdate.cxx5
-rw-r--r--framework/source/helper/uiconfigelementwrapperbase.cxx34
-rw-r--r--framework/source/helper/uielementwrapperbase.cxx23
-rw-r--r--framework/source/helper/vclstatusindicator.cxx5
-rw-r--r--framework/source/inc/accelerators/acceleratorconfiguration.hxx148
-rw-r--r--framework/source/inc/accelerators/keymapping.hxx3
-rw-r--r--framework/source/inc/dispatch/dispatchdisabler.hxx51
-rw-r--r--framework/source/inc/dispatch/loaddispatcher.hxx15
-rw-r--r--framework/source/inc/loadenv/loadenv.hxx26
-rw-r--r--framework/source/interaction/quietinteraction.cxx2
-rw-r--r--framework/source/jobs/helponstartup.cxx4
-rw-r--r--framework/source/jobs/job.cxx14
-rw-r--r--framework/source/jobs/jobdispatch.cxx39
-rw-r--r--framework/source/jobs/jobexecutor.cxx33
-rw-r--r--framework/source/jobs/shelljob.cxx3
-rw-r--r--framework/source/layoutmanager/layoutmanager.cxx57
-rw-r--r--framework/source/layoutmanager/toolbarlayoutmanager.cxx18
-rw-r--r--framework/source/layoutmanager/toolbarlayoutmanager.hxx32
-rw-r--r--framework/source/loadenv/loadenv.cxx26
-rw-r--r--framework/source/recording/dispatchrecorder.cxx20
-rw-r--r--framework/source/recording/dispatchrecordersupplier.cxx6
-rw-r--r--framework/source/services/ContextChangeEventMultiplexer.cxx32
-rw-r--r--framework/source/services/autorecovery.cxx57
-rw-r--r--framework/source/services/desktop.cxx95
-rw-r--r--framework/source/services/dispatchhelper.cxx4
-rw-r--r--framework/source/services/frame.cxx337
-rw-r--r--framework/source/services/mediatypedetectionhelper.cxx1
-rw-r--r--framework/source/services/modulemanager.cxx61
-rw-r--r--framework/source/services/pathsettings.cxx161
-rw-r--r--framework/source/services/sessionlistener.cxx40
-rw-r--r--framework/source/services/substitutepathvars.cxx33
-rw-r--r--framework/source/services/taskcreatorsrv.cxx21
-rw-r--r--framework/source/services/uriabbreviation.cxx2
-rw-r--r--framework/source/services/urltransformer.cxx29
-rw-r--r--framework/source/tabwin/tabwindow.cxx28
-rw-r--r--framework/source/tabwin/tabwinfactory.cxx2
-rw-r--r--framework/source/uiconfiguration/globalsettings.cxx12
-rw-r--r--framework/source/uiconfiguration/graphicnameaccess.cxx7
-rw-r--r--framework/source/uiconfiguration/imagemanager.cxx34
-rw-r--r--framework/source/uiconfiguration/imagemanagerimpl.cxx33
-rw-r--r--framework/source/uiconfiguration/imagemanagerimpl.hxx38
-rw-r--r--framework/source/uiconfiguration/moduleimagemanager.cxx33
-rw-r--r--framework/source/uiconfiguration/moduleuicfgsupplier.cxx13
-rw-r--r--framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx93
-rw-r--r--framework/source/uiconfiguration/uicategorydescription.cxx45
-rw-r--r--framework/source/uiconfiguration/uiconfigurationmanager.cxx95
-rw-r--r--framework/source/uiconfiguration/windowstateconfiguration.cxx77
-rw-r--r--framework/source/uielement/addonstoolbarmanager.cxx2
-rw-r--r--framework/source/uielement/addonstoolbarwrapper.cxx6
-rw-r--r--framework/source/uielement/buttontoolbarcontroller.cxx14
-rw-r--r--framework/source/uielement/comboboxtoolbarcontroller.cxx1
-rw-r--r--framework/source/uielement/complextoolbarcontroller.cxx3
-rw-r--r--framework/source/uielement/controlmenucontroller.cxx29
-rw-r--r--framework/source/uielement/dropdownboxtoolbarcontroller.cxx1
-rw-r--r--framework/source/uielement/edittoolbarcontroller.cxx1
-rw-r--r--framework/source/uielement/fontmenucontroller.cxx8
-rw-r--r--framework/source/uielement/fontsizemenucontroller.cxx6
-rw-r--r--framework/source/uielement/genericstatusbarcontroller.cxx3
-rw-r--r--framework/source/uielement/generictoolbarcontroller.cxx7
-rw-r--r--framework/source/uielement/headermenucontroller.cxx6
-rw-r--r--framework/source/uielement/imagebuttontoolbarcontroller.cxx1
-rw-r--r--framework/source/uielement/langselectionmenucontroller.cxx8
-rw-r--r--framework/source/uielement/langselectionstatusbarcontroller.cxx15
-rw-r--r--framework/source/uielement/macrosmenucontroller.cxx4
-rw-r--r--framework/source/uielement/menubarmanager.cxx20
-rw-r--r--framework/source/uielement/menubarwrapper.cxx15
-rw-r--r--framework/source/uielement/newmenucontroller.cxx10
-rw-r--r--framework/source/uielement/notebookbarmenucontroller.cxx10
-rw-r--r--framework/source/uielement/objectmenucontroller.cxx17
-rw-r--r--framework/source/uielement/popuptoolbarcontroller.cxx83
-rw-r--r--framework/source/uielement/progressbarwrapper.cxx9
-rw-r--r--framework/source/uielement/recentfilesmenucontroller.cxx31
-rw-r--r--framework/source/uielement/resourcemenucontroller.cxx33
-rw-r--r--framework/source/uielement/spinfieldtoolbarcontroller.cxx1
-rw-r--r--framework/source/uielement/statusbaritem.cxx17
-rw-r--r--framework/source/uielement/statusbarmanager.cxx15
-rw-r--r--framework/source/uielement/statusbarwrapper.cxx8
-rw-r--r--framework/source/uielement/statusindicatorinterfacewrapper.cxx5
-rw-r--r--framework/source/uielement/subtoolbarcontroller.cxx60
-rw-r--r--framework/source/uielement/thesaurusmenucontroller.cxx9
-rw-r--r--framework/source/uielement/togglebuttontoolbarcontroller.cxx2
-rw-r--r--framework/source/uielement/toolbarmanager.cxx15
-rw-r--r--framework/source/uielement/toolbarmodemenucontroller.cxx10
-rw-r--r--framework/source/uielement/toolbarsmenucontroller.cxx12
-rw-r--r--framework/source/uielement/toolbarwrapper.cxx16
-rw-r--r--framework/source/uielement/uicommanddescription.cxx41
-rw-r--r--framework/source/uifactory/addonstoolbarfactory.cxx14
-rw-r--r--framework/source/uifactory/factoryconfiguration.cxx8
-rw-r--r--framework/source/uifactory/menubarfactory.cxx1
-rw-r--r--framework/source/uifactory/statusbarfactory.cxx12
-rw-r--r--framework/source/uifactory/toolbarfactory.cxx13
-rw-r--r--framework/source/uifactory/uicontrollerfactory.cxx45
-rw-r--r--framework/source/uifactory/uielementfactorymanager.cxx32
-rw-r--r--framework/source/uifactory/windowcontentfactorymanager.cxx15
-rw-r--r--framework/source/xml/acceleratorconfigurationreader.cxx16
-rw-r--r--framework/source/xml/imagesdocumenthandler.cxx27
142 files changed, 975 insertions, 2260 deletions
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index eae3a99704f9..a42c55ffbc26 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -87,7 +87,6 @@ XMLBasedAcceleratorConfiguration::~XMLBasedAcceleratorConfiguration()
}
css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfiguration::getAllKeyEvents()
- throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
AcceleratorCache& rCache = impl_getCFG();
@@ -96,8 +95,6 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati
}
OUString SAL_CALL XMLBasedAcceleratorConfiguration::getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent)
- throw(css::container::NoSuchElementException,
- css::uno::RuntimeException, std::exception )
{
SolarMutexGuard g;
AcceleratorCache& rCache = impl_getCFG();
@@ -110,8 +107,6 @@ OUString SAL_CALL XMLBasedAcceleratorConfiguration::getCommandByKeyEvent(const c
void SAL_CALL XMLBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyEvent& aKeyEvent,
const OUString& sCommand )
- throw(css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception )
{
if (
(aKeyEvent.KeyCode == 0) &&
@@ -136,8 +131,6 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE
}
void SAL_CALL XMLBasedAcceleratorConfiguration::removeKeyEvent(const css::awt::KeyEvent& aKeyEvent)
-throw(css::container::NoSuchElementException,
- css::uno::RuntimeException, std::exception )
{
SolarMutexGuard g;
AcceleratorCache& rCache = impl_getCFG(true); // true => force using of a writeable cache
@@ -149,9 +142,6 @@ throw(css::container::NoSuchElementException,
}
css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfiguration::getKeyEventsByCommand(const OUString& sCommand)
- throw(css::lang::IllegalArgumentException ,
- css::container::NoSuchElementException,
- css::uno::RuntimeException, std::exception )
{
if (sCommand.isEmpty())
throw css::lang::IllegalArgumentException(
@@ -171,8 +161,6 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati
}
css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList)
- throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException,
- css::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
@@ -205,9 +193,6 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::g
}
void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(const OUString& sCommand)
- throw(css::lang::IllegalArgumentException ,
- css::container::NoSuchElementException,
- css::uno::RuntimeException, std::exception )
{
if (sCommand.isEmpty())
throw css::lang::IllegalArgumentException(
@@ -225,8 +210,6 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co
}
void SAL_CALL XMLBasedAcceleratorConfiguration::reload()
- throw(css::uno::Exception ,
- css::uno::RuntimeException, std::exception)
{
css::uno::Reference< css::io::XStream > xStream;
css::uno::Reference< css::io::XStream > xStreamNoLang;
@@ -268,8 +251,6 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::reload()
}
void SAL_CALL XMLBasedAcceleratorConfiguration::store()
- throw(css::uno::Exception ,
- css::uno::RuntimeException, std::exception)
{
css::uno::Reference< css::io::XStream > xStream;
{
@@ -296,8 +277,6 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::store()
}
void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::Reference< css::embed::XStorage >& xStorage)
- throw(css::uno::Exception ,
- css::uno::RuntimeException, std::exception)
{
css::uno::Reference< css::io::XStream > xStream = StorageHolder::openSubStreamWithFallback(
xStorage,
@@ -319,14 +298,12 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::R
}
sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::isModified()
- throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
return (m_pWriteCache != nullptr);
}
sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::isReadOnly()
- throw(css::uno::RuntimeException, std::exception)
{
css::uno::Reference< css::io::XStream > xStream;
{
@@ -342,32 +319,27 @@ sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::isReadOnly()
}
void SAL_CALL XMLBasedAcceleratorConfiguration::setStorage(const css::uno::Reference< css::embed::XStorage >& /*xStorage*/)
- throw(css::uno::RuntimeException, std::exception)
{
SAL_INFO("fwk.accelerators", "XMLBasedAcceleratorConfiguration::setStorage(): implement this HACK .-)");
}
sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::hasStorage()
- throw(css::uno::RuntimeException, std::exception)
{
SAL_INFO("fwk.accelerators", "XMLBasedAcceleratorConfiguration::hasStorage(): implement this HACK .-)");
return false;
}
void SAL_CALL XMLBasedAcceleratorConfiguration::addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/)
- throw(css::uno::RuntimeException, std::exception)
{
SAL_INFO("fwk.accelerators", "XMLBasedAcceleratorConfiguration::addConfigurationListener(): implement me");
}
void SAL_CALL XMLBasedAcceleratorConfiguration::removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/)
- throw(css::uno::RuntimeException, std::exception)
{
SAL_INFO("fwk.accelerators", "XMLBasedAcceleratorConfiguration::removeConfigurationListener(): implement me");
}
void SAL_CALL XMLBasedAcceleratorConfiguration::reset()
-throw(css::uno::RuntimeException, std::exception)
{
{
SolarMutexGuard g;
@@ -378,13 +350,11 @@ throw(css::uno::RuntimeException, std::exception)
}
void SAL_CALL XMLBasedAcceleratorConfiguration::addResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/)
- throw(css::uno::RuntimeException, std::exception)
{
SAL_INFO("fwk.accelerators", "XMLBasedAcceleratorConfiguration::addResetListener(): implement me");
}
void SAL_CALL XMLBasedAcceleratorConfiguration::removeResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/)
- throw(css::uno::RuntimeException, std::exception)
{
SAL_INFO("fwk.accelerators", "XMLBasedAcceleratorConfiguration::removeResetListener(): implement me");
}
@@ -534,7 +504,6 @@ XCUBasedAcceleratorConfiguration::~XCUBasedAcceleratorConfiguration()
}
css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfiguration::getAllKeyEvents()
- throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
@@ -551,8 +520,6 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati
}
OUString SAL_CALL XCUBasedAcceleratorConfiguration::getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent)
- throw(css::container::NoSuchElementException,
- css::uno::RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -572,9 +539,6 @@ OUString SAL_CALL XCUBasedAcceleratorConfiguration::getCommandByKeyEvent(const c
void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyEvent& aKeyEvent,
const OUString& sCommand )
- throw (css::lang::IllegalArgumentException,
- css::container::NoSuchElementException,
- css::uno::RuntimeException, std::exception)
{
SAL_INFO( "fwk.accelerators", "XCUBasedAcceleratorConfiguration::setKeyEvent" );
@@ -654,8 +618,6 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE
}
void SAL_CALL XCUBasedAcceleratorConfiguration::removeKeyEvent(const css::awt::KeyEvent& aKeyEvent)
- throw(css::container::NoSuchElementException,
- css::uno::RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -693,9 +655,6 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeKeyEvent(const css::awt::K
}
css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfiguration::getKeyEventsByCommand(const OUString& sCommand)
- throw(css::lang::IllegalArgumentException ,
- css::container::NoSuchElementException,
- css::uno::RuntimeException, std::exception )
{
if (sCommand.isEmpty())
throw css::lang::IllegalArgumentException(
@@ -742,8 +701,6 @@ AcceleratorCache::TKeyList::const_iterator lcl_getPreferredKey(const Accelerator
}
css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList)
- throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException,
- css::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
@@ -780,9 +737,6 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::g
}
void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(const OUString& sCommand)
- throw(css::lang::IllegalArgumentException ,
- css::container::NoSuchElementException,
- css::uno::RuntimeException, std::exception )
{
if (sCommand.isEmpty())
throw css::lang::IllegalArgumentException(
@@ -807,8 +761,6 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co
}
void SAL_CALL XCUBasedAcceleratorConfiguration::reload()
- throw(css::uno::Exception ,
- css::uno::RuntimeException, std::exception)
{
SAL_INFO( "fwk.accelerators", "XCUBasedAcceleratorConfiguration::reload()" );
@@ -843,8 +795,6 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reload()
}
void SAL_CALL XCUBasedAcceleratorConfiguration::store()
- throw(css::uno::Exception ,
- css::uno::RuntimeException, std::exception)
{
SAL_INFO( "fwk.accelerators", "XCUBasedAcceleratorConfiguration::store()" );
@@ -867,8 +817,6 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::store()
}
void SAL_CALL XCUBasedAcceleratorConfiguration::storeToStorage(const css::uno::Reference< css::embed::XStorage >& xStorage)
- throw(css::uno::Exception ,
- css::uno::RuntimeException, std::exception)
{
// use m_aCache + old AcceleratorXMLWriter to store data directly on storage given as parameter ...
if (!xStorage.is())
@@ -931,44 +879,37 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::storeToStorage(const css::uno::R
}
sal_Bool SAL_CALL XCUBasedAcceleratorConfiguration::isModified()
- throw(css::uno::RuntimeException, std::exception)
{
return false;
}
sal_Bool SAL_CALL XCUBasedAcceleratorConfiguration::isReadOnly()
- throw(css::uno::RuntimeException, std::exception)
{
return false;
}
void SAL_CALL XCUBasedAcceleratorConfiguration::setStorage(const css::uno::Reference< css::embed::XStorage >& /*xStorage*/)
- throw(css::uno::RuntimeException, std::exception)
{
SAL_INFO("fwk.accelerators", "XCUBasedAcceleratorConfiguration::setStorage(): implement this HACK .-)");
}
sal_Bool SAL_CALL XCUBasedAcceleratorConfiguration::hasStorage()
- throw(css::uno::RuntimeException, std::exception)
{
SAL_INFO("fwk.accelerators", "XCUBasedAcceleratorConfiguration::hasStorage(): implement this HACK .-)");
return false;
}
void SAL_CALL XCUBasedAcceleratorConfiguration::addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/)
- throw(css::uno::RuntimeException, std::exception)
{
SAL_INFO("fwk.accelerators", "XCUBasedAcceleratorConfiguration::addConfigurationListener(): implement me");
}
void SAL_CALL XCUBasedAcceleratorConfiguration::removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/)
- throw(css::uno::RuntimeException, std::exception)
{
SAL_INFO("fwk.accelerators", "XCUBasedAcceleratorConfiguration::removeConfigurationListener(): implement me");
}
void SAL_CALL XCUBasedAcceleratorConfiguration::reset()
- throw(css::uno::RuntimeException, std::exception)
{
css::uno::Reference< css::container::XNamed > xNamed(m_xCfg, css::uno::UNO_QUERY);
OUString sConfig = xNamed->getName();
@@ -989,19 +930,16 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reset()
}
void SAL_CALL XCUBasedAcceleratorConfiguration::addResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/)
- throw(css::uno::RuntimeException, std::exception)
{
SAL_INFO("fwk.accelerators", "XCUBasedAcceleratorConfiguration::addResetListener(): implement me");
}
void SAL_CALL XCUBasedAcceleratorConfiguration::removeResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/)
- throw(css::uno::RuntimeException, std::exception)
{
SAL_INFO("fwk.accelerators", "XCUBasedAcceleratorConfiguration::removeResetListener(): implement me");
}
void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util::ChangesEvent& aEvent)
- throw(css::uno::RuntimeException, std::exception)
{
SAL_INFO( "fwk.accelerators", "XCUBasedAcceleratorConfiguration::changesOccurred()" );
@@ -1052,24 +990,20 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util:
}
void SAL_CALL XCUBasedAcceleratorConfiguration::disposing(const css::lang::EventObject& /*aSource*/)
- throw(css::uno::RuntimeException, std::exception)
{
}
void SAL_CALL XCUBasedAcceleratorConfiguration::dispose()
- throw(css::uno::RuntimeException, std::exception)
{
// nop
}
void SAL_CALL XCUBasedAcceleratorConfiguration::addEventListener( const css::uno::Reference< css::lang::XEventListener >& /*xListener*/ )
- throw(css::uno::RuntimeException, std::exception)
{
// nop
}
void SAL_CALL XCUBasedAcceleratorConfiguration::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& /*xListener*/ )
- throw(css::uno::RuntimeException, std::exception)
{
// nop
}
diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx
index d9b05459fe85..0c306fbc81d0 100644
--- a/framework/source/accelerators/documentacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx
@@ -72,30 +72,25 @@ public:
virtual ~DocumentAcceleratorConfiguration() override;
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.framework.DocumentAcceleratorConfiguration");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
return {"com.sun.star.ui.DocumentAcceleratorConfiguration"};
}
// XUIConfigurationStorage
- virtual void SAL_CALL setStorage(const css::uno::Reference< css::embed::XStorage >& xStorage)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) override;
- virtual sal_Bool SAL_CALL hasStorage()
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasStorage() override;
/** read all data into the cache. */
void fillCache();
@@ -129,7 +124,6 @@ DocumentAcceleratorConfiguration::~DocumentAcceleratorConfiguration()
}
void SAL_CALL DocumentAcceleratorConfiguration::setStorage(const css::uno::Reference< css::embed::XStorage >& xStorage)
- throw(css::uno::RuntimeException, std::exception)
{
// Attention! xStorage must be accepted too, if it's NULL !
@@ -149,7 +143,6 @@ void SAL_CALL DocumentAcceleratorConfiguration::setStorage(const css::uno::Refer
}
sal_Bool SAL_CALL DocumentAcceleratorConfiguration::hasStorage()
- throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
return m_xDocumentRoot.is();
diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx b/framework/source/accelerators/globalacceleratorconfiguration.cxx
index 257802a9828f..5648c917653c 100644
--- a/framework/source/accelerators/globalacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx
@@ -54,26 +54,23 @@ public:
*/
explicit GlobalAcceleratorConfiguration(const css::uno::Reference< css::uno::XComponentContext >& xContext);
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.framework.GlobalAcceleratorConfiguration");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
return {"com.sun.star.ui.GlobalAcceleratorConfiguration"};
}
// XComponent
- virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose() override;
/// This has to be called after when the instance is acquire()'d.
void fillCache();
@@ -120,7 +117,6 @@ void GlobalAcceleratorConfiguration::fillCache()
// XComponent.dispose(), #i120029#, to release the cyclic reference
void SAL_CALL GlobalAcceleratorConfiguration::dispose()
- throw(css::uno::RuntimeException, std::exception)
{
try
{
diff --git a/framework/source/accelerators/keymapping.cxx b/framework/source/accelerators/keymapping.cxx
index c2fbcb53431c..efbe78360d71 100644
--- a/framework/source/accelerators/keymapping.cxx
+++ b/framework/source/accelerators/keymapping.cxx
@@ -164,7 +164,6 @@ KeyMapping & KeyMapping::get() {
}
sal_uInt16 KeyMapping::mapIdentifierToCode(const OUString& sIdentifier)
- throw(css::lang::IllegalArgumentException)
{
Identifier2CodeHash::const_iterator pIt = m_lIdentifierHash.find(sIdentifier);
if (pIt != m_lIdentifierHash.end())
diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
index 9d56890992d8..86d9c536acd9 100644
--- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
@@ -68,26 +68,23 @@ public:
const css::uno::Reference< css::uno::XComponentContext >& xContext,
const css::uno::Sequence< css::uno::Any >& lArguments);
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.framework.ModuleAcceleratorConfiguration");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
return {"com.sun.star.ui.ModuleAcceleratorConfiguration"};
}
// XComponent
- virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose() override;
/// This has to be called after when the instance is acquire()'d.
void SAL_CALL fillCache();
@@ -156,7 +153,6 @@ void ModuleAcceleratorConfiguration::fillCache()
// XComponent.dispose(), #i120029#, to release the cyclic reference
void SAL_CALL ModuleAcceleratorConfiguration::dispose()
- throw(css::uno::RuntimeException, std::exception)
{
try
{
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index 5b0a545154f5..a9ad77b8db7d 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -86,13 +86,11 @@ CloseDispatcher::~CloseDispatcher()
void SAL_CALL CloseDispatcher::dispatch(const css::util::URL& aURL ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments)
- throw(css::uno::RuntimeException, std::exception)
{
dispatchWithNotification(aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >());
}
css::uno::Sequence< sal_Int16 > SAL_CALL CloseDispatcher::getSupportedCommandGroups()
- throw(css::uno::RuntimeException, std::exception)
{
css::uno::Sequence< sal_Int16 > lGroups(2);
lGroups[0] = css::frame::CommandGroup::VIEW;
@@ -101,7 +99,6 @@ css::uno::Sequence< sal_Int16 > SAL_CALL CloseDispatcher::getSupportedCommandGro
}
css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL CloseDispatcher::getConfigurableDispatchInformation(sal_Int16 nCommandGroup)
- throw(css::uno::RuntimeException, std::exception)
{
if (nCommandGroup == css::frame::CommandGroup::VIEW)
{
@@ -126,20 +123,17 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL CloseDispatcher::
void SAL_CALL CloseDispatcher::addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/,
const css::util::URL& /*aURL*/ )
- throw(css::uno::RuntimeException, std::exception)
{
}
void SAL_CALL CloseDispatcher::removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/,
const css::util::URL& /*aURL*/ )
- throw(css::uno::RuntimeException, std::exception)
{
}
void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL& aURL ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
const css::uno::Reference< css::frame::XDispatchResultListener >& xListener )
- throw(css::uno::RuntimeException, std::exception)
{
// SAFE -> ----------------------------------
SolarMutexClearableGuard aWriteLock;
diff --git a/framework/source/dispatch/dispatchdisabler.cxx b/framework/source/dispatch/dispatchdisabler.cxx
index 016d3ad2cf65..725b2e7557fe 100644
--- a/framework/source/dispatch/dispatchdisabler.cxx
+++ b/framework/source/dispatch/dispatchdisabler.cxx
@@ -24,7 +24,6 @@ DispatchDisabler::DispatchDisabler(const uno::Reference< uno::XComponentContext
// XInitialization
void SAL_CALL DispatchDisabler::initialize( const uno::Sequence< uno::Any >& aArguments )
- throw (uno::Exception, uno::RuntimeException, ::std::exception)
{
uno::Sequence< OUString > aDisabledURLs;
if( aArguments.getLength() > 0 &&
@@ -40,7 +39,6 @@ uno::Reference< frame::XDispatch > SAL_CALL
DispatchDisabler::queryDispatch( const util::URL& rURL,
const OUString& rTargetFrameName,
::sal_Int32 nSearchFlags )
- throw (uno::RuntimeException, ::std::exception)
{
// If present - disabled.
if( maDisabledURLs.find(rURL.Complete) != maDisabledURLs.end() ||
@@ -52,7 +50,6 @@ DispatchDisabler::queryDispatch( const util::URL& rURL,
uno::Sequence< uno::Reference< frame::XDispatch > > SAL_CALL
DispatchDisabler::queryDispatches( const uno::Sequence< frame::DispatchDescriptor >& rRequests )
- throw (uno::RuntimeException, ::std::exception)
{
uno::Sequence< uno::Reference< frame::XDispatch > > aResult(rRequests.getLength());
for( sal_Int32 i = 0; i < rRequests.getLength(); ++i )
@@ -64,25 +61,23 @@ DispatchDisabler::queryDispatches( const uno::Sequence< frame::DispatchDescripto
// XDispatchProviderInterceptor
uno::Reference< frame::XDispatchProvider > SAL_CALL
-DispatchDisabler::getSlaveDispatchProvider() throw (uno::RuntimeException, ::std::exception)
+DispatchDisabler::getSlaveDispatchProvider()
{
return mxSlave;
}
void SAL_CALL DispatchDisabler::setSlaveDispatchProvider( const uno::Reference< frame::XDispatchProvider >& xNewDispatchProvider )
- throw (uno::RuntimeException, ::std::exception)
{
mxSlave = xNewDispatchProvider;
}
uno::Reference< frame::XDispatchProvider > SAL_CALL
-DispatchDisabler::getMasterDispatchProvider() throw (uno::RuntimeException, ::std::exception)
+DispatchDisabler::getMasterDispatchProvider()
{
return mxMaster;
}
void SAL_CALL
DispatchDisabler::setMasterDispatchProvider( const uno::Reference< frame::XDispatchProvider >& xNewSupplier )
- throw (uno::RuntimeException, ::std::exception)
{
mxMaster = xNewSupplier;
}
@@ -90,7 +85,6 @@ DispatchDisabler::setMasterDispatchProvider( const uno::Reference< frame::XDispa
// XInterceptorInfo
uno::Sequence< OUString > SAL_CALL
DispatchDisabler::getInterceptedURLs()
- throw (uno::RuntimeException, ::std::exception)
{
uno::Sequence< OUString > aDisabledURLs(maDisabledURLs.size());
sal_Int32 n = 0;
@@ -101,42 +95,34 @@ uno::Sequence< OUString > SAL_CALL
// XElementAccess
uno::Type SAL_CALL DispatchDisabler::getElementType()
- throw (uno::RuntimeException, ::std::exception)
{
uno::Type aModuleType = cppu::UnoType<OUString>::get();
return aModuleType;
}
::sal_Bool SAL_CALL DispatchDisabler::hasElements()
- throw (uno::RuntimeException, ::std::exception)
{
return maDisabledURLs.size() > 0;
}
// XNameAccess
uno::Any SAL_CALL DispatchDisabler::getByName( const OUString& )
- throw (container::NoSuchElementException, lang::WrappedTargetException,
- uno::RuntimeException, ::std::exception)
{
return uno::Any();
}
uno::Sequence< OUString > SAL_CALL DispatchDisabler::getElementNames()
- throw (uno::RuntimeException, ::std::exception)
{
return getInterceptedURLs();
}
sal_Bool SAL_CALL DispatchDisabler::hasByName( const OUString& rName )
- throw (uno::RuntimeException, ::std::exception)
{
return maDisabledURLs.find(rName) != maDisabledURLs.end();
}
// XNameReplace
void SAL_CALL DispatchDisabler::replaceByName( const OUString& rName, const uno::Any& aElement )
- throw (lang::IllegalArgumentException, container::NoSuchElementException,
- lang::WrappedTargetException, uno::RuntimeException, ::std::exception)
{
removeByName( rName );
insertByName( rName, aElement );
@@ -144,15 +130,11 @@ void SAL_CALL DispatchDisabler::replaceByName( const OUString& rName, const uno:
// XNameContainer
void DispatchDisabler::insertByName( const OUString& rName, const uno::Any& )
- throw (lang::IllegalArgumentException, container::ElementExistException,
- lang::WrappedTargetException, uno::RuntimeException, ::std::exception)
{
maDisabledURLs.insert(rName);
}
void DispatchDisabler::removeByName( const OUString& rName )
- throw (container::NoSuchElementException, lang::WrappedTargetException,
- uno::RuntimeException, ::std::exception)
{
auto it = maDisabledURLs.find(rName);
if( it != maDisabledURLs.end() )
diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx
index 86a86618867c..a35191893a60 100644
--- a/framework/source/dispatch/dispatchinformationprovider.cxx
+++ b/framework/source/dispatch/dispatchinformationprovider.cxx
@@ -41,7 +41,6 @@ DispatchInformationProvider::~DispatchInformationProvider()
}
css::uno::Sequence< sal_Int16 > SAL_CALL DispatchInformationProvider::getSupportedCommandGroups()
- throw (css::uno::RuntimeException, std::exception)
{
css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvider > > lProvider = implts_getAllSubProvider();
sal_Int32 c1 = lProvider.getLength();
@@ -73,7 +72,6 @@ css::uno::Sequence< sal_Int16 > SAL_CALL DispatchInformationProvider::getSupport
}
css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL DispatchInformationProvider::getConfigurableDispatchInformation(sal_Int16 nCommandGroup)
- throw (css::uno::RuntimeException, std::exception)
{
css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvider > > lProvider = implts_getAllSubProvider();
sal_Int32 c1 = lProvider.getLength();
diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx
index 397855fbb2c7..f368878e5d98 100644
--- a/framework/source/dispatch/dispatchprovider.cxx
+++ b/framework/source/dispatch/dispatchprovider.cxx
@@ -97,7 +97,7 @@ DispatchProvider::~DispatchProvider()
*/
css::uno::Reference< css::frame::XDispatch > SAL_CALL DispatchProvider::queryDispatch( const css::util::URL& aURL ,
const OUString& sTargetFrameName ,
- sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException, std::exception )
+ sal_Int32 nSearchFlags )
{
css::uno::Reference< css::frame::XDispatch > xDispatcher;
@@ -128,7 +128,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL DispatchProvider::queryDis
@threadsafe yes
*/
-css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL DispatchProvider::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptions ) throw( css::uno::RuntimeException, std::exception )
+css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL DispatchProvider::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptions )
{
// Create return list - which must have same size then the given descriptor
// It's not allowed to pack it!
diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx
index f3736dee80e5..2d80df72f0b0 100644
--- a/framework/source/dispatch/interceptionhelper.cxx
+++ b/framework/source/dispatch/interceptionhelper.cxx
@@ -39,7 +39,6 @@ InterceptionHelper::~InterceptionHelper()
css::uno::Reference< css::frame::XDispatch > SAL_CALL InterceptionHelper::queryDispatch(const css::util::URL& aURL ,
const OUString& sTargetFrameName,
sal_Int32 nSearchFlags )
- throw(css::uno::RuntimeException, std::exception)
{
// SAFE {
SolarMutexClearableGuard aReadLock;
@@ -85,7 +84,6 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL InterceptionHelper::queryD
}
css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL InterceptionHelper::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor )
- throw(css::uno::RuntimeException, std::exception)
{
sal_Int32 c = lDescriptor.getLength();
css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > lDispatches (c);
@@ -99,7 +97,6 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Inte
}
void SAL_CALL InterceptionHelper::registerDispatchProviderInterceptor(const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor)
- throw(css::uno::RuntimeException, std::exception)
{
// reject incorrect calls of this interface method
css::uno::Reference< css::frame::XDispatchProvider > xThis(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY);
@@ -163,7 +160,6 @@ void SAL_CALL InterceptionHelper::registerDispatchProviderInterceptor(const css:
}
void SAL_CALL InterceptionHelper::releaseDispatchProviderInterceptor(const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor)
- throw(css::uno::RuntimeException, std::exception)
{
// reject wrong calling of this interface method
css::uno::Reference< css::frame::XDispatchProvider > xThis(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY);
@@ -211,7 +207,6 @@ void SAL_CALL InterceptionHelper::releaseDispatchProviderInterceptor(const css::
#define FORCE_DESTRUCTION_OF_INTERCEPTION_CHAIN
void SAL_CALL InterceptionHelper::disposing(const css::lang::EventObject& aEvent)
- throw(css::uno::RuntimeException, std::exception)
{
#ifdef FORCE_DESTRUCTION_OF_INTERCEPTION_CHAIN
// SAFE ->
diff --git a/framework/source/dispatch/loaddispatcher.cxx b/framework/source/dispatch/loaddispatcher.cxx
index 4e90a3a846ca..f5d9d1465a37 100644
--- a/framework/source/dispatch/loaddispatcher.cxx
+++ b/framework/source/dispatch/loaddispatcher.cxx
@@ -43,34 +43,29 @@ LoadDispatcher::~LoadDispatcher()
void SAL_CALL LoadDispatcher::dispatchWithNotification(const css::util::URL& aURL ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
const css::uno::Reference< css::frame::XDispatchResultListener >& xListener )
- throw(css::uno::RuntimeException, std::exception)
{
impl_dispatch( aURL, lArguments, xListener );
}
void SAL_CALL LoadDispatcher::dispatch(const css::util::URL& aURL ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments)
- throw(css::uno::RuntimeException, std::exception)
{
impl_dispatch( aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >() );
}
css::uno::Any SAL_CALL LoadDispatcher::dispatchWithReturnValue( const css::util::URL& rURL,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
- throw( css::uno::RuntimeException, std::exception )
{
return impl_dispatch( rURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >());
}
void SAL_CALL LoadDispatcher::addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/,
const css::util::URL& /*aURL*/ )
- throw(css::uno::RuntimeException, std::exception)
{
}
void SAL_CALL LoadDispatcher::removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/,
const css::util::URL& /*aURL*/ )
- throw(css::uno::RuntimeException, std::exception)
{
}
diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx
index 48d498e97174..ed3e099e7e81 100644
--- a/framework/source/dispatch/mailtodispatcher.cxx
+++ b/framework/source/dispatch/mailtodispatcher.cxx
@@ -76,7 +76,7 @@ MailToDispatcher::~MailToDispatcher()
*/
css::uno::Reference< css::frame::XDispatch > SAL_CALL MailToDispatcher::queryDispatch( const css::util::URL& aURL ,
const OUString& /*sTarget*/ ,
- sal_Int32 /*nFlags*/ ) throw( css::uno::RuntimeException, std::exception )
+ sal_Int32 /*nFlags*/ )
{
css::uno::Reference< css::frame::XDispatch > xDispatcher;
if (aURL.Complete.startsWith("mailto:"))
@@ -87,7 +87,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL MailToDispatcher::queryDis
/**
@short do the same like dispatch() but for multiple requests at the same time
*/
-css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL MailToDispatcher::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException, std::exception )
+css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL MailToDispatcher::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor )
{
sal_Int32 nCount = lDescriptor.getLength();
css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > lDispatcher( nCount );
@@ -113,7 +113,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Mail
list of optional arguments for this mail request
*/
void SAL_CALL MailToDispatcher::dispatch( const css::util::URL& aURL ,
- const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception )
+ const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
{
// dispatch() is an [oneway] call ... and may our user release his reference to us immediately.
// So we should hold us self alive till this call ends.
@@ -136,7 +136,7 @@ void SAL_CALL MailToDispatcher::dispatch( const css::util::URL&
*/
void SAL_CALL MailToDispatcher::dispatchWithNotification( const css::util::URL& aURL ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
- const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw( css::uno::RuntimeException, std::exception )
+ const css::uno::Reference< css::frame::XDispatchResultListener >& xListener )
{
// This class was designed to die by reference. And if user release his reference to us immediately after calling this method
// we can run into some problems. So we hold us self alive till this method ends.
@@ -174,7 +174,7 @@ void SAL_CALL MailToDispatcher::dispatchWithNotification( const css::util::URL&
<FALSE/> if necessary resource couldn't be created or an exception was thrown.
*/
bool MailToDispatcher::implts_dispatch( const css::util::URL& aURL ,
- const css::uno::Sequence< css::beans::PropertyValue >& /*lArguments*/ ) throw( css::uno::RuntimeException )
+ const css::uno::Sequence< css::beans::PropertyValue >& /*lArguments*/ )
{
bool bSuccess = false;
@@ -210,13 +210,13 @@ bool MailToDispatcher::implts_dispatch( const css::util::URL&
URL about listener will be informed, if something occurred
*/
void SAL_CALL MailToDispatcher::addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ ,
- const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException, std::exception )
+ const css::util::URL& /*aURL*/ )
{
// not supported yet
}
void SAL_CALL MailToDispatcher::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ ,
- const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException, std::exception )
+ const css::util::URL& /*aURL*/ )
{
// not supported yet
}
diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx
index bd19c85e3e4d..3781966bd11d 100644
--- a/framework/source/dispatch/oxt_handler.cxx
+++ b/framework/source/dispatch/oxt_handler.cxx
@@ -96,7 +96,6 @@ Oxt_Handler::~Oxt_Handler()
void SAL_CALL Oxt_Handler::dispatchWithNotification( const css::util::URL& aURL,
const css::uno::Sequence< css::beans::PropertyValue >& /*lArguments*/,
const css::uno::Reference< css::frame::XDispatchResultListener >& xListener )
- throw( css::uno::RuntimeException, std::exception )
{
osl::MutexGuard g(m_mutex);
@@ -121,7 +120,6 @@ void SAL_CALL Oxt_Handler::dispatchWithNotification( const css::util::URL& aURL,
void SAL_CALL Oxt_Handler::dispatch( const css::util::URL& aURL ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
- throw( css::uno::RuntimeException, std::exception )
{
dispatchWithNotification( aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >() );
}
@@ -148,7 +146,6 @@ void SAL_CALL Oxt_Handler::dispatch( const css::util::URL&
@threadsafe yes
*//*-*************************************************************************************************************/
OUString SAL_CALL Oxt_Handler::detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor )
- throw( css::uno::RuntimeException, std::exception )
{
// Our default is "nothing". So we can return it, if detection failed or file type is really unknown.
OUString sTypeName;
diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx
index c07f0bf26da2..c20043eb871b 100644
--- a/framework/source/dispatch/popupmenudispatcher.cxx
+++ b/framework/source/dispatch/popupmenudispatcher.cxx
@@ -72,19 +72,17 @@ PopupMenuDispatcher::~PopupMenuDispatcher()
// and a dtor isn't the best place to do that!
}
-OUString SAL_CALL PopupMenuDispatcher::getImplementationName() throw( css::uno::RuntimeException, std::exception )
+OUString SAL_CALL PopupMenuDispatcher::getImplementationName()
{
return impl_getStaticImplementationName();
}
sal_Bool SAL_CALL PopupMenuDispatcher::supportsService( const OUString& sServiceName )
- throw( css::uno::RuntimeException, std::exception )
{
return cppu::supportsService(this, sServiceName);
}
css::uno::Sequence< OUString > SAL_CALL PopupMenuDispatcher::getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception )
{
return impl_getStaticSupportedServiceNames();
}
@@ -102,7 +100,6 @@ OUString PopupMenuDispatcher::impl_getStaticImplementationName()
css::uno::Reference< css::uno::XInterface >
SAL_CALL PopupMenuDispatcher::impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager )
-throw( css::uno::Exception )
{
/* create new instance of service */
PopupMenuDispatcher* pClass = new PopupMenuDispatcher( comphelper::getComponentContext(xServiceManager) );
@@ -137,7 +134,6 @@ DEFINE_INIT_SERVICE(PopupMenuDispatcher,
)
void SAL_CALL PopupMenuDispatcher::initialize( const css::uno::Sequence< css::uno::Any >& lArguments )
-throw( css::uno::Exception, css::uno::RuntimeException, std::exception)
{
css::uno::Reference< css::frame::XFrame > xFrame;
@@ -162,7 +158,6 @@ SAL_CALL PopupMenuDispatcher::queryDispatch(
const css::util::URL& rURL ,
const OUString& sTarget ,
sal_Int32 nFlags )
-throw( css::uno::RuntimeException, std::exception )
{
css::uno::Reference< css::frame::XDispatch > xDispatch;
@@ -225,7 +220,6 @@ throw( css::uno::RuntimeException, std::exception )
css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL
PopupMenuDispatcher::queryDispatches(
const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor )
-throw( css::uno::RuntimeException, std::exception )
{
sal_Int32 nCount = lDescriptor.getLength();
css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > lDispatcher( nCount );
@@ -240,13 +234,11 @@ throw( css::uno::RuntimeException, std::exception )
}
void SAL_CALL PopupMenuDispatcher::dispatch( const URL& /*aURL*/, const Sequence< PropertyValue >& /*seqProperties*/ )
-throw( RuntimeException, std::exception )
{
}
void SAL_CALL PopupMenuDispatcher::addStatusListener( const uno::Reference< XStatusListener >& xControl,
const URL& aURL )
-throw( RuntimeException, std::exception )
{
SolarMutexGuard g;
// Safe impossible cases
@@ -256,7 +248,6 @@ throw( RuntimeException, std::exception )
void SAL_CALL PopupMenuDispatcher::removeStatusListener( const uno::Reference< XStatusListener >& xControl,
const URL& aURL )
-throw( RuntimeException, std::exception )
{
SolarMutexGuard g;
// Safe impossible cases
@@ -265,7 +256,6 @@ throw( RuntimeException, std::exception )
}
void SAL_CALL PopupMenuDispatcher::frameAction( const FrameActionEvent& aEvent )
-throw ( RuntimeException, std::exception )
{
SolarMutexGuard g;
if (( aEvent.Action == css::frame::FrameAction_COMPONENT_DETACHING ) ||
@@ -276,7 +266,7 @@ throw ( RuntimeException, std::exception )
}
}
-void SAL_CALL PopupMenuDispatcher::disposing( const EventObject& ) throw( RuntimeException, std::exception )
+void SAL_CALL PopupMenuDispatcher::disposing( const EventObject& )
{
SolarMutexGuard g;
// Safe impossible cases
diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx
index 93acf4b4209f..3aac8a1f1489 100644
--- a/framework/source/dispatch/servicehandler.cxx
+++ b/framework/source/dispatch/servicehandler.cxx
@@ -78,7 +78,7 @@ ServiceHandler::~ServiceHandler()
*/
css::uno::Reference< css::frame::XDispatch > SAL_CALL ServiceHandler::queryDispatch( const css::util::URL& aURL ,
const OUString& /*sTarget*/ ,
- sal_Int32 /*nFlags*/ ) throw( css::uno::RuntimeException, std::exception )
+ sal_Int32 /*nFlags*/ )
{
css::uno::Reference< css::frame::XDispatch > xDispatcher;
if (aURL.Complete.startsWith(PROTOCOL_VALUE))
@@ -89,7 +89,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL ServiceHandler::queryDispa
/**
@short do the same like dispatch() but for multiple requests at the same time
*/
-css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL ServiceHandler::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException, std::exception )
+css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL ServiceHandler::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor )
{
sal_Int32 nCount = lDescriptor.getLength();
css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > lDispatcher( nCount );
@@ -114,7 +114,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Serv
list of optional arguments for this request
*/
void SAL_CALL ServiceHandler::dispatch( const css::util::URL& aURL ,
- const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception )
+ const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
{
// dispatch() is an [oneway] call ... and may our user release his reference to us immediately.
// So we should hold us self alive till this call ends.
@@ -137,7 +137,7 @@ void SAL_CALL ServiceHandler::dispatch( const css::util::URL&
*/
void SAL_CALL ServiceHandler::dispatchWithNotification( const css::util::URL& aURL ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
- const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw( css::uno::RuntimeException, std::exception )
+ const css::uno::Reference< css::frame::XDispatchResultListener >& xListener )
{
// This class was designed to die by reference. And if user release his reference to us immediately after calling this method
// we can run into some problems. So we hold us self alive till this method ends.
@@ -175,7 +175,7 @@ void SAL_CALL ServiceHandler::dispatchWithNotification( const css::util::URL&
if dispatch was successfully or not.
*/
css::uno::Reference< css::uno::XInterface > ServiceHandler::implts_dispatch( const css::util::URL& aURL ,
- const css::uno::Sequence< css::beans::PropertyValue >& /*lArguments*/ ) throw( css::uno::RuntimeException )
+ const css::uno::Sequence< css::beans::PropertyValue >& /*lArguments*/ )
{
if (!m_xFactory.is())
return css::uno::Reference< css::uno::XInterface >();
@@ -240,13 +240,13 @@ css::uno::Reference< css::uno::XInterface > ServiceHandler::implts_dispatch( con
URL about listener will be informed, if something occurred
*/
void SAL_CALL ServiceHandler::addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ ,
- const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException, std::exception )
+ const css::util::URL& /*aURL*/ )
{
// not supported yet
}
void SAL_CALL ServiceHandler::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ ,
- const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException, std::exception )
+ const css::util::URL& /*aURL*/ )
{
// not supported yet
}
diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx
index 945717afaa5b..8fb1006d4c27 100644
--- a/framework/source/dispatch/startmoduledispatcher.cxx
+++ b/framework/source/dispatch/startmoduledispatcher.cxx
@@ -58,7 +58,6 @@ StartModuleDispatcher::~StartModuleDispatcher()
void SAL_CALL StartModuleDispatcher::dispatch(const css::util::URL& aURL ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments)
- throw(css::uno::RuntimeException, std::exception)
{
dispatchWithNotification(aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >());
}
@@ -66,7 +65,6 @@ void SAL_CALL StartModuleDispatcher::dispatch(const css::util::URL&
void SAL_CALL StartModuleDispatcher::dispatchWithNotification(const css::util::URL& aURL ,
const css::uno::Sequence< css::beans::PropertyValue >& /*lArguments*/,
const css::uno::Reference< css::frame::XDispatchResultListener >& xListener )
- throw(css::uno::RuntimeException, std::exception)
{
::sal_Int16 nResult = css::frame::DispatchResultState::DONTKNOW;
if (isStartModuleDispatch(aURL))
@@ -83,26 +81,22 @@ void SAL_CALL StartModuleDispatcher::dispatchWithNotification(const css::util::U
}
css::uno::Sequence< ::sal_Int16 > SAL_CALL StartModuleDispatcher::getSupportedCommandGroups()
- throw(css::uno::RuntimeException, std::exception)
{
return css::uno::Sequence< ::sal_Int16 >();
}
css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL StartModuleDispatcher::getConfigurableDispatchInformation(::sal_Int16 /*nCommandGroup*/)
- throw(css::uno::RuntimeException, std::exception)
{
return css::uno::Sequence< css::frame::DispatchInformation >();
}
void SAL_CALL StartModuleDispatcher::addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/,
const css::util::URL& /*aURL*/ )
- throw(css::uno::RuntimeException, std::exception)
{
}
void SAL_CALL StartModuleDispatcher::removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/,
const css::util::URL& /*aURL*/ )
- throw(css::uno::RuntimeException, std::exception)
{
}
diff --git a/framework/source/dispatch/systemexec.cxx b/framework/source/dispatch/systemexec.cxx
index 91e058b9c7bb..764140af6d90 100644
--- a/framework/source/dispatch/systemexec.cxx
+++ b/framework/source/dispatch/systemexec.cxx
@@ -63,7 +63,7 @@ SystemExec::~SystemExec()
css::uno::Reference< css::frame::XDispatch > SAL_CALL SystemExec::queryDispatch( const css::util::URL& aURL ,
const OUString&,
- sal_Int32 ) throw( css::uno::RuntimeException, std::exception )
+ sal_Int32 )
{
css::uno::Reference< css::frame::XDispatch > xDispatcher;
if (aURL.Complete.startsWith(PROTOCOL_VALUE))
@@ -71,7 +71,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL SystemExec::queryDispatch(
return xDispatcher;
}
-css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL SystemExec::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException, std::exception )
+css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL SystemExec::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor )
{
sal_Int32 nCount = lDescriptor.getLength();
css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > lDispatcher( nCount );
@@ -86,14 +86,14 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Syst
}
void SAL_CALL SystemExec::dispatch( const css::util::URL& aURL ,
- const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception )
+ const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
{
dispatchWithNotification(aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >());
}
void SAL_CALL SystemExec::dispatchWithNotification( const css::util::URL& aURL ,
const css::uno::Sequence< css::beans::PropertyValue >&,
- const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw( css::uno::RuntimeException, std::exception )
+ const css::uno::Reference< css::frame::XDispatchResultListener >& xListener )
{
// convert "systemexec:file:///c:/temp/test.html" => "file:///c:/temp/test.html"
sal_Int32 c = aURL.Complete.getLength()-PROTOCOL_LENGTH;
@@ -124,13 +124,13 @@ void SAL_CALL SystemExec::dispatchWithNotification( const css::util::URL&
}
void SAL_CALL SystemExec::addStatusListener( const css::uno::Reference< css::frame::XStatusListener >&,
- const css::util::URL& ) throw( css::uno::RuntimeException, std::exception )
+ const css::util::URL& )
{
// not supported yet
}
void SAL_CALL SystemExec::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >&,
- const css::util::URL& ) throw( css::uno::RuntimeException, std::exception )
+ const css::util::URL& )
{
// not supported yet
}
diff --git a/framework/source/fwe/classes/actiontriggercontainer.cxx b/framework/source/fwe/classes/actiontriggercontainer.cxx
index 8144dfec7d7a..71a6d4532047 100644
--- a/framework/source/fwe/classes/actiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/actiontriggercontainer.cxx
@@ -43,7 +43,6 @@ ActionTriggerContainer::~ActionTriggerContainer()
// XInterface
Any SAL_CALL ActionTriggerContainer::queryInterface( const Type& aType )
-throw ( RuntimeException, std::exception )
{
Any a = ::cppu::queryInterface(
aType ,
@@ -71,7 +70,6 @@ void ActionTriggerContainer::release() throw()
// XMultiServiceFactory
Reference< XInterface > SAL_CALL ActionTriggerContainer::createInstance( const OUString& aServiceSpecifier )
-throw ( css::uno::Exception, RuntimeException, std::exception)
{
if ( aServiceSpecifier == SERVICENAME_ACTIONTRIGGER )
return static_cast<OWeakObject *>( new ActionTriggerPropertySet());
@@ -84,13 +82,11 @@ throw ( css::uno::Exception, RuntimeException, std::exception)
}
Reference< XInterface > SAL_CALL ActionTriggerContainer::createInstanceWithArguments( const OUString& ServiceSpecifier, const Sequence< Any >& /*Arguments*/ )
-throw ( Exception, RuntimeException, std::exception)
{
return createInstance( ServiceSpecifier );
}
Sequence< OUString > SAL_CALL ActionTriggerContainer::getAvailableServiceNames()
-throw ( RuntimeException, std::exception )
{
Sequence< OUString > aSeq( 3 );
@@ -103,26 +99,23 @@ throw ( RuntimeException, std::exception )
// XServiceInfo
OUString SAL_CALL ActionTriggerContainer::getImplementationName()
-throw ( RuntimeException, std::exception )
{
return OUString( IMPLEMENTATIONNAME_ACTIONTRIGGERCONTAINER );
}
sal_Bool SAL_CALL ActionTriggerContainer::supportsService( const OUString& ServiceName )
-throw ( RuntimeException, std::exception )
{
return cppu::supportsService(this, ServiceName);
}
Sequence< OUString > SAL_CALL ActionTriggerContainer::getSupportedServiceNames()
-throw ( RuntimeException, std::exception )
{
Sequence< OUString > seqServiceNames { SERVICENAME_ACTIONTRIGGERCONTAINER };
return seqServiceNames;
}
// XTypeProvider
-Sequence< Type > SAL_CALL ActionTriggerContainer::getTypes() throw ( RuntimeException, std::exception )
+Sequence< Type > SAL_CALL ActionTriggerContainer::getTypes()
{
// Optimize this method !
// We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -152,7 +145,7 @@ Sequence< Type > SAL_CALL ActionTriggerContainer::getTypes() throw ( RuntimeExce
return pTypeCollection->getTypes();
}
-Sequence< sal_Int8 > SAL_CALL ActionTriggerContainer::getImplementationId() throw ( RuntimeException, std::exception )
+Sequence< sal_Int8 > SAL_CALL ActionTriggerContainer::getImplementationId()
{
return css::uno::Sequence<sal_Int8>();
}
diff --git a/framework/source/fwe/classes/actiontriggerpropertyset.cxx b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
index 158429eef129..738a5ac5b1df 100644
--- a/framework/source/fwe/classes/actiontriggerpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
@@ -66,7 +66,6 @@ ActionTriggerPropertySet::~ActionTriggerPropertySet()
// XInterface
Any SAL_CALL ActionTriggerPropertySet::queryInterface( const Type& aType )
-throw ( RuntimeException, std::exception )
{
Any a = ::cppu::queryInterface(
aType,
@@ -98,26 +97,23 @@ void SAL_CALL ActionTriggerPropertySet::release() throw ()
// XServiceInfo
OUString SAL_CALL ActionTriggerPropertySet::getImplementationName()
-throw ( RuntimeException, std::exception )
{
return OUString( IMPLEMENTATIONNAME_ACTIONTRIGGER );
}
sal_Bool SAL_CALL ActionTriggerPropertySet::supportsService( const OUString& ServiceName )
-throw ( RuntimeException, std::exception )
{
return cppu::supportsService(this, ServiceName);
}
Sequence< OUString > SAL_CALL ActionTriggerPropertySet::getSupportedServiceNames()
-throw ( RuntimeException, std::exception )
{
Sequence<OUString> seqServiceNames { SERVICENAME_ACTIONTRIGGER };
return seqServiceNames;
}
// XTypeProvider
-Sequence< Type > SAL_CALL ActionTriggerPropertySet::getTypes() throw ( RuntimeException, std::exception )
+Sequence< Type > SAL_CALL ActionTriggerPropertySet::getTypes()
{
// Optimize this method !
// We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -148,7 +144,7 @@ Sequence< Type > SAL_CALL ActionTriggerPropertySet::getTypes() throw ( RuntimeEx
return pTypeCollection->getTypes();
}
-Sequence< sal_Int8 > SAL_CALL ActionTriggerPropertySet::getImplementationId() throw ( RuntimeException, std::exception )
+Sequence< sal_Int8 > SAL_CALL ActionTriggerPropertySet::getImplementationId()
{
return css::uno::Sequence<sal_Int8>();
}
@@ -158,7 +154,6 @@ sal_Bool SAL_CALL ActionTriggerPropertySet::convertFastPropertyValue(
Any& aOldValue,
sal_Int32 nHandle,
const Any& aValue )
-throw( IllegalArgumentException )
{
// Check, if value of property will changed in method "setFastPropertyValue_NoBroadcast()".
// Return sal_True, if changed - else return sal_False.
@@ -196,7 +191,6 @@ throw( IllegalArgumentException )
void SAL_CALL ActionTriggerPropertySet::setFastPropertyValue_NoBroadcast(
sal_Int32 nHandle, const Any& aValue )
-throw( Exception, std::exception )
{
SolarMutexGuard aGuard;
@@ -280,7 +274,6 @@ void SAL_CALL ActionTriggerPropertySet::getFastPropertyValue(
}
Reference< XPropertySetInfo > SAL_CALL ActionTriggerPropertySet::getPropertySetInfo()
-throw ( RuntimeException, std::exception )
{
// Optimize this method !
// We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -326,7 +319,6 @@ bool ActionTriggerPropertySet::impl_tryToChangeProperty(
const Any& aNewValue ,
Any& aOldValue ,
Any& aConvertedValue )
-throw( IllegalArgumentException )
{
// Set default return value if method failed.
bool bReturn = false;
@@ -361,7 +353,6 @@ bool ActionTriggerPropertySet::impl_tryToChangeProperty(
const Any& aNewValue ,
Any& aOldValue ,
Any& aConvertedValue )
-throw( IllegalArgumentException )
{
// Set default return value if method failed.
bool bReturn = false;
@@ -396,7 +387,6 @@ bool ActionTriggerPropertySet::impl_tryToChangeProperty(
const Any& aNewValue ,
Any& aOldValue ,
Any& aConvertedValue )
-throw( IllegalArgumentException )
{
// Set default return value if method failed.
bool bReturn = false;
diff --git a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
index 53b3e0e559c8..7752d6caa9f6 100644
--- a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
@@ -59,7 +59,6 @@ ActionTriggerSeparatorPropertySet::~ActionTriggerSeparatorPropertySet()
// XInterface
Any SAL_CALL ActionTriggerSeparatorPropertySet::queryInterface( const Type& aType )
-throw ( RuntimeException, std::exception )
{
Any a = ::cppu::queryInterface(
aType,
@@ -91,26 +90,23 @@ void ActionTriggerSeparatorPropertySet::release() throw()
// XServiceInfo
OUString SAL_CALL ActionTriggerSeparatorPropertySet::getImplementationName()
-throw ( RuntimeException, std::exception )
{
return OUString( IMPLEMENTATIONNAME_ACTIONTRIGGERSEPARATOR );
}
sal_Bool SAL_CALL ActionTriggerSeparatorPropertySet::supportsService( const OUString& ServiceName )
-throw ( RuntimeException, std::exception )
{
return cppu::supportsService(this, ServiceName);
}
Sequence< OUString > SAL_CALL ActionTriggerSeparatorPropertySet::getSupportedServiceNames()
-throw ( RuntimeException, std::exception )
{
Sequence<OUString> seqServiceNames { SERVICENAME_ACTIONTRIGGERSEPARATOR };
return seqServiceNames;
}
// XTypeProvider
-Sequence< Type > SAL_CALL ActionTriggerSeparatorPropertySet::getTypes() throw ( RuntimeException, std::exception )
+Sequence< Type > SAL_CALL ActionTriggerSeparatorPropertySet::getTypes()
{
// Optimize this method !
// We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -141,7 +137,7 @@ Sequence< Type > SAL_CALL ActionTriggerSeparatorPropertySet::getTypes() throw (
return pTypeCollection->getTypes();
}
-Sequence< sal_Int8 > SAL_CALL ActionTriggerSeparatorPropertySet::getImplementationId() throw ( RuntimeException, std::exception )
+Sequence< sal_Int8 > SAL_CALL ActionTriggerSeparatorPropertySet::getImplementationId()
{
return css::uno::Sequence<sal_Int8>();
}
@@ -151,7 +147,6 @@ sal_Bool SAL_CALL ActionTriggerSeparatorPropertySet::convertFastPropertyValue(
Any& aOldValue,
sal_Int32 nHandle,
const Any& aValue )
- throw( IllegalArgumentException, RuntimeException, std::exception )
{
// Check, if value of property will changed in method "setFastPropertyValue_NoBroadcast()".
// Return sal_True, if changed - else return sal_False.
@@ -173,7 +168,6 @@ sal_Bool SAL_CALL ActionTriggerSeparatorPropertySet::convertFastPropertyValue(
void SAL_CALL ActionTriggerSeparatorPropertySet::setFastPropertyValue_NoBroadcast(
sal_Int32 nHandle, const Any& aValue )
-throw( Exception, std::exception )
{
SolarMutexGuard aGuard;
@@ -225,7 +219,6 @@ void SAL_CALL ActionTriggerSeparatorPropertySet::getFastPropertyValue(
}
Reference< XPropertySetInfo > SAL_CALL ActionTriggerSeparatorPropertySet::getPropertySetInfo()
-throw ( RuntimeException, std::exception )
{
// Optimize this method !
// We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -267,7 +260,6 @@ bool ActionTriggerSeparatorPropertySet::impl_tryToChangeProperty(
const Any& aNewValue ,
Any& aOldValue ,
Any& aConvertedValue )
-throw( IllegalArgumentException, RuntimeException, std::exception )
{
// Set default return value if method failed.
bool bReturn = false;
diff --git a/framework/source/fwe/classes/imagewrapper.cxx b/framework/source/fwe/classes/imagewrapper.cxx
index 98897e39149a..f475dd2bf7bb 100644
--- a/framework/source/fwe/classes/imagewrapper.cxx
+++ b/framework/source/fwe/classes/imagewrapper.cxx
@@ -53,7 +53,7 @@ Sequence< sal_Int8 > ImageWrapper::GetUnoTunnelId()
}
// XBitmap
-css::awt::Size SAL_CALL ImageWrapper::getSize() throw ( RuntimeException, std::exception )
+css::awt::Size SAL_CALL ImageWrapper::getSize()
{
SolarMutexGuard aGuard;
@@ -63,7 +63,7 @@ css::awt::Size SAL_CALL ImageWrapper::getSize() throw ( RuntimeException, std::e
return css::awt::Size( aBitmapSize.Width(), aBitmapSize.Height() );
}
-Sequence< sal_Int8 > SAL_CALL ImageWrapper::getDIB() throw ( RuntimeException, std::exception )
+Sequence< sal_Int8 > SAL_CALL ImageWrapper::getDIB()
{
SolarMutexGuard aGuard;
@@ -72,7 +72,7 @@ Sequence< sal_Int8 > SAL_CALL ImageWrapper::getDIB() throw ( RuntimeException, s
return Sequence< sal_Int8 >( static_cast<sal_Int8 const *>(aMem.GetData()), aMem.Tell() );
}
-Sequence< sal_Int8 > SAL_CALL ImageWrapper::getMaskDIB() throw ( RuntimeException, std::exception )
+Sequence< sal_Int8 > SAL_CALL ImageWrapper::getMaskDIB()
{
SolarMutexGuard aGuard;
BitmapEx aBmpEx( m_aImage.GetBitmapEx() );
@@ -94,7 +94,7 @@ Sequence< sal_Int8 > SAL_CALL ImageWrapper::getMaskDIB() throw ( RuntimeExceptio
}
// XUnoTunnel
-sal_Int64 SAL_CALL ImageWrapper::getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw ( RuntimeException, std::exception )
+sal_Int64 SAL_CALL ImageWrapper::getSomething( const Sequence< sal_Int8 >& aIdentifier )
{
if ( aIdentifier == impl_getStaticIdentifier() )
return reinterpret_cast< sal_Int64 >( this );
diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
index 7c4312470c8b..c1306b33dfd5 100644
--- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
@@ -60,7 +60,6 @@ RootActionTriggerContainer::~RootActionTriggerContainer()
// XInterface
Any SAL_CALL RootActionTriggerContainer::queryInterface( const Type& aType )
-throw ( RuntimeException, std::exception )
{
Any a = ::cppu::queryInterface(
aType ,
@@ -90,7 +89,6 @@ void SAL_CALL RootActionTriggerContainer::release() throw ()
// XMultiServiceFactory
Reference< XInterface > SAL_CALL RootActionTriggerContainer::createInstance( const OUString& aServiceSpecifier )
-throw ( Exception, RuntimeException, std::exception )
{
if ( aServiceSpecifier == SERVICENAME_ACTIONTRIGGER )
return static_cast<OWeakObject *>( new ActionTriggerPropertySet());
@@ -103,13 +101,11 @@ throw ( Exception, RuntimeException, std::exception )
}
Reference< XInterface > SAL_CALL RootActionTriggerContainer::createInstanceWithArguments( const OUString& ServiceSpecifier, const Sequence< Any >& /*Arguments*/ )
-throw ( Exception, RuntimeException, std::exception )
{
return createInstance( ServiceSpecifier );
}
Sequence< OUString > SAL_CALL RootActionTriggerContainer::getAvailableServiceNames()
-throw ( RuntimeException, std::exception )
{
Sequence< OUString > aSeq( 3 );
@@ -122,7 +118,6 @@ throw ( RuntimeException, std::exception )
// XIndexContainer
void SAL_CALL RootActionTriggerContainer::insertByIndex( sal_Int32 Index, const Any& Element )
-throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -135,7 +130,6 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept
}
void SAL_CALL RootActionTriggerContainer::removeByIndex( sal_Int32 Index )
-throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -149,7 +143,6 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std
// XIndexReplace
void SAL_CALL RootActionTriggerContainer::replaceByIndex( sal_Int32 Index, const Any& Element )
-throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -163,7 +156,6 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept
// XIndexAccess
sal_Int32 SAL_CALL RootActionTriggerContainer::getCount()
-throw ( RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -184,7 +176,6 @@ throw ( RuntimeException, std::exception )
}
Any SAL_CALL RootActionTriggerContainer::getByIndex( sal_Int32 Index )
-throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -196,13 +187,11 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std
// XElementAccess
Type SAL_CALL RootActionTriggerContainer::getElementType()
- throw (css::uno::RuntimeException, std::exception)
{
return cppu::UnoType<XPropertySet>::get();
}
sal_Bool SAL_CALL RootActionTriggerContainer::hasElements()
-throw (css::uno::RuntimeException, std::exception)
{
if ( m_pMenu )
{
@@ -215,26 +204,23 @@ throw (css::uno::RuntimeException, std::exception)
// XServiceInfo
OUString SAL_CALL RootActionTriggerContainer::getImplementationName()
-throw ( RuntimeException, std::exception )
{
return OUString( IMPLEMENTATIONNAME_ROOTACTIONTRIGGERCONTAINER );
}
sal_Bool SAL_CALL RootActionTriggerContainer::supportsService( const OUString& ServiceName )
-throw ( RuntimeException, std::exception )
{
return cppu::supportsService(this, ServiceName);
}
Sequence< OUString > SAL_CALL RootActionTriggerContainer::getSupportedServiceNames()
-throw ( RuntimeException, std::exception )
{
Sequence< OUString > seqServiceNames { SERVICENAME_ACTIONTRIGGERCONTAINER };
return seqServiceNames;
}
// XUnoTunnel
-sal_Int64 SAL_CALL RootActionTriggerContainer::getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw ( RuntimeException, std::exception )
+sal_Int64 SAL_CALL RootActionTriggerContainer::getSomething( const Sequence< sal_Int8 >& aIdentifier )
{
if ( aIdentifier == impl_getStaticIdentifier() )
return reinterpret_cast< sal_Int64 >( this );
@@ -243,7 +229,7 @@ sal_Int64 SAL_CALL RootActionTriggerContainer::getSomething( const Sequence< sal
}
// XTypeProvider
-Sequence< Type > SAL_CALL RootActionTriggerContainer::getTypes() throw ( RuntimeException, std::exception )
+Sequence< Type > SAL_CALL RootActionTriggerContainer::getTypes()
{
// Optimize this method !
// We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -275,7 +261,7 @@ Sequence< Type > SAL_CALL RootActionTriggerContainer::getTypes() throw ( Runtime
return pTypeCollection->getTypes();
}
-Sequence< sal_Int8 > SAL_CALL RootActionTriggerContainer::getImplementationId() throw ( RuntimeException, std::exception )
+Sequence< sal_Int8 > SAL_CALL RootActionTriggerContainer::getImplementationId()
{
return css::uno::Sequence<sal_Int8>();
}
@@ -291,7 +277,7 @@ void RootActionTriggerContainer::FillContainer()
m_pMenu );
m_bInContainerCreation = false;
}
-OUString RootActionTriggerContainer::getName() throw ( RuntimeException, std::exception )
+OUString RootActionTriggerContainer::getName()
{
OUString sRet;
if( m_pMenuIdentifier )
@@ -299,7 +285,7 @@ OUString RootActionTriggerContainer::getName() throw ( RuntimeException, std::ex
return sRet;
}
-void RootActionTriggerContainer::setName( const OUString& ) throw ( RuntimeException, std::exception)
+void RootActionTriggerContainer::setName( const OUString& )
{
throw RuntimeException();
}
diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx
index a4a7fc2e2b0d..a9025aaef71b 100644
--- a/framework/source/fwe/dispatch/interaction.cxx
+++ b/framework/source/fwe/dispatch/interaction.cxx
@@ -53,8 +53,8 @@ class ContinuationFilterSelect : public comphelper::OInteraction< css::document:
// uno interface
public:
- virtual void SAL_CALL setFilter( const OUString& sFilter ) throw( css::uno::RuntimeException, std::exception ) override;
- virtual OUString SAL_CALL getFilter( ) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL setFilter( const OUString& sFilter ) override;
+ virtual OUString SAL_CALL getFilter( ) override;
// member
private:
@@ -71,14 +71,14 @@ ContinuationFilterSelect::ContinuationFilterSelect()
// handler should use it after selection to set user specified filter for transport
-void SAL_CALL ContinuationFilterSelect::setFilter( const OUString& sFilter ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL ContinuationFilterSelect::setFilter( const OUString& sFilter )
{
m_sFilter = sFilter;
}
// read access to transported filter
-OUString SAL_CALL ContinuationFilterSelect::getFilter() throw( css::uno::RuntimeException, std::exception )
+OUString SAL_CALL ContinuationFilterSelect::getFilter()
{
return m_sFilter;
}
@@ -91,8 +91,8 @@ public:
OUString getFilter() const;
public:
- virtual css::uno::Any SAL_CALL getRequest() throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL getRequest() override;
+ virtual css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL getContinuations() override;
private:
css::uno::Any m_aRequest;
@@ -135,7 +135,7 @@ OUString RequestFilterSelect_Impl::getFilter() const
// handler call it to get type of request
// Is hard coded to "please select filter" here. see ctor for further information.
-css::uno::Any SAL_CALL RequestFilterSelect_Impl::getRequest() throw( css::uno::RuntimeException, std::exception )
+css::uno::Any SAL_CALL RequestFilterSelect_Impl::getRequest()
{
return m_aRequest;
}
@@ -145,7 +145,7 @@ css::uno::Any SAL_CALL RequestFilterSelect_Impl::getRequest() throw( css::uno::R
// After interaction we support read access on these continuations on our c++ interface to
// return user decision.
-css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL RequestFilterSelect_Impl::getContinuations() throw( css::uno::RuntimeException, std::exception )
+css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL RequestFilterSelect_Impl::getContinuations()
{
return { m_xAbort.get(), m_xFilter.get() };
}
@@ -193,18 +193,16 @@ public:
m_lContinuations = lContinuations;
}
- virtual uno::Any SAL_CALL getRequest() throw( uno::RuntimeException, std::exception ) override;
- virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations()
- throw( uno::RuntimeException, std::exception ) override;
+ virtual uno::Any SAL_CALL getRequest() override;
+ virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations() override;
};
-uno::Any SAL_CALL InteractionRequest_Impl::getRequest() throw( uno::RuntimeException, std::exception )
+uno::Any SAL_CALL InteractionRequest_Impl::getRequest()
{
return m_aRequest;
}
uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL InteractionRequest_Impl::getContinuations()
- throw( uno::RuntimeException, std::exception )
{
return m_lContinuations;
}
diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx
index 7fd256c133ee..ddf7c1d32a41 100644
--- a/framework/source/fwe/helper/actiontriggerhelper.cxx
+++ b/framework/source/fwe/helper/actiontriggerhelper.cxx
@@ -237,7 +237,7 @@ void InsertSubMenuItems( Menu* pSubMenu, sal_uInt16& nItemId, const Reference< X
// implementation helper ( ActionTrigger => menu )
/// @throws RuntimeException
-Reference< XPropertySet > CreateActionTrigger( sal_uInt16 nItemId, const Menu* pMenu, const Reference< XIndexContainer >& rActionTriggerContainer ) throw ( RuntimeException )
+Reference< XPropertySet > CreateActionTrigger( sal_uInt16 nItemId, const Menu* pMenu, const Reference< XIndexContainer >& rActionTriggerContainer )
{
Reference< XPropertySet > xPropSet;
@@ -284,7 +284,7 @@ Reference< XPropertySet > CreateActionTrigger( sal_uInt16 nItemId, const Menu* p
}
/// @throws RuntimeException
-Reference< XPropertySet > CreateActionTriggerSeparator( const Reference< XIndexContainer >& rActionTriggerContainer ) throw ( RuntimeException )
+Reference< XPropertySet > CreateActionTriggerSeparator( const Reference< XIndexContainer >& rActionTriggerContainer )
{
Reference< XMultiServiceFactory > xMultiServiceFactory( rActionTriggerContainer, UNO_QUERY );
if ( xMultiServiceFactory.is() )
@@ -298,7 +298,7 @@ Reference< XPropertySet > CreateActionTriggerSeparator( const Reference< XIndexC
}
/// @throws RuntimeException
-Reference< XIndexContainer > CreateActionTriggerContainer( const Reference< XIndexContainer >& rActionTriggerContainer ) throw ( RuntimeException )
+Reference< XIndexContainer > CreateActionTriggerContainer( const Reference< XIndexContainer >& rActionTriggerContainer )
{
Reference< XMultiServiceFactory > xMultiServiceFactory( rActionTriggerContainer, UNO_QUERY );
if ( xMultiServiceFactory.is() )
diff --git a/framework/source/fwe/helper/documentundoguard.cxx b/framework/source/fwe/helper/documentundoguard.cxx
index 94e9b3fb14ba..b51b3e283f58 100644
--- a/framework/source/fwe/helper/documentundoguard.cxx
+++ b/framework/source/fwe/helper/documentundoguard.cxx
@@ -77,20 +77,20 @@ namespace framework
}
// XUndoManagerListener
- virtual void SAL_CALL undoActionAdded( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL actionUndone( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL actionRedone( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL allActionsCleared( const EventObject& i_event ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL redoActionsCleared( const EventObject& i_event ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL resetAll( const EventObject& i_event ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL enteredContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL enteredHiddenContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL leftContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL leftHiddenContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL cancelledContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) override;
+ virtual void SAL_CALL undoActionAdded( const UndoManagerEvent& i_event ) override;
+ virtual void SAL_CALL actionUndone( const UndoManagerEvent& i_event ) override;
+ virtual void SAL_CALL actionRedone( const UndoManagerEvent& i_event ) override;
+ virtual void SAL_CALL allActionsCleared( const EventObject& i_event ) override;
+ virtual void SAL_CALL redoActionsCleared( const EventObject& i_event ) override;
+ virtual void SAL_CALL resetAll( const EventObject& i_event ) override;
+ virtual void SAL_CALL enteredContext( const UndoManagerEvent& i_event ) override;
+ virtual void SAL_CALL enteredHiddenContext( const UndoManagerEvent& i_event ) override;
+ virtual void SAL_CALL leftContext( const UndoManagerEvent& i_event ) override;
+ virtual void SAL_CALL leftHiddenContext( const UndoManagerEvent& i_event ) override;
+ virtual void SAL_CALL cancelledContext( const UndoManagerEvent& i_event ) override;
// XEventListener
- virtual void SAL_CALL disposing( const EventObject& i_event ) throw (RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( const EventObject& i_event ) override;
private:
Reference< XUndoManager > const m_xUndoManager;
@@ -98,73 +98,73 @@ namespace framework
bool m_documentDisposed;
};
- void SAL_CALL UndoManagerContextListener::undoActionAdded( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception)
+ void SAL_CALL UndoManagerContextListener::undoActionAdded( const UndoManagerEvent& i_event )
{
(void)i_event;
// not interested in
}
- void SAL_CALL UndoManagerContextListener::actionUndone( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception)
+ void SAL_CALL UndoManagerContextListener::actionUndone( const UndoManagerEvent& i_event )
{
(void)i_event;
// not interested in
}
- void SAL_CALL UndoManagerContextListener::actionRedone( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception)
+ void SAL_CALL UndoManagerContextListener::actionRedone( const UndoManagerEvent& i_event )
{
(void)i_event;
// not interested in
}
- void SAL_CALL UndoManagerContextListener::allActionsCleared( const EventObject& i_event ) throw (RuntimeException, std::exception)
+ void SAL_CALL UndoManagerContextListener::allActionsCleared( const EventObject& i_event )
{
(void)i_event;
// not interested in
}
- void SAL_CALL UndoManagerContextListener::redoActionsCleared( const EventObject& i_event ) throw (RuntimeException, std::exception)
+ void SAL_CALL UndoManagerContextListener::redoActionsCleared( const EventObject& i_event )
{
(void)i_event;
// not interested in
}
- void SAL_CALL UndoManagerContextListener::resetAll( const EventObject& i_event ) throw (RuntimeException, std::exception)
+ void SAL_CALL UndoManagerContextListener::resetAll( const EventObject& i_event )
{
(void)i_event;
m_nRelativeContextDepth = 0;
}
- void SAL_CALL UndoManagerContextListener::enteredContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception)
+ void SAL_CALL UndoManagerContextListener::enteredContext( const UndoManagerEvent& i_event )
{
(void)i_event;
osl_atomic_increment( &m_nRelativeContextDepth );
}
- void SAL_CALL UndoManagerContextListener::enteredHiddenContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception)
+ void SAL_CALL UndoManagerContextListener::enteredHiddenContext( const UndoManagerEvent& i_event )
{
(void)i_event;
osl_atomic_increment( &m_nRelativeContextDepth );
}
- void SAL_CALL UndoManagerContextListener::leftContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception)
+ void SAL_CALL UndoManagerContextListener::leftContext( const UndoManagerEvent& i_event )
{
(void)i_event;
osl_atomic_decrement( &m_nRelativeContextDepth );
}
- void SAL_CALL UndoManagerContextListener::leftHiddenContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception)
+ void SAL_CALL UndoManagerContextListener::leftHiddenContext( const UndoManagerEvent& i_event )
{
(void)i_event;
osl_atomic_decrement( &m_nRelativeContextDepth );
}
- void SAL_CALL UndoManagerContextListener::cancelledContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception)
+ void SAL_CALL UndoManagerContextListener::cancelledContext( const UndoManagerEvent& i_event )
{
(void)i_event;
osl_atomic_decrement( &m_nRelativeContextDepth );
}
- void SAL_CALL UndoManagerContextListener::disposing( const EventObject& i_event ) throw (RuntimeException, std::exception)
+ void SAL_CALL UndoManagerContextListener::disposing( const EventObject& i_event )
{
(void)i_event;
m_documentDisposed = true;
diff --git a/framework/source/fwe/helper/propertysetcontainer.cxx b/framework/source/fwe/helper/propertysetcontainer.cxx
index 7b867d1df361..641e98792324 100644
--- a/framework/source/fwe/helper/propertysetcontainer.cxx
+++ b/framework/source/fwe/helper/propertysetcontainer.cxx
@@ -55,7 +55,6 @@ void SAL_CALL PropertySetContainer::release() throw ()
}
Any SAL_CALL PropertySetContainer::queryInterface( const Type& rType )
-throw ( RuntimeException, std::exception )
{
Any a = ::cppu::queryInterface(
rType ,
@@ -74,7 +73,6 @@ throw ( RuntimeException, std::exception )
// XIndexContainer
void SAL_CALL PropertySetContainer::insertByIndex( sal_Int32 Index, const css::uno::Any& Element )
- throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -107,7 +105,6 @@ void SAL_CALL PropertySetContainer::insertByIndex( sal_Int32 Index, const css::u
}
void SAL_CALL PropertySetContainer::removeByIndex( sal_Int32 nIndex )
- throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -121,7 +118,6 @@ void SAL_CALL PropertySetContainer::removeByIndex( sal_Int32 nIndex )
// XIndexReplace
void SAL_CALL PropertySetContainer::replaceByIndex( sal_Int32 Index, const css::uno::Any& Element )
- throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception)
{
if ( (sal_Int32)m_aPropertySetVector.size() > Index )
{
@@ -144,7 +140,6 @@ void SAL_CALL PropertySetContainer::replaceByIndex( sal_Int32 Index, const css::
// XIndexAccess
sal_Int32 SAL_CALL PropertySetContainer::getCount()
- throw ( RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -152,7 +147,6 @@ sal_Int32 SAL_CALL PropertySetContainer::getCount()
}
Any SAL_CALL PropertySetContainer::getByIndex( sal_Int32 Index )
- throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -169,7 +163,6 @@ Any SAL_CALL PropertySetContainer::getByIndex( sal_Int32 Index )
// XElementAccess
sal_Bool SAL_CALL PropertySetContainer::hasElements()
- throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx
index 16ad4b3dafb4..818a4595a4d4 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -91,7 +91,6 @@ void TitleHelper::setOwner(const css::uno::Reference< css::uno::XInterface >& xO
}
OUString SAL_CALL TitleHelper::getTitle()
- throw (css::uno::RuntimeException, std::exception)
{
// SYNCHRONIZED ->
::osl::ResettableMutexGuard aLock(m_aMutex);
@@ -125,7 +124,6 @@ void TitleHelper::connectWithUntitledNumbers (const css::uno::Reference< css::fr
}
void SAL_CALL TitleHelper::setTitle(const OUString& sTitle)
- throw (css::uno::RuntimeException, std::exception)
{
// SYNCHRONIZED ->
::osl::ResettableMutexGuard aLock(m_aMutex);
@@ -140,21 +138,18 @@ void SAL_CALL TitleHelper::setTitle(const OUString& sTitle)
}
void SAL_CALL TitleHelper::addTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener)
- throw (css::uno::RuntimeException, std::exception)
{
// container is threadsafe by himself
m_aListener.addInterface( cppu::UnoType<css::frame::XTitleChangeListener>::get(), xListener );
}
void SAL_CALL TitleHelper::removeTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener)
- throw (css::uno::RuntimeException, std::exception)
{
// container is threadsafe by himself
m_aListener.removeInterface( cppu::UnoType<css::frame::XTitleChangeListener>::get(), xListener );
}
void SAL_CALL TitleHelper::titleChanged(const css::frame::TitleChangedEvent& aEvent)
- throw (css::uno::RuntimeException, std::exception)
{
// SYNCHRONIZED ->
::osl::ResettableMutexGuard aLock(m_aMutex);
@@ -171,7 +166,6 @@ void SAL_CALL TitleHelper::titleChanged(const css::frame::TitleChangedEvent& aEv
}
void SAL_CALL TitleHelper::documentEventOccured(const css::document::DocumentEvent& aEvent)
- throw (css::uno::RuntimeException, std::exception)
{
if ( ! aEvent.EventName.equalsIgnoreAsciiCase("OnSaveAsDone")
&& ! aEvent.EventName.equalsIgnoreAsciiCase("OnModeChanged")
@@ -198,7 +192,6 @@ void SAL_CALL TitleHelper::documentEventOccured(const css::document::DocumentEve
}
void SAL_CALL TitleHelper::frameAction(const css::frame::FrameActionEvent& aEvent)
- throw(css::uno::RuntimeException, std::exception)
{
// SYNCHRONIZED ->
::osl::ResettableMutexGuard aLock(m_aMutex);
@@ -225,7 +218,6 @@ void SAL_CALL TitleHelper::frameAction(const css::frame::FrameActionEvent& aEven
}
void SAL_CALL TitleHelper::disposing(const css::lang::EventObject& aEvent)
- throw (css::uno::RuntimeException, std::exception)
{
// SYNCHRONIZED ->
::osl::ResettableMutexGuard aLock(m_aMutex);
diff --git a/framework/source/fwe/interaction/preventduplicateinteraction.cxx b/framework/source/fwe/interaction/preventduplicateinteraction.cxx
index 818fdfe2122a..a019094d1484 100644
--- a/framework/source/fwe/interaction/preventduplicateinteraction.cxx
+++ b/framework/source/fwe/interaction/preventduplicateinteraction.cxx
@@ -63,7 +63,6 @@ void PreventDuplicateInteraction::useDefaultUUIHandler()
}
css::uno::Any SAL_CALL PreventDuplicateInteraction::queryInterface( const css::uno::Type& aType )
- throw (css::uno::RuntimeException, std::exception)
{
if ( aType.equals( cppu::UnoType<XInteractionHandler2>::get() ) )
{
@@ -76,7 +75,6 @@ css::uno::Any SAL_CALL PreventDuplicateInteraction::queryInterface( const css::u
}
void SAL_CALL PreventDuplicateInteraction::handle(const css::uno::Reference< css::task::XInteractionRequest >& xRequest)
- throw(css::uno::RuntimeException, std::exception)
{
css::uno::Any aRequest = xRequest->getRequest();
bool bHandleIt = true;
@@ -130,7 +128,6 @@ void SAL_CALL PreventDuplicateInteraction::handle(const css::uno::Reference< css
}
sal_Bool SAL_CALL PreventDuplicateInteraction::handleInteractionRequest( const css::uno::Reference< css::task::XInteractionRequest >& xRequest )
- throw (css::uno::RuntimeException, std::exception)
{
css::uno::Any aRequest = xRequest->getRequest();
bool bHandleIt = true;
diff --git a/framework/source/fwe/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx
index fcda2ed2f1d4..9ed762ce2d59 100644
--- a/framework/source/fwe/xml/menuconfiguration.cxx
+++ b/framework/source/fwe/xml/menuconfiguration.cxx
@@ -54,7 +54,6 @@ MenuConfiguration::~MenuConfiguration()
Reference< XIndexAccess > MenuConfiguration::CreateMenuBarConfigurationFromXML(
Reference< XInputStream >& rInputStream )
- throw (WrappedTargetException, RuntimeException)
{
Reference< XParser > xParser = Parser::create( m_xContext );
@@ -102,7 +101,6 @@ Reference< XIndexAccess > MenuConfiguration::CreateMenuBarConfigurationFromXML(
void MenuConfiguration::StoreMenuBarConfigurationToXML(
Reference< XIndexAccess >& rMenuBarConfiguration,
Reference< XOutputStream >& rOutputStream, bool bIsMenuBar )
- throw (WrappedTargetException, RuntimeException)
{
Reference< XWriter > xWriter = Writer::create(m_xContext);
xWriter->setOutputStream( rOutputStream );
diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx
index 759244db6c54..485717088a00 100644
--- a/framework/source/fwe/xml/menudocumenthandler.cxx
+++ b/framework/source/fwe/xml/menudocumenthandler.cxx
@@ -163,19 +163,16 @@ ReadMenuDocumentHandlerBase::~ReadMenuDocumentHandlerBase()
void SAL_CALL ReadMenuDocumentHandlerBase::ignorableWhitespace(
const OUString& )
-throw( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL ReadMenuDocumentHandlerBase::processingInstruction(
const OUString& /*aTarget*/, const OUString& /*aData*/ )
-throw( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL ReadMenuDocumentHandlerBase::setDocumentLocator(
const Reference< XLocator > &xLocator)
-throw( SAXException, RuntimeException, std::exception )
{
m_xLocator = xLocator;
}
@@ -226,12 +223,10 @@ OReadMenuDocumentHandler::~OReadMenuDocumentHandler()
}
void SAL_CALL OReadMenuDocumentHandler::startDocument()
- throw ( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadMenuDocumentHandler::endDocument()
- throw( SAXException, RuntimeException, std::exception )
{
if ( m_nElementDepth > 0 )
{
@@ -243,7 +238,6 @@ void SAL_CALL OReadMenuDocumentHandler::endDocument()
void SAL_CALL OReadMenuDocumentHandler::startElement(
const OUString& aName, const Reference< XAttributeList > &xAttrList )
-throw( SAXException, RuntimeException, std::exception )
{
if ( m_eReaderMode != ReaderMode::None )
{
@@ -268,12 +262,10 @@ throw( SAXException, RuntimeException, std::exception )
}
void SAL_CALL OReadMenuDocumentHandler::characters(const OUString&)
-throw( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadMenuDocumentHandler::endElement( const OUString& aName )
- throw( SAXException, RuntimeException, std::exception )
{
if ( m_eReaderMode != ReaderMode::None )
{
@@ -315,18 +307,15 @@ OReadMenuBarHandler::~OReadMenuBarHandler()
}
void SAL_CALL OReadMenuBarHandler::startDocument()
- throw ( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadMenuBarHandler::endDocument()
- throw( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadMenuBarHandler::startElement(
const OUString& rName, const Reference< XAttributeList > &xAttrList )
-throw( SAXException, RuntimeException, std::exception )
{
if ( m_bMenuMode )
{
@@ -413,12 +402,10 @@ throw( SAXException, RuntimeException, std::exception )
}
void SAL_CALL OReadMenuBarHandler::characters(const OUString&)
-throw( SAXException, RuntimeException, std::exception )
{
}
void OReadMenuBarHandler::endElement( const OUString& aName )
- throw( SAXException, RuntimeException, std::exception )
{
if ( m_bMenuMode )
{
@@ -455,18 +442,15 @@ OReadMenuHandler::~OReadMenuHandler()
}
void SAL_CALL OReadMenuHandler::startDocument()
- throw ( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadMenuHandler::endDocument()
- throw( SAXException, RuntimeException, std::exception)
{
}
void SAL_CALL OReadMenuHandler::startElement(
const OUString& aName, const Reference< XAttributeList > &xAttrList )
-throw( SAXException, RuntimeException, std::exception )
{
if ( m_bMenuPopupMode )
{
@@ -489,12 +473,10 @@ throw( SAXException, RuntimeException, std::exception )
}
void SAL_CALL OReadMenuHandler::characters(const OUString&)
-throw( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadMenuHandler::endElement( const OUString& aName )
- throw( SAXException, RuntimeException, std::exception )
{
if ( m_bMenuPopupMode )
{
@@ -533,18 +515,15 @@ OReadMenuPopupHandler::~OReadMenuPopupHandler()
}
void SAL_CALL OReadMenuPopupHandler::startDocument()
- throw ( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadMenuPopupHandler::endDocument()
- throw( SAXException, RuntimeException, std::exception)
{
}
void SAL_CALL OReadMenuPopupHandler::startElement(
const OUString& rName, const Reference< XAttributeList > &xAttrList )
-throw( SAXException, RuntimeException, std::exception )
{
++m_nElementDepth;
@@ -682,12 +661,10 @@ throw( SAXException, RuntimeException, std::exception )
}
void SAL_CALL OReadMenuPopupHandler::characters(const OUString&)
-throw( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadMenuPopupHandler::endElement( const OUString& aName )
- throw( SAXException, RuntimeException, std::exception )
{
--m_nElementDepth;
if ( m_bMenuMode )
@@ -752,7 +729,6 @@ OWriteMenuDocumentHandler::~OWriteMenuDocumentHandler()
}
void OWriteMenuDocumentHandler::WriteMenuDocument()
-throw ( SAXException, RuntimeException )
{
::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
Reference< XAttributeList > rList( static_cast<XAttributeList *>(pList) , UNO_QUERY );
@@ -793,7 +769,6 @@ throw ( SAXException, RuntimeException )
}
void OWriteMenuDocumentHandler::WriteMenu( const Reference< XIndexAccess >& rMenuContainer )
-throw ( SAXException, RuntimeException )
{
sal_Int32 nItemCount = rMenuContainer->getCount();
bool bSeparator = false;
diff --git a/framework/source/fwe/xml/saxnamespacefilter.cxx b/framework/source/fwe/xml/saxnamespacefilter.cxx
index 4e4b1bf122b7..f2f8169b3258 100644
--- a/framework/source/fwe/xml/saxnamespacefilter.cxx
+++ b/framework/source/fwe/xml/saxnamespacefilter.cxx
@@ -49,18 +49,15 @@ SaxNamespaceFilter::~SaxNamespaceFilter()
// XDocumentHandler
void SAL_CALL SaxNamespaceFilter::startDocument()
- throw ( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL SaxNamespaceFilter::endDocument()
- throw( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL SaxNamespaceFilter::startElement(
const OUString& rName, const Reference< XAttributeList > &xAttribs )
- throw( SAXException, RuntimeException, std::exception )
{
XMLNamespaces aXMLNamespaces;
if ( !m_aNamespaceStack.empty() )
@@ -119,7 +116,6 @@ void SAL_CALL SaxNamespaceFilter::startElement(
}
void SAL_CALL SaxNamespaceFilter::endElement(const OUString& aName)
- throw( SAXException, RuntimeException, std::exception )
{
XMLNamespaces& aXMLNamespaces = m_aNamespaceStack.top();
OUString aNamespaceElementName;
@@ -139,27 +135,23 @@ void SAL_CALL SaxNamespaceFilter::endElement(const OUString& aName)
}
void SAL_CALL SaxNamespaceFilter::characters(const OUString& aChars)
- throw( SAXException, RuntimeException, std::exception )
{
xDocumentHandler->characters( aChars );
}
void SAL_CALL SaxNamespaceFilter::ignorableWhitespace(const OUString& aWhitespaces)
- throw( SAXException, RuntimeException, std::exception )
{
xDocumentHandler->ignorableWhitespace( aWhitespaces );
}
void SAL_CALL SaxNamespaceFilter::processingInstruction(
const OUString& aTarget, const OUString& aData)
- throw( SAXException, RuntimeException, std::exception )
{
xDocumentHandler->processingInstruction( aTarget, aData );
}
void SAL_CALL SaxNamespaceFilter::setDocumentLocator(
const Reference< XLocator > &xLocator)
- throw( SAXException, RuntimeException, std::exception )
{
m_xLocator = xLocator;
xDocumentHandler->setDocumentLocator( xLocator );
diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx
index 4d7e66a06ca8..190877c78546 100644
--- a/framework/source/fwe/xml/statusbardocumenthandler.cxx
+++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx
@@ -179,12 +179,10 @@ OReadStatusBarDocumentHandler::~OReadStatusBarDocumentHandler()
// XDocumentHandler
void SAL_CALL OReadStatusBarDocumentHandler::startDocument()
-throw ( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadStatusBarDocumentHandler::endDocument()
-throw( SAXException, RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -198,7 +196,6 @@ throw( SAXException, RuntimeException, std::exception )
void SAL_CALL OReadStatusBarDocumentHandler::startElement(
const OUString& aName, const Reference< XAttributeList > &xAttribs )
-throw( SAXException, RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -397,7 +394,6 @@ throw( SAXException, RuntimeException, std::exception )
}
void SAL_CALL OReadStatusBarDocumentHandler::endElement(const OUString& aName)
-throw( SAXException, RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -439,24 +435,20 @@ throw( SAXException, RuntimeException, std::exception )
}
void SAL_CALL OReadStatusBarDocumentHandler::characters(const OUString&)
-throw( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadStatusBarDocumentHandler::ignorableWhitespace(const OUString&)
-throw( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadStatusBarDocumentHandler::processingInstruction(
const OUString& /*aTarget*/, const OUString& /*aData*/ )
-throw( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadStatusBarDocumentHandler::setDocumentLocator(
const Reference< XLocator > &xLocator)
-throw( SAXException, RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -496,8 +488,7 @@ OWriteStatusBarDocumentHandler::~OWriteStatusBarDocumentHandler()
{
}
-void OWriteStatusBarDocumentHandler::WriteStatusBarDocument() throw
-( SAXException, RuntimeException )
+void OWriteStatusBarDocumentHandler::WriteStatusBarDocument()
{
SolarMutexGuard g;
@@ -567,7 +558,6 @@ void OWriteStatusBarDocumentHandler::WriteStatusBarItem(
sal_Int16 nOffset,
sal_Int16 nStyle,
sal_Int16 nWidth )
-throw ( SAXException, RuntimeException )
{
::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
Reference< XAttributeList > xList( static_cast<XAttributeList *>(pList) , UNO_QUERY );
diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
index e31da549bfe8..fad320b13108 100644
--- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
@@ -178,12 +178,10 @@ OReadToolBoxDocumentHandler::~OReadToolBoxDocumentHandler()
// XDocumentHandler
void SAL_CALL OReadToolBoxDocumentHandler::startDocument()
-throw ( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadToolBoxDocumentHandler::endDocument()
-throw( SAXException, RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -197,7 +195,6 @@ throw( SAXException, RuntimeException, std::exception )
void SAL_CALL OReadToolBoxDocumentHandler::startElement(
const OUString& aName, const Reference< XAttributeList > &xAttribs )
-throw( SAXException, RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -491,7 +488,6 @@ throw( SAXException, RuntimeException, std::exception )
}
void SAL_CALL OReadToolBoxDocumentHandler::endElement(const OUString& aName)
-throw( SAXException, RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -572,24 +568,20 @@ throw( SAXException, RuntimeException, std::exception )
}
void SAL_CALL OReadToolBoxDocumentHandler::characters(const OUString&)
-throw( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadToolBoxDocumentHandler::ignorableWhitespace(const OUString&)
-throw( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadToolBoxDocumentHandler::processingInstruction(
const OUString& /*aTarget*/, const OUString& /*aData*/ )
-throw( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadToolBoxDocumentHandler::setDocumentLocator(
const Reference< XLocator > &xLocator)
-throw( SAXException, RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -629,8 +621,7 @@ OWriteToolBoxDocumentHandler::~OWriteToolBoxDocumentHandler()
{
}
-void OWriteToolBoxDocumentHandler::WriteToolBoxDocument() throw
-( SAXException, RuntimeException )
+void OWriteToolBoxDocumentHandler::WriteToolBoxDocument()
{
SolarMutexGuard g;
@@ -718,7 +709,6 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxItem(
const OUString& rHelpURL,
sal_Int16 nStyle,
bool bVisible )
-throw ( SAXException, RuntimeException )
{
::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
Reference< XAttributeList > xList( static_cast<XAttributeList *>(pList) , UNO_QUERY );
@@ -777,8 +767,7 @@ throw ( SAXException, RuntimeException )
m_xWriteDocumentHandler->endElement( ELEMENT_NS_TOOLBARITEM );
}
-void OWriteToolBoxDocumentHandler::WriteToolBoxSpace() throw
-( SAXException, RuntimeException )
+void OWriteToolBoxDocumentHandler::WriteToolBoxSpace()
{
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
m_xWriteDocumentHandler->startElement( ELEMENT_NS_TOOLBARSPACE, m_xEmptyList );
@@ -786,8 +775,7 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxSpace() throw
m_xWriteDocumentHandler->endElement( ELEMENT_NS_TOOLBARSPACE );
}
-void OWriteToolBoxDocumentHandler::WriteToolBoxBreak() throw
-( SAXException, RuntimeException )
+void OWriteToolBoxDocumentHandler::WriteToolBoxBreak()
{
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
m_xWriteDocumentHandler->startElement( ELEMENT_NS_TOOLBARBREAK, m_xEmptyList );
@@ -795,8 +783,7 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxBreak() throw
m_xWriteDocumentHandler->endElement( ELEMENT_NS_TOOLBARBREAK );
}
-void OWriteToolBoxDocumentHandler::WriteToolBoxSeparator() throw
-( SAXException, RuntimeException )
+void OWriteToolBoxDocumentHandler::WriteToolBoxSeparator()
{
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
m_xWriteDocumentHandler->startElement( ELEMENT_NS_TOOLBARSEPARATOR, m_xEmptyList );
diff --git a/framework/source/fwe/xml/xmlnamespaces.cxx b/framework/source/fwe/xml/xmlnamespaces.cxx
index a208e440a3b4..7b103eae24c5 100644
--- a/framework/source/fwe/xml/xmlnamespaces.cxx
+++ b/framework/source/fwe/xml/xmlnamespaces.cxx
@@ -40,7 +40,7 @@ XMLNamespaces::~XMLNamespaces()
{
}
-void XMLNamespaces::addNamespace( const OUString& aName, const OUString& aValue ) throw( SAXException )
+void XMLNamespaces::addNamespace( const OUString& aName, const OUString& aValue )
{
NamespaceMap::iterator p;
OUString aNamespaceName( aName );
@@ -93,7 +93,7 @@ void XMLNamespaces::addNamespace( const OUString& aName, const OUString& aValue
}
}
-OUString XMLNamespaces::applyNSToAttributeName( const OUString& aName ) const throw( SAXException, std::exception )
+OUString XMLNamespaces::applyNSToAttributeName( const OUString& aName ) const
{
// xml draft: there is no default namespace for attributes!
@@ -118,7 +118,7 @@ OUString XMLNamespaces::applyNSToAttributeName( const OUString& aName ) const th
return aName;
}
-OUString XMLNamespaces::applyNSToElementName( const OUString& aName ) const throw( SAXException, std::exception )
+OUString XMLNamespaces::applyNSToElementName( const OUString& aName ) const
{
// xml draft: element names can have a default namespace
@@ -156,7 +156,7 @@ OUString XMLNamespaces::applyNSToElementName( const OUString& aName ) const th
return aElementName;
}
-OUString XMLNamespaces::getNamespaceValue( const OUString& aNamespace ) const throw( SAXException )
+OUString XMLNamespaces::getNamespaceValue( const OUString& aNamespace ) const
{
if ( aNamespace.isEmpty() )
return m_aDefaultNamespace;
diff --git a/framework/source/fwi/threadhelp/transactionmanager.cxx b/framework/source/fwi/threadhelp/transactionmanager.cxx
index a6d8efc466a1..fa7847e5696f 100644
--- a/framework/source/fwi/threadhelp/transactionmanager.cxx
+++ b/framework/source/fwi/threadhelp/transactionmanager.cxx
@@ -153,7 +153,7 @@ EWorkingMode TransactionManager::getWorkingMode() const
@param "eMode" ,used to enable/disable throwing exceptions automatically for rejected calls
*//*-*****************************************************************************************************/
-void TransactionManager::registerTransaction( EExceptionMode eMode ) throw( css::uno::RuntimeException, css::lang::DisposedException )
+void TransactionManager::registerTransaction( EExceptionMode eMode )
{
::osl::MutexGuard aAccessGuard( m_aAccessLock );
switch( m_eWorkingMode )
@@ -198,7 +198,7 @@ void TransactionManager::registerTransaction( EExceptionMode eMode ) throw( css
@seealso method registerTransaction()
*//*-*****************************************************************************************************/
-void TransactionManager::unregisterTransaction() throw( css::uno::RuntimeException, css::lang::DisposedException )
+void TransactionManager::unregisterTransaction()
{
// This call could not rejected!
// Safe access to internal member.
diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx
index 9653444f9126..6a1c6f696433 100644
--- a/framework/source/fwi/uielement/constitemcontainer.cxx
+++ b/framework/source/fwi/uielement/constitemcontainer.cxx
@@ -163,7 +163,7 @@ Reference< XIndexAccess > ConstItemContainer::deepCopyContainer( const Reference
}
// XUnoTunnel
-sal_Int64 ConstItemContainer::getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception)
+sal_Int64 ConstItemContainer::getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier )
{
if( ( rIdentifier.getLength() == 16 ) && ( 0 == memcmp( ConstItemContainer::GetUnoTunnelId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) )
{
@@ -191,20 +191,17 @@ ConstItemContainer* ConstItemContainer::GetImplementation( const css::uno::Refer
// XElementAccess
sal_Bool SAL_CALL ConstItemContainer::hasElements()
-throw ( RuntimeException, std::exception )
{
return ( !m_aItemVector.empty() );
}
// XIndexAccess
sal_Int32 SAL_CALL ConstItemContainer::getCount()
-throw ( RuntimeException, std::exception )
{
return m_aItemVector.size();
}
Any SAL_CALL ConstItemContainer::getByIndex( sal_Int32 Index )
-throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
if ( sal_Int32( m_aItemVector.size()) > Index )
return makeAny( m_aItemVector[Index] );
@@ -214,7 +211,6 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std
// XPropertySet
Reference< XPropertySetInfo > SAL_CALL ConstItemContainer::getPropertySetInfo()
-throw (css::uno::RuntimeException, std::exception)
{
// Optimize this method !
// We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -239,12 +235,10 @@ throw (css::uno::RuntimeException, std::exception)
}
void SAL_CALL ConstItemContainer::setPropertyValue( const OUString&, const Any& )
-throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
}
Any SAL_CALL ConstItemContainer::getPropertyValue( const OUString& PropertyName )
-throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
if ( PropertyName == PROPNAME_UINAME )
return makeAny( m_aUIName );
@@ -253,36 +247,30 @@ throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
}
void SAL_CALL ConstItemContainer::addPropertyChangeListener( const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener >& )
-throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
}
void SAL_CALL ConstItemContainer::removePropertyChangeListener( const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener >& )
-throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
// Only read-only properties - do nothing
}
void SAL_CALL ConstItemContainer::addVetoableChangeListener( const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener >& )
-throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
// Only read-only properties - do nothing
}
void SAL_CALL ConstItemContainer::removeVetoableChangeListener( const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener >& )
-throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
// Only read-only properties - do nothing
}
// XFastPropertySet
void SAL_CALL ConstItemContainer::setFastPropertyValue( sal_Int32, const css::uno::Any& )
-throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
}
Any SAL_CALL ConstItemContainer::getFastPropertyValue( sal_Int32 nHandle )
-throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
if ( nHandle == PROPHANDLE_UINAME )
return makeAny( m_aUIName );
diff --git a/framework/source/fwi/uielement/itemcontainer.cxx b/framework/source/fwi/uielement/itemcontainer.cxx
index 239f4027acba..892947009ff3 100644
--- a/framework/source/fwi/uielement/itemcontainer.cxx
+++ b/framework/source/fwi/uielement/itemcontainer.cxx
@@ -148,7 +148,6 @@ ItemContainer* ItemContainer::GetImplementation( const css::uno::Reference< css:
// XElementAccess
sal_Bool SAL_CALL ItemContainer::hasElements()
-throw ( RuntimeException, std::exception )
{
ShareGuard aLock( m_aShareMutex );
return ( !m_aItemVector.empty() );
@@ -156,14 +155,12 @@ throw ( RuntimeException, std::exception )
// XIndexAccess
sal_Int32 SAL_CALL ItemContainer::getCount()
-throw ( RuntimeException, std::exception )
{
ShareGuard aLock( m_aShareMutex );
return m_aItemVector.size();
}
Any SAL_CALL ItemContainer::getByIndex( sal_Int32 Index )
-throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
ShareGuard aLock( m_aShareMutex );
if ( sal_Int32( m_aItemVector.size()) > Index )
@@ -174,7 +171,6 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std
// XIndexContainer
void SAL_CALL ItemContainer::insertByIndex( sal_Int32 Index, const Any& aItem )
-throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
Sequence< PropertyValue > aSeq;
if ( aItem >>= aSeq )
@@ -197,7 +193,6 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept
}
void SAL_CALL ItemContainer::removeByIndex( sal_Int32 nIndex )
-throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
ShareGuard aLock( m_aShareMutex );
if ( (sal_Int32)m_aItemVector.size() > nIndex )
@@ -209,7 +204,6 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std
}
void SAL_CALL ItemContainer::replaceByIndex( sal_Int32 Index, const Any& aItem )
-throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
Sequence< PropertyValue > aSeq;
if ( aItem >>= aSeq )
diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx
index 5974fd94c376..b6c2a6499aec 100644
--- a/framework/source/fwi/uielement/rootitemcontainer.cxx
+++ b/framework/source/fwi/uielement/rootitemcontainer.cxx
@@ -106,7 +106,7 @@ RootItemContainer::~RootItemContainer()
{
}
-Any SAL_CALL RootItemContainer::queryInterface( const Type& _rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL RootItemContainer::queryInterface( const Type& _rType )
{
Any aRet = RootItemContainer_BASE::queryInterface( _rType );
if ( !aRet.hasValue() )
@@ -114,7 +114,7 @@ Any SAL_CALL RootItemContainer::queryInterface( const Type& _rType ) throw(Runti
return aRet;
}
-Sequence< Type > SAL_CALL RootItemContainer::getTypes( ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL RootItemContainer::getTypes( )
{
return comphelper::concatSequences(
RootItemContainer_BASE::getTypes(),
@@ -140,7 +140,7 @@ Reference< XIndexAccess > RootItemContainer::deepCopyContainer( const Reference<
}
// XUnoTunnel
-sal_Int64 RootItemContainer::getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception)
+sal_Int64 RootItemContainer::getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier )
{
if( ( rIdentifier.getLength() == 16 ) && ( 0 == memcmp( RootItemContainer::GetUnoTunnelId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) )
return sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >( this ));
@@ -166,7 +166,6 @@ RootItemContainer* RootItemContainer::GetImplementation( const css::uno::Referen
// XElementAccess
sal_Bool SAL_CALL RootItemContainer::hasElements()
-throw ( RuntimeException, std::exception )
{
ShareGuard aLock( m_aShareMutex );
return ( !m_aItemVector.empty() );
@@ -174,14 +173,12 @@ throw ( RuntimeException, std::exception )
// XIndexAccess
sal_Int32 SAL_CALL RootItemContainer::getCount()
-throw ( RuntimeException, std::exception )
{
ShareGuard aLock( m_aShareMutex );
return m_aItemVector.size();
}
Any SAL_CALL RootItemContainer::getByIndex( sal_Int32 Index )
-throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
ShareGuard aLock( m_aShareMutex );
if ( sal_Int32( m_aItemVector.size()) > Index )
@@ -192,7 +189,6 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std
// XIndexContainer
void SAL_CALL RootItemContainer::insertByIndex( sal_Int32 Index, const Any& aItem )
-throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
Sequence< PropertyValue > aSeq;
if ( aItem >>= aSeq )
@@ -214,7 +210,6 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept
}
void SAL_CALL RootItemContainer::removeByIndex( sal_Int32 nIndex )
-throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
ShareGuard aLock( m_aShareMutex );
if ( (sal_Int32)m_aItemVector.size() > nIndex )
@@ -226,7 +221,6 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std
}
void SAL_CALL RootItemContainer::replaceByIndex( sal_Int32 Index, const Any& aItem )
-throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
Sequence< PropertyValue > aSeq;
if ( aItem >>= aSeq )
@@ -242,13 +236,11 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept
}
Reference< XInterface > SAL_CALL RootItemContainer::createInstanceWithContext( const Reference< XComponentContext >& )
-throw ( Exception, RuntimeException, std::exception)
{
return static_cast<OWeakObject *>(new ItemContainer( m_aShareMutex ));
}
Reference< XInterface > SAL_CALL RootItemContainer::createInstanceWithArgumentsAndContext( const Sequence< Any >&, const Reference< XComponentContext >& )
-throw (Exception, RuntimeException, std::exception)
{
return static_cast<OWeakObject *>(new ItemContainer( m_aShareMutex ));
}
@@ -258,7 +250,6 @@ sal_Bool SAL_CALL RootItemContainer::convertFastPropertyValue( Any& aConve
Any& aOldValue ,
sal_Int32 nHandle ,
const Any& aValue )
-throw( css::lang::IllegalArgumentException )
{
// Initialize state with sal_False !!!
// (Handle can be invalid)
@@ -281,7 +272,6 @@ throw( css::lang::IllegalArgumentException )
void SAL_CALL RootItemContainer::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle ,
const css::uno::Any& aValue )
-throw( css::uno::Exception, std::exception )
{
switch( nHandle )
{
@@ -329,7 +319,6 @@ void SAL_CALL RootItemContainer::getFastPropertyValue( css::uno::Any& aValue ,
}
css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL RootItemContainer::getPropertySetInfo()
-throw (css::uno::RuntimeException, std::exception)
{
// Optimize this method !
// We initialize a static variable only one time. And we don't must use a mutex at every call!
diff --git a/framework/source/helper/dockingareadefaultacceptor.cxx b/framework/source/helper/dockingareadefaultacceptor.cxx
index eef64d29da80..63d9fe0f1698 100644
--- a/framework/source/helper/dockingareadefaultacceptor.cxx
+++ b/framework/source/helper/dockingareadefaultacceptor.cxx
@@ -48,7 +48,7 @@ DockingAreaDefaultAcceptor::~DockingAreaDefaultAcceptor()
}
// XDockingAreaAcceptor
-css::uno::Reference< css::awt::XWindow > SAL_CALL DockingAreaDefaultAcceptor::getContainerWindow() throw (css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::awt::XWindow > SAL_CALL DockingAreaDefaultAcceptor::getContainerWindow()
{
SolarMutexGuard g;
@@ -60,7 +60,7 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL DockingAreaDefaultAcceptor::ge
return xContainerWindow;
}
-sal_Bool SAL_CALL DockingAreaDefaultAcceptor::requestDockingAreaSpace( const css::awt::Rectangle& RequestedSpace ) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL DockingAreaDefaultAcceptor::requestDockingAreaSpace( const css::awt::Rectangle& RequestedSpace )
{
// Try to "lock" the frame for access to taskscontainer.
css::uno::Reference< XFrame > xFrame( m_xOwner );
@@ -93,7 +93,7 @@ sal_Bool SAL_CALL DockingAreaDefaultAcceptor::requestDockingAreaSpace( const css
return false;
}
-void SAL_CALL DockingAreaDefaultAcceptor::setDockingAreaSpace( const css::awt::Rectangle& BorderSpace ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL DockingAreaDefaultAcceptor::setDockingAreaSpace( const css::awt::Rectangle& BorderSpace )
{
SolarMutexGuard g;
diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx
index f120a79380f4..cb5eed5a9e18 100644
--- a/framework/source/helper/ocomponentaccess.cxx
+++ b/framework/source/helper/ocomponentaccess.cxx
@@ -49,7 +49,7 @@ OComponentAccess::~OComponentAccess()
}
// XEnumerationAccess
-css::uno::Reference< XEnumeration > SAL_CALL OComponentAccess::createEnumeration() throw( RuntimeException, std::exception )
+css::uno::Reference< XEnumeration > SAL_CALL OComponentAccess::createEnumeration()
{
SolarMutexGuard g;
@@ -76,7 +76,7 @@ css::uno::Reference< XEnumeration > SAL_CALL OComponentAccess::createEnumeration
}
// XElementAccess
-Type SAL_CALL OComponentAccess::getElementType() throw( RuntimeException, std::exception )
+Type SAL_CALL OComponentAccess::getElementType()
{
// Elements in list an enumeration are components!
// Return the uno-type of XComponent.
@@ -84,7 +84,7 @@ Type SAL_CALL OComponentAccess::getElementType() throw( RuntimeException, std::e
}
// XElementAccess
-sal_Bool SAL_CALL OComponentAccess::hasElements() throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL OComponentAccess::hasElements()
{
SolarMutexGuard g;
diff --git a/framework/source/helper/ocomponentenumeration.cxx b/framework/source/helper/ocomponentenumeration.cxx
index 9f4768c26b2f..673a0a3fc6df 100644
--- a/framework/source/helper/ocomponentenumeration.cxx
+++ b/framework/source/helper/ocomponentenumeration.cxx
@@ -45,7 +45,7 @@ OComponentEnumeration::~OComponentEnumeration()
}
// XEventListener
-void SAL_CALL OComponentEnumeration::disposing( const EventObject& aEvent ) throw( RuntimeException, std::exception )
+void SAL_CALL OComponentEnumeration::disposing( const EventObject& aEvent )
{
SolarMutexGuard g;
@@ -59,7 +59,7 @@ void SAL_CALL OComponentEnumeration::disposing( const EventObject& aEvent ) thro
}
// XEnumeration
-sal_Bool SAL_CALL OComponentEnumeration::hasMoreElements() throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL OComponentEnumeration::hasMoreElements()
{
SolarMutexGuard g;
@@ -72,9 +72,7 @@ sal_Bool SAL_CALL OComponentEnumeration::hasMoreElements() throw( RuntimeExcepti
// XEnumeration
-Any SAL_CALL OComponentEnumeration::nextElement() throw( NoSuchElementException ,
- WrappedTargetException ,
- RuntimeException, std::exception )
+Any SAL_CALL OComponentEnumeration::nextElement()
{
SolarMutexGuard g;
diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx
index f243584b1e97..ee23298f99fc 100644
--- a/framework/source/helper/oframes.cxx
+++ b/framework/source/helper/oframes.cxx
@@ -57,7 +57,7 @@ OFrames::~OFrames()
}
// XFrames
-void SAL_CALL OFrames::append( const css::uno::Reference< XFrame >& xFrame ) throw( RuntimeException, std::exception )
+void SAL_CALL OFrames::append( const css::uno::Reference< XFrame >& xFrame )
{
SolarMutexGuard g;
@@ -80,7 +80,7 @@ void SAL_CALL OFrames::append( const css::uno::Reference< XFrame >& xFrame ) thr
}
// XFrames
-void SAL_CALL OFrames::remove( const css::uno::Reference< XFrame >& xFrame ) throw( RuntimeException, std::exception )
+void SAL_CALL OFrames::remove( const css::uno::Reference< XFrame >& xFrame )
{
SolarMutexGuard g;
@@ -104,7 +104,7 @@ void SAL_CALL OFrames::remove( const css::uno::Reference< XFrame >& xFrame ) thr
}
// XFrames
-Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearchFlags ) throw( RuntimeException, std::exception )
+Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearchFlags )
{
SolarMutexGuard g;
@@ -202,7 +202,7 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int
}
// XIndexAccess
-sal_Int32 SAL_CALL OFrames::getCount() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL OFrames::getCount()
{
SolarMutexGuard g;
@@ -224,9 +224,7 @@ sal_Int32 SAL_CALL OFrames::getCount() throw( RuntimeException, std::exception )
// XIndexAccess
-Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsException ,
- WrappedTargetException ,
- RuntimeException, std::exception )
+Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex )
{
SolarMutexGuard g;
@@ -253,14 +251,14 @@ Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsExce
}
// XElementAccess
-Type SAL_CALL OFrames::getElementType() throw( RuntimeException, std::exception )
+Type SAL_CALL OFrames::getElementType()
{
// This "container" support XFrame-interfaces only!
return cppu::UnoType<XFrame>::get();
}
// XElementAccess
-sal_Bool SAL_CALL OFrames::hasElements() throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL OFrames::hasElements()
{
SolarMutexGuard g;
diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx
index 6cfb1f075c00..537fa79fc81d 100644
--- a/framework/source/helper/persistentwindowstate.cxx
+++ b/framework/source/helper/persistentwindowstate.cxx
@@ -48,8 +48,6 @@ PersistentWindowState::~PersistentWindowState()
}
void SAL_CALL PersistentWindowState::initialize(const css::uno::Sequence< css::uno::Any >& lArguments)
- throw(css::uno::Exception ,
- css::uno::RuntimeException, std::exception)
{
// check arguments
css::uno::Reference< css::frame::XFrame > xFrame;
@@ -76,7 +74,6 @@ void SAL_CALL PersistentWindowState::initialize(const css::uno::Sequence< css::u
}
void SAL_CALL PersistentWindowState::frameAction(const css::frame::FrameActionEvent& aEvent)
- throw(css::uno::RuntimeException, std::exception)
{
// We don't want to do this stuff when being used through LibreOfficeKit
if( comphelper::LibreOfficeKit::isActive() )
@@ -139,7 +136,6 @@ void SAL_CALL PersistentWindowState::frameAction(const css::frame::FrameActionEv
}
void SAL_CALL PersistentWindowState::disposing(const css::lang::EventObject&)
- throw(css::uno::RuntimeException, std::exception)
{
// nothing todo here - because we hold the frame as weak reference only
}
diff --git a/framework/source/helper/statusindicator.cxx b/framework/source/helper/statusindicator.cxx
index fc0ecb7f2f85..134a6f5a2448 100644
--- a/framework/source/helper/statusindicator.cxx
+++ b/framework/source/helper/statusindicator.cxx
@@ -35,7 +35,6 @@ StatusIndicator::~StatusIndicator()
void SAL_CALL StatusIndicator::start(const OUString& sText ,
sal_Int32 nRange)
- throw(css::uno::RuntimeException, std::exception)
{
if (comphelper::LibreOfficeKit::isActive())
{
@@ -54,7 +53,6 @@ void SAL_CALL StatusIndicator::start(const OUString& sText ,
}
void SAL_CALL StatusIndicator::end()
- throw(css::uno::RuntimeException, std::exception)
{
if (comphelper::LibreOfficeKit::isActive())
{
@@ -70,7 +68,6 @@ void SAL_CALL StatusIndicator::end()
}
void SAL_CALL StatusIndicator::reset()
- throw(css::uno::RuntimeException, std::exception)
{
if (comphelper::LibreOfficeKit::isActive())
return;
@@ -84,7 +81,6 @@ void SAL_CALL StatusIndicator::reset()
}
void SAL_CALL StatusIndicator::setText(const OUString& sText)
- throw(css::uno::RuntimeException, std::exception)
{
if (comphelper::LibreOfficeKit::isActive())
return;
@@ -98,7 +94,6 @@ void SAL_CALL StatusIndicator::setText(const OUString& sText)
}
void SAL_CALL StatusIndicator::setValue(sal_Int32 nValue)
- throw(css::uno::RuntimeException, std::exception)
{
if (comphelper::LibreOfficeKit::isActive())
{
diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx
index 9f4d658ed2c4..bb385f0b70ed 100644
--- a/framework/source/helper/statusindicatorfactory.cxx
+++ b/framework/source/helper/statusindicatorfactory.cxx
@@ -67,8 +67,6 @@ StatusIndicatorFactory::~StatusIndicatorFactory()
}
void SAL_CALL StatusIndicatorFactory::initialize(const css::uno::Sequence< css::uno::Any >& lArguments)
- throw(css::uno::Exception ,
- css::uno::RuntimeException, std::exception)
{
if (lArguments.getLength() > 0) {
osl::MutexGuard g(m_mutex);
@@ -102,7 +100,6 @@ void SAL_CALL StatusIndicatorFactory::initialize(const css::uno::Sequence< css::
}
css::uno::Reference< css::task::XStatusIndicator > SAL_CALL StatusIndicatorFactory::createStatusIndicator()
- throw(css::uno::RuntimeException, std::exception)
{
StatusIndicator* pIndicator = new StatusIndicator(this);
css::uno::Reference< css::task::XStatusIndicator > xIndicator(static_cast< ::cppu::OWeakObject* >(pIndicator), css::uno::UNO_QUERY_THROW);
@@ -111,7 +108,6 @@ css::uno::Reference< css::task::XStatusIndicator > SAL_CALL StatusIndicatorFacto
}
void SAL_CALL StatusIndicatorFactory::update()
- throw(css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(m_mutex);
m_bAllowReschedule = true;
diff --git a/framework/source/helper/tagwindowasmodified.cxx b/framework/source/helper/tagwindowasmodified.cxx
index 47eb85bdedbb..a71b613f8d45 100644
--- a/framework/source/helper/tagwindowasmodified.cxx
+++ b/framework/source/helper/tagwindowasmodified.cxx
@@ -46,8 +46,6 @@ TagWindowAsModified::~TagWindowAsModified()
}
void SAL_CALL TagWindowAsModified::initialize(const css::uno::Sequence< css::uno::Any >& lArguments)
- throw(css::uno::Exception ,
- css::uno::RuntimeException, std::exception)
{
css::uno::Reference< css::frame::XFrame > xFrame;
@@ -67,7 +65,6 @@ void SAL_CALL TagWindowAsModified::initialize(const css::uno::Sequence< css::uno
}
void SAL_CALL TagWindowAsModified::modified(const css::lang::EventObject& aEvent)
- throw(css::uno::RuntimeException, std::exception)
{
css::uno::Reference< css::util::XModifiable > xModel;
css::uno::Reference< css::awt::XWindow > xWindow;
@@ -105,7 +102,6 @@ void SAL_CALL TagWindowAsModified::modified(const css::lang::EventObject& aEvent
}
void SAL_CALL TagWindowAsModified::frameAction(const css::frame::FrameActionEvent& aEvent)
- throw(css::uno::RuntimeException, std::exception)
{
if (
(aEvent.Action != css::frame::FrameAction_COMPONENT_REATTACHED) &&
@@ -128,7 +124,6 @@ void SAL_CALL TagWindowAsModified::frameAction(const css::frame::FrameActionEven
}
void SAL_CALL TagWindowAsModified::disposing(const css::lang::EventObject& aEvent)
- throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx
index 0f600e5a01bd..15476a178ce2 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -60,8 +60,6 @@ TitleBarUpdate::~TitleBarUpdate()
}
void SAL_CALL TitleBarUpdate::initialize(const css::uno::Sequence< css::uno::Any >& lArguments)
- throw(css::uno::Exception ,
- css::uno::RuntimeException, std::exception)
{
// check arguments
css::uno::Reference< css::frame::XFrame > xFrame;
@@ -93,7 +91,6 @@ void SAL_CALL TitleBarUpdate::initialize(const css::uno::Sequence< css::uno::Any
}
void SAL_CALL TitleBarUpdate::frameAction(const css::frame::FrameActionEvent& aEvent)
- throw(css::uno::RuntimeException, std::exception)
{
// we are interested on events only, which must trigger a title bar update
// because component was changed.
@@ -108,13 +105,11 @@ void SAL_CALL TitleBarUpdate::frameAction(const css::frame::FrameActionEvent& aE
}
void SAL_CALL TitleBarUpdate::titleChanged(const css::frame::TitleChangedEvent& /* aEvent */)
- throw (css::uno::RuntimeException, std::exception)
{
impl_forceUpdate ();
}
void SAL_CALL TitleBarUpdate::disposing(const css::lang::EventObject&)
- throw(css::uno::RuntimeException, std::exception)
{
// nothing todo here - because we hold the frame as weak reference only
}
diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx
index a1ea8de92693..0a39baf25164 100644
--- a/framework/source/helper/uiconfigelementwrapperbase.cxx
+++ b/framework/source/helper/uiconfigelementwrapperbase.cxx
@@ -76,7 +76,7 @@ UIConfigElementWrapperBase::~UIConfigElementWrapperBase()
{
}
-Any SAL_CALL UIConfigElementWrapperBase::queryInterface( const Type& _rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL UIConfigElementWrapperBase::queryInterface( const Type& _rType )
{
Any aRet = UIConfigElementWrapperBase_BASE::queryInterface( _rType );
if ( !aRet.hasValue() )
@@ -84,7 +84,7 @@ Any SAL_CALL UIConfigElementWrapperBase::queryInterface( const Type& _rType ) th
return aRet;
}
-Sequence< Type > SAL_CALL UIConfigElementWrapperBase::getTypes( ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL UIConfigElementWrapperBase::getTypes( )
{
return comphelper::concatSequences(
UIConfigElementWrapperBase_BASE::getTypes(),
@@ -93,26 +93,24 @@ Sequence< Type > SAL_CALL UIConfigElementWrapperBase::getTypes( ) throw(Runtime
}
// XComponent
-void SAL_CALL UIConfigElementWrapperBase::addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigElementWrapperBase::addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
{
m_aListenerContainer.addInterface( cppu::UnoType<css::lang::XEventListener>::get(), xListener );
}
-void SAL_CALL UIConfigElementWrapperBase::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigElementWrapperBase::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener )
{
m_aListenerContainer.removeInterface( cppu::UnoType<css::lang::XEventListener>::get(), aListener );
}
// XEventListener
void SAL_CALL UIConfigElementWrapperBase::disposing( const EventObject& )
-throw( RuntimeException, std::exception )
{
SolarMutexGuard g;
m_xConfigSource.clear();
}
void SAL_CALL UIConfigElementWrapperBase::initialize( const Sequence< Any >& aArguments )
-throw ( Exception, RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -145,22 +143,22 @@ throw ( Exception, RuntimeException, std::exception )
}
// XUpdatable
-void SAL_CALL UIConfigElementWrapperBase::update() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigElementWrapperBase::update()
{
// can be implemented by derived class
}
-void SAL_CALL UIConfigElementWrapperBase::elementInserted( const css::ui::ConfigurationEvent& ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigElementWrapperBase::elementInserted( const css::ui::ConfigurationEvent& )
{
// can be implemented by derived class
}
-void SAL_CALL UIConfigElementWrapperBase::elementRemoved( const css::ui::ConfigurationEvent& ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigElementWrapperBase::elementRemoved( const css::ui::ConfigurationEvent& )
{
// can be implemented by derived class
}
-void SAL_CALL UIConfigElementWrapperBase::elementReplaced( const css::ui::ConfigurationEvent& ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigElementWrapperBase::elementReplaced( const css::ui::ConfigurationEvent& )
{
// can be implemented by derived class
}
@@ -169,7 +167,7 @@ void SAL_CALL UIConfigElementWrapperBase::elementReplaced( const css::ui::Config
sal_Bool SAL_CALL UIConfigElementWrapperBase::convertFastPropertyValue( Any& aConvertedValue ,
Any& aOldValue ,
sal_Int32 nHandle ,
- const Any& aValue ) throw( css::lang::IllegalArgumentException )
+ const Any& aValue )
{
// Initialize state with sal_False !!!
// (Handle can be invalid)
@@ -250,7 +248,7 @@ sal_Bool SAL_CALL UIConfigElementWrapperBase::convertFastPropertyValue( Any&
}
void SAL_CALL UIConfigElementWrapperBase::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle ,
- const css::uno::Any& aValue ) throw( css::uno::Exception, std::exception )
+ const css::uno::Any& aValue )
{
switch( nHandle )
{
@@ -399,7 +397,7 @@ void SAL_CALL UIConfigElementWrapperBase::getFastPropertyValue( css::uno::Any& a
return(*pInfoHelper);
}
-css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL UIConfigElementWrapperBase::getPropertySetInfo() throw (css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL UIConfigElementWrapperBase::getPropertySetInfo()
{
// Optimize this method !
// We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -448,7 +446,7 @@ const css::uno::Sequence< css::beans::Property > UIConfigElementWrapperBase::imp
// Return "PropertyDescriptor"
return lPropertyDescriptor;
}
-void SAL_CALL UIConfigElementWrapperBase::setSettings( const Reference< XIndexAccess >& xSettings ) throw ( RuntimeException, std::exception )
+void SAL_CALL UIConfigElementWrapperBase::setSettings( const Reference< XIndexAccess >& xSettings )
{
SolarMutexClearableGuard aLock;
@@ -486,7 +484,7 @@ void SAL_CALL UIConfigElementWrapperBase::setSettings( const Reference< XIndexAc
void UIConfigElementWrapperBase::impl_fillNewData()
{
}
-Reference< XIndexAccess > SAL_CALL UIConfigElementWrapperBase::getSettings( sal_Bool bWriteable ) throw ( RuntimeException, std::exception )
+Reference< XIndexAccess > SAL_CALL UIConfigElementWrapperBase::getSettings( sal_Bool bWriteable )
{
SolarMutexGuard g;
@@ -496,20 +494,20 @@ Reference< XIndexAccess > SAL_CALL UIConfigElementWrapperBase::getSettings( sal_
return m_xConfigData;
}
-Reference< XFrame > SAL_CALL UIConfigElementWrapperBase::getFrame() throw (RuntimeException, std::exception)
+Reference< XFrame > SAL_CALL UIConfigElementWrapperBase::getFrame()
{
SolarMutexGuard g;
Reference< XFrame > xFrame( m_xWeakFrame );
return xFrame;
}
-OUString SAL_CALL UIConfigElementWrapperBase::getResourceURL() throw (RuntimeException, std::exception)
+OUString SAL_CALL UIConfigElementWrapperBase::getResourceURL()
{
SolarMutexGuard g;
return m_aResourceURL;
}
-::sal_Int16 SAL_CALL UIConfigElementWrapperBase::getType() throw (RuntimeException, std::exception)
+::sal_Int16 SAL_CALL UIConfigElementWrapperBase::getType()
{
SolarMutexGuard g;
return m_nType;
diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx
index e3def0119a1d..cfb48e553f37 100644
--- a/framework/source/helper/uielementwrapperbase.cxx
+++ b/framework/source/helper/uielementwrapperbase.cxx
@@ -57,7 +57,7 @@ UIElementWrapperBase::~UIElementWrapperBase()
{
}
-Any SAL_CALL UIElementWrapperBase::queryInterface( const Type& _rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL UIElementWrapperBase::queryInterface( const Type& _rType )
{
Any aRet = UIElementWrapperBase_BASE::queryInterface( _rType );
if ( !aRet.hasValue() )
@@ -65,7 +65,7 @@ Any SAL_CALL UIElementWrapperBase::queryInterface( const Type& _rType ) throw(Ru
return aRet;
}
-Sequence< Type > SAL_CALL UIElementWrapperBase::getTypes( ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL UIElementWrapperBase::getTypes( )
{
return comphelper::concatSequences(
UIElementWrapperBase_BASE::getTypes(),
@@ -73,18 +73,17 @@ Sequence< Type > SAL_CALL UIElementWrapperBase::getTypes( ) throw(RuntimeExcept
);
}
-void SAL_CALL UIElementWrapperBase::addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIElementWrapperBase::addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
{
m_aListenerContainer.addInterface( cppu::UnoType<css::lang::XEventListener>::get(), xListener );
}
-void SAL_CALL UIElementWrapperBase::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIElementWrapperBase::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
{
m_aListenerContainer.removeInterface( cppu::UnoType<css::lang::XEventListener>::get(), xListener );
}
void SAL_CALL UIElementWrapperBase::initialize( const Sequence< Any >& aArguments )
-throw ( Exception, RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -111,24 +110,24 @@ throw ( Exception, RuntimeException, std::exception )
}
// XUIElement
-css::uno::Reference< css::frame::XFrame > SAL_CALL UIElementWrapperBase::getFrame() throw (css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::frame::XFrame > SAL_CALL UIElementWrapperBase::getFrame()
{
css::uno::Reference< css::frame::XFrame > xFrame( m_xWeakFrame );
return xFrame;
}
-OUString SAL_CALL UIElementWrapperBase::getResourceURL() throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL UIElementWrapperBase::getResourceURL()
{
return m_aResourceURL;
}
-::sal_Int16 SAL_CALL UIElementWrapperBase::getType() throw (css::uno::RuntimeException, std::exception)
+::sal_Int16 SAL_CALL UIElementWrapperBase::getType()
{
return m_nType;
}
// XUpdatable
-void SAL_CALL UIElementWrapperBase::update() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIElementWrapperBase::update()
{
// can be implemented by derived class
}
@@ -137,7 +136,7 @@ void SAL_CALL UIElementWrapperBase::update() throw (css::uno::RuntimeException,
sal_Bool SAL_CALL UIElementWrapperBase::convertFastPropertyValue( Any& /*aConvertedValue*/ ,
Any& /*aOldValue*/ ,
sal_Int32 /*nHandle*/ ,
- const Any& /*aValue*/ ) throw( css::lang::IllegalArgumentException )
+ const Any& /*aValue*/ )
{
// Initialize state with sal_False !!!
// (Handle can be invalid)
@@ -145,7 +144,7 @@ sal_Bool SAL_CALL UIElementWrapperBase::convertFastPropertyValue( Any& /*a
}
void SAL_CALL UIElementWrapperBase::setFastPropertyValue_NoBroadcast( sal_Int32 /*nHandle*/ ,
- const css::uno::Any& /*aValue*/ ) throw( css::uno::Exception, std::exception )
+ const css::uno::Any& /*aValue*/ )
{
}
@@ -193,7 +192,7 @@ void SAL_CALL UIElementWrapperBase::getFastPropertyValue( css::uno::Any& aValue
return(*pInfoHelper);
}
-css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL UIElementWrapperBase::getPropertySetInfo() throw (css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL UIElementWrapperBase::getPropertySetInfo()
{
// Optimize this method !
// We initialize a static variable only one time. And we don't must use a mutex at every call!
diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx
index 1ca763ed5cd7..5a83fe6d8776 100644
--- a/framework/source/helper/vclstatusindicator.cxx
+++ b/framework/source/helper/vclstatusindicator.cxx
@@ -42,7 +42,6 @@ VCLStatusIndicator::~VCLStatusIndicator()
void SAL_CALL VCLStatusIndicator::start(const OUString& sText ,
sal_Int32 nRange)
- throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aSolarGuard;
@@ -67,7 +66,6 @@ void SAL_CALL VCLStatusIndicator::start(const OUString& sText ,
}
void SAL_CALL VCLStatusIndicator::reset()
- throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aSolarGuard;
if (m_pStatusBar)
@@ -78,7 +76,6 @@ void SAL_CALL VCLStatusIndicator::reset()
}
void SAL_CALL VCLStatusIndicator::end()
- throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aSolarGuard;
@@ -96,7 +93,6 @@ void SAL_CALL VCLStatusIndicator::end()
}
void SAL_CALL VCLStatusIndicator::setText(const OUString& sText)
- throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aSolarGuard;
m_sText = sText;
@@ -105,7 +101,6 @@ void SAL_CALL VCLStatusIndicator::setText(const OUString& sText)
}
void SAL_CALL VCLStatusIndicator::setValue(sal_Int32 nValue)
- throw(css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aSolarGuard;
diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
index ca2bae697177..bf141896591b 100644
--- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
@@ -98,79 +98,49 @@ class XMLBasedAcceleratorConfiguration : public ::cppu::WeakImplHelper<
public:
// XAcceleratorConfiguration
- virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getAllKeyEvents()
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getAllKeyEvents() override;
- virtual OUString SAL_CALL getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent)
- throw(css::container::NoSuchElementException,
- css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent) override;
virtual void SAL_CALL setKeyEvent(const css::awt::KeyEvent& aKeyEvent,
- const OUString& sCommand )
- throw(css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception ) override;
+ const OUString& sCommand ) override;
- virtual void SAL_CALL removeKeyEvent(const css::awt::KeyEvent& aKeyEvent)
- throw(css::container::NoSuchElementException,
- css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL removeKeyEvent(const css::awt::KeyEvent& aKeyEvent) override;
- virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getKeyEventsByCommand(const OUString& sCommand)
- throw(css::lang::IllegalArgumentException ,
- css::container::NoSuchElementException,
- css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getKeyEventsByCommand(const OUString& sCommand) override;
- virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList)
- throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException,
- css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList) override;
- virtual void SAL_CALL removeCommandFromAllKeyEvents(const OUString& sCommand)
- throw(css::lang::IllegalArgumentException ,
- css::container::NoSuchElementException,
- css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL removeCommandFromAllKeyEvents(const OUString& sCommand) override;
// XUIConfigurationPersistence
- virtual void SAL_CALL reload()
- throw(css::uno::Exception ,
- css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL reload() override;
- virtual void SAL_CALL store()
- throw(css::uno::Exception ,
- css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL store() override;
- virtual void SAL_CALL storeToStorage(const css::uno::Reference< css::embed::XStorage >& xStorage)
- throw(css::uno::Exception ,
- css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL storeToStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) override;
- virtual sal_Bool SAL_CALL isModified()
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isModified() override;
- virtual sal_Bool SAL_CALL isReadOnly()
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isReadOnly() override;
// XUIConfigurationStorage
- virtual void SAL_CALL setStorage(const css::uno::Reference< css::embed::XStorage >& xStorage)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) override;
- virtual sal_Bool SAL_CALL hasStorage()
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasStorage() override;
// XUIConfiguration
- virtual void SAL_CALL addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& xListener)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& xListener) override;
- virtual void SAL_CALL removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& xListener)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& xListener) override;
// XReset
// TODO use XPresetHandler instead if available
- virtual void SAL_CALL reset()
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL reset() override;
- virtual void SAL_CALL addResetListener(const css::uno::Reference< css::form::XResetListener >& xListener)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addResetListener(const css::uno::Reference< css::form::XResetListener >& xListener) override;
- virtual void SAL_CALL removeResetListener(const css::uno::Reference< css::form::XResetListener >& xListener)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removeResetListener(const css::uno::Reference< css::form::XResetListener >& xListener) override;
// called when changes occurred in the storage
void changesOccurred();
@@ -267,92 +237,60 @@ class XCUBasedAcceleratorConfiguration : public ::cppu::WeakImplHelper<
public:
// XAcceleratorConfiguration
- virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getAllKeyEvents()
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getAllKeyEvents() override;
- virtual OUString SAL_CALL getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent)
- throw(css::container::NoSuchElementException,
- css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent) override;
virtual void SAL_CALL setKeyEvent(const css::awt::KeyEvent& aKeyEvent,
- const OUString& sCommand )
- throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException,
- css::uno::RuntimeException, std::exception) override;
+ const OUString& sCommand ) override;
- virtual void SAL_CALL removeKeyEvent(const css::awt::KeyEvent& aKeyEvent)
- throw(css::container::NoSuchElementException,
- css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL removeKeyEvent(const css::awt::KeyEvent& aKeyEvent) override;
- virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getKeyEventsByCommand(const OUString& sCommand)
- throw(css::lang::IllegalArgumentException ,
- css::container::NoSuchElementException,
- css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getKeyEventsByCommand(const OUString& sCommand) override;
- virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList)
- throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException,
- css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList) override;
- virtual void SAL_CALL removeCommandFromAllKeyEvents(const OUString& sCommand)
- throw(css::lang::IllegalArgumentException ,
- css::container::NoSuchElementException,
- css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL removeCommandFromAllKeyEvents(const OUString& sCommand) override;
// XUIConfigurationPersistence
- virtual void SAL_CALL reload()
- throw(css::uno::Exception ,
- css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL reload() override;
- virtual void SAL_CALL store()
- throw(css::uno::Exception ,
- css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL store() override;
- virtual void SAL_CALL storeToStorage(const css::uno::Reference< css::embed::XStorage >& xStorage)
- throw(css::uno::Exception ,
- css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL storeToStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) override;
- virtual sal_Bool SAL_CALL isModified()
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isModified() override;
- virtual sal_Bool SAL_CALL isReadOnly()
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isReadOnly() override;
// XUIConfigurationStorage
- virtual void SAL_CALL setStorage(const css::uno::Reference< css::embed::XStorage >& xStorage)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) override;
- virtual sal_Bool SAL_CALL hasStorage()
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasStorage() override;
// XUIConfiguration
- virtual void SAL_CALL addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& xListener)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& xListener) override;
- virtual void SAL_CALL removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& xListener)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& xListener) override;
// XReset
// TODO use XPresetHandler instead if available
- virtual void SAL_CALL reset()
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL reset() override;
- virtual void SAL_CALL addResetListener(const css::uno::Reference< css::form::XResetListener >& xListener)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addResetListener(const css::uno::Reference< css::form::XResetListener >& xListener) override;
- virtual void SAL_CALL removeResetListener(const css::uno::Reference< css::form::XResetListener >& xListener)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removeResetListener(const css::uno::Reference< css::form::XResetListener >& xListener) override;
// css.util.XChangesListener
- virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent) override;
// css.lang.XEventListener
- virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) override;
// XComponent
- virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose() override;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
// helper for derived classes
diff --git a/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx
index d86917ead052..639d6e09a9d7 100644
--- a/framework/source/inc/accelerators/keymapping.hxx
+++ b/framework/source/inc/accelerators/keymapping.hxx
@@ -91,8 +91,7 @@ class KeyMapping
if the given identifier does not describe
a well known key code.
*/
- sal_uInt16 mapIdentifierToCode(const OUString& sIdentifier)
- throw(css::lang::IllegalArgumentException);
+ sal_uInt16 mapIdentifierToCode(const OUString& sIdentifier);
/** @short return a suitable key identifier
for the specified key code.
diff --git a/framework/source/inc/dispatch/dispatchdisabler.hxx b/framework/source/inc/dispatch/dispatchdisabler.hxx
index b41d7af00221..cbc7dffaf13c 100644
--- a/framework/source/inc/dispatch/dispatchdisabler.hxx
+++ b/framework/source/inc/dispatch/dispatchdisabler.hxx
@@ -48,67 +48,50 @@ public:
DispatchDisabler(const css::uno::Reference< css::uno::XComponentContext >& rxContext);
// XInitialization
- virtual void SAL_CALL initialize( const ::css::uno::Sequence< ::css::uno::Any >& aArguments )
- throw (::css::uno::Exception, ::css::uno::RuntimeException, ::std::exception) override;
+ virtual void SAL_CALL initialize( const ::css::uno::Sequence< ::css::uno::Any >& aArguments ) override;
// XDispatchProvider
virtual ::css::uno::Reference< ::css::frame::XDispatch > SAL_CALL
queryDispatch( const ::css::util::URL& URL,
const OUString& TargetFrameName,
- ::sal_Int32 SearchFlags )
- throw (::css::uno::RuntimeException, ::std::exception) override;
+ ::sal_Int32 SearchFlags ) override;
virtual ::css::uno::Sequence< ::css::uno::Reference< ::css::frame::XDispatch > > SAL_CALL
- queryDispatches( const ::css::uno::Sequence< ::css::frame::DispatchDescriptor >& Requests )
- throw (::css::uno::RuntimeException, ::std::exception) override;
+ queryDispatches( const ::css::uno::Sequence< ::css::frame::DispatchDescriptor >& Requests ) override;
// XDispatchProviderInterceptor
virtual ::css::uno::Reference< ::css::frame::XDispatchProvider > SAL_CALL
- getSlaveDispatchProvider() throw (::css::uno::RuntimeException, ::std::exception) override;
+ getSlaveDispatchProvider() override;
virtual void SAL_CALL
- setSlaveDispatchProvider( const ::css::uno::Reference< ::css::frame::XDispatchProvider >& NewDispatchProvider )
- throw (::css::uno::RuntimeException, ::std::exception) override;
+ setSlaveDispatchProvider( const ::css::uno::Reference< ::css::frame::XDispatchProvider >& NewDispatchProvider ) override;
virtual ::css::uno::Reference< ::css::frame::XDispatchProvider > SAL_CALL
- getMasterDispatchProvider() throw (::css::uno::RuntimeException, ::std::exception) override;
+ getMasterDispatchProvider() override;
virtual void SAL_CALL
- setMasterDispatchProvider( const ::css::uno::Reference< ::css::frame::XDispatchProvider >& NewSupplier )
- throw (::css::uno::RuntimeException, ::std::exception) override;
+ setMasterDispatchProvider( const ::css::uno::Reference< ::css::frame::XDispatchProvider >& NewSupplier ) override;
// XInterceptorInfo
virtual ::css::uno::Sequence< OUString > SAL_CALL
- getInterceptedURLs() throw (::css::uno::RuntimeException, ::std::exception) override;
+ getInterceptedURLs() override;
// XElementAccess
- virtual ::css::uno::Type SAL_CALL getElementType()
- throw (::css::uno::RuntimeException, ::std::exception) override;
- virtual ::sal_Bool SAL_CALL hasElements()
- throw (::css::uno::RuntimeException, ::std::exception) override;
+ virtual ::css::uno::Type SAL_CALL getElementType() override;
+ virtual ::sal_Bool SAL_CALL hasElements() override;
// XNameAccess
- virtual ::css::uno::Any SAL_CALL getByName( const OUString& aName )
- throw (::css::container::NoSuchElementException, ::css::lang::WrappedTargetException,
- ::css::uno::RuntimeException, ::std::exception) override;
- virtual ::css::uno::Sequence< OUString > SAL_CALL getElementNames()
- throw (::css::uno::RuntimeException, ::std::exception) override;
- virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
- throw (::css::uno::RuntimeException, ::std::exception) override;
+ virtual ::css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+ virtual ::css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+ virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
// XNameReplace
- virtual void SAL_CALL replaceByName( const OUString& aName, const ::css::uno::Any& aElement )
- throw (::css::lang::IllegalArgumentException, ::css::container::NoSuchElementException,
- ::css::lang::WrappedTargetException, ::css::uno::RuntimeException, ::std::exception) override;
+ virtual void SAL_CALL replaceByName( const OUString& aName, const ::css::uno::Any& aElement ) override;
// XNameContainer
- virtual void SAL_CALL insertByName( const OUString& aName, const ::css::uno::Any& aElement )
- throw (::css::lang::IllegalArgumentException, ::css::container::ElementExistException,
- ::css::lang::WrappedTargetException, ::css::uno::RuntimeException, ::std::exception) override;
- virtual void SAL_CALL removeByName( const OUString& Name )
- throw (::css::container::NoSuchElementException, ::css::lang::WrappedTargetException,
- ::css::uno::RuntimeException, ::std::exception) override;
+ virtual void SAL_CALL insertByName( const OUString& aName, const ::css::uno::Any& aElement ) override;
+ virtual void SAL_CALL removeByName( const OUString& Name ) override;
DECLARE_XSERVICEINFO_NOFACTORY
/* Helper for registry */
/// @throws css::uno::Exception
- static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+ static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
};
diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx
index 9d49e46b711a..c368b37fb626 100644
--- a/framework/source/inc/dispatch/loaddispatcher.hxx
+++ b/framework/source/inc/dispatch/loaddispatcher.hxx
@@ -98,26 +98,21 @@ class LoadDispatcher : public ::cppu::WeakImplHelper< css::frame::XNotifyingDis
// XNotifyingDispatch
virtual void SAL_CALL dispatchWithNotification(const css::util::URL& aURL ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
- const css::uno::Reference< css::frame::XDispatchResultListener >& xListener )
- throw(css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) override;
// XDispatch
virtual void SAL_CALL dispatch(const css::util::URL& aURL ,
- const css::uno::Sequence< css::beans::PropertyValue >& lArguments)
- throw(css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::beans::PropertyValue >& lArguments) override;
virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener,
- const css::util::URL& aURL )
- throw(css::uno::RuntimeException, std::exception) override;
+ const css::util::URL& aURL ) override;
virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener,
- const css::util::URL& aURL )
- throw(css::uno::RuntimeException, std::exception) override;
+ const css::util::URL& aURL ) override;
// XSynchronousDispatch
virtual css::uno::Any SAL_CALL dispatchWithReturnValue( const css::util::URL& aURL ,
- const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
- throw( css::uno::RuntimeException, std::exception ) override;
+ const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) override;
private:
css::uno::Any impl_dispatch( const css::util::URL& rURL,
diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx
index bf6dfc1ff32d..3597547675c1 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -206,8 +206,7 @@ public:
@throw A RuntimeException in case any internal process indicates, that
the whole runtime can't be used any longer.
*/
- LoadEnv(const css::uno::Reference< css::uno::XComponentContext >& xContext)
- throw(LoadEnvException, css::uno::RuntimeException);
+ LoadEnv(const css::uno::Reference< css::uno::XComponentContext >& xContext);
/** @short deinitialize an instance of this class in the right way.
*/
@@ -221,10 +220,7 @@ public:
const OUString& sURL ,
const OUString& sTarget,
sal_Int32 nFlags ,
- const css::uno::Sequence< css::beans::PropertyValue >& lArgs )
- throw(css::lang::IllegalArgumentException,
- css::io::IOException ,
- css::uno::RuntimeException );
+ const css::uno::Sequence< css::beans::PropertyValue >& lArgs );
/** @short set some changeable parameters for a new load request.
@@ -377,8 +373,7 @@ public:
@throw A RuntimeException in case any internal process indicates, that
the whole runtime can't be used any longer.
*/
- void impl_reactForLoadingState()
- throw(LoadEnvException, css::uno::RuntimeException);
+ void impl_reactForLoadingState();
private:
@@ -400,8 +395,7 @@ private:
@throw A RuntimeException in case any internal process indicates, that
the whole runtime can't be used any longer.
*/
- void impl_detectTypeAndFilter()
- throw(LoadEnvException, css::uno::RuntimeException, std::exception);
+ void impl_detectTypeAndFilter();
/** @short tries to use ContentHandler objects for loading.
@@ -421,8 +415,7 @@ private:
@throw A RuntimeException in case any internal process indicates, that
the whole runtime can't be used any longer.
*/
- bool impl_handleContent()
- throw(LoadEnvException, css::uno::RuntimeException, std::exception);
+ bool impl_handleContent();
/** @short tries to use FrameLoader objects for loading.
@@ -440,8 +433,7 @@ private:
@throw A RuntimeException in case any internal process indicates, that
the whole runtime can't be used any longer.
*/
- bool impl_loadContent()
- throw(LoadEnvException, css::uno::RuntimeException, std::exception);
+ bool impl_loadContent();
/** @short checks if the specified content is already loaded.
@@ -466,8 +458,7 @@ private:
@throw A RuntimeException in case any internal process indicates, that
the whole runtime can't be used any longer.
*/
- css::uno::Reference< css::frame::XFrame > impl_searchAlreadyLoaded()
- throw(LoadEnvException, css::uno::RuntimeException);
+ css::uno::Reference< css::frame::XFrame > impl_searchAlreadyLoaded();
/** @short search for any target frame, which seems to be useable
for this load request.
@@ -497,8 +488,7 @@ private:
@throw A RuntimeException in case any internal process indicates, that
the whole runtime can't be used any longer.
*/
- css::uno::Reference< css::frame::XFrame > impl_searchRecycleTarget()
- throw(LoadEnvException, css::uno::RuntimeException, std::exception);
+ css::uno::Reference< css::frame::XFrame > impl_searchRecycleTarget();
/** @short because showing of a frame is needed more than once...
it's implemented as an separate method .-)
diff --git a/framework/source/interaction/quietinteraction.cxx b/framework/source/interaction/quietinteraction.cxx
index e25aa308986d..202a9ae18d49 100644
--- a/framework/source/interaction/quietinteraction.cxx
+++ b/framework/source/interaction/quietinteraction.cxx
@@ -39,7 +39,7 @@ QuietInteraction::QuietInteraction()
{
}
-void SAL_CALL QuietInteraction::handle( const css::uno::Reference< css::task::XInteractionRequest >& xRequest ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL QuietInteraction::handle( const css::uno::Reference< css::task::XInteractionRequest >& xRequest )
{
// safe the request for outside analyzing every time!
css::uno::Any aRequest = xRequest->getRequest();
diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx
index 8acf25982587..8384ae363aa9 100644
--- a/framework/source/jobs/helponstartup.cxx
+++ b/framework/source/jobs/helponstartup.cxx
@@ -104,9 +104,6 @@ HelpOnStartup::~HelpOnStartup()
// css.task.XJob
css::uno::Any SAL_CALL HelpOnStartup::execute(const css::uno::Sequence< css::beans::NamedValue >& lArguments)
- throw(css::lang::IllegalArgumentException,
- css::uno::Exception ,
- css::uno::RuntimeException, std::exception )
{
// Analyze the given arguments; try to locate a model there and
// classify it's used application module.
@@ -150,7 +147,6 @@ css::uno::Any SAL_CALL HelpOnStartup::execute(const css::uno::Sequence< css::bea
}
void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent)
- throw(css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(m_mutex);
if (aEvent.Source == m_xModuleManager)
diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx
index 935c79c073c4..be7ab2137b3c 100644
--- a/framework/source/jobs/job.cxx
+++ b/framework/source/jobs/job.cxx
@@ -619,7 +619,7 @@ void Job::impl_stopListening()
its results
*/
void SAL_CALL Job::jobFinished( /*IN*/ const css::uno::Reference< css::task::XAsyncJob >& xJob ,
- /*IN*/ const css::uno::Any& aResult ) throw(css::uno::RuntimeException, std::exception)
+ /*IN*/ const css::uno::Any& aResult )
{
SolarMutexGuard g;
@@ -657,8 +657,7 @@ void SAL_CALL Job::jobFinished( /*IN*/ const css::uno::Reference< css::task::XAs
@throw TerminateVetoException
if our internal wrapped job is still running.
*/
-void SAL_CALL Job::queryTermination( /*IN*/ const css::lang::EventObject& ) throw(css::frame::TerminationVetoException,
- css::uno::RuntimeException, std::exception )
+void SAL_CALL Job::queryTermination( /*IN*/ const css::lang::EventObject& )
{
SolarMutexGuard g;
@@ -694,7 +693,7 @@ void SAL_CALL Job::queryTermination( /*IN*/ const css::lang::EventObject& ) thro
@param aEvent
describes the broadcaster and must be the desktop instance
*/
-void SAL_CALL Job::notifyTermination( /*IN*/ const css::lang::EventObject& ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL Job::notifyTermination( /*IN*/ const css::lang::EventObject& )
{
die();
// Do nothing else here. Our internal resources was released ...
@@ -719,8 +718,7 @@ void SAL_CALL Job::notifyTermination( /*IN*/ const css::lang::EventObject& ) thr
if our internal wrapped job is still running.
*/
void SAL_CALL Job::queryClosing( const css::lang::EventObject& aEvent ,
- sal_Bool bGetsOwnership ) throw(css::util::CloseVetoException,
- css::uno::RuntimeException, std::exception )
+ sal_Bool bGetsOwnership )
{
SolarMutexGuard g;
@@ -788,7 +786,7 @@ void SAL_CALL Job::queryClosing( const css::lang::EventObject& aEvent ,
@param aEvent
describes the broadcaster and must be the frame or model instance we know
*/
-void SAL_CALL Job::notifyClosing( const css::lang::EventObject& ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL Job::notifyClosing( const css::lang::EventObject& )
{
die();
// Do nothing else here. Our internal resources was released ...
@@ -802,7 +800,7 @@ void SAL_CALL Job::notifyClosing( const css::lang::EventObject& ) throw(css::uno
@param aEvent
describe the broadcaster
*/
-void SAL_CALL Job::disposing( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL Job::disposing( const css::lang::EventObject& aEvent )
{
/* SAFE { */
SolarMutexClearableGuard aWriteLock;
diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx
index e11c8228b6f8..bb67e08af31a 100644
--- a/framework/source/jobs/jobdispatch.cxx
+++ b/framework/source/jobs/jobdispatch.cxx
@@ -90,47 +90,43 @@ public:
const css::uno::Reference< css::frame::XDispatchResultListener >& xListener );
public:
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.framework.jobs.JobDispatch");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
css::uno::Sequence< OUString > aSeq { "com.sun.star.frame.ProtocolHandler" };
return aSeq;
}
// Xinitialization
- virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& lArguments ) throw(css::uno::Exception ,
- css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& lArguments ) override;
// XDispatchProvider
virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch ( const css::util::URL& aURL ,
const OUString& sTargetFrameName ,
- sal_Int32 nSearchFlags ) throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw(css::uno::RuntimeException, std::exception) override;
+ sal_Int32 nSearchFlags ) override;
+ virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) override;
// XNotifyingDispatch
virtual void SAL_CALL dispatchWithNotification( const css::util::URL& aURL ,
const css::uno::Sequence< css::beans::PropertyValue >& lArgs ,
- const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) override;
// XDispatch
virtual void SAL_CALL dispatch ( const css::util::URL& aURL ,
- const css::uno::Sequence< css::beans::PropertyValue >& lArgs ) throw(css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::beans::PropertyValue >& lArgs ) override;
virtual void SAL_CALL addStatusListener ( const css::uno::Reference< css::frame::XStatusListener >& xListener ,
- const css::util::URL& aURL ) throw(css::uno::RuntimeException, std::exception) override;
+ const css::util::URL& aURL ) override;
virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener ,
- const css::util::URL& aURL ) throw(css::uno::RuntimeException, std::exception) override;
+ const css::util::URL& aURL ) override;
};
/**
@@ -165,8 +161,7 @@ JobDispatch::~JobDispatch()
the list of initialization arguments
First parameter should be the frame reference we need.
*/
-void SAL_CALL JobDispatch::initialize( const css::uno::Sequence< css::uno::Any >& lArguments ) throw(css::uno::Exception ,
- css::uno::RuntimeException, std::exception)
+void SAL_CALL JobDispatch::initialize( const css::uno::Sequence< css::uno::Any >& lArguments )
{
SolarMutexGuard g;
@@ -207,7 +202,7 @@ void SAL_CALL JobDispatch::initialize( const css::uno::Sequence< css::uno::Any >
*/
css::uno::Reference< css::frame::XDispatch > SAL_CALL JobDispatch::queryDispatch( /*IN*/ const css::util::URL& aURL ,
/*IN*/ const OUString& /*sTargetFrameName*/ ,
- /*IN*/ sal_Int32 /*nSearchFlags*/ ) throw(css::uno::RuntimeException, std::exception)
+ /*IN*/ sal_Int32 /*nSearchFlags*/ )
{
css::uno::Reference< css::frame::XDispatch > xDispatch;
@@ -230,7 +225,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL JobDispatch::queryDispatch
NULL references are not skipped. Every result
match to one given descriptor item.
*/
-css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL JobDispatch::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL JobDispatch::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor )
{
// don't pack resulting list!
sal_Int32 nCount = lDescriptor.getLength();
@@ -269,7 +264,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL JobD
*/
void SAL_CALL JobDispatch::dispatchWithNotification( /*IN*/ const css::util::URL& aURL ,
/*IN*/ const css::uno::Sequence< css::beans::PropertyValue >& lArgs ,
- /*IN*/ const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException, std::exception)
+ /*IN*/ const css::uno::Reference< css::frame::XDispatchResultListener >& xListener )
{
JobURL aAnalyzedURL(aURL.Complete);
if (aAnalyzedURL.isValid())
@@ -483,7 +478,7 @@ void JobDispatch::impl_dispatchAlias( /*IN*/ const OUString&
@see dispatchWithNotification()
*/
void SAL_CALL JobDispatch::dispatch( /*IN*/ const css::util::URL& aURL ,
- /*IN*/ const css::uno::Sequence< css::beans::PropertyValue >& lArgs ) throw(css::uno::RuntimeException, std::exception)
+ /*IN*/ const css::uno::Sequence< css::beans::PropertyValue >& lArgs )
{
dispatchWithNotification(aURL, lArgs, css::uno::Reference< css::frame::XDispatchResultListener >());
}
@@ -492,7 +487,7 @@ void SAL_CALL JobDispatch::dispatch( /*IN*/ const css::util::URL&
@short not supported
*/
void SAL_CALL JobDispatch::addStatusListener( /*IN*/ const css::uno::Reference< css::frame::XStatusListener >&,
- /*IN*/ const css::util::URL& ) throw(css::uno::RuntimeException, std::exception)
+ /*IN*/ const css::util::URL& )
{
}
@@ -500,7 +495,7 @@ void SAL_CALL JobDispatch::addStatusListener( /*IN*/ const css::uno::Reference<
@short not supported
*/
void SAL_CALL JobDispatch::removeStatusListener( /*IN*/ const css::uno::Reference< css::frame::XStatusListener >&,
- /*IN*/ const css::util::URL& ) throw(css::uno::RuntimeException, std::exception)
+ /*IN*/ const css::util::URL& )
{
}
diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx
index 462f47ca8973..11f5c9bfb6fd 100644
--- a/framework/source/jobs/jobexecutor.cxx
+++ b/framework/source/jobs/jobexecutor.cxx
@@ -86,40 +86,37 @@ public:
explicit JobExecutor(const css::uno::Reference< css::uno::XComponentContext >& xContext);
virtual ~JobExecutor() override;
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.framework.JobExecutor");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
return {"com.sun.star.task.JobExecutor"};
}
// task.XJobExecutor
- virtual void SAL_CALL trigger( const OUString& sEvent ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL trigger( const OUString& sEvent ) override;
/// Initialization function after having acquire()'d.
void initListeners();
// document.XEventListener
- virtual void SAL_CALL notifyEvent( const css::document::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL notifyEvent( const css::document::EventObject& aEvent ) override;
// container.XContainerListener
- virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& aEvent ) throw(css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL elementRemoved ( const css::container::ContainerEvent& aEvent ) throw(css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& aEvent ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& aEvent ) override;
+ virtual void SAL_CALL elementRemoved ( const css::container::ContainerEvent& aEvent ) override;
+ virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& aEvent ) override;
// lang.XEventListener
- virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) override;
};
/**
@@ -200,7 +197,7 @@ void JobExecutor::disposing() {
@param sEvent
is used to locate registered jobs
*/
-void SAL_CALL JobExecutor::trigger( const OUString& sEvent ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL JobExecutor::trigger( const OUString& sEvent )
{
SAL_INFO( "fwk", "JobExecutor::trigger()");
@@ -247,7 +244,7 @@ void SAL_CALL JobExecutor::trigger( const OUString& sEvent ) throw(css::uno::Run
}
}
-void SAL_CALL JobExecutor::notifyEvent( const css::document::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL JobExecutor::notifyEvent( const css::document::EventObject& aEvent )
{
OUString EVENT_ON_DOCUMENT_OPENED("onDocumentOpened"); // Job UI event : OnNew or OnLoad
OUString EVENT_ON_DOCUMENT_ADDED("onDocumentAdded"); // Job API event : OnCreate or OnLoadFinished
@@ -330,7 +327,7 @@ void SAL_CALL JobExecutor::notifyEvent( const css::document::EventObject& aEvent
}
}
-void SAL_CALL JobExecutor::elementInserted( const css::container::ContainerEvent& aEvent ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL JobExecutor::elementInserted( const css::container::ContainerEvent& aEvent )
{
OUString sValue;
if (aEvent.Accessor >>= sValue)
@@ -345,7 +342,7 @@ void SAL_CALL JobExecutor::elementInserted( const css::container::ContainerEvent
}
}
-void SAL_CALL JobExecutor::elementRemoved ( const css::container::ContainerEvent& aEvent ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL JobExecutor::elementRemoved ( const css::container::ContainerEvent& aEvent )
{
OUString sValue;
if (aEvent.Accessor >>= sValue)
@@ -360,7 +357,7 @@ void SAL_CALL JobExecutor::elementRemoved ( const css::container::ContainerEvent
}
}
-void SAL_CALL JobExecutor::elementReplaced( const css::container::ContainerEvent& ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL JobExecutor::elementReplaced( const css::container::ContainerEvent& )
{
// I'm not interested on changed items :-)
}
@@ -379,7 +376,7 @@ void SAL_CALL JobExecutor::elementReplaced( const css::container::ContainerEvent
reference ... SOLUTION => check the given event source and react only, if it's our internal
hold configuration object!
*/
-void SAL_CALL JobExecutor::disposing( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL JobExecutor::disposing( const css::lang::EventObject& aEvent )
{
/* SAFE { */
osl::MutexGuard g(rBHelper.rMutex);
diff --git a/framework/source/jobs/shelljob.cxx b/framework/source/jobs/shelljob.cxx
index ebad3a570667..fc4a16158c7e 100644
--- a/framework/source/jobs/shelljob.cxx
+++ b/framework/source/jobs/shelljob.cxx
@@ -65,9 +65,6 @@ ShellJob::~ShellJob()
}
css::uno::Any SAL_CALL ShellJob::execute(const css::uno::Sequence< css::beans::NamedValue >& lJobArguments)
- throw(css::lang::IllegalArgumentException,
- css::uno::Exception ,
- css::uno::RuntimeException, std::exception )
{
::comphelper::SequenceAsHashMap lArgs (lJobArguments);
/** address job configuration inside argument set provided on method execute(). */
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 606b06d229b4..efec9ece7cef 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -1135,7 +1135,6 @@ void LayoutManager::implts_setOffset( const sal_Int32 nBottomOffset )
}
void LayoutManager::implts_setInplaceMenuBar( const Reference< XIndexAccess >& xMergedMenuBar )
-throw (uno::RuntimeException, std::exception)
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
SolarMutexClearableGuard aWriteLock;
@@ -1180,7 +1179,6 @@ throw (uno::RuntimeException, std::exception)
}
void LayoutManager::implts_resetInplaceMenuBar()
-throw (uno::RuntimeException)
{
SolarMutexGuard g;
m_bInplaceMenuSet = false;
@@ -1211,14 +1209,12 @@ throw (uno::RuntimeException)
}
void SAL_CALL LayoutManager::attachFrame( const Reference< XFrame >& xFrame )
-throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
m_xFrame = xFrame;
}
void SAL_CALL LayoutManager::reset()
-throw (RuntimeException, std::exception)
{
implts_reset( true );
}
@@ -1227,7 +1223,6 @@ throw (RuntimeException, std::exception)
sal_Bool SAL_CALL LayoutManager::setMergedMenuBar(
const Reference< XIndexAccess >& xMergedMenuBar )
-throw (uno::RuntimeException, std::exception)
{
implts_setInplaceMenuBar( xMergedMenuBar );
@@ -1237,27 +1232,23 @@ throw (uno::RuntimeException, std::exception)
}
void SAL_CALL LayoutManager::removeMergedMenuBar()
-throw (uno::RuntimeException, std::exception)
{
implts_resetInplaceMenuBar();
}
awt::Rectangle SAL_CALL LayoutManager::getCurrentDockingArea()
-throw ( RuntimeException, std::exception )
{
SolarMutexGuard g;
return m_aDockingArea;
}
Reference< XDockingAreaAcceptor > SAL_CALL LayoutManager::getDockingAreaAcceptor()
-throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
return m_xDockingAreaAcceptor;
}
void SAL_CALL LayoutManager::setDockingAreaAcceptor( const Reference< ui::XDockingAreaAcceptor >& xDockingAreaAcceptor )
-throw ( RuntimeException, std::exception )
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
SolarMutexClearableGuard aWriteLock;
@@ -1417,7 +1408,6 @@ IMPL_LINK( LayoutManager, WindowEventListener, VclWindowEvent&, rEvent, void )
}
void SAL_CALL LayoutManager::createElement( const OUString& aName )
-throw (RuntimeException, std::exception)
{
SAL_INFO( "fwk", "framework (cd100003) ::LayoutManager::createElement" );
@@ -1551,7 +1541,6 @@ throw (RuntimeException, std::exception)
}
void SAL_CALL LayoutManager::destroyElement( const OUString& aName )
-throw (RuntimeException, std::exception)
{
SAL_INFO( "fwk", "framework (cd100003) ::LayoutManager::destroyElement" );
@@ -1620,7 +1609,6 @@ throw (RuntimeException, std::exception)
}
sal_Bool SAL_CALL LayoutManager::requestElement( const OUString& rResourceURL )
-throw (uno::RuntimeException, std::exception)
{
bool bResult( false );
bool bNotify( false );
@@ -1697,7 +1685,6 @@ throw (uno::RuntimeException, std::exception)
}
Reference< XUIElement > SAL_CALL LayoutManager::getElement( const OUString& aName )
-throw (RuntimeException, std::exception)
{
Reference< XUIElement > xUIElement = implts_findElement( aName );
if ( !xUIElement.is() )
@@ -1714,7 +1701,6 @@ throw (RuntimeException, std::exception)
}
Sequence< Reference< ui::XUIElement > > SAL_CALL LayoutManager::getElements()
-throw (uno::RuntimeException, std::exception)
{
SolarMutexClearableGuard aReadLock;
uno::Reference< ui::XUIElement > xMenuBar( m_xMenuBar );
@@ -1750,7 +1736,6 @@ throw (uno::RuntimeException, std::exception)
}
sal_Bool SAL_CALL LayoutManager::showElement( const OUString& aName )
-throw (RuntimeException, std::exception)
{
SAL_INFO( "fwk", "framework (cd100003) ::LayoutManager::showElement" );
@@ -1828,7 +1813,6 @@ throw (RuntimeException, std::exception)
}
sal_Bool SAL_CALL LayoutManager::hideElement( const OUString& aName )
-throw (RuntimeException, std::exception)
{
SAL_INFO( "fwk", "framework (cd100003) ::LayoutManager::hideElement" );
@@ -1913,7 +1897,6 @@ throw (RuntimeException, std::exception)
}
sal_Bool SAL_CALL LayoutManager::dockWindow( const OUString& aName, DockingArea DockingArea, const awt::Point& Pos )
-throw (RuntimeException, std::exception)
{
OUString aElementType;
OUString aElementName;
@@ -1935,7 +1918,7 @@ throw (RuntimeException, std::exception)
return false;
}
-sal_Bool SAL_CALL LayoutManager::dockAllWindows( ::sal_Int16 /*nElementType*/ ) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL LayoutManager::dockAllWindows( ::sal_Int16 /*nElementType*/ )
{
SolarMutexClearableGuard aReadLock;
bool bResult( false );
@@ -1952,7 +1935,6 @@ sal_Bool SAL_CALL LayoutManager::dockAllWindows( ::sal_Int16 /*nElementType*/ )
}
sal_Bool SAL_CALL LayoutManager::floatWindow( const OUString& aName )
-throw (RuntimeException, std::exception)
{
bool bResult( false );
if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ))
@@ -1972,7 +1954,6 @@ throw (RuntimeException, std::exception)
}
sal_Bool SAL_CALL LayoutManager::lockWindow( const OUString& aName )
-throw (uno::RuntimeException, std::exception)
{
bool bResult( false );
if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ))
@@ -1992,7 +1973,6 @@ throw (uno::RuntimeException, std::exception)
}
sal_Bool SAL_CALL LayoutManager::unlockWindow( const OUString& aName )
-throw (uno::RuntimeException, std::exception)
{
bool bResult( false );
if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ))
@@ -2012,7 +1992,6 @@ throw (uno::RuntimeException, std::exception)
}
void SAL_CALL LayoutManager::setElementSize( const OUString& aName, const awt::Size& aSize )
-throw (RuntimeException, std::exception)
{
if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ))
{
@@ -2030,7 +2009,6 @@ throw (RuntimeException, std::exception)
}
void SAL_CALL LayoutManager::setElementPos( const OUString& aName, const awt::Point& aPos )
-throw (RuntimeException, std::exception)
{
if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ))
{
@@ -2048,7 +2026,6 @@ throw (RuntimeException, std::exception)
}
void SAL_CALL LayoutManager::setElementPosSize( const OUString& aName, const awt::Point& aPos, const awt::Size& aSize )
-throw (RuntimeException, std::exception)
{
if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ))
{
@@ -2066,7 +2043,6 @@ throw (RuntimeException, std::exception)
}
sal_Bool SAL_CALL LayoutManager::isElementVisible( const OUString& aName )
-throw (RuntimeException, std::exception)
{
OUString aElementType;
OUString aElementName;
@@ -2141,7 +2117,6 @@ throw (RuntimeException, std::exception)
}
sal_Bool SAL_CALL LayoutManager::isElementFloating( const OUString& aName )
-throw (RuntimeException, std::exception)
{
if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ))
{
@@ -2157,7 +2132,6 @@ throw (RuntimeException, std::exception)
}
sal_Bool SAL_CALL LayoutManager::isElementDocked( const OUString& aName )
-throw (RuntimeException, std::exception)
{
if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ))
{
@@ -2173,7 +2147,6 @@ throw (RuntimeException, std::exception)
}
sal_Bool SAL_CALL LayoutManager::isElementLocked( const OUString& aName )
-throw (uno::RuntimeException, std::exception)
{
if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ))
{
@@ -2189,7 +2162,6 @@ throw (uno::RuntimeException, std::exception)
}
awt::Size SAL_CALL LayoutManager::getElementSize( const OUString& aName )
-throw (RuntimeException, std::exception)
{
if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ))
{
@@ -2205,7 +2177,6 @@ throw (RuntimeException, std::exception)
}
awt::Point SAL_CALL LayoutManager::getElementPos( const OUString& aName )
-throw (RuntimeException, std::exception)
{
if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR ))
{
@@ -2221,7 +2192,6 @@ throw (RuntimeException, std::exception)
}
void SAL_CALL LayoutManager::lock()
-throw (RuntimeException, std::exception)
{
implts_lock();
@@ -2243,7 +2213,6 @@ throw (RuntimeException, std::exception)
}
void SAL_CALL LayoutManager::unlock()
-throw (RuntimeException, std::exception)
{
bool bDoLayout( implts_unlock() );
@@ -2274,7 +2243,6 @@ throw (RuntimeException, std::exception)
}
void SAL_CALL LayoutManager::doLayout()
-throw (RuntimeException, std::exception)
{
implts_doLayout_notify( true );
}
@@ -2457,7 +2425,6 @@ bool LayoutManager::implts_resizeContainerWindow( const awt::Size& rContainerSiz
}
void SAL_CALL LayoutManager::setVisible( sal_Bool bVisible )
-throw (uno::RuntimeException, std::exception)
{
SolarMutexClearableGuard aWriteLock;
bool bWasVisible( m_bVisible );
@@ -2469,7 +2436,6 @@ throw (uno::RuntimeException, std::exception)
}
sal_Bool SAL_CALL LayoutManager::isVisible()
-throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
return m_bVisible;
@@ -2619,13 +2585,11 @@ IMPL_LINK_NOARG(LayoutManager, MenuBarClose, void*, void)
// XLayoutManagerEventBroadcaster
void SAL_CALL LayoutManager::addLayoutManagerEventListener( const uno::Reference< frame::XLayoutManagerListener >& xListener )
-throw (uno::RuntimeException, std::exception)
{
m_aListenerContainer.addInterface( cppu::UnoType<frame::XLayoutManagerListener>::get(), xListener );
}
void SAL_CALL LayoutManager::removeLayoutManagerEventListener( const uno::Reference< frame::XLayoutManagerListener >& xListener )
-throw (uno::RuntimeException, std::exception)
{
m_aListenerContainer.removeInterface( cppu::UnoType<frame::XLayoutManagerListener>::get(), xListener );
}
@@ -2654,7 +2618,6 @@ void LayoutManager::implts_notifyListeners(short nEvent, const uno::Any& rInfoPa
// XWindowListener
void SAL_CALL LayoutManager::windowResized( const awt::WindowEvent& aEvent )
-throw( uno::RuntimeException, std::exception )
{
SolarMutexGuard g;
Reference< awt::XWindow > xContainerWindow( m_xContainerWindow );
@@ -2694,11 +2657,11 @@ throw( uno::RuntimeException, std::exception )
}
}
-void SAL_CALL LayoutManager::windowMoved( const awt::WindowEvent& ) throw( uno::RuntimeException, std::exception )
+void SAL_CALL LayoutManager::windowMoved( const awt::WindowEvent& )
{
}
-void SAL_CALL LayoutManager::windowShown( const lang::EventObject& aEvent ) throw( uno::RuntimeException, std::exception )
+void SAL_CALL LayoutManager::windowShown( const lang::EventObject& aEvent )
{
SolarMutexClearableGuard aReadLock;
Reference< awt::XWindow > xContainerWindow( m_xContainerWindow );
@@ -2718,7 +2681,7 @@ void SAL_CALL LayoutManager::windowShown( const lang::EventObject& aEvent ) thro
}
}
-void SAL_CALL LayoutManager::windowHidden( const lang::EventObject& aEvent ) throw( uno::RuntimeException, std::exception )
+void SAL_CALL LayoutManager::windowHidden( const lang::EventObject& aEvent )
{
SolarMutexClearableGuard aReadLock;
Reference< awt::XWindow > xContainerWindow( m_xContainerWindow );
@@ -2760,7 +2723,6 @@ IMPL_LINK_NOARG(LayoutManager, AsyncLayoutHdl, Timer *, void)
// XFrameActionListener
void SAL_CALL LayoutManager::frameAction( const FrameActionEvent& aEvent )
-throw ( RuntimeException, std::exception )
{
if (( aEvent.Action == FrameAction_COMPONENT_ATTACHED ) || ( aEvent.Action == FrameAction_COMPONENT_REATTACHED ))
{
@@ -2798,7 +2760,6 @@ throw ( RuntimeException, std::exception )
}
void SAL_CALL LayoutManager::disposing( const lang::EventObject& rEvent )
-throw( RuntimeException, std::exception )
{
bool bDisposeAndClear( false );
@@ -2904,7 +2865,7 @@ throw( RuntimeException, std::exception )
}
}
-void SAL_CALL LayoutManager::elementInserted( const ui::ConfigurationEvent& Event ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL LayoutManager::elementInserted( const ui::ConfigurationEvent& Event )
{
SolarMutexClearableGuard aReadLock;
Reference< XFrame > xFrame( m_xFrame );
@@ -2948,7 +2909,7 @@ void SAL_CALL LayoutManager::elementInserted( const ui::ConfigurationEvent& Even
}
}
-void SAL_CALL LayoutManager::elementRemoved( const ui::ConfigurationEvent& Event ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL LayoutManager::elementRemoved( const ui::ConfigurationEvent& Event )
{
SolarMutexClearableGuard aReadLock;
Reference< frame::XFrame > xFrame( m_xFrame );
@@ -3035,7 +2996,7 @@ void SAL_CALL LayoutManager::elementRemoved( const ui::ConfigurationEvent& Event
}
}
-void SAL_CALL LayoutManager::elementReplaced( const ui::ConfigurationEvent& Event ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL LayoutManager::elementReplaced( const ui::ConfigurationEvent& Event )
{
SolarMutexClearableGuard aReadLock;
Reference< XFrame > xFrame( m_xFrame );
@@ -3085,7 +3046,7 @@ void SAL_CALL LayoutManager::elementReplaced( const ui::ConfigurationEvent& Even
}
void SAL_CALL LayoutManager::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle,
- const uno::Any& aValue ) throw( uno::Exception, std::exception )
+ const uno::Any& aValue )
{
if ( nHandle != LAYOUTMANAGER_PROPHANDLE_REFRESHVISIBILITY )
LayoutManager_PBase::setFastPropertyValue_NoBroadcast( nHandle, aValue );
@@ -3152,7 +3113,7 @@ namespace
return theInfoHelper::get(*this).getHelper();
}
-uno::Reference< beans::XPropertySetInfo > SAL_CALL LayoutManager::getPropertySetInfo() throw (uno::RuntimeException, std::exception)
+uno::Reference< beans::XPropertySetInfo > SAL_CALL LayoutManager::getPropertySetInfo()
{
static uno::Reference< beans::XPropertySetInfo >* pInfo = nullptr;
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 6b0114025574..6ef563206cda 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -91,7 +91,7 @@ void SAL_CALL ToolbarLayoutManager::release() throw()
OWeakObject::release();
}
-uno::Any SAL_CALL ToolbarLayoutManager::queryInterface( const uno::Type & rType ) throw( uno::RuntimeException, std::exception )
+uno::Any SAL_CALL ToolbarLayoutManager::queryInterface( const uno::Type & rType )
{
uno::Any a = ::cppu::queryInterface( rType,
(static_cast< awt::XDockableWindowListener* >(this)),
@@ -104,7 +104,7 @@ uno::Any SAL_CALL ToolbarLayoutManager::queryInterface( const uno::Type & rType
return OWeakObject::queryInterface( rType );
}
-void SAL_CALL ToolbarLayoutManager::disposing( const lang::EventObject& aEvent ) throw( uno::RuntimeException, std::exception )
+void SAL_CALL ToolbarLayoutManager::disposing( const lang::EventObject& aEvent )
{
if ( aEvent.Source == m_xFrame )
{
@@ -3193,7 +3193,6 @@ void ToolbarLayoutManager::implts_renumberRowColumnData(
// XWindowListener
void SAL_CALL ToolbarLayoutManager::windowResized( const awt::WindowEvent& aEvent )
-throw( uno::RuntimeException, std::exception )
{
SolarMutexClearableGuard aWriteLock;
bool bLocked( m_bDockingInProgress );
@@ -3243,24 +3242,20 @@ throw( uno::RuntimeException, std::exception )
}
void SAL_CALL ToolbarLayoutManager::windowMoved( const awt::WindowEvent& /*aEvent*/ )
-throw( uno::RuntimeException, std::exception )
{
}
void SAL_CALL ToolbarLayoutManager::windowShown( const lang::EventObject& /*aEvent*/ )
-throw( uno::RuntimeException, std::exception )
{
}
void SAL_CALL ToolbarLayoutManager::windowHidden( const lang::EventObject& /*aEvent*/ )
-throw( uno::RuntimeException, std::exception )
{
}
// XDockableWindowListener
void SAL_CALL ToolbarLayoutManager::startDocking( const awt::DockingEvent& e )
-throw (uno::RuntimeException, std::exception)
{
bool bWinFound( false );
@@ -3311,7 +3306,6 @@ throw (uno::RuntimeException, std::exception)
}
awt::DockingData SAL_CALL ToolbarLayoutManager::docking( const awt::DockingEvent& e )
-throw (uno::RuntimeException, std::exception)
{
const sal_Int32 MAGNETIC_DISTANCE_UNDOCK = 25;
const sal_Int32 MAGNETIC_DISTANCE_DOCK = 20;
@@ -3485,7 +3479,6 @@ throw (uno::RuntimeException, std::exception)
}
void SAL_CALL ToolbarLayoutManager::endDocking( const awt::EndDockingEvent& e )
-throw (uno::RuntimeException, std::exception)
{
if (e.bCancelled)
return;
@@ -3584,7 +3577,6 @@ throw (uno::RuntimeException, std::exception)
}
sal_Bool SAL_CALL ToolbarLayoutManager::prepareToggleFloatingMode( const lang::EventObject& e )
-throw (uno::RuntimeException, std::exception)
{
SolarMutexClearableGuard aReadLock;
bool bDockingInProgress = m_bDockingInProgress;
@@ -3625,7 +3617,6 @@ throw (uno::RuntimeException, std::exception)
}
void SAL_CALL ToolbarLayoutManager::toggleFloatingMode( const lang::EventObject& e )
-throw (uno::RuntimeException, std::exception)
{
UIElement aUIDockingElement;
@@ -3756,7 +3747,6 @@ throw (uno::RuntimeException, std::exception)
}
void SAL_CALL ToolbarLayoutManager::closed( const lang::EventObject& e )
-throw (uno::RuntimeException, std::exception)
{
OUString aName;
UIElement aUIElement;
@@ -3803,14 +3793,12 @@ throw (uno::RuntimeException, std::exception)
}
void SAL_CALL ToolbarLayoutManager::endPopupMode( const awt::EndPopupModeEvent& /*e*/ )
-throw (uno::RuntimeException, std::exception)
{
}
// XUIConfigurationListener
void SAL_CALL ToolbarLayoutManager::elementInserted( const ui::ConfigurationEvent& rEvent )
-throw (uno::RuntimeException, std::exception)
{
UIElement aUIElement = implts_findToolbar( rEvent.ResourceURL );
@@ -3874,7 +3862,6 @@ throw (uno::RuntimeException, std::exception)
}
void SAL_CALL ToolbarLayoutManager::elementRemoved( const ui::ConfigurationEvent& rEvent )
-throw (uno::RuntimeException, std::exception)
{
SolarMutexClearableGuard aReadLock;
uno::Reference< awt::XWindow > xContainerWindow( m_xContainerWindow, uno::UNO_QUERY );
@@ -3922,7 +3909,6 @@ throw (uno::RuntimeException, std::exception)
}
void SAL_CALL ToolbarLayoutManager::elementReplaced( const ui::ConfigurationEvent& rEvent )
-throw (uno::RuntimeException, std::exception)
{
UIElement aUIElement = implts_findToolbar( rEvent.ResourceURL );
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
index 200ef47635d7..d3d1f4970149 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
@@ -137,30 +137,30 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< css::awt::XDockableW
virtual void SAL_CALL acquire() throw() override;
virtual void SAL_CALL release() throw() override;
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
// XEventListener
- virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) override;
// XWindowListener
- virtual void SAL_CALL windowResized( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL windowShown( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL windowHidden( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL windowResized( const css::awt::WindowEvent& aEvent ) override;
+ virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& aEvent ) override;
+ virtual void SAL_CALL windowShown( const css::lang::EventObject& aEvent ) override;
+ virtual void SAL_CALL windowHidden( const css::lang::EventObject& aEvent ) override;
// XDockableWindowListener
- virtual void SAL_CALL startDocking( const css::awt::DockingEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::awt::DockingData SAL_CALL docking( const css::awt::DockingEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL endDocking( const css::awt::EndDockingEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL prepareToggleFloatingMode( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL toggleFloatingMode( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL closed( const css::lang::EventObject& e ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL endPopupMode( const css::awt::EndPopupModeEvent& e ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL startDocking( const css::awt::DockingEvent& e ) override;
+ virtual css::awt::DockingData SAL_CALL docking( const css::awt::DockingEvent& e ) override;
+ virtual void SAL_CALL endDocking( const css::awt::EndDockingEvent& e ) override;
+ virtual sal_Bool SAL_CALL prepareToggleFloatingMode( const css::lang::EventObject& e ) override;
+ virtual void SAL_CALL toggleFloatingMode( const css::lang::EventObject& e ) override;
+ virtual void SAL_CALL closed( const css::lang::EventObject& e ) override;
+ virtual void SAL_CALL endPopupMode( const css::awt::EndPopupModeEvent& e ) override;
// XUIConfigurationListener
- virtual void SAL_CALL elementInserted( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL elementRemoved( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL elementReplaced( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL elementInserted( const css::ui::ConfigurationEvent& Event ) override;
+ virtual void SAL_CALL elementRemoved( const css::ui::ConfigurationEvent& Event ) override;
+ virtual void SAL_CALL elementReplaced( const css::ui::ConfigurationEvent& Event ) override;
private:
enum DockingOperation
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index b0e65802db4d..b5af8ee4d62c 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -108,23 +108,18 @@ class LoadEnvListener : public ::cppu::WeakImplHelper< css::frame::XLoadEventLis
}
// frame.XLoadEventListener
- virtual void SAL_CALL loadFinished(const css::uno::Reference< css::frame::XFrameLoader >& xLoader)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL loadFinished(const css::uno::Reference< css::frame::XFrameLoader >& xLoader) override;
- virtual void SAL_CALL loadCancelled(const css::uno::Reference< css::frame::XFrameLoader >& xLoader)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL loadCancelled(const css::uno::Reference< css::frame::XFrameLoader >& xLoader) override;
// frame.XDispatchResultListener
- virtual void SAL_CALL dispatchFinished(const css::frame::DispatchResultEvent& aEvent)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispatchFinished(const css::frame::DispatchResultEvent& aEvent) override;
// lang.XEventListener
- virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) override;
};
LoadEnv::LoadEnv(const css::uno::Reference< css::uno::XComponentContext >& xContext)
- throw(LoadEnvException, css::uno::RuntimeException)
: m_xContext(xContext)
, m_nSearchFlags(0)
, m_eFeature(E_NO_FEATURE)
@@ -145,9 +140,6 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const
const OUString& sTarget,
sal_Int32 nFlags ,
const css::uno::Sequence< css::beans::PropertyValue >& lArgs )
- throw(css::lang::IllegalArgumentException,
- css::io::IOException ,
- css::uno::RuntimeException )
{
css::uno::Reference< css::lang::XComponent > xComponent;
@@ -440,7 +432,6 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::getTargetComponent() const
}
void SAL_CALL LoadEnvListener::loadFinished(const css::uno::Reference< css::frame::XFrameLoader >&)
- throw(css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(m_mutex);
if (m_bWaitingResult)
@@ -449,7 +440,6 @@ void SAL_CALL LoadEnvListener::loadFinished(const css::uno::Reference< css::fram
}
void SAL_CALL LoadEnvListener::loadCancelled(const css::uno::Reference< css::frame::XFrameLoader >&)
- throw(css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(m_mutex);
if (m_bWaitingResult)
@@ -458,7 +448,6 @@ void SAL_CALL LoadEnvListener::loadCancelled(const css::uno::Reference< css::fra
}
void SAL_CALL LoadEnvListener::dispatchFinished(const css::frame::DispatchResultEvent& aEvent)
- throw(css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(m_mutex);
@@ -483,7 +472,6 @@ void SAL_CALL LoadEnvListener::dispatchFinished(const css::frame::DispatchResult
}
void SAL_CALL LoadEnvListener::disposing(const css::lang::EventObject&)
- throw(css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(m_mutex);
if (m_bWaitingResult)
@@ -711,7 +699,6 @@ bool queryOrcusTypeAndFilter(const uno::Sequence<beans::PropertyValue>& rDescrip
}
void LoadEnv::impl_detectTypeAndFilter()
- throw(LoadEnvException, css::uno::RuntimeException, std::exception)
{
static sal_Int32 FILTERFLAG_TEMPLATEPATH = 16;
@@ -833,7 +820,6 @@ void LoadEnv::impl_detectTypeAndFilter()
}
bool LoadEnv::impl_handleContent()
- throw(LoadEnvException, css::uno::RuntimeException, std::exception)
{
// SAFE -> -----------------------------------
osl::ClearableMutexGuard aReadLock(m_mutex);
@@ -972,7 +958,6 @@ bool LoadEnv::impl_furtherDocsAllowed()
}
bool LoadEnv::impl_loadContent()
- throw(LoadEnvException, css::uno::RuntimeException, std::exception)
{
// SAFE -> -----------------------------------
osl::ClearableMutexGuard aWriteLock(m_mutex);
@@ -1201,7 +1186,6 @@ void LoadEnv::impl_jumpToMark(const css::uno::Reference< css::frame::XFrame >& x
}
css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded()
- throw(LoadEnvException, css::uno::RuntimeException)
{
osl::MutexGuard g(m_mutex);
@@ -1355,7 +1339,6 @@ bool LoadEnv::impl_isFrameAlreadyUsedForLoading(const css::uno::Reference< css::
}
css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget()
- throw(LoadEnvException, css::uno::RuntimeException, std::exception)
{
// SAFE -> ..................................
osl::ClearableMutexGuard aReadLock(m_mutex);
@@ -1487,7 +1470,6 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget()
}
void LoadEnv::impl_reactForLoadingState()
- throw(LoadEnvException, css::uno::RuntimeException)
{
/*TODO reset action locks */
diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx
index aca5335d6164..fad2881fb32f 100644
--- a/framework/source/recording/dispatchrecorder.cxx
+++ b/framework/source/recording/dispatchrecorder.cxx
@@ -100,14 +100,14 @@ DispatchRecorder::~DispatchRecorder()
}
// generate header
-void SAL_CALL DispatchRecorder::startRecording( const css::uno::Reference< css::frame::XFrame >& ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL DispatchRecorder::startRecording( const css::uno::Reference< css::frame::XFrame >& )
{
/* SAFE{ */
/* } */
}
void SAL_CALL DispatchRecorder::recordDispatch( const css::util::URL& aURL,
- const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception )
+ const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
{
OUString aTarget;
@@ -116,7 +116,7 @@ void SAL_CALL DispatchRecorder::recordDispatch( const css::util::URL& aURL,
}
void SAL_CALL DispatchRecorder::recordDispatchAsComment( const css::util::URL& aURL,
- const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception )
+ const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
{
OUString aTarget;
@@ -125,13 +125,13 @@ void SAL_CALL DispatchRecorder::recordDispatchAsComment( const css::util::URL&
m_aStatements.push_back( aStatement );
}
-void SAL_CALL DispatchRecorder::endRecording() throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL DispatchRecorder::endRecording()
{
SolarMutexGuard g;
m_aStatements.clear();
}
-OUString SAL_CALL DispatchRecorder::getRecordedMacro() throw( css::uno::RuntimeException, std::exception )
+OUString SAL_CALL DispatchRecorder::getRecordedMacro()
{
SolarMutexGuard g;
@@ -374,22 +374,22 @@ void SAL_CALL DispatchRecorder::implts_recordMacro( const OUString& aURL,
/* } */
}
-css::uno::Type SAL_CALL DispatchRecorder::getElementType() throw (css::uno::RuntimeException, std::exception)
+css::uno::Type SAL_CALL DispatchRecorder::getElementType()
{
return cppu::UnoType<css::frame::DispatchStatement>::get();
}
-sal_Bool SAL_CALL DispatchRecorder::hasElements() throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL DispatchRecorder::hasElements()
{
return (! m_aStatements.empty());
}
-sal_Int32 SAL_CALL DispatchRecorder::getCount() throw (css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL DispatchRecorder::getCount()
{
return m_aStatements.size();
}
-css::uno::Any SAL_CALL DispatchRecorder::getByIndex(sal_Int32 idx) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+css::uno::Any SAL_CALL DispatchRecorder::getByIndex(sal_Int32 idx)
{
if (idx >= (sal_Int32)m_aStatements.size()) {
throw css::lang::IndexOutOfBoundsException( "Dispatch recorder out of bounds" );
@@ -401,7 +401,7 @@ css::uno::Any SAL_CALL DispatchRecorder::getByIndex(sal_Int32 idx) throw (css::
return element;
}
-void SAL_CALL DispatchRecorder::replaceByIndex(sal_Int32 idx, const css::uno::Any& element) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
+void SAL_CALL DispatchRecorder::replaceByIndex(sal_Int32 idx, const css::uno::Any& element)
{
if (element.getValueType() !=
cppu::UnoType<css::frame::DispatchStatement>::get()) {
diff --git a/framework/source/recording/dispatchrecordersupplier.cxx b/framework/source/recording/dispatchrecordersupplier.cxx
index e98b6ee6ccec..d78ca5440aea 100644
--- a/framework/source/recording/dispatchrecordersupplier.cxx
+++ b/framework/source/recording/dispatchrecordersupplier.cxx
@@ -83,7 +83,7 @@ DispatchRecorderSupplier::~DispatchRecorderSupplier()
@change 09.04.2002 by Andreas Schluens
*/
-void SAL_CALL DispatchRecorderSupplier::setDispatchRecorder( const css::uno::Reference< css::frame::XDispatchRecorder >& xRecorder ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL DispatchRecorderSupplier::setDispatchRecorder( const css::uno::Reference< css::frame::XDispatchRecorder >& xRecorder )
{
SolarMutexGuard g;
m_xDispatchRecorder=xRecorder;
@@ -103,7 +103,7 @@ void SAL_CALL DispatchRecorderSupplier::setDispatchRecorder( const css::uno::Ref
@change 09.04.2002 by Andreas Schluens
*/
-css::uno::Reference< css::frame::XDispatchRecorder > SAL_CALL DispatchRecorderSupplier::getDispatchRecorder() throw (css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::frame::XDispatchRecorder > SAL_CALL DispatchRecorderSupplier::getDispatchRecorder()
{
SolarMutexGuard g;
return m_xDispatchRecorder;
@@ -124,7 +124,7 @@ css::uno::Reference< css::frame::XDispatchRecorder > SAL_CALL DispatchRecorderSu
*/
void SAL_CALL DispatchRecorderSupplier::dispatchAndRecord( const css::util::URL& aURL ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments ,
- const css::uno::Reference< css::frame::XDispatch >& xDispatcher ) throw (css::uno::RuntimeException, std::exception)
+ const css::uno::Reference< css::frame::XDispatch >& xDispatcher )
{
SolarMutexClearableGuard aReadLock;
css::uno::Reference< css::frame::XDispatchRecorder > xRecorder = m_xDispatchRecorder;
diff --git a/framework/source/services/ContextChangeEventMultiplexer.cxx b/framework/source/services/ContextChangeEventMultiplexer.cxx
index fd695d110b4e..fedd333ba5a5 100644
--- a/framework/source/services/ContextChangeEventMultiplexer.cxx
+++ b/framework/source/services/ContextChangeEventMultiplexer.cxx
@@ -61,33 +61,25 @@ public:
// XContextChangeEventMultiplexer
virtual void SAL_CALL addContextChangeEventListener (
const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener,
- const cssu::Reference<cssu::XInterface>& rxEventFocus)
- throw(cssu::RuntimeException, cssl::IllegalArgumentException, std::exception) override;
+ const cssu::Reference<cssu::XInterface>& rxEventFocus) override;
virtual void SAL_CALL removeContextChangeEventListener (
const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener,
- const cssu::Reference<cssu::XInterface>& rxEventFocus)
- throw(cssu::RuntimeException, cssl::IllegalArgumentException, std::exception) override;
+ const cssu::Reference<cssu::XInterface>& rxEventFocus) override;
virtual void SAL_CALL removeAllContextChangeEventListeners (
- const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener)
- throw(cssu::RuntimeException, cssl::IllegalArgumentException, std::exception) override;
+ const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener) override;
virtual void SAL_CALL broadcastContextChangeEvent (
const css::ui::ContextChangeEventObject& rContextChangeEventObject,
- const cssu::Reference<cssu::XInterface>& rxEventFocus)
- throw(cssu::RuntimeException, std::exception) override;
+ const cssu::Reference<cssu::XInterface>& rxEventFocus) override;
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName()
- throw (cssu::RuntimeException, std::exception) override;
+ virtual ::rtl::OUString SAL_CALL getImplementationName() override;
virtual sal_Bool SAL_CALL supportsService (
- const ::rtl::OUString& rsServiceName)
- throw (cssu::RuntimeException, std::exception) override;
- virtual cssu::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames()
- throw (cssu::RuntimeException, std::exception) override;
+ const ::rtl::OUString& rsServiceName) override;
+ virtual cssu::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames() override;
// XEventListener
virtual void SAL_CALL disposing (
- const css::lang::EventObject& rEvent)
- throw (cssu::RuntimeException, std::exception) override;
+ const css::lang::EventObject& rEvent) override;
typedef ::std::vector<cssu::Reference<css::ui::XContextChangeEventListener> > ListenerContainer;
class FocusDescriptor
@@ -153,7 +145,6 @@ void SAL_CALL ContextChangeEventMultiplexer::disposing()
void SAL_CALL ContextChangeEventMultiplexer::addContextChangeEventListener (
const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener,
const cssu::Reference<cssu::XInterface>& rxEventFocus)
- throw(cssu::RuntimeException,cssl::IllegalArgumentException, std::exception)
{
if ( ! rxListener.is())
throw css::lang::IllegalArgumentException(
@@ -190,7 +181,6 @@ void SAL_CALL ContextChangeEventMultiplexer::addContextChangeEventListener (
void SAL_CALL ContextChangeEventMultiplexer::removeContextChangeEventListener (
const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener,
const cssu::Reference<cssu::XInterface>& rxEventFocus)
- throw(cssu::RuntimeException,cssl::IllegalArgumentException, std::exception)
{
if ( ! rxListener.is())
throw cssl::IllegalArgumentException(
@@ -216,7 +206,6 @@ void SAL_CALL ContextChangeEventMultiplexer::removeContextChangeEventListener (
void SAL_CALL ContextChangeEventMultiplexer::removeAllContextChangeEventListeners (
const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener)
- throw(cssu::RuntimeException,cssl::IllegalArgumentException, std::exception)
{
if ( ! rxListener.is())
throw cssl::IllegalArgumentException(
@@ -244,7 +233,6 @@ void SAL_CALL ContextChangeEventMultiplexer::removeAllContextChangeEventListener
void SAL_CALL ContextChangeEventMultiplexer::broadcastContextChangeEvent (
const css::ui::ContextChangeEventObject& rEventObject,
const cssu::Reference<cssu::XInterface>& rxEventFocus)
- throw(cssu::RuntimeException, std::exception)
{
// Remember the current context.
if (rxEventFocus.is())
@@ -308,26 +296,22 @@ ContextChangeEventMultiplexer::FocusDescriptor* ContextChangeEventMultiplexer::G
}
OUString SAL_CALL ContextChangeEventMultiplexer::getImplementationName()
- throw(cssu::RuntimeException, std::exception)
{
return OUString("org.apache.openoffice.comp.framework.ContextChangeEventMultiplexer");
}
sal_Bool SAL_CALL ContextChangeEventMultiplexer::supportsService ( const ::rtl::OUString& rsServiceName)
- throw (cssu::RuntimeException, std::exception)
{
return cppu::supportsService(this, rsServiceName);
}
css::uno::Sequence<OUString> SAL_CALL ContextChangeEventMultiplexer::getSupportedServiceNames()
- throw (cssu::RuntimeException, std::exception)
{
// it's a singleton, not a service
return css::uno::Sequence<OUString>();
}
void SAL_CALL ContextChangeEventMultiplexer::disposing ( const css::lang::EventObject& rEvent)
- throw (cssu::RuntimeException, std::exception)
{
ListenerMap::iterator iDescriptor (maListeners.find(rEvent.Source));
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index cd74f30d07f0..a29ef9a37eba 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -439,20 +439,17 @@ public:
explicit AutoRecovery(const css::uno::Reference< css::uno::XComponentContext >& xContext);
virtual ~AutoRecovery( ) override;
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.framework.AutoRecovery");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
return {"com.sun.star.frame.AutoRecovery"};
}
@@ -462,26 +459,23 @@ public:
{ OWeakObject::acquire(); }
virtual void SAL_CALL release() throw () override
{ OWeakObject::release(); }
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) override;
/// Initialization function after having acquire()'d.
void initListeners();
// XTypeProvider
- virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override;
// css.frame.XDispatch
virtual void SAL_CALL dispatch(const css::util::URL& aURL ,
- const css::uno::Sequence< css::beans::PropertyValue >& lArguments)
- throw(css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::beans::PropertyValue >& lArguments) override;
virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener,
- const css::util::URL& aURL )
- throw(css::uno::RuntimeException, std::exception) override;
+ const css::util::URL& aURL ) override;
virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener,
- const css::util::URL& aURL )
- throw(css::uno::RuntimeException, std::exception) override;
+ const css::util::URL& aURL ) override;
// css.document.XDocumentEventListener
/** @short informs about created/opened documents.
@@ -493,20 +487,16 @@ public:
@param aEvent
points to the new created/opened document.
*/
- virtual void SAL_CALL documentEventOccured(const css::document::DocumentEvent& aEvent)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL documentEventOccured(const css::document::DocumentEvent& aEvent) override;
// css.util.XChangesListener
- virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent) override;
// css.util.XModifyListener
- virtual void SAL_CALL modified(const css::lang::EventObject& aEvent)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL modified(const css::lang::EventObject& aEvent) override;
// css.lang.XEventListener
- virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) override;
protected:
@@ -515,20 +505,17 @@ protected:
virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& aConvertedValue,
css::uno::Any& aOldValue ,
sal_Int32 nHandle ,
- const css::uno::Any& aValue )
- throw(css::lang::IllegalArgumentException) override;
+ const css::uno::Any& aValue ) override;
virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle,
- const css::uno::Any& aValue )
- throw(css::uno::Exception, std::exception) override;
+ const css::uno::Any& aValue ) override;
using cppu::OPropertySetHelper::getFastPropertyValue;
virtual void SAL_CALL getFastPropertyValue(css::uno::Any& aValue ,
sal_Int32 nHandle) const override;
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
- virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
private:
virtual void SAL_CALL disposing() final override;
@@ -1268,7 +1255,7 @@ void AutoRecovery::disposing()
implts_stopTimer();
}
-Any SAL_CALL AutoRecovery::queryInterface( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception)
+Any SAL_CALL AutoRecovery::queryInterface( const css::uno::Type& _rType )
{
Any aRet = AutoRecovery_BASE::queryInterface( _rType );
if ( !aRet.hasValue() )
@@ -1276,7 +1263,7 @@ Any SAL_CALL AutoRecovery::queryInterface( const css::uno::Type& _rType ) throw(
return aRet;
}
-Sequence< css::uno::Type > SAL_CALL AutoRecovery::getTypes( ) throw(css::uno::RuntimeException, std::exception)
+Sequence< css::uno::Type > SAL_CALL AutoRecovery::getTypes( )
{
return comphelper::concatSequences(
AutoRecovery_BASE::getTypes(),
@@ -1286,7 +1273,6 @@ Sequence< css::uno::Type > SAL_CALL AutoRecovery::getTypes( ) throw(css::uno::R
void SAL_CALL AutoRecovery::dispatch(const css::util::URL& aURL ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments)
- throw(css::uno::RuntimeException, std::exception)
{
SAL_INFO("fwk.autorecovery", "AutoRecovery::dispatch() starts ..." << aURL.Complete);
@@ -1520,7 +1506,6 @@ void AutoRecovery::implts_dispatch(const DispatchParams& aParams)
void SAL_CALL AutoRecovery::addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener,
const css::util::URL& aURL )
- throw(css::uno::RuntimeException, std::exception)
{
if (!xListener.is())
throw css::uno::RuntimeException("Invalid listener reference.", static_cast< css::frame::XDispatch* >(this));
@@ -1553,7 +1538,6 @@ void SAL_CALL AutoRecovery::addStatusListener(const css::uno::Reference< css::fr
void SAL_CALL AutoRecovery::removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener,
const css::util::URL& aURL )
- throw(css::uno::RuntimeException, std::exception)
{
if (!xListener.is())
throw css::uno::RuntimeException("Invalid listener reference.", static_cast< css::frame::XDispatch* >(this));
@@ -1562,7 +1546,6 @@ void SAL_CALL AutoRecovery::removeStatusListener(const css::uno::Reference< css:
}
void SAL_CALL AutoRecovery::documentEventOccured(const css::document::DocumentEvent& aEvent)
- throw(css::uno::RuntimeException, std::exception)
{
css::uno::Reference< css::frame::XModel > xDocument(aEvent.Source, css::uno::UNO_QUERY);
@@ -1630,7 +1613,6 @@ void SAL_CALL AutoRecovery::documentEventOccured(const css::document::DocumentEv
}
void SAL_CALL AutoRecovery::changesOccurred(const css::util::ChangesEvent& aEvent)
- throw(css::uno::RuntimeException, std::exception)
{
const css::uno::Sequence< css::util::ElementChange > lChanges (aEvent.Changes);
const css::util::ElementChange* pChanges = lChanges.getConstArray();
@@ -1683,7 +1665,6 @@ void SAL_CALL AutoRecovery::changesOccurred(const css::util::ChangesEvent& aEven
}
void SAL_CALL AutoRecovery::modified(const css::lang::EventObject& aEvent)
- throw(css::uno::RuntimeException, std::exception)
{
css::uno::Reference< css::frame::XModel > xDocument(aEvent.Source, css::uno::UNO_QUERY);
if (! xDocument.is())
@@ -1693,7 +1674,6 @@ void SAL_CALL AutoRecovery::modified(const css::lang::EventObject& aEvent)
}
void SAL_CALL AutoRecovery::disposing(const css::lang::EventObject& aEvent)
- throw(css::uno::RuntimeException, std::exception)
{
/* SAFE */ {
osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex);
@@ -3977,7 +3957,6 @@ sal_Bool SAL_CALL AutoRecovery::convertFastPropertyValue( css::uno::Any& /*
css::uno::Any& /*aOldValue*/ ,
sal_Int32 /*nHandle*/ ,
const css::uno::Any& /*aValue*/ )
- throw(css::lang::IllegalArgumentException)
{
// not needed currently
return false;
@@ -3985,7 +3964,6 @@ sal_Bool SAL_CALL AutoRecovery::convertFastPropertyValue( css::uno::Any& /*
void SAL_CALL AutoRecovery::setFastPropertyValue_NoBroadcast( sal_Int32 /*nHandle*/,
const css::uno::Any& /*aValue*/ )
- throw(css::uno::Exception, std::exception)
{
// not needed currently
}
@@ -4065,7 +4043,6 @@ const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescripto
}
css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL AutoRecovery::getPropertySetInfo()
- throw(css::uno::RuntimeException, std::exception)
{
static css::uno::Reference< css::beans::XPropertySetInfo >* pInfo = nullptr;
if(!pInfo)
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index 434435d481fe..62df7dc047da 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -76,19 +76,16 @@ enum PropHandle {
Title };
OUString SAL_CALL Desktop::getImplementationName()
- throw (css::uno::RuntimeException, std::exception)
{
return OUString("com.sun.star.comp.framework.Desktop");
}
sal_Bool SAL_CALL Desktop::supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
css::uno::Sequence<OUString> SAL_CALL Desktop::getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception)
{
return { "com.sun.star.frame.Desktop" };
}
@@ -192,7 +189,7 @@ Desktop::~Desktop()
SAL_WARN_IF( m_aTransactionManager.getWorkingMode()!=E_CLOSE, "fwk.desktop", "Desktop::~Desktop(): Who forgot to dispose this service?" );
}
-css::uno::Any SAL_CALL Desktop::queryInterface( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Any SAL_CALL Desktop::queryInterface( const css::uno::Type& _rType )
{
css::uno::Any aRet = Desktop_BASE::queryInterface( _rType );
if ( !aRet.hasValue() )
@@ -200,7 +197,7 @@ css::uno::Any SAL_CALL Desktop::queryInterface( const css::uno::Type& _rType ) t
return aRet;
}
-css::uno::Sequence< css::uno::Type > SAL_CALL Desktop::getTypes( ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< css::uno::Type > SAL_CALL Desktop::getTypes( )
{
return comphelper::concatSequences(
Desktop_BASE::getTypes(),
@@ -209,7 +206,6 @@ css::uno::Sequence< css::uno::Type > SAL_CALL Desktop::getTypes( ) throw(css::u
}
sal_Bool SAL_CALL Desktop::terminate()
- throw( css::uno::RuntimeException, std::exception )
{
TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
@@ -389,14 +385,12 @@ namespace
}
bool SAL_CALL Desktop::terminateQuickstarterToo()
- throw( css::uno::RuntimeException )
{
QuickstartSuppressor aQuickstartSuppressor(this, m_xQuickLauncher);
return terminate();
}
void SAL_CALL Desktop::addTerminateListener( const css::uno::Reference< css::frame::XTerminateListener >& xListener )
- throw( css::uno::RuntimeException, std::exception )
{
TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
@@ -444,7 +438,6 @@ void SAL_CALL Desktop::addTerminateListener( const css::uno::Reference< css::fra
}
void SAL_CALL Desktop::removeTerminateListener( const css::uno::Reference< css::frame::XTerminateListener >& xListener )
- throw( css::uno::RuntimeException, std::exception )
{
TransactionGuard aTransaction( m_aTransactionManager, E_SOFTEXCEPTIONS );
@@ -509,7 +502,7 @@ void SAL_CALL Desktop::removeTerminateListener( const css::uno::Reference< css::
@onerror We return a null-reference.
@threadsafe yes
*//*-*************************************************************************************************************/
-css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getComponents() throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getComponents()
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
// Register transaction and reject wrong calls.
@@ -534,7 +527,7 @@ css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getC
@onerror We return a null-reference.
@threadsafe yes
*//*-*************************************************************************************************************/
-css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::getCurrentComponent() throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::getCurrentComponent()
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
// Register transaction and reject wrong calls.
@@ -569,7 +562,7 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::getCurrentCompone
@onerror We return a null reference.
@threadsafe yes
*//*-*************************************************************************************************************/
-css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getCurrentFrame() throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getCurrentFrame()
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
// Register transaction and reject wrong calls.
@@ -610,9 +603,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getCurrentFrame() th
css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::loadComponentFromURL( const OUString& sURL ,
const OUString& sTargetFrameName,
sal_Int32 nSearchFlags ,
- const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::io::IOException ,
- css::lang::IllegalArgumentException ,
- css::uno::RuntimeException, std::exception )
+ const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
// Register transaction and reject wrong calls.
@@ -643,7 +634,7 @@ But; Don't forget - you will be the owner of returned object and must release it
@onerror A null reference is returned.
@threadsafe yes
*//*-*************************************************************************************************************/
-css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getTasks() throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getTasks()
{
SAL_INFO("fwk.desktop", "Desktop::getTasks(): Use of obsolete interface XTaskSupplier");
return nullptr;
@@ -665,7 +656,7 @@ css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getT
@onerror A null reference is returned.
@threadsafe yes
*//*-*************************************************************************************************************/
-css::uno::Reference< css::frame::XTask > SAL_CALL Desktop::getActiveTask() throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::frame::XTask > SAL_CALL Desktop::getActiveTask()
{
SAL_INFO("fwk.desktop", "Desktop::getActiveTask(): Use of obsolete interface XTaskSupplier");
return nullptr;
@@ -692,7 +683,7 @@ css::uno::Reference< css::frame::XTask > SAL_CALL Desktop::getActiveTask() throw
*//*-*************************************************************************************************************/
css::uno::Reference< css::frame::XDispatch > SAL_CALL Desktop::queryDispatch( const css::util::URL& aURL ,
const OUString& sTargetFrameName ,
- sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException, std::exception )
+ sal_Int32 nSearchFlags )
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
// Register transaction and reject wrong calls.
@@ -718,7 +709,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL Desktop::queryDispatch( co
}
}
-css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Desktop::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lQueries ) throw( css::uno::RuntimeException, std::exception )
+css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Desktop::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lQueries )
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
// Register transaction and reject wrong calls.
@@ -739,7 +730,6 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Desk
@threadsafe yes
*//*-*************************************************************************************************************/
void SAL_CALL Desktop::registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor)
- throw( css::uno::RuntimeException, std::exception)
{
TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
@@ -748,7 +738,6 @@ void SAL_CALL Desktop::registerDispatchProviderInterceptor( const css::uno::Refe
}
void SAL_CALL Desktop::releaseDispatchProviderInterceptor ( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor)
- throw( css::uno::RuntimeException, std::exception)
{
TransactionGuard aTransaction( m_aTransactionManager, E_SOFTEXCEPTIONS );
@@ -771,7 +760,7 @@ void SAL_CALL Desktop::releaseDispatchProviderInterceptor ( const css::uno::Refe
@onerror A null reference is returned.
@threadsafe yes
*//*-*************************************************************************************************************/
-css::uno::Reference< css::frame::XFrames > SAL_CALL Desktop::getFrames() throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::frame::XFrames > SAL_CALL Desktop::getFrames()
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
// Register transaction and reject wrong calls.
@@ -797,7 +786,7 @@ css::uno::Reference< css::frame::XFrames > SAL_CALL Desktop::getFrames() throw(
@onerror A null reference is returned.
@threadsafe yes
*//*-*************************************************************************************************************/
-void SAL_CALL Desktop::setActiveFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::setActiveFrame( const css::uno::Reference< css::frame::XFrame >& xFrame )
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
// Register transaction and reject wrong calls.
@@ -819,7 +808,7 @@ void SAL_CALL Desktop::setActiveFrame( const css::uno::Reference< css::frame::XF
}
}
-css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getActiveFrame() throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getActiveFrame()
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
// Register transaction and reject wrong calls.
@@ -834,86 +823,86 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getActiveFrame() thr
@descr Some method make no sense for our desktop! He has no window or parent or ...
So we should implement it empty and warn programmer, if he use it!
*/
-void SAL_CALL Desktop::initialize( const css::uno::Reference< css::awt::XWindow >& ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::initialize( const css::uno::Reference< css::awt::XWindow >& )
{
}
-css::uno::Reference< css::awt::XWindow > SAL_CALL Desktop::getContainerWindow() throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::awt::XWindow > SAL_CALL Desktop::getContainerWindow()
{
return css::uno::Reference< css::awt::XWindow >();
}
-void SAL_CALL Desktop::setCreator( const css::uno::Reference< css::frame::XFramesSupplier >& /*xCreator*/ ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::setCreator( const css::uno::Reference< css::frame::XFramesSupplier >& /*xCreator*/ )
{
}
-css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Desktop::getCreator() throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Desktop::getCreator()
{
return css::uno::Reference< css::frame::XFramesSupplier >();
}
-OUString SAL_CALL Desktop::getName() throw( css::uno::RuntimeException, std::exception )
+OUString SAL_CALL Desktop::getName()
{
SolarMutexGuard g;
return m_sName;
}
-void SAL_CALL Desktop::setName( const OUString& sName ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::setName( const OUString& sName )
{
SolarMutexGuard g;
m_sName = sName;
}
-sal_Bool SAL_CALL Desktop::isTop() throw( css::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL Desktop::isTop()
{
return true;
}
-void SAL_CALL Desktop::activate() throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::activate()
{
// Desktop is active always... but sometimes our frames try to activate
// the complete path from bottom to top... And our desktop is the topest frame :-(
// So - please don't show any assertions here. Do nothing!
}
-void SAL_CALL Desktop::deactivate() throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::deactivate()
{
// Desktop is active always... but sometimes our frames try to deactivate
// the complete path from bottom to top... And our desktop is the topest frame :-(
// So - please don't show any assertions here. Do nothing!
}
-sal_Bool SAL_CALL Desktop::isActive() throw( css::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL Desktop::isActive()
{
return true;
}
sal_Bool SAL_CALL Desktop::setComponent( const css::uno::Reference< css::awt::XWindow >& /*xComponentWindow*/ ,
- const css::uno::Reference< css::frame::XController >& /*xController*/ ) throw( css::uno::RuntimeException, std::exception )
+ const css::uno::Reference< css::frame::XController >& /*xController*/ )
{
return false;
}
-css::uno::Reference< css::awt::XWindow > SAL_CALL Desktop::getComponentWindow() throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::awt::XWindow > SAL_CALL Desktop::getComponentWindow()
{
return css::uno::Reference< css::awt::XWindow >();
}
-css::uno::Reference< css::frame::XController > SAL_CALL Desktop::getController() throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::frame::XController > SAL_CALL Desktop::getController()
{
return css::uno::Reference< css::frame::XController >();
}
-void SAL_CALL Desktop::contextChanged() throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::contextChanged()
{
}
-void SAL_CALL Desktop::addFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::addFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& )
{
}
// css::frame::XFrame
-void SAL_CALL Desktop::removeFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::removeFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& )
{
}
@@ -945,7 +934,7 @@ void SAL_CALL Desktop::removeFrameActionListener( const css::uno::Reference< css
@threadsafe yes
*//*-*************************************************************************************************************/
css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUString& sTargetFrameName ,
- sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException, std::exception )
+ sal_Int32 nSearchFlags )
{
css::uno::Reference< css::frame::XFrame > xTarget;
@@ -1067,7 +1056,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS
}
void SAL_CALL Desktop::disposing()
- throw( css::uno::RuntimeException )
{
// Safe impossible cases
// It's an programming error if dispose is called before terminate!
@@ -1148,7 +1136,7 @@ void SAL_CALL Desktop::disposing()
@param "xListener", reference to valid listener. We don't accept invalid values!
@threadsafe yes
*/
-void SAL_CALL Desktop::addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
// Safe impossible cases
@@ -1160,7 +1148,7 @@ void SAL_CALL Desktop::addEventListener( const css::uno::Reference< css::lang::X
m_aListenerContainer.addInterface( cppu::UnoType<css::lang::XEventListener>::get(), xListener );
}
-void SAL_CALL Desktop::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
// Safe impossible cases
@@ -1185,7 +1173,7 @@ void SAL_CALL Desktop::removeEventListener( const css::uno::Reference< css::lang
@param "aEvent", state event which (hopefully) valid information
@threadsafe yes
*//*-*************************************************************************************************************/
-void SAL_CALL Desktop::dispatchFinished( const css::frame::DispatchResultEvent& aEvent ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::dispatchFinished( const css::frame::DispatchResultEvent& aEvent )
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
// Register transaction and reject wrong calls.
@@ -1213,7 +1201,7 @@ void SAL_CALL Desktop::dispatchFinished( const css::frame::DispatchResultEvent&
@seealso method loadComponentFromURL()
*//*-*************************************************************************************************************/
-void SAL_CALL Desktop::disposing( const css::lang::EventObject& ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::disposing( const css::lang::EventObject& )
{
SAL_WARN( "fwk.desktop", "Desktop::disposing(): Algorithm error! Normally desktop is temp. listener ... not all the time. So this method shouldn't be called." );
}
@@ -1238,7 +1226,7 @@ void SAL_CALL Desktop::disposing( const css::lang::EventObject& ) throw( css::un
@param "xRequest", request for interaction - normal a wrapped target exception from bottom services
@threadsafe yes
*//*-*************************************************************************************************************/
-void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractionRequest >& xRequest ) throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractionRequest >& xRequest )
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
// Register transaction and reject wrong calls.
@@ -1307,31 +1295,24 @@ void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractio
}
::sal_Int32 SAL_CALL Desktop::leaseNumber( const css::uno::Reference< css::uno::XInterface >& xComponent )
- throw (css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception )
{
TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
return m_xTitleNumberGenerator->leaseNumber (xComponent);
}
void SAL_CALL Desktop::releaseNumber( ::sal_Int32 nNumber )
- throw (css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception )
{
TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
m_xTitleNumberGenerator->releaseNumber (nNumber);
}
void SAL_CALL Desktop::releaseNumberForComponent( const css::uno::Reference< css::uno::XInterface >& xComponent )
- throw (css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception )
{
TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
m_xTitleNumberGenerator->releaseNumberForComponent (xComponent);
}
OUString SAL_CALL Desktop::getUntitledPrefix()
- throw (css::uno::RuntimeException, std::exception)
{
TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
return m_xTitleNumberGenerator->getUntitledPrefix ();
@@ -1364,7 +1345,7 @@ OUString SAL_CALL Desktop::getUntitledPrefix()
sal_Bool SAL_CALL Desktop::convertFastPropertyValue( css::uno::Any& aConvertedValue ,
css::uno::Any& aOldValue ,
sal_Int32 nHandle ,
- const css::uno::Any& aValue ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception )
+ const css::uno::Any& aValue )
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
// Register transaction and reject wrong calls.
@@ -1418,7 +1399,7 @@ sal_Bool SAL_CALL Desktop::convertFastPropertyValue( css::uno::Any& aCon
@threadsafe yes
*//*-*************************************************************************************************************/
void SAL_CALL Desktop::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle ,
- const css::uno::Any& aValue ) throw( css::uno::Exception, std::exception )
+ const css::uno::Any& aValue )
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
// Register transaction and reject wrong calls.
@@ -1515,7 +1496,7 @@ void SAL_CALL Desktop::getFastPropertyValue( css::uno::Any& aValue ,
@return reference to object with information [XPropertySetInfo]
@threadsafe yes
*//*-*************************************************************************************************************/
-css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL Desktop::getPropertySetInfo() throw (css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL Desktop::getPropertySetInfo()
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
// Register transaction and reject wrong calls.
diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx
index 73311778683b..da6bc9c52997 100644
--- a/framework/source/services/dispatchhelper.cxx
+++ b/framework/source/services/dispatchhelper.cxx
@@ -78,7 +78,6 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch(
const OUString& sTargetFrameName ,
sal_Int32 nSearchFlags ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
- throw(css::uno::RuntimeException, std::exception)
{
// check for valid parameters
if (
@@ -113,7 +112,6 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch(
const css::util::URL& aURL ,
bool SyncronFlag ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
- throw(css::uno::RuntimeException)
{
css::uno::Reference< css::uno::XInterface > xTHIS(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY);
m_aResult.clear();
@@ -167,7 +165,6 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch(
describes the result of the dispatch operation
*/
void SAL_CALL DispatchHelper::dispatchFinished( const css::frame::DispatchResultEvent& aResult )
- throw(css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(m_mutex);
m_aResult <<= aResult;
@@ -181,7 +178,6 @@ void SAL_CALL DispatchHelper::dispatchFinished( const css::frame::DispatchResult
describe the source of this event and MUST be our save broadcaster!
*/
void SAL_CALL DispatchHelper::disposing( const css::lang::EventObject& )
- throw(css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(m_mutex);
m_aResult.clear();
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index cb6994a07b3e..1af055615b1f 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -123,20 +123,17 @@ public:
/// Initialization function after having acquire()'d.
void initListeners();
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.framework.Frame");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
return {"com.sun.star.frame.Frame"};
}
@@ -147,251 +144,163 @@ public:
const OUString& sURL,
const OUString& sTargetFrameName,
sal_Int32 nSearchFlags,
- const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
- throw( css::io::IOException,
- css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception ) override;
+ const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) override;
// XFramesSupplier
- virtual css::uno::Reference < css::frame::XFrames > SAL_CALL getFrames()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference < css::frame::XFrame > SAL_CALL getActiveFrame()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setActiveFrame(const css::uno::Reference < css::frame::XFrame > & xFrame)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference < css::frame::XFrames > SAL_CALL getFrames() override;
+ virtual css::uno::Reference < css::frame::XFrame > SAL_CALL getActiveFrame() override;
+ virtual void SAL_CALL setActiveFrame(const css::uno::Reference < css::frame::XFrame > & xFrame) override;
// XFrame
- virtual void SAL_CALL initialize(const css::uno::Reference < css::awt::XWindow > & xWindow)
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference < css::awt::XWindow > SAL_CALL getContainerWindow()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setCreator(const css::uno::Reference < css::frame::XFramesSupplier > & xCreator)
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference < css::frame::XFramesSupplier > SAL_CALL getCreator()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getName()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setName(const OUString & sName)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL initialize(const css::uno::Reference < css::awt::XWindow > & xWindow) override;
+ virtual css::uno::Reference < css::awt::XWindow > SAL_CALL getContainerWindow() override;
+ virtual void SAL_CALL setCreator(const css::uno::Reference < css::frame::XFramesSupplier > & xCreator) override;
+ virtual css::uno::Reference < css::frame::XFramesSupplier > SAL_CALL getCreator() override;
+ virtual OUString SAL_CALL getName() override;
+ virtual void SAL_CALL setName(const OUString & sName) override;
virtual css::uno::Reference < css::frame::XFrame > SAL_CALL findFrame(
const OUString & sTargetFrameName,
- sal_Int32 nSearchFlags)
- throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isTop()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL activate()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL deactivate()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isActive()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL contextChanged()
- throw (css::uno::RuntimeException, std::exception) override;
+ sal_Int32 nSearchFlags) override;
+ virtual sal_Bool SAL_CALL isTop() override;
+ virtual void SAL_CALL activate() override;
+ virtual void SAL_CALL deactivate() override;
+ virtual sal_Bool SAL_CALL isActive() override;
+ virtual void SAL_CALL contextChanged() override;
virtual sal_Bool SAL_CALL setComponent(
const css::uno::Reference < css::awt::XWindow > & xComponentWindow,
- const css::uno::Reference < css::frame::XController > & xController)
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference < css::awt::XWindow > SAL_CALL getComponentWindow()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference < css::frame::XController > SAL_CALL getController()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addFrameActionListener(const css::uno::Reference < css::frame::XFrameActionListener > & xListener)
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeFrameActionListener(const css::uno::Reference < css::frame::XFrameActionListener > & xListener)
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference < css::frame::XController > & xController) override;
+ virtual css::uno::Reference < css::awt::XWindow > SAL_CALL getComponentWindow() override;
+ virtual css::uno::Reference < css::frame::XController > SAL_CALL getController() override;
+ virtual void SAL_CALL addFrameActionListener(const css::uno::Reference < css::frame::XFrameActionListener > & xListener) override;
+ virtual void SAL_CALL removeFrameActionListener(const css::uno::Reference < css::frame::XFrameActionListener > & xListener) override;
// XComponent
virtual void SAL_CALL disposing() override;
- virtual void SAL_CALL addEventListener(const css::uno::Reference < css::lang::XEventListener > & xListener)
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeEventListener(const css::uno::Reference < css::lang::XEventListener > & xListener)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addEventListener(const css::uno::Reference < css::lang::XEventListener > & xListener) override;
+ virtual void SAL_CALL removeEventListener(const css::uno::Reference < css::lang::XEventListener > & xListener) override;
// XStatusIndicatorFactory
- virtual css::uno::Reference < css::task::XStatusIndicator > SAL_CALL createStatusIndicator()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference < css::task::XStatusIndicator > SAL_CALL createStatusIndicator() override;
// XDispatchProvider
virtual css::uno::Reference < css::frame::XDispatch > SAL_CALL queryDispatch(const css::util::URL & aURL,
const OUString & sTargetFrameName,
- sal_Int32 nSearchFlags)
- throw (css::uno::RuntimeException, std::exception) override;
+ sal_Int32 nSearchFlags) override;
virtual css::uno::Sequence < css::uno::Reference < css::frame::XDispatch > > SAL_CALL queryDispatches(
- const css::uno::Sequence < css::frame::DispatchDescriptor > & lDescriptor)
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence < css::frame::DispatchDescriptor > & lDescriptor) override;
// XDispatchProviderInterception
virtual void SAL_CALL registerDispatchProviderInterceptor(
- const css::uno::Reference < css::frame::XDispatchProviderInterceptor > & xInterceptor)
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference < css::frame::XDispatchProviderInterceptor > & xInterceptor) override;
virtual void SAL_CALL releaseDispatchProviderInterceptor(
- const css::uno::Reference < css::frame::XDispatchProviderInterceptor > & xInterceptor)
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference < css::frame::XDispatchProviderInterceptor > & xInterceptor) override;
// XDispatchInformationProvider
- virtual css::uno::Sequence < sal_Int16 > SAL_CALL getSupportedCommandGroups()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence < css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation(sal_Int16 nCommandGroup)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence < sal_Int16 > SAL_CALL getSupportedCommandGroups() override;
+ virtual css::uno::Sequence < css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation(sal_Int16 nCommandGroup) override;
// XWindowListener
// Attention: windowResized() and windowShown() are implement only! All other are empty!
- virtual void SAL_CALL windowResized(const css::awt::WindowEvent & aEvent)
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL windowMoved(const css::awt::WindowEvent & /*aEvent*/ )
- throw (css::uno::RuntimeException, std::exception) override {};
- virtual void SAL_CALL windowShown(const css::lang::EventObject & aEvent)
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL windowHidden(const css::lang::EventObject & aEvent)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL windowResized(const css::awt::WindowEvent & aEvent) override;
+ virtual void SAL_CALL windowMoved(const css::awt::WindowEvent & /*aEvent*/ ) override {};
+ virtual void SAL_CALL windowShown(const css::lang::EventObject & aEvent) override;
+ virtual void SAL_CALL windowHidden(const css::lang::EventObject & aEvent) override;
// XFocusListener
// Attention: focusLost() not implemented yet!
- virtual void SAL_CALL focusGained(const css::awt::FocusEvent & aEvent)
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL focusLost(const css::awt::FocusEvent & /*aEvent*/ )
- throw (css::uno::RuntimeException, std::exception) override {};
+ virtual void SAL_CALL focusGained(const css::awt::FocusEvent & aEvent) override;
+ virtual void SAL_CALL focusLost(const css::awt::FocusEvent & /*aEvent*/ ) override {};
// XTopWindowListener
// Attention: windowActivated(), windowDeactivated() and windowClosing() are implement only! All other are empty!
- virtual void SAL_CALL windowActivated(const css::lang::EventObject & aEvent)
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL windowDeactivated(const css::lang::EventObject & aEvent)
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL windowOpened(const css::lang::EventObject & /*aEvent*/ )
- throw (css::uno::RuntimeException, std::exception) override {};
- virtual void SAL_CALL windowClosing(const css::lang::EventObject & aEvent)
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL windowClosed(const css::lang::EventObject & /*aEvent*/ )
- throw (css::uno::RuntimeException, std::exception) override {};
- virtual void SAL_CALL windowMinimized(const css::lang::EventObject & /*aEvent*/ )
- throw (css::uno::RuntimeException, std::exception) override {};
- virtual void SAL_CALL windowNormalized(const css::lang::EventObject & /*aEvent*/ )
- throw (css::uno::RuntimeException, std::exception) override {};
+ virtual void SAL_CALL windowActivated(const css::lang::EventObject & aEvent) override;
+ virtual void SAL_CALL windowDeactivated(const css::lang::EventObject & aEvent) override;
+ virtual void SAL_CALL windowOpened(const css::lang::EventObject & /*aEvent*/ ) override {};
+ virtual void SAL_CALL windowClosing(const css::lang::EventObject & aEvent) override;
+ virtual void SAL_CALL windowClosed(const css::lang::EventObject & /*aEvent*/ ) override {};
+ virtual void SAL_CALL windowMinimized(const css::lang::EventObject & /*aEvent*/ ) override {};
+ virtual void SAL_CALL windowNormalized(const css::lang::EventObject & /*aEvent*/ ) override {};
// XEventListener
- virtual void SAL_CALL disposing(const css::lang::EventObject & aEvent)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing(const css::lang::EventObject & aEvent) override;
// XActionLockable
- virtual sal_Bool SAL_CALL isActionLocked()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addActionLock()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeActionLock()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setActionLocks(sal_Int16 nLock)
- throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL resetActionLocks()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isActionLocked() override;
+ virtual void SAL_CALL addActionLock() override;
+ virtual void SAL_CALL removeActionLock() override;
+ virtual void SAL_CALL setActionLocks(sal_Int16 nLock) override;
+ virtual sal_Int16 SAL_CALL resetActionLocks() override;
// XCloseable
- virtual void SAL_CALL close(sal_Bool bDeliverOwnership)
- throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL close(sal_Bool bDeliverOwnership) override;
// XCloseBroadcaster
- virtual void SAL_CALL addCloseListener(const css::uno::Reference < css::util::XCloseListener > & xListener)
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeCloseListener(const css::uno::Reference < css::util::XCloseListener > & xListener)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addCloseListener(const css::uno::Reference < css::util::XCloseListener > & xListener) override;
+ virtual void SAL_CALL removeCloseListener(const css::uno::Reference < css::util::XCloseListener > & xListener) override;
// XTitle
- virtual OUString SAL_CALL getTitle()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setTitle(const OUString & sTitle)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getTitle() override;
+ virtual void SAL_CALL setTitle(const OUString & sTitle) override;
// XTitleChangeBroadcaster
- virtual void SAL_CALL addTitleChangeListener(const css::uno::Reference < css::frame::XTitleChangeListener > & xListener)
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeTitleChangeListener(const css::uno::Reference < css::frame::XTitleChangeListener > & xListenr)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addTitleChangeListener(const css::uno::Reference < css::frame::XTitleChangeListener > & xListener) override;
+ virtual void SAL_CALL removeTitleChangeListener(const css::uno::Reference < css::frame::XTitleChangeListener > & xListenr) override;
// XFrame2 attributes
- virtual css::uno::Reference < css::container::XNameContainer > SAL_CALL getUserDefinedAttributes()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference < css::container::XNameContainer > SAL_CALL getUserDefinedAttributes() override;
- virtual css::uno::Reference < css::frame::XDispatchRecorderSupplier > SAL_CALL getDispatchRecorderSupplier()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setDispatchRecorderSupplier(const css::uno::Reference < css::frame::XDispatchRecorderSupplier > & )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference < css::frame::XDispatchRecorderSupplier > SAL_CALL getDispatchRecorderSupplier() override;
+ virtual void SAL_CALL setDispatchRecorderSupplier(const css::uno::Reference < css::frame::XDispatchRecorderSupplier > & ) override;
- virtual css::uno::Reference < css::uno::XInterface > SAL_CALL getLayoutManager()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setLayoutManager(const css::uno::Reference < css::uno::XInterface > & )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference < css::uno::XInterface > SAL_CALL getLayoutManager() override;
+ virtual void SAL_CALL setLayoutManager(const css::uno::Reference < css::uno::XInterface > & ) override;
// XPropertySet
- virtual css::uno::Reference < css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference < css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
- virtual void SAL_CALL setPropertyValue(const OUString & sProperty, const css::uno::Any & aValue)
- throw (css::beans::UnknownPropertyException,
- css::beans::PropertyVetoException,
- css::lang::IllegalArgumentException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setPropertyValue(const OUString & sProperty, const css::uno::Any & aValue) override;
- virtual css::uno::Any SAL_CALL getPropertyValue(const OUString & sProperty)
- throw (css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getPropertyValue(const OUString & sProperty) override;
virtual void SAL_CALL addPropertyChangeListener(
const OUString & sProperty,
- const css::uno::Reference < css::beans::XPropertyChangeListener > & xListener)
- throw (css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference < css::beans::XPropertyChangeListener > & xListener) override;
virtual void SAL_CALL removePropertyChangeListener(
const OUString & sProperty,
- const css::uno::Reference < css::beans::XPropertyChangeListener > & xListener)
- throw (css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference < css::beans::XPropertyChangeListener > & xListener) override;
virtual void SAL_CALL addVetoableChangeListener(
const OUString & sProperty,
- const css::uno::Reference < css::beans::XVetoableChangeListener > & xListener)
- throw (css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference < css::beans::XVetoableChangeListener > & xListener) override;
virtual void SAL_CALL removeVetoableChangeListener(
const OUString & sProperty,
- const css::uno::Reference < css::beans::XVetoableChangeListener > & xListener)
- throw (css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference < css::beans::XVetoableChangeListener > & xListener) override;
// XPropertySetInfo
- virtual css::uno::Sequence < css::beans::Property > SAL_CALL getProperties()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence < css::beans::Property > SAL_CALL getProperties() override;
- virtual css::beans::Property SAL_CALL getPropertyByName(const OUString & sName)
- throw (css::beans::UnknownPropertyException,
- css::uno::RuntimeException, std::exception) override;
+ virtual css::beans::Property SAL_CALL getPropertyByName(const OUString & sName) override;
- virtual sal_Bool SAL_CALL hasPropertyByName(const OUString & sName)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasPropertyByName(const OUString & sName) override;
private:
@@ -423,9 +332,7 @@ private:
* The owner of this class has to be sure, that every new property does
* not clash with any existing one.
*/
- void SAL_CALL impl_addPropertyInfo(const css::beans::Property& aProperty)
- throw(css::beans::PropertyExistException,
- css::uno::Exception );
+ void SAL_CALL impl_addPropertyInfo(const css::beans::Property& aProperty);
/** mark the object as "dead".
*/
@@ -674,10 +581,6 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Frame::loadComponentFromUR
const OUString& sTargetFrameName,
sal_Int32 nSearchFlags,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
- throw( css::io::IOException,
- css::lang::IllegalArgumentException,
- css::uno::RuntimeException,
- std::exception)
{
checkDisposed();
@@ -697,7 +600,6 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Frame::loadComponentFromUR
@onerror A null reference is returned.
*//*-*****************************************************************************************************/
css::uno::Reference< css::frame::XFrames > SAL_CALL Frame::getFrames()
- throw( css::uno::RuntimeException, std::exception )
{
checkDisposed();
@@ -721,7 +623,6 @@ css::uno::Reference< css::frame::XFrames > SAL_CALL Frame::getFrames()
@onerror A null reference is returned.
*//*-*****************************************************************************************************/
css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::getActiveFrame()
- throw( css::uno::RuntimeException, std::exception )
{
checkDisposed();
@@ -744,7 +645,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::getActiveFrame()
@onerror An assertion is thrown and element is ignored, if given frame isn't already a child of us.
*//*-*****************************************************************************************************/
void SAL_CALL Frame::setActiveFrame( const css::uno::Reference< css::frame::XFrame >& xFrame )
- throw( css::uno::RuntimeException, std::exception )
{
checkDisposed();
@@ -848,7 +748,6 @@ void Frame::disableLayoutManager(const css::uno::Reference< css::frame::XLayoutM
@onerror We do nothing.
*//*-*****************************************************************************************************/
void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >& xWindow )
- throw( css::uno::RuntimeException, std::exception )
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
if (!xWindow.is())
@@ -925,7 +824,6 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >&
@onerror A null reference is returned.
*//*-*****************************************************************************************************/
css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getContainerWindow()
- throw( css::uno::RuntimeException, std::exception )
{
SolarMutexGuard g;
return m_xContainerWindow;
@@ -949,7 +847,6 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getContainerWindow()
@threadsafe yes
*//*-*****************************************************************************************************/
void SAL_CALL Frame::setCreator( const css::uno::Reference< css::frame::XFramesSupplier >& xCreator )
- throw( css::uno::RuntimeException, std::exception )
{
checkDisposed();
@@ -973,7 +870,6 @@ void SAL_CALL Frame::setCreator( const css::uno::Reference< css::frame::XFramesS
@onerror A null reference is returned.
*//*-*****************************************************************************************************/
css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Frame::getCreator()
- throw( css::uno::RuntimeException, std::exception )
{
checkDisposed();
SolarMutexGuard g;
@@ -990,7 +886,6 @@ css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Frame::getCreator()
@onerror An empty string is returned.
*//*-*****************************************************************************************************/
OUString SAL_CALL Frame::getName()
- throw( css::uno::RuntimeException, std::exception )
{
SolarMutexGuard g;
return m_sName;
@@ -1009,7 +904,6 @@ OUString SAL_CALL Frame::getName()
@onerror We do nothing.
*//*-*****************************************************************************************************/
void SAL_CALL Frame::setName( const OUString& sName )
- throw( css::uno::RuntimeException, std::exception )
{
SolarMutexGuard g;
// Set new name... but look for invalid special target names!
@@ -1045,7 +939,6 @@ void SAL_CALL Frame::setName( const OUString& sName )
*//*-*****************************************************************************************************/
css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUString& sTargetFrameName,
sal_Int32 nSearchFlags )
- throw( css::uno::RuntimeException, std::exception )
{
css::uno::Reference< css::frame::XFrame > xTarget;
@@ -1301,7 +1194,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr
@onerror No error should occur!
*//*-*****************************************************************************************************/
sal_Bool SAL_CALL Frame::isTop()
- throw( css::uno::RuntimeException, std::exception )
{
checkDisposed();
SolarMutexGuard g;
@@ -1321,7 +1213,6 @@ sal_Bool SAL_CALL Frame::isTop()
@seealso listener mechanism
*//*-*****************************************************************************************************/
void SAL_CALL Frame::activate()
- throw( css::uno::RuntimeException, std::exception )
{
checkDisposed();
@@ -1402,7 +1293,7 @@ void SAL_CALL Frame::activate()
@seealso enum EActiveState
@seealso listener mechanism
*//*-*****************************************************************************************************/
-void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Frame::deactivate()
{
checkDisposed();
@@ -1476,7 +1367,7 @@ void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException, std::except
@onerror No error should occur.
*//*-*****************************************************************************************************/
-sal_Bool SAL_CALL Frame::isActive() throw( css::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL Frame::isActive()
{
checkDisposed();
SolarMutexGuard g;
@@ -1486,7 +1377,7 @@ sal_Bool SAL_CALL Frame::isActive() throw( css::uno::RuntimeException, std::exce
/*-****************************************************************************************************
@short ???
*//*-*****************************************************************************************************/
-void SAL_CALL Frame::contextChanged() throw( css::uno::RuntimeException, std::exception )
+void SAL_CALL Frame::contextChanged()
{
// Sometimes called during closing object...
// Impl-method is threadsafe himself!
@@ -1524,7 +1415,6 @@ void SAL_CALL Frame::contextChanged() throw( css::uno::RuntimeException, std::ex
*//*-*****************************************************************************************************/
sal_Bool SAL_CALL Frame::setComponent(const css::uno::Reference< css::awt::XWindow >& xComponentWindow,
const css::uno::Reference< css::frame::XController >& xController )
- throw( css::uno::RuntimeException, std::exception )
{
// Ignore this HACK of sfx2!
@@ -1682,7 +1572,6 @@ sal_Bool SAL_CALL Frame::setComponent(const css::uno::Reference< css::awt::XWind
@onerror A null reference is returned.
*//*-*****************************************************************************************************/
css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getComponentWindow()
- throw( css::uno::RuntimeException, std::exception )
{
checkDisposed();
SolarMutexGuard g;
@@ -1706,7 +1595,6 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getComponentWindow()
@onerror A null reference is returned.
*//*-*****************************************************************************************************/
css::uno::Reference< css::frame::XController > SAL_CALL Frame::getController()
- throw( css::uno::RuntimeException, std::exception )
{
SolarMutexGuard g;
return m_xController;
@@ -1722,14 +1610,12 @@ css::uno::Reference< css::frame::XController > SAL_CALL Frame::getController()
@onerror Listener is ignored.
*//*-*****************************************************************************************************/
void SAL_CALL Frame::addFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& xListener )
- throw( css::uno::RuntimeException, std::exception )
{
checkDisposed();
m_aListenerContainer.addInterface( cppu::UnoType<css::frame::XFrameActionListener>::get(), xListener );
}
void SAL_CALL Frame::removeFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& xListener )
- throw( css::uno::RuntimeException, std::exception )
{
m_aListenerContainer.removeInterface( cppu::UnoType<css::frame::XFrameActionListener>::get(), xListener );
}
@@ -1754,7 +1640,6 @@ void SAL_CALL Frame::removeFrameActionListener( const css::uno::Reference< css::
@threadsafe yes
*//*-*****************************************************************************************************/
void SAL_CALL Frame::close( sal_Bool bDeliverOwnership )
- throw( css::util::CloseVetoException, css::uno::RuntimeException, std::exception )
{
checkDisposed();
@@ -1845,20 +1730,17 @@ void SAL_CALL Frame::close( sal_Bool bDeliverOwnership )
@threadsafe yes
*//*-*****************************************************************************************************/
void SAL_CALL Frame::addCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener )
- throw (css::uno::RuntimeException, std::exception)
{
checkDisposed();
m_aListenerContainer.addInterface( cppu::UnoType<css::util::XCloseListener>::get(), xListener );
}
void SAL_CALL Frame::removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener )
- throw (css::uno::RuntimeException, std::exception)
{
m_aListenerContainer.removeInterface( cppu::UnoType<css::util::XCloseListener>::get(), xListener );
}
OUString SAL_CALL Frame::getTitle()
- throw (css::uno::RuntimeException, std::exception)
{
checkDisposed();
@@ -1872,7 +1754,6 @@ OUString SAL_CALL Frame::getTitle()
}
void SAL_CALL Frame::setTitle( const OUString& sTitle )
- throw (css::uno::RuntimeException, std::exception)
{
checkDisposed();
@@ -1886,7 +1767,6 @@ void SAL_CALL Frame::setTitle( const OUString& sTitle )
}
void SAL_CALL Frame::addTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener)
- throw (css::uno::RuntimeException, std::exception)
{
checkDisposed();
@@ -1900,7 +1780,6 @@ void SAL_CALL Frame::addTitleChangeListener( const css::uno::Reference< css::fra
}
void SAL_CALL Frame::removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener )
- throw (css::uno::RuntimeException, std::exception)
{
checkDisposed();
@@ -1914,21 +1793,18 @@ void SAL_CALL Frame::removeTitleChangeListener( const css::uno::Reference< css::
}
css::uno::Reference<css::container::XNameContainer> SAL_CALL Frame::getUserDefinedAttributes()
- throw (css::uno::RuntimeException, std::exception)
{
// optional attribute
return nullptr;
}
css::uno::Reference<css::frame::XDispatchRecorderSupplier> SAL_CALL Frame::getDispatchRecorderSupplier()
- throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
return m_xDispatchRecorderSupplier;
}
void SAL_CALL Frame::setDispatchRecorderSupplier(const css::uno::Reference<css::frame::XDispatchRecorderSupplier>& p)
- throw (css::uno::RuntimeException, std::exception)
{
checkDisposed();
SolarMutexGuard g;
@@ -1936,14 +1812,12 @@ void SAL_CALL Frame::setDispatchRecorderSupplier(const css::uno::Reference<css::
}
css::uno::Reference<css::uno::XInterface> SAL_CALL Frame::getLayoutManager()
- throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
return m_xLayoutManager;
}
void SAL_CALL Frame::setLayoutManager(const css::uno::Reference<css::uno::XInterface>& p1)
- throw (css::uno::RuntimeException, std::exception)
{
checkDisposed();
SolarMutexGuard g;
@@ -1951,7 +1825,6 @@ void SAL_CALL Frame::setLayoutManager(const css::uno::Reference<css::uno::XInter
}
css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL Frame::getPropertySetInfo()
- throw(css::uno::RuntimeException, std::exception)
{
checkDisposed();
css::uno::Reference< css::beans::XPropertySetInfo > xInfo(
@@ -1961,12 +1834,6 @@ css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL Frame::getPropertyS
void SAL_CALL Frame::setPropertyValue(const OUString& sProperty,
const css::uno::Any& aValue )
- throw(css::beans::UnknownPropertyException,
- css::beans::PropertyVetoException,
- css::lang::IllegalArgumentException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException,
- std::exception)
{
// TODO look for e.g. readonly props and reject setProp() call!
@@ -2004,10 +1871,6 @@ void SAL_CALL Frame::setPropertyValue(const OUString& sProperty,
}
css::uno::Any SAL_CALL Frame::getPropertyValue(const OUString& sProperty)
- throw(css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException,
- std::exception)
{
checkDisposed();
@@ -2026,10 +1889,6 @@ css::uno::Any SAL_CALL Frame::getPropertyValue(const OUString& sProperty)
void SAL_CALL Frame::addPropertyChangeListener(
const OUString& sProperty,
const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
- throw(css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException,
- std::exception)
{
checkDisposed();
@@ -2049,10 +1908,6 @@ void SAL_CALL Frame::addPropertyChangeListener(
void SAL_CALL Frame::removePropertyChangeListener(
const OUString& sProperty,
const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
- throw(css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException,
- std::exception)
{
// SAFE ->
SolarMutexClearableGuard aReadLock;
@@ -2070,10 +1925,6 @@ void SAL_CALL Frame::removePropertyChangeListener(
void SAL_CALL Frame::addVetoableChangeListener(
const OUString& sProperty,
const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
- throw(css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException,
- std::exception)
{
checkDisposed();
@@ -2093,10 +1944,6 @@ void SAL_CALL Frame::addVetoableChangeListener(
void SAL_CALL Frame::removeVetoableChangeListener(
const OUString& sProperty,
const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
- throw(css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException,
- std::exception)
{
// SAFE ->
SolarMutexClearableGuard aReadLock;
@@ -2112,7 +1959,6 @@ void SAL_CALL Frame::removeVetoableChangeListener(
}
css::uno::Sequence< css::beans::Property > SAL_CALL Frame::getProperties()
- throw(css::uno::RuntimeException, std::exception)
{
checkDisposed();
@@ -2133,8 +1979,6 @@ css::uno::Sequence< css::beans::Property > SAL_CALL Frame::getProperties()
}
css::beans::Property SAL_CALL Frame::getPropertyByName(const OUString& sName)
- throw(css::beans::UnknownPropertyException,
- css::uno::RuntimeException, std::exception)
{
checkDisposed();
@@ -2148,7 +1992,6 @@ css::beans::Property SAL_CALL Frame::getPropertyByName(const OUString& sName)
}
sal_Bool SAL_CALL Frame::hasPropertyByName(const OUString& sName)
- throw(css::uno::RuntimeException, std::exception)
{
checkDisposed();
@@ -2366,14 +2209,12 @@ void SAL_CALL Frame::disposing()
@onerror Listener is ignored.
*//*-*****************************************************************************************************/
void SAL_CALL Frame::addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
- throw( css::uno::RuntimeException, std::exception )
{
checkDisposed();
m_aListenerContainer.addInterface( cppu::UnoType<css::lang::XEventListener>::get(), xListener );
}
void SAL_CALL Frame::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
- throw( css::uno::RuntimeException, std::exception )
{
m_aListenerContainer.removeInterface( cppu::UnoType<css::lang::XEventListener>::get(), xListener );
}
@@ -2390,7 +2231,6 @@ void SAL_CALL Frame::removeEventListener( const css::uno::Reference< css::lang::
@onerror We return a null reference.
*//*-*****************************************************************************************************/
css::uno::Reference< css::task::XStatusIndicator > SAL_CALL Frame::createStatusIndicator()
- throw( css::uno::RuntimeException, std::exception )
{
checkDisposed();
@@ -2436,7 +2276,6 @@ css::uno::Reference< css::task::XStatusIndicator > SAL_CALL Frame::createStatusI
css::uno::Reference< css::frame::XDispatch > SAL_CALL Frame::queryDispatch( const css::util::URL& aURL,
const OUString& sTargetFrameName,
sal_Int32 nSearchFlags)
- throw( css::uno::RuntimeException, std::exception )
{
// Don't check incoming parameter here! Our helper do it for us and it is not a good idea to do it more than ones!
@@ -2480,7 +2319,6 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL Frame::queryDispatch( cons
*//*-*****************************************************************************************************/
css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Frame::queryDispatches(
const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor )
- throw( css::uno::RuntimeException, std::exception )
{
// Don't check incoming parameter here! Our helper do it for us and it is not a good idea to do it more than ones!
@@ -2510,7 +2348,6 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Fram
*//*-*****************************************************************************************************/
void SAL_CALL Frame::registerDispatchProviderInterceptor(
const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor )
- throw( css::uno::RuntimeException, std::exception )
{
// We use a helper to support these interface and an interceptor mechanism.
// This helper is threadsafe himself and check incoming parameter too.
@@ -2530,7 +2367,6 @@ void SAL_CALL Frame::registerDispatchProviderInterceptor(
void SAL_CALL Frame::releaseDispatchProviderInterceptor(
const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor )
- throw( css::uno::RuntimeException, std::exception )
{
// We use a helper to support these interface and an interceptor mechanism.
// This helper is threadsafe himself and check incoming parameter too.
@@ -2553,14 +2389,12 @@ void SAL_CALL Frame::releaseDispatchProviderInterceptor(
inside the current frame environment
*//*-*****************************************************************************************************/
css::uno::Sequence< sal_Int16 > SAL_CALL Frame::getSupportedCommandGroups()
- throw(css::uno::RuntimeException, std::exception)
{
return m_xDispatchInfoHelper->getSupportedCommandGroups();
}
css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL Frame::getConfigurableDispatchInformation(
sal_Int16 nCommandGroup)
- throw(css::uno::RuntimeException, std::exception)
{
return m_xDispatchInfoHelper->getConfigurableDispatchInformation(nCommandGroup);
}
@@ -2576,7 +2410,6 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL Frame::getConfigu
@param "aEvent" describe source of detected event
*//*-*****************************************************************************************************/
void SAL_CALL Frame::windowResized( const css::awt::WindowEvent& )
- throw( css::uno::RuntimeException, std::exception )
{
// Part of dispose-mechanism
@@ -2587,7 +2420,6 @@ void SAL_CALL Frame::windowResized( const css::awt::WindowEvent& )
}
void SAL_CALL Frame::focusGained( const css::awt::FocusEvent& )
- throw( css::uno::RuntimeException, std::exception )
{
// Part of dispose() mechanism
@@ -2616,7 +2448,6 @@ void SAL_CALL Frame::focusGained( const css::awt::FocusEvent& )
@param "aEvent" describe source of detected event
*//*-*****************************************************************************************************/
void SAL_CALL Frame::windowActivated( const css::lang::EventObject& )
- throw( css::uno::RuntimeException, std::exception )
{
checkDisposed();
@@ -2635,7 +2466,6 @@ void SAL_CALL Frame::windowActivated( const css::lang::EventObject& )
}
void SAL_CALL Frame::windowDeactivated( const css::lang::EventObject& )
- throw( css::uno::RuntimeException, std::exception )
{
// Sometimes called during dispose()
@@ -2680,7 +2510,6 @@ void SAL_CALL Frame::windowDeactivated( const css::lang::EventObject& )
}
void SAL_CALL Frame::windowClosing( const css::lang::EventObject& )
- throw( css::uno::RuntimeException, std::exception )
{
checkDisposed();
@@ -2734,7 +2563,6 @@ void SAL_CALL Frame::windowClosing( const css::lang::EventObject& )
@threadsafe yes
*//*-*****************************************************************************************************/
void SAL_CALL Frame::windowShown( const css::lang::EventObject& )
- throw(css::uno::RuntimeException, std::exception)
{
static bool bFirstVisibleTask = true;
static osl::Mutex aFirstVisibleLock;
@@ -2765,7 +2593,6 @@ void SAL_CALL Frame::windowShown( const css::lang::EventObject& )
}
void SAL_CALL Frame::windowHidden( const css::lang::EventObject& )
- throw(css::uno::RuntimeException, std::exception)
{
/* SAFE { */
SolarMutexClearableGuard aReadLock;
@@ -2787,7 +2614,6 @@ void SAL_CALL Frame::windowHidden( const css::lang::EventObject& )
@seealso XFocusListener
*//*-*****************************************************************************************************/
void SAL_CALL Frame::disposing( const css::lang::EventObject& aEvent )
- throw( css::uno::RuntimeException, std::exception )
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
SolarMutexResettableGuard aWriteLock;
@@ -2818,21 +2644,18 @@ void SAL_CALL Frame::disposing( const css::lang::EventObject& aEvent )
@threadsafe yes
*//*-*************************************************************************************************************/
sal_Bool SAL_CALL Frame::isActionLocked()
- throw( css::uno::RuntimeException, std::exception )
{
SolarMutexGuard g;
return( m_nExternalLockCount!=0);
}
void SAL_CALL Frame::addActionLock()
- throw( css::uno::RuntimeException, std::exception )
{
SolarMutexGuard g;
++m_nExternalLockCount;
}
void SAL_CALL Frame::removeActionLock()
- throw( css::uno::RuntimeException, std::exception )
{
{
SolarMutexGuard g;
@@ -2845,7 +2668,6 @@ void SAL_CALL Frame::removeActionLock()
}
void SAL_CALL Frame::setActionLocks( sal_Int16 nLock )
- throw( css::uno::RuntimeException, std::exception )
{
SolarMutexGuard g;
// Attention: If somewhere called resetActionLocks() before and get e.g. 5 locks ...
@@ -2856,7 +2678,6 @@ void SAL_CALL Frame::setActionLocks( sal_Int16 nLock )
}
sal_Int16 SAL_CALL Frame::resetActionLocks()
- throw( css::uno::RuntimeException, std::exception )
{
sal_Int16 nCurrentLocks = 0;
{
@@ -2985,8 +2806,6 @@ void Frame::impl_setPropertyChangeBroadcaster(const css::uno::Reference< css::un
}
void SAL_CALL Frame::impl_addPropertyInfo(const css::beans::Property& aProperty)
- throw(css::beans::PropertyExistException,
- css::uno::Exception )
{
SolarMutexGuard g;
diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx
index 38fbb1d77838..ac8a1f2ea52d 100644
--- a/framework/source/services/mediatypedetectionhelper.cxx
+++ b/framework/source/services/mediatypedetectionhelper.cxx
@@ -52,7 +52,6 @@ DEFINE_INIT_SERVICE ( MediaTypeDetectionHelper,
// XStringMapping
sal_Bool SAL_CALL MediaTypeDetectionHelper::mapStrings(uno::Sequence< OUString >& rSeq)
- throw (uno::RuntimeException, std::exception)
{
bool bModified = false;
for( sal_Int32 i = rSeq.getLength(); i--; )
diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx
index 53f89089a309..b4a602f77a1c 100644
--- a/framework/source/services/modulemanager.cxx
+++ b/framework/source/services/modulemanager.cxx
@@ -65,55 +65,37 @@ public:
ModuleManager& operator=(const ModuleManager&) = delete;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
virtual sal_Bool SAL_CALL supportsService(
- OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override;
+ OUString const & ServiceName) override;
virtual css::uno::Sequence< OUString > SAL_CALL
- getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+ getSupportedServiceNames() override;
// XModuleManager
- virtual OUString SAL_CALL identify(const css::uno::Reference< css::uno::XInterface >& xModule)
- throw(css::lang::IllegalArgumentException,
- css::frame::UnknownModuleException,
- css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL identify(const css::uno::Reference< css::uno::XInterface >& xModule) override;
// XNameReplace
virtual void SAL_CALL replaceByName(const OUString& sName ,
- const css::uno::Any& aValue)
- throw (css::lang::IllegalArgumentException ,
- css::container::NoSuchElementException,
- css::lang::WrappedTargetException ,
- css::uno::RuntimeException, std::exception ) override;
+ const css::uno::Any& aValue) override;
// XNameAccess
- virtual css::uno::Any SAL_CALL getByName(const OUString& sName)
- throw(css::container::NoSuchElementException,
- css::lang::WrappedTargetException ,
- css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL getByName(const OUString& sName) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
- virtual sal_Bool SAL_CALL hasByName(const OUString& sName)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasByName(const OUString& sName) override;
// XElementAccess
- virtual css::uno::Type SAL_CALL getElementType()
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Type SAL_CALL getElementType() override;
- virtual sal_Bool SAL_CALL hasElements()
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasElements() override;
// XContainerQuery
- virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery(const OUString& sQuery)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery(const OUString& sQuery) override;
- virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties(const css::uno::Sequence< css::beans::NamedValue >& lProperties)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties(const css::uno::Sequence< css::beans::NamedValue >& lProperties) override;
private:
@@ -150,27 +132,21 @@ ModuleManager::ModuleManager(const css::uno::Reference< css::uno::XComponentCont
}
OUString ModuleManager::getImplementationName()
- throw (css::uno::RuntimeException, std::exception)
{
return OUString("com.sun.star.comp.framework.ModuleManager");
}
sal_Bool ModuleManager::supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
css::uno::Sequence< OUString > ModuleManager::getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception)
{
return { "com.sun.star.frame.ModuleManager" };
}
OUString SAL_CALL ModuleManager::identify(const css::uno::Reference< css::uno::XInterface >& xModule)
- throw(css::lang::IllegalArgumentException,
- css::frame::UnknownModuleException,
- css::uno::RuntimeException, std::exception )
{
// valid parameter?
css::uno::Reference< css::frame::XFrame > xFrame (xModule, css::uno::UNO_QUERY);
@@ -222,10 +198,6 @@ OUString SAL_CALL ModuleManager::identify(const css::uno::Reference< css::uno::X
void SAL_CALL ModuleManager::replaceByName(const OUString& sName ,
const css::uno::Any& aValue)
- throw (css::lang::IllegalArgumentException ,
- css::container::NoSuchElementException,
- css::lang::WrappedTargetException ,
- css::uno::RuntimeException, std::exception )
{
::comphelper::SequenceAsHashMap lProps(aValue);
if (lProps.empty() )
@@ -273,9 +245,6 @@ void SAL_CALL ModuleManager::replaceByName(const OUString& sName ,
}
css::uno::Any SAL_CALL ModuleManager::getByName(const OUString& sName)
- throw(css::container::NoSuchElementException,
- css::lang::WrappedTargetException ,
- css::uno::RuntimeException, std::exception )
{
// get access to the element
css::uno::Reference< css::container::XNameAccess > xModule;
@@ -302,37 +271,31 @@ css::uno::Any SAL_CALL ModuleManager::getByName(const OUString& sName)
}
css::uno::Sequence< OUString > SAL_CALL ModuleManager::getElementNames()
- throw(css::uno::RuntimeException, std::exception)
{
return m_xCFG->getElementNames();
}
sal_Bool SAL_CALL ModuleManager::hasByName(const OUString& sName)
- throw(css::uno::RuntimeException, std::exception)
{
return m_xCFG->hasByName(sName);
}
css::uno::Type SAL_CALL ModuleManager::getElementType()
- throw(css::uno::RuntimeException, std::exception)
{
return cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get();
}
sal_Bool SAL_CALL ModuleManager::hasElements()
- throw(css::uno::RuntimeException, std::exception)
{
return m_xCFG->hasElements();
}
css::uno::Reference< css::container::XEnumeration > SAL_CALL ModuleManager::createSubSetEnumerationByQuery(const OUString&)
- throw(css::uno::RuntimeException, std::exception)
{
return css::uno::Reference< css::container::XEnumeration >();
}
css::uno::Reference< css::container::XEnumeration > SAL_CALL ModuleManager::createSubSetEnumerationByProperties(const css::uno::Sequence< css::beans::NamedValue >& lProperties)
- throw(css::uno::RuntimeException, std::exception)
{
::comphelper::SequenceAsHashMap lSearchProps(lProperties);
const css::uno::Sequence< OUString > lModules = getElementNames();
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index e4440da6e30b..bd4488e664af 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -185,170 +185,160 @@ public:
/** free all used resources ... if it was not already done. */
virtual ~PathSettings() override;
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.framework.PathSettings");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
css::uno::Sequence< OUString > aSeq { "com.sun.star.util.PathSettings" };
return aSeq;
}
// XInterface
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) override;
virtual void SAL_CALL acquire() throw () override
{ OWeakObject::acquire(); }
virtual void SAL_CALL release() throw () override
{ OWeakObject::release(); }
// XTypeProvider
- virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override;
// css::util::XChangesListener
- virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent) override;
// css::lang::XEventListener
- virtual void SAL_CALL disposing(const css::lang::EventObject& aSource)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing(const css::lang::EventObject& aSource) override;
/**
* XPathSettings attribute methods
*/
- virtual OUString SAL_CALL getAddin() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getAddin() override
{ return getStringProperty("Addin"); }
- virtual void SAL_CALL setAddin(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setAddin(const OUString& p1) override
{ setStringProperty("Addin", p1); }
- virtual OUString SAL_CALL getAutoCorrect() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getAutoCorrect() override
{ return getStringProperty("AutoCorrect"); }
- virtual void SAL_CALL setAutoCorrect(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setAutoCorrect(const OUString& p1) override
{ setStringProperty("AutoCorrect", p1); }
- virtual OUString SAL_CALL getAutoText() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getAutoText() override
{ return getStringProperty("AutoText"); }
- virtual void SAL_CALL setAutoText(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setAutoText(const OUString& p1) override
{ setStringProperty("AutoText", p1); }
- virtual OUString SAL_CALL getBackup() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getBackup() override
{ return getStringProperty("Backup"); }
- virtual void SAL_CALL setBackup(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setBackup(const OUString& p1) override
{ setStringProperty("Backup", p1); }
- virtual OUString SAL_CALL getBasic() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getBasic() override
{ return getStringProperty("Basic"); }
- virtual void SAL_CALL setBasic(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setBasic(const OUString& p1) override
{ setStringProperty("Basic", p1); }
- virtual OUString SAL_CALL getBitmap() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getBitmap() override
{ return getStringProperty("Bitmap"); }
- virtual void SAL_CALL setBitmap(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setBitmap(const OUString& p1) override
{ setStringProperty("Bitmap", p1); }
- virtual OUString SAL_CALL getConfig() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getConfig() override
{ return getStringProperty("Config"); }
- virtual void SAL_CALL setConfig(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setConfig(const OUString& p1) override
{ setStringProperty("Config", p1); }
- virtual OUString SAL_CALL getDictionary() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getDictionary() override
{ return getStringProperty("Dictionary"); }
- virtual void SAL_CALL setDictionary(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setDictionary(const OUString& p1) override
{ setStringProperty("Dictionary", p1); }
- virtual OUString SAL_CALL getFavorite() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getFavorite() override
{ return getStringProperty("Favorite"); }
- virtual void SAL_CALL setFavorite(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setFavorite(const OUString& p1) override
{ setStringProperty("Favorite", p1); }
- virtual OUString SAL_CALL getFilter() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getFilter() override
{ return getStringProperty("Filter"); }
- virtual void SAL_CALL setFilter(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setFilter(const OUString& p1) override
{ setStringProperty("Filter", p1); }
- virtual OUString SAL_CALL getGallery() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getGallery() override
{ return getStringProperty("Gallery"); }
- virtual void SAL_CALL setGallery(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setGallery(const OUString& p1) override
{ setStringProperty("Gallery", p1); }
- virtual OUString SAL_CALL getGraphic() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getGraphic() override
{ return getStringProperty("Graphic"); }
- virtual void SAL_CALL setGraphic(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setGraphic(const OUString& p1) override
{ setStringProperty("Graphic", p1); }
- virtual OUString SAL_CALL getHelp() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getHelp() override
{ return getStringProperty("Help"); }
- virtual void SAL_CALL setHelp(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setHelp(const OUString& p1) override
{ setStringProperty("Help", p1); }
- virtual OUString SAL_CALL getLinguistic() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getLinguistic() override
{ return getStringProperty("Linguistic"); }
- virtual void SAL_CALL setLinguistic(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setLinguistic(const OUString& p1) override
{ setStringProperty("Linguistic", p1); }
- virtual OUString SAL_CALL getModule() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getModule() override
{ return getStringProperty("Module"); }
- virtual void SAL_CALL setModule(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setModule(const OUString& p1) override
{ setStringProperty("Module", p1); }
- virtual OUString SAL_CALL getPalette() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getPalette() override
{ return getStringProperty("Palette"); }
- virtual void SAL_CALL setPalette(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setPalette(const OUString& p1) override
{ setStringProperty("Palette", p1); }
- virtual OUString SAL_CALL getPlugin() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getPlugin() override
{ return getStringProperty("Plugin"); }
- virtual void SAL_CALL setPlugin(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setPlugin(const OUString& p1) override
{ setStringProperty("Plugin", p1); }
- virtual OUString SAL_CALL getStorage() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getStorage() override
{ return getStringProperty("Storage"); }
- virtual void SAL_CALL setStorage(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setStorage(const OUString& p1) override
{ setStringProperty("Storage", p1); }
- virtual OUString SAL_CALL getTemp() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getTemp() override
{ return getStringProperty("Temp"); }
- virtual void SAL_CALL setTemp(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setTemp(const OUString& p1) override
{ setStringProperty("Temp", p1); }
- virtual OUString SAL_CALL getTemplate() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getTemplate() override
{ return getStringProperty("Template"); }
- virtual void SAL_CALL setTemplate(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setTemplate(const OUString& p1) override
{ setStringProperty("Template", p1); }
- virtual OUString SAL_CALL getUIConfig() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getUIConfig() override
{ return getStringProperty("UIConfig"); }
- virtual void SAL_CALL setUIConfig(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setUIConfig(const OUString& p1) override
{ setStringProperty("UIConfig", p1); }
- virtual OUString SAL_CALL getUserConfig() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getUserConfig() override
{ return getStringProperty("UserConfig"); }
- virtual void SAL_CALL setUserConfig(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setUserConfig(const OUString& p1) override
{ setStringProperty("UserConfig", p1); }
- virtual OUString SAL_CALL getUserDictionary() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getUserDictionary() override
{ return getStringProperty("UserDictionary"); }
- virtual void SAL_CALL setUserDictionary(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setUserDictionary(const OUString& p1) override
{ setStringProperty("UserDictionary", p1); }
- virtual OUString SAL_CALL getWork() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getWork() override
{ return getStringProperty("Work"); }
- virtual void SAL_CALL setWork(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setWork(const OUString& p1) override
{ setStringProperty("Work", p1); }
- virtual OUString SAL_CALL getBasePathShareLayer() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getBasePathShareLayer() override
{ return getStringProperty("UIConfig"); }
- virtual void SAL_CALL setBasePathShareLayer(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setBasePathShareLayer(const OUString& p1) override
{ setStringProperty("UIConfig", p1); }
- virtual OUString SAL_CALL getBasePathUserLayer() throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getBasePathUserLayer() override
{ return getStringProperty("UserConfig"); }
- virtual void SAL_CALL setBasePathUserLayer(const OUString& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setBasePathUserLayer(const OUString& p1) override
{ setStringProperty("UserConfig", p1); }
/**
* overrides to resolve inheritance ambiguity
*/
- virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2)
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2) override
{ ::cppu::OPropertySetHelper::setPropertyValue(p1, p2); }
- virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p1)
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p1) override
{ return ::cppu::OPropertySetHelper::getPropertyValue(p1); }
- virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2)
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) override
{ ::cppu::OPropertySetHelper::addPropertyChangeListener(p1, p2); }
- virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2)
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) override
{ ::cppu::OPropertySetHelper::removePropertyChangeListener(p1, p2); }
- virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2)
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override
{ ::cppu::OPropertySetHelper::addVetoableChangeListener(p1, p2); }
- virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2)
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override
{ ::cppu::OPropertySetHelper::removeVetoableChangeListener(p1, p2); }
/** read all configured paths and create all needed internal structures. */
void impl_readAll();
@@ -357,12 +347,10 @@ private:
virtual void SAL_CALL disposing() final override;
/// @throws css::uno::RuntimeException
- OUString getStringProperty(const OUString& p1)
- throw(css::uno::RuntimeException);
+ OUString getStringProperty(const OUString& p1);
/// @throws css::uno::RuntimeException
- void setStringProperty(const OUString& p1, const OUString& p2)
- throw(css::uno::RuntimeException);
+ void setStringProperty(const OUString& p1, const OUString& p2);
/** read a path info using the old cfg schema.
This is needed for "migration on demand" reasons only.
@@ -438,9 +426,9 @@ private:
virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& aConvertedValue,
css::uno::Any& aOldValue,
sal_Int32 nHandle,
- const css::uno::Any& aValue ) throw(css::lang::IllegalArgumentException) override;
+ const css::uno::Any& aValue ) override;
virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle,
- const css::uno::Any& aValue ) throw(css::uno::Exception, std::exception) override;
+ const css::uno::Any& aValue ) override;
virtual void SAL_CALL getFastPropertyValue( css::uno::Any& aValue,
sal_Int32 nHandle ) const override;
// Avoid:
@@ -448,7 +436,7 @@ private:
// warning: by ‘virtual void {anonymous}::PathSettings::getFastPropertyValue(css::uno::Any&, sal_Int32) const’ [-Woverloaded-virtual]
using cppu::OPropertySetHelper::getFastPropertyValue;
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
- virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
/** factory methods to guarantee right (but on demand) initialized members ... */
css::uno::Reference< css::util::XStringSubstitution > fa_getSubstitution();
@@ -489,7 +477,6 @@ void SAL_CALL PathSettings::disposing()
}
css::uno::Any SAL_CALL PathSettings::queryInterface( const css::uno::Type& _rType )
- throw(css::uno::RuntimeException, std::exception)
{
css::uno::Any aRet = PathSettings_BASE::queryInterface( _rType );
if ( !aRet.hasValue() )
@@ -498,7 +485,6 @@ css::uno::Any SAL_CALL PathSettings::queryInterface( const css::uno::Type& _rTyp
}
css::uno::Sequence< css::uno::Type > SAL_CALL PathSettings::getTypes( )
- throw(css::uno::RuntimeException, std::exception)
{
return comphelper::concatSequences(
PathSettings_BASE::getTypes(),
@@ -507,7 +493,6 @@ css::uno::Sequence< css::uno::Type > SAL_CALL PathSettings::getTypes( )
}
void SAL_CALL PathSettings::changesOccurred(const css::util::ChangesEvent& aEvent)
- throw (css::uno::RuntimeException, std::exception)
{
sal_Int32 c = aEvent.Changes.getLength();
sal_Int32 i = 0;
@@ -537,7 +522,6 @@ void SAL_CALL PathSettings::changesOccurred(const css::util::ChangesEvent& aEven
}
void SAL_CALL PathSettings::disposing(const css::lang::EventObject& aSource)
- throw(css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex);
@@ -546,7 +530,6 @@ void SAL_CALL PathSettings::disposing(const css::lang::EventObject& aSource)
}
OUString PathSettings::getStringProperty(const OUString& p1)
- throw(css::uno::RuntimeException)
{
css::uno::Any a = ::cppu::OPropertySetHelper::getPropertyValue(p1);
OUString s;
@@ -555,7 +538,6 @@ OUString PathSettings::getStringProperty(const OUString& p1)
}
void PathSettings::setStringProperty(const OUString& p1, const OUString& p2)
- throw(css::uno::RuntimeException)
{
::cppu::OPropertySetHelper::setPropertyValue(p1, css::uno::Any(p2));
}
@@ -1387,7 +1369,6 @@ sal_Bool SAL_CALL PathSettings::convertFastPropertyValue( css::uno::Any& aC
css::uno::Any& aOldValue ,
sal_Int32 nHandle ,
const css::uno::Any& aValue )
- throw(css::lang::IllegalArgumentException)
{
// throws NoSuchElementException !
css::uno::Any aCurrentVal = impl_getPathValue(nHandle);
@@ -1401,7 +1382,6 @@ sal_Bool SAL_CALL PathSettings::convertFastPropertyValue( css::uno::Any& aC
void SAL_CALL PathSettings::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle,
const css::uno::Any& aValue )
- throw(css::uno::Exception, std::exception)
{
// throws NoSuchElement- and IllegalArgumentException !
impl_setPathValue(nHandle, aValue);
@@ -1419,7 +1399,6 @@ void SAL_CALL PathSettings::getFastPropertyValue(css::uno::Any& aValue ,
}
css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL PathSettings::getPropertySetInfo()
- throw(css::uno::RuntimeException, std::exception)
{
return css::uno::Reference< css::beans::XPropertySetInfo >(
::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()));
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index 8723177494c2..89be517fe071 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -110,46 +110,37 @@ public:
virtual ~SessionListener() override;
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.frame.SessionListener");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
return {"com.sun.star.frame.SessionListener"};
}
- virtual void SAL_CALL disposing(const css::lang::EventObject&) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing(const css::lang::EventObject&) override;
// XInitialization
- virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& args) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& args) override;
// XSessionManagerListener
- virtual void SAL_CALL doSave( sal_Bool bShutdown, sal_Bool bCancelable )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL approveInteraction( sal_Bool bInteractionGranted )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL shutdownCanceled()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL doRestore()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL doSave( sal_Bool bShutdown, sal_Bool bCancelable ) override;
+ virtual void SAL_CALL approveInteraction( sal_Bool bInteractionGranted ) override;
+ virtual void SAL_CALL shutdownCanceled() override;
+ virtual sal_Bool SAL_CALL doRestore() override;
// XSessionManagerListener2
- virtual void SAL_CALL doQuit()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL doQuit() override;
// XStatusListener
- virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& event)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& event) override;
};
SessionListener::SessionListener(const css::uno::Reference< css::uno::XComponentContext >& rxContext )
@@ -229,7 +220,7 @@ void SessionListener::QuitSessionQuietly()
}
}
-void SAL_CALL SessionListener::disposing(const css::lang::EventObject& Source) throw (RuntimeException, std::exception)
+void SAL_CALL SessionListener::disposing(const css::lang::EventObject& Source)
{
SAL_INFO("fwk.session", "SessionListener::disposing");
if (Source.Source == m_rSessionManager) {
@@ -238,7 +229,6 @@ void SAL_CALL SessionListener::disposing(const css::lang::EventObject& Source) t
}
void SAL_CALL SessionListener::initialize(const Sequence< Any >& args)
- throw (RuntimeException, std::exception)
{
SAL_INFO("fwk.session", "SessionListener::initialize");
@@ -274,7 +264,6 @@ void SAL_CALL SessionListener::initialize(const Sequence< Any >& args)
}
void SAL_CALL SessionListener::statusChanged(const frame::FeatureStateEvent& event)
- throw (css::uno::RuntimeException, std::exception)
{
SAL_INFO("fwk.session", "SessionListener::statusChanged");
@@ -297,7 +286,6 @@ void SAL_CALL SessionListener::statusChanged(const frame::FeatureStateEvent& eve
}
sal_Bool SAL_CALL SessionListener::doRestore()
- throw (RuntimeException, std::exception)
{
SAL_INFO("fwk.session", "SessionListener::doRestore");
osl::MutexGuard g(m_aMutex);
@@ -322,7 +310,6 @@ sal_Bool SAL_CALL SessionListener::doRestore()
}
void SAL_CALL SessionListener::doSave( sal_Bool bShutdown, sal_Bool /*bCancelable*/ )
- throw (RuntimeException, std::exception)
{
SAL_INFO("fwk.session", "SessionListener::doSave");
@@ -342,7 +329,6 @@ void SAL_CALL SessionListener::doSave( sal_Bool bShutdown, sal_Bool /*bCancelabl
}
void SAL_CALL SessionListener::approveInteraction( sal_Bool bInteractionGranted )
- throw (RuntimeException, std::exception)
{
SAL_INFO("fwk.session", "SessionListener::approveInteraction");
// do AutoSave as the first step
@@ -396,7 +382,6 @@ void SAL_CALL SessionListener::approveInteraction( sal_Bool bInteractionGranted
}
void SessionListener::shutdownCanceled()
- throw (RuntimeException, std::exception)
{
SAL_INFO("fwk.session", "SessionListener::shutdownCanceled");
// set the state back
@@ -404,7 +389,6 @@ void SessionListener::shutdownCanceled()
}
void SessionListener::doQuit()
- throw (RuntimeException, std::exception)
{
SAL_INFO("fwk.session", "SessionListener::doQuit");
if ( m_bSessionStoreRequested && !m_bTerminated )
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index 861c973a3f1d..2f38a872a094 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -137,31 +137,25 @@ class SubstitutePathVariables : private cppu::BaseMutex,
public:
explicit SubstitutePathVariables(const css::uno::Reference< css::uno::XComponentContext >& xContext);
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.framework.PathSubstitution");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
return {"com.sun.star.util.PathSubstitution"};
}
// XStringSubstitution
- virtual OUString SAL_CALL substituteVariables( const OUString& aText, sal_Bool bSubstRequired )
- throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL reSubstituteVariables( const OUString& aText )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getSubstituteVariableValue( const OUString& variable )
- throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL substituteVariables( const OUString& aText, sal_Bool bSubstRequired ) override;
+ virtual OUString SAL_CALL reSubstituteVariables( const OUString& aText ) override;
+ virtual OUString SAL_CALL getSubstituteVariableValue( const OUString& variable ) override;
protected:
void SetPredefinedPathVariables();
@@ -177,15 +171,12 @@ protected:
// XStringSubstitution implementation methods
/// @throws css::container::NoSuchElementException
/// @throws css::uno::RuntimeException
- OUString impl_substituteVariable( const OUString& aText, bool bSustRequired )
- throw (css::container::NoSuchElementException, css::uno::RuntimeException);
+ OUString impl_substituteVariable( const OUString& aText, bool bSustRequired );
/// @throws css::uno::RuntimeException
- OUString impl_reSubstituteVariables( const OUString& aText )
- throw (css::uno::RuntimeException);
+ OUString impl_reSubstituteVariables( const OUString& aText );
/// @throws css::container::NoSuchElementException
/// @throws css::uno::RuntimeException
- OUString const & impl_getSubstituteVariableValue( const OUString& variable )
- throw (css::container::NoSuchElementException, css::uno::RuntimeException);
+ OUString const & impl_getSubstituteVariableValue( const OUString& variable );
private:
typedef std::unordered_map<OUString, PreDefVariable, OUStringHash>
@@ -234,21 +225,18 @@ SubstitutePathVariables::SubstitutePathVariables( const Reference< XComponentCon
// XStringSubstitution
OUString SAL_CALL SubstitutePathVariables::substituteVariables( const OUString& aText, sal_Bool bSubstRequired )
-throw ( NoSuchElementException, RuntimeException, std::exception )
{
osl::MutexGuard g(rBHelper.rMutex);
return impl_substituteVariable( aText, bSubstRequired );
}
OUString SAL_CALL SubstitutePathVariables::reSubstituteVariables( const OUString& aText )
-throw ( RuntimeException, std::exception )
{
osl::MutexGuard g(rBHelper.rMutex);
return impl_reSubstituteVariables( aText );
}
OUString SAL_CALL SubstitutePathVariables::getSubstituteVariableValue( const OUString& aVariable )
-throw ( NoSuchElementException, RuntimeException, std::exception )
{
osl::MutexGuard g(rBHelper.rMutex);
return impl_getSubstituteVariableValue( aVariable );
@@ -326,7 +314,6 @@ OUString SubstitutePathVariables::GetPathVariableValue() const
}
OUString SubstitutePathVariables::impl_substituteVariable( const OUString& rText, bool bSubstRequired )
-throw ( NoSuchElementException, RuntimeException )
{
// This is maximal recursive depth supported!
const sal_Int32 nMaxRecursiveDepth = 8;
@@ -513,7 +500,6 @@ throw ( NoSuchElementException, RuntimeException )
}
OUString SubstitutePathVariables::impl_reSubstituteVariables( const OUString& rURL )
-throw ( RuntimeException )
{
OUString aURL;
@@ -594,7 +580,6 @@ throw ( RuntimeException )
// This method support both request schemes "$("<varname>")" or "<varname>".
OUString const & SubstitutePathVariables::impl_getSubstituteVariableValue( const OUString& rVariable )
-throw ( NoSuchElementException, RuntimeException )
{
OUString aVariable;
diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx
index ca41f84236e0..d66eff4fcb09 100644
--- a/framework/source/services/taskcreatorsrv.cxx
+++ b/framework/source/services/taskcreatorsrv.cxx
@@ -65,32 +65,25 @@ public:
explicit TaskCreatorService(const css::uno::Reference< css::uno::XComponentContext >& xContext);
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.framework.TaskCreator");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
return {"com.sun.star.frame.TaskCreator"};
}
// XSingleServiceFactory
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance()
- throw(css::uno::Exception ,
- css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance() override;
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const css::uno::Sequence< css::uno::Any >& lArguments)
- throw(css::uno::Exception ,
- css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const css::uno::Sequence< css::uno::Any >& lArguments) override;
private:
@@ -119,15 +112,11 @@ TaskCreatorService::TaskCreatorService(const css::uno::Reference< css::uno::XCom
}
css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createInstance()
- throw(css::uno::Exception ,
- css::uno::RuntimeException, std::exception)
{
return createInstanceWithArguments(css::uno::Sequence< css::uno::Any >());
}
css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createInstanceWithArguments(const css::uno::Sequence< css::uno::Any >& lArguments)
- throw(css::uno::Exception ,
- css::uno::RuntimeException, std::exception)
{
::comphelper::SequenceAsHashMap lArgs(lArguments);
diff --git a/framework/source/services/uriabbreviation.cxx b/framework/source/services/uriabbreviation.cxx
index 5c924f1ae5bc..b6707cff57b3 100644
--- a/framework/source/services/uriabbreviation.cxx
+++ b/framework/source/services/uriabbreviation.cxx
@@ -48,7 +48,7 @@ UriAbbreviation::UriAbbreviation(css::uno::Reference< css::uno::XComponentContex
}
// css::util::XStringAbbreviation:
-OUString SAL_CALL UriAbbreviation::abbreviateString(const css::uno::Reference< css::util::XStringWidth > & xStringWidth, ::sal_Int32 nWidth, const OUString & aString) throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL UriAbbreviation::abbreviateString(const css::uno::Reference< css::util::XStringWidth > & xStringWidth, ::sal_Int32 nWidth, const OUString & aString)
{
OUString aResult( aString );
if ( xStringWidth.is() )
diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx
index 5078747a264f..d84f5b6180d3 100644
--- a/framework/source/services/urltransformer.cxx
+++ b/framework/source/services/urltransformer.cxx
@@ -37,35 +37,28 @@ class URLTransformer : public ::cppu::WeakImplHelper< css::util::XURLTransformer
public:
URLTransformer() {}
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.framework.URLTransformer");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
return {"com.sun.star.util.URLTransformer"};
}
- virtual sal_Bool SAL_CALL parseStrict( css::util::URL& aURL )
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL parseStrict( css::util::URL& aURL ) override;
- virtual sal_Bool SAL_CALL parseSmart( css::util::URL& aURL, const OUString& sSmartProtocol )
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL parseSmart( css::util::URL& aURL, const OUString& sSmartProtocol ) override;
- virtual sal_Bool SAL_CALL assemble( css::util::URL& aURL )
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL assemble( css::util::URL& aURL ) override;
- virtual OUString SAL_CALL getPresentation( const css::util::URL& aURL, sal_Bool bWithPassword )
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getPresentation( const css::util::URL& aURL, sal_Bool bWithPassword ) override;
};
namespace
@@ -121,7 +114,7 @@ namespace
}
// XURLTransformer
-sal_Bool SAL_CALL URLTransformer::parseStrict( css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL URLTransformer::parseStrict( css::util::URL& aURL )
{
// Safe impossible cases.
if ( aURL.Complete.isEmpty() )
@@ -173,7 +166,7 @@ sal_Bool SAL_CALL URLTransformer::parseStrict( css::util::URL& aURL ) throw( css
// XURLTransformer
sal_Bool SAL_CALL URLTransformer::parseSmart( css::util::URL& aURL,
- const OUString& sSmartProtocol ) throw( css::uno::RuntimeException, std::exception )
+ const OUString& sSmartProtocol )
{
// Safe impossible cases.
if ( aURL.Complete.isEmpty() )
@@ -225,7 +218,7 @@ sal_Bool SAL_CALL URLTransformer::parseSmart( css::util::URL& aURL,
}
// XURLTransformer
-sal_Bool SAL_CALL URLTransformer::assemble( css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL URLTransformer::assemble( css::util::URL& aURL )
{
// Initialize parser.
INetURLObject aParser;
@@ -284,7 +277,7 @@ sal_Bool SAL_CALL URLTransformer::assemble( css::util::URL& aURL ) throw( css::u
// XURLTransformer
OUString SAL_CALL URLTransformer::getPresentation( const css::util::URL& aURL,
- sal_Bool bWithPassword ) throw( css::uno::RuntimeException, std::exception )
+ sal_Bool bWithPassword )
{
// Safe impossible cases.
if ( aURL.Complete.isEmpty() )
diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx
index f92628f81597..6d92e2fcbde4 100644
--- a/framework/source/tabwin/tabwindow.cxx
+++ b/framework/source/tabwin/tabwindow.cxx
@@ -257,7 +257,6 @@ IMPL_LINK( TabWindow, Deactivate, TabControl*, pTabControl, bool )
// XInitialization
void SAL_CALL TabWindow::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
{
const OUString aTopWindowArgName( "TopWindow" );
const OUString aSizeArgName( "Size" );
@@ -411,7 +410,7 @@ throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
// XComponent
-void SAL_CALL TabWindow::dispose() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL TabWindow::dispose()
{
// Send message to all listener and forget her references.
css::uno::Reference< css::lang::XComponent > xThis(
@@ -451,7 +450,6 @@ void SAL_CALL TabWindow::dispose() throw (css::uno::RuntimeException, std::excep
}
void SAL_CALL TabWindow::addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
-throw (css::uno::RuntimeException, std::exception)
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
SolarMutexClearableGuard aLock;
@@ -464,7 +462,6 @@ throw (css::uno::RuntimeException, std::exception)
}
void SAL_CALL TabWindow::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
-throw (css::uno::RuntimeException, std::exception)
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
SolarMutexClearableGuard aLock;
@@ -479,25 +476,21 @@ throw (css::uno::RuntimeException, std::exception)
// XEventListener
void SAL_CALL TabWindow::disposing( const css::lang::EventObject& )
-throw( css::uno::RuntimeException, std::exception )
{
}
// XWindowListener
void SAL_CALL TabWindow::windowResized( const css::awt::WindowEvent& )
-throw( css::uno::RuntimeException, std::exception )
{
implts_LayoutWindows();
}
void SAL_CALL TabWindow::windowMoved( const css::awt::WindowEvent& )
-throw( css::uno::RuntimeException, std::exception )
{
}
void SAL_CALL TabWindow::windowShown( const css::lang::EventObject& )
-throw( css::uno::RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -514,7 +507,6 @@ throw( css::uno::RuntimeException, std::exception )
}
void SAL_CALL TabWindow::windowHidden( const css::lang::EventObject& )
-throw( css::uno::RuntimeException, std::exception )
{
SolarMutexGuard g;
if ( m_xContainerWindow.is() )
@@ -532,12 +524,10 @@ throw( css::uno::RuntimeException, std::exception )
// XTopWindowListener
void SAL_CALL TabWindow::windowOpened( const css::lang::EventObject& )
-throw (css::uno::RuntimeException, std::exception)
{
}
void SAL_CALL TabWindow::windowClosing( const css::lang::EventObject& )
-throw (css::uno::RuntimeException, std::exception)
{
css::uno::Reference< css::lang::XComponent > xComponent( static_cast<OWeakObject *>(this), css::uno::UNO_QUERY );
if ( xComponent.is() )
@@ -545,34 +535,28 @@ throw (css::uno::RuntimeException, std::exception)
}
void SAL_CALL TabWindow::windowClosed( const css::lang::EventObject& )
-throw (css::uno::RuntimeException, std::exception)
{
}
void SAL_CALL TabWindow::windowMinimized( const css::lang::EventObject& )
-throw (css::uno::RuntimeException, std::exception)
{
}
void SAL_CALL TabWindow::windowNormalized( const css::lang::EventObject& )
-throw (css::uno::RuntimeException, std::exception)
{
}
void SAL_CALL TabWindow::windowActivated( const css::lang::EventObject& )
-throw (css::uno::RuntimeException, std::exception)
{
}
void SAL_CALL TabWindow::windowDeactivated( const css::lang::EventObject& )
-throw (css::uno::RuntimeException, std::exception)
{
}
// XSimpleTabController
::sal_Int32 SAL_CALL TabWindow::insertTab()
-throw (css::uno::RuntimeException, std::exception)
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
SolarMutexClearableGuard aLock;
@@ -595,7 +579,6 @@ throw (css::uno::RuntimeException, std::exception)
}
void SAL_CALL TabWindow::removeTab( ::sal_Int32 ID )
-throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
SolarMutexClearableGuard aLock;
@@ -624,7 +607,6 @@ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::ex
}
void SAL_CALL TabWindow::setTabProps( ::sal_Int32 ID, const css::uno::Sequence< css::beans::NamedValue >& Properties )
-throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
SolarMutexClearableGuard aLock;
@@ -670,7 +652,6 @@ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::ex
}
css::uno::Sequence< css::beans::NamedValue > SAL_CALL TabWindow::getTabProps( ::sal_Int32 ID )
-throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
@@ -703,7 +684,6 @@ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::ex
}
void SAL_CALL TabWindow::activateTab( ::sal_Int32 ID )
-throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
SolarMutexClearableGuard aLock;
@@ -736,7 +716,6 @@ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::ex
}
::sal_Int32 SAL_CALL TabWindow::getActiveTabID()
-throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
@@ -758,7 +737,6 @@ throw (css::uno::RuntimeException, std::exception)
void SAL_CALL TabWindow::addTabListener(
const css::uno::Reference< css::awt::XTabListener >& xListener )
-throw (css::uno::RuntimeException, std::exception)
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
SolarMutexClearableGuard aLock;
@@ -772,7 +750,6 @@ throw (css::uno::RuntimeException, std::exception)
}
void SAL_CALL TabWindow::removeTabListener( const css::uno::Reference< css::awt::XTabListener >& xListener )
-throw (css::uno::RuntimeException, std::exception)
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
SolarMutexClearableGuard aLock;
@@ -792,7 +769,6 @@ sal_Bool SAL_CALL TabWindow::convertFastPropertyValue( css::uno::Any& aCon
css::uno::Any& aOldValue ,
sal_Int32 nHandle ,
const css::uno::Any& aValue )
-throw( css::lang::IllegalArgumentException )
{
// Initialize state with sal_False !!!
// (Handle can be invalid)
@@ -823,7 +799,6 @@ throw( css::lang::IllegalArgumentException )
void SAL_CALL TabWindow::setFastPropertyValue_NoBroadcast( sal_Int32,
const css::uno::Any&)
-throw( css::uno::Exception, std::exception )
{
}
@@ -868,7 +843,6 @@ void SAL_CALL TabWindow::getFastPropertyValue( css::uno::Any& aValue ,
}
css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL TabWindow::getPropertySetInfo()
-throw ( css::uno::RuntimeException, std::exception )
{
// Optimize this method !
// We initialize a static variable only one time. And we don't must use a mutex at every call!
diff --git a/framework/source/tabwin/tabwinfactory.cxx b/framework/source/tabwin/tabwinfactory.cxx
index e343a78b2a1d..87e3f23340f6 100644
--- a/framework/source/tabwin/tabwinfactory.cxx
+++ b/framework/source/tabwin/tabwinfactory.cxx
@@ -60,7 +60,6 @@ TabWinFactory::~TabWinFactory()
css::uno::Reference< css::uno::XInterface > SAL_CALL TabWinFactory::createInstanceWithContext(
const css::uno::Reference< css::uno::XComponentContext >& xContext )
-throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
{
css::uno::Sequence< css::uno::Any > aArgs;
@@ -69,7 +68,6 @@ throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
css::uno::Reference< css::uno::XInterface > SAL_CALL TabWinFactory::createInstanceWithArgumentsAndContext(
const css::uno::Sequence< css::uno::Any >& Arguments, const css::uno::Reference< css::uno::XComponentContext >& )
-throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
{
const OUString aTopWindowArgName( "TopWindow");
diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx
index 214ff1f79322..c5e8e2b3710b 100644
--- a/framework/source/uiconfiguration/globalsettings.cxx
+++ b/framework/source/uiconfiguration/globalsettings.cxx
@@ -52,12 +52,12 @@ class GlobalSettings_Access : public ::cppu::WeakImplHelper<
explicit GlobalSettings_Access( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
// XComponent
- virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose() override;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
// XEventListener
- virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
// settings access
bool HasStatesInfo( GlobalSettings::UIElementType eElementType );
@@ -90,7 +90,6 @@ GlobalSettings_Access::GlobalSettings_Access( const css::uno::Reference< css::un
// XComponent
void SAL_CALL GlobalSettings_Access::dispose()
-throw ( css::uno::RuntimeException, std::exception )
{
osl::MutexGuard g(m_mutex);
m_xConfigAccess.clear();
@@ -98,18 +97,15 @@ throw ( css::uno::RuntimeException, std::exception )
}
void SAL_CALL GlobalSettings_Access::addEventListener( const css::uno::Reference< css::lang::XEventListener >& )
-throw (css::uno::RuntimeException, std::exception)
{
}
void SAL_CALL GlobalSettings_Access::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& )
-throw (css::uno::RuntimeException, std::exception)
{
}
// XEventListener
void SAL_CALL GlobalSettings_Access::disposing( const css::lang::EventObject& )
-throw (css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(m_mutex);
m_xConfigAccess.clear();
diff --git a/framework/source/uiconfiguration/graphicnameaccess.cxx b/framework/source/uiconfiguration/graphicnameaccess.cxx
index 2b12988f5c2e..029d34d05cd3 100644
--- a/framework/source/uiconfiguration/graphicnameaccess.cxx
+++ b/framework/source/uiconfiguration/graphicnameaccess.cxx
@@ -41,9 +41,6 @@ void GraphicNameAccess::addElement( const OUString& rName, const uno::Reference<
// XNameAccess
uno::Any SAL_CALL GraphicNameAccess::getByName( const OUString& aName )
-throw( container::NoSuchElementException,
- lang::WrappedTargetException,
- uno::RuntimeException, std::exception)
{
NameGraphicHashMap::const_iterator pIter = m_aNameToElementMap.find( aName );
if ( pIter != m_aNameToElementMap.end() )
@@ -53,7 +50,6 @@ throw( container::NoSuchElementException,
}
uno::Sequence< OUString > SAL_CALL GraphicNameAccess::getElementNames()
-throw(css::uno::RuntimeException, std::exception)
{
if ( m_aSeq.getLength() == 0 )
{
@@ -64,7 +60,6 @@ throw(css::uno::RuntimeException, std::exception)
}
sal_Bool SAL_CALL GraphicNameAccess::hasByName( const OUString& aName )
-throw(css::uno::RuntimeException, std::exception)
{
NameGraphicHashMap::const_iterator pIter = m_aNameToElementMap.find( aName );
return ( pIter != m_aNameToElementMap.end() );
@@ -72,13 +67,11 @@ throw(css::uno::RuntimeException, std::exception)
// XElementAccess
sal_Bool SAL_CALL GraphicNameAccess::hasElements()
-throw( uno::RuntimeException, std::exception )
{
return ( !m_aNameToElementMap.empty() );
}
uno::Type SAL_CALL GraphicNameAccess::getElementType()
-throw( uno::RuntimeException, std::exception )
{
return cppu::UnoType<graphic::XGraphic>::get();
}
diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx
index 045529ba03b4..00519550bfe5 100644
--- a/framework/source/uiconfiguration/imagemanager.cxx
+++ b/framework/source/uiconfiguration/imagemanager.cxx
@@ -66,17 +66,17 @@ ImageManager::~ImageManager()
}
// XComponent
-void SAL_CALL ImageManager::dispose() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ImageManager::dispose()
{
m_pImpl->dispose();
}
-void SAL_CALL ImageManager::addEventListener( const uno::Reference< XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ImageManager::addEventListener( const uno::Reference< XEventListener >& xListener )
{
m_pImpl->addEventListener(xListener);
}
-void SAL_CALL ImageManager::removeEventListener( const uno::Reference< XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ImageManager::removeEventListener( const uno::Reference< XEventListener >& xListener )
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
m_pImpl->removeEventListener(xListener);
@@ -84,7 +84,6 @@ void SAL_CALL ImageManager::removeEventListener( const uno::Reference< XEventLis
// Non-UNO methods
void ImageManager::setStorage( const uno::Reference< XStorage >& Storage )
-throw (css::uno::RuntimeException)
{
SolarMutexGuard g;
@@ -93,29 +92,24 @@ throw (css::uno::RuntimeException)
}
// XInitialization
-void SAL_CALL ImageManager::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception )
+void SAL_CALL ImageManager::initialize( const Sequence< Any >& aArguments )
{
m_pImpl->initialize(aArguments);
}
// XImageManager
void SAL_CALL ImageManager::reset()
- throw (css::lang::IllegalAccessException,
- css::uno::RuntimeException,
- std::exception)
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
m_pImpl->reset();
}
Sequence< OUString > SAL_CALL ImageManager::getAllImageNames( ::sal_Int16 nImageType )
-throw (css::uno::RuntimeException, std::exception)
{
return m_pImpl->getAllImageNames( nImageType );
}
sal_Bool SAL_CALL ImageManager::hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL )
-throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
{
return m_pImpl->hasImage(nImageType,aCommandURL);
}
@@ -123,7 +117,6 @@ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exc
Sequence< uno::Reference< XGraphic > > SAL_CALL ImageManager::getImages(
::sal_Int16 nImageType,
const Sequence< OUString >& aCommandURLSequence )
-throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception )
{
return m_pImpl->getImages(nImageType,aCommandURLSequence);
}
@@ -132,39 +125,27 @@ void SAL_CALL ImageManager::replaceImages(
::sal_Int16 nImageType,
const Sequence< OUString >& aCommandURLSequence,
const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence )
-throw ( css::lang::IllegalArgumentException,
- css::lang::IllegalAccessException,
- css::uno::RuntimeException, std::exception)
{
m_pImpl->replaceImages(nImageType,aCommandURLSequence,aGraphicsSequence);
}
void SAL_CALL ImageManager::removeImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence )
-throw ( css::lang::IllegalArgumentException,
- css::lang::IllegalAccessException,
- css::uno::RuntimeException, std::exception)
{
m_pImpl->removeImages(nImageType,aCommandURLSequence);
}
void SAL_CALL ImageManager::insertImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence )
-throw ( css::container::ElementExistException,
- css::lang::IllegalArgumentException,
- css::lang::IllegalAccessException,
- css::uno::RuntimeException, std::exception)
{
m_pImpl->insertImages(nImageType,aCommandURLSequence,aGraphicSequence);
}
// XUIConfiguration
void SAL_CALL ImageManager::addConfigurationListener( const uno::Reference< css::ui::XUIConfigurationListener >& xListener )
-throw (css::uno::RuntimeException, std::exception)
{
m_pImpl->addConfigurationListener(xListener);
}
void SAL_CALL ImageManager::removeConfigurationListener( const uno::Reference< css::ui::XUIConfigurationListener >& xListener )
-throw (css::uno::RuntimeException, std::exception)
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
m_pImpl->removeConfigurationListener(xListener);
@@ -172,31 +153,26 @@ throw (css::uno::RuntimeException, std::exception)
// XUIConfigurationPersistence
void SAL_CALL ImageManager::reload()
-throw ( css::uno::Exception,
- css::uno::RuntimeException, std::exception )
{
m_pImpl->reload();
}
void SAL_CALL ImageManager::store()
-throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
{
m_pImpl->store();
}
void SAL_CALL ImageManager::storeToStorage( const uno::Reference< XStorage >& Storage )
-throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
{
m_pImpl->storeToStorage(Storage);
}
sal_Bool SAL_CALL ImageManager::isModified()
-throw (css::uno::RuntimeException, std::exception)
{
return m_pImpl->isModified();
}
-sal_Bool SAL_CALL ImageManager::isReadOnly() throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ImageManager::isReadOnly()
{
return m_pImpl->isReadOnly();
}
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 33c6dd7abe9f..a479bac0498a 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -556,7 +556,7 @@ void ImageManagerImpl::dispose()
}
}
-void ImageManagerImpl::addEventListener( const uno::Reference< XEventListener >& xListener ) throw (css::uno::RuntimeException)
+void ImageManagerImpl::addEventListener( const uno::Reference< XEventListener >& xListener )
{
{
SolarMutexGuard g;
@@ -569,7 +569,7 @@ void ImageManagerImpl::addEventListener( const uno::Reference< XEventListener >&
m_aListenerContainer.addInterface( cppu::UnoType<XEventListener>::get(), xListener );
}
-void ImageManagerImpl::removeEventListener( const uno::Reference< XEventListener >& xListener ) throw (css::uno::RuntimeException)
+void ImageManagerImpl::removeEventListener( const uno::Reference< XEventListener >& xListener )
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
m_aListenerContainer.removeInterface( cppu::UnoType<XEventListener>::get(), xListener );
@@ -621,7 +621,6 @@ void ImageManagerImpl::initialize( const Sequence< Any >& aArguments )
// XImageManagerImpl
void ImageManagerImpl::reset()
-throw (css::uno::RuntimeException, lang::IllegalAccessException)
{
SolarMutexGuard g;
@@ -648,7 +647,6 @@ throw (css::uno::RuntimeException, lang::IllegalAccessException)
}
Sequence< OUString > ImageManagerImpl::getAllImageNames( ::sal_Int16 nImageType )
-throw (css::uno::RuntimeException)
{
SolarMutexGuard g;
@@ -687,7 +685,6 @@ throw (css::uno::RuntimeException)
}
bool ImageManagerImpl::hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL )
-throw (css::lang::IllegalArgumentException, css::uno::RuntimeException)
{
SolarMutexGuard g;
@@ -728,7 +725,6 @@ namespace
Sequence< uno::Reference< XGraphic > > ImageManagerImpl::getImages(
::sal_Int16 nImageType,
const Sequence< OUString >& aCommandURLSequence )
-throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException )
{
SolarMutexGuard g;
@@ -777,10 +773,6 @@ void ImageManagerImpl::replaceImages(
::sal_Int16 nImageType,
const Sequence< OUString >& aCommandURLSequence,
const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence )
-throw (css::lang::IllegalArgumentException,
- css::lang::IllegalAccessException,
- css::uno::RuntimeException,
- std::exception)
{
CmdToXGraphicNameAccess* pInsertedImages( nullptr );
CmdToXGraphicNameAccess* pReplacedImages( nullptr );
@@ -861,9 +853,6 @@ throw (css::lang::IllegalArgumentException,
}
void ImageManagerImpl::removeImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence )
-throw ( css::lang::IllegalArgumentException,
- css::lang::IllegalAccessException,
- css::uno::RuntimeException)
{
CmdToXGraphicNameAccess* pRemovedImages( nullptr );
CmdToXGraphicNameAccess* pReplacedImages( nullptr );
@@ -964,19 +953,12 @@ throw ( css::lang::IllegalArgumentException,
}
void ImageManagerImpl::insertImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence )
-throw ( css::container::ElementExistException,
- css::lang::IllegalArgumentException,
- css::lang::IllegalAccessException,
- css::uno::RuntimeException)
{
replaceImages(nImageType,aCommandURLSequence,aGraphicSequence);
}
// XUIConfigurationPersistence
void ImageManagerImpl::reload()
- throw (css::uno::Exception,
- css::uno::RuntimeException,
- std::exception)
{
SolarMutexClearableGuard aGuard;
@@ -1126,9 +1108,6 @@ void ImageManagerImpl::reload()
}
void ImageManagerImpl::store()
- throw (css::uno::Exception,
- css::uno::RuntimeException,
- std::exception)
{
SolarMutexGuard g;
@@ -1161,9 +1140,6 @@ void ImageManagerImpl::store()
}
void ImageManagerImpl::storeToStorage( const uno::Reference< XStorage >& Storage )
- throw (css::uno::Exception,
- css::uno::RuntimeException,
- std::exception)
{
SolarMutexGuard g;
@@ -1194,20 +1170,18 @@ void ImageManagerImpl::storeToStorage( const uno::Reference< XStorage >& Storage
}
bool ImageManagerImpl::isModified()
-throw (css::uno::RuntimeException)
{
SolarMutexGuard g;
return m_bModified;
}
-bool ImageManagerImpl::isReadOnly() throw (css::uno::RuntimeException)
+bool ImageManagerImpl::isReadOnly()
{
SolarMutexGuard g;
return m_bReadOnly;
}
// XUIConfiguration
void ImageManagerImpl::addConfigurationListener( const uno::Reference< css::ui::XUIConfigurationListener >& xListener )
-throw (css::uno::RuntimeException)
{
{
SolarMutexGuard g;
@@ -1221,7 +1195,6 @@ throw (css::uno::RuntimeException)
}
void ImageManagerImpl::removeConfigurationListener( const uno::Reference< css::ui::XUIConfigurationListener >& xListener )
-throw (css::uno::RuntimeException)
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
m_aListenerContainer.removeInterface( cppu::UnoType<XUIConfigurationListener>::get(), xListener );
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx
index 7b439045b17e..746b0b68d323 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.hxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx
@@ -95,62 +95,56 @@ namespace framework
void dispose();
void initialize( const css::uno::Sequence< css::uno::Any >& aArguments );
/// @throws css::uno::RuntimeException
- void addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException);
+ void addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener );
/// @throws css::uno::RuntimeException
- void removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException);
+ void removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener );
// XImageManager
/// @throws css::uno::RuntimeException
/// @throws css::lang::IllegalAccessException
- void reset() throw (css::uno::RuntimeException, css::lang::IllegalAccessException);
+ void reset();
/// @throws css::uno::RuntimeException
- css::uno::Sequence< OUString > getAllImageNames( ::sal_Int16 nImageType ) throw (css::uno::RuntimeException);
+ css::uno::Sequence< OUString > getAllImageNames( ::sal_Int16 nImageType );
/// @throws css::lang::IllegalArgumentException
/// @throws css::uno::RuntimeException
- bool hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+ bool hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL );
/// @throws css::lang::IllegalArgumentException
/// @throws css::uno::RuntimeException
- css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > > getImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+ css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > > getImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence );
/// @throws css::lang::IllegalArgumentException
/// @throws css::lang::IllegalAccessException
/// @throws css::uno::RuntimeException
- void replaceImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicsSequence ) throw (css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception);
+ void replaceImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicsSequence );
/// @throws css::lang::IllegalArgumentException
/// @throws css::lang::IllegalAccessException
/// @throws css::uno::RuntimeException
- void removeImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aResourceURLSequence ) throw (css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException);
+ void removeImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aResourceURLSequence );
/// @throws css::container::ElementExistException
/// @throws css::lang::IllegalArgumentException
/// @throws css::lang::IllegalAccessException
/// @throws css::uno::RuntimeException
- void insertImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicSequence ) throw (css::container::ElementExistException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException);
+ void insertImages( ::sal_Int16 nImageType, const css::uno::Sequence< OUString >& aCommandURLSequence, const css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > >& aGraphicSequence );
// XUIConfiguration
/// @throws css::uno::RuntimeException
- void addConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException);
+ void addConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener );
/// @throws css::uno::RuntimeException
- void removeConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException);
+ void removeConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener );
// XUIConfigurationPersistence
/// @throws css::uno::Exception
/// @throws css::uno::RuntimeException
- void reload() throw (css::uno::Exception, css::uno::RuntimeException, std::exception);
+ void reload();
/// @throws css::uno::Exception
/// @throws css::uno::RuntimeException
- void store()
- throw (css::uno::Exception,
- css::uno::RuntimeException,
- std::exception);
+ void store();
/// @throws css::uno::Exception
/// @throws css::uno::RuntimeException
- void storeToStorage( const css::uno::Reference< css::embed::XStorage >& Storage )
- throw (css::uno::Exception,
- css::uno::RuntimeException,
- std::exception);
+ void storeToStorage( const css::uno::Reference< css::embed::XStorage >& Storage );
/// @throws css::uno::RuntimeException
- bool isModified() throw (css::uno::RuntimeException);
+ bool isModified();
/// @throws css::uno::RuntimeException
- bool isReadOnly() throw (css::uno::RuntimeException);
+ bool isReadOnly();
void clear();
diff --git a/framework/source/uiconfiguration/moduleimagemanager.cxx b/framework/source/uiconfiguration/moduleimagemanager.cxx
index 323e9ab6417b..e5b6069d29fd 100644
--- a/framework/source/uiconfiguration/moduleimagemanager.cxx
+++ b/framework/source/uiconfiguration/moduleimagemanager.cxx
@@ -73,45 +73,40 @@ ModuleImageManager::~ModuleImageManager()
}
// XComponent
-void SAL_CALL ModuleImageManager::dispose() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ModuleImageManager::dispose()
{
m_pImpl->dispose();
}
-void SAL_CALL ModuleImageManager::addEventListener( const uno::Reference< XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ModuleImageManager::addEventListener( const uno::Reference< XEventListener >& xListener )
{
m_pImpl->addEventListener(xListener);
}
-void SAL_CALL ModuleImageManager::removeEventListener( const uno::Reference< XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ModuleImageManager::removeEventListener( const uno::Reference< XEventListener >& xListener )
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
m_pImpl->removeEventListener(xListener);
}
// XInitialization
-void SAL_CALL ModuleImageManager::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception )
+void SAL_CALL ModuleImageManager::initialize( const Sequence< Any >& aArguments )
{
m_pImpl->initialize(aArguments);
}
// XImageManager
void SAL_CALL ModuleImageManager::reset()
- throw (css::lang::IllegalAccessException,
- css::uno::RuntimeException,
- std::exception)
{
m_pImpl->reset();
}
Sequence< OUString > SAL_CALL ModuleImageManager::getAllImageNames( ::sal_Int16 nImageType )
-throw (css::uno::RuntimeException, std::exception)
{
return m_pImpl->getAllImageNames( nImageType );
}
sal_Bool SAL_CALL ModuleImageManager::hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL )
-throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
{
return m_pImpl->hasImage(nImageType,aCommandURL);
}
@@ -119,7 +114,6 @@ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exc
Sequence< uno::Reference< XGraphic > > SAL_CALL ModuleImageManager::getImages(
::sal_Int16 nImageType,
const Sequence< OUString >& aCommandURLSequence )
-throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception )
{
SAL_INFO( "fwk", "framework: ModuleImageManager::getImages" );
return m_pImpl->getImages(nImageType,aCommandURLSequence);
@@ -129,70 +123,53 @@ void SAL_CALL ModuleImageManager::replaceImages(
::sal_Int16 nImageType,
const Sequence< OUString >& aCommandURLSequence,
const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence )
-throw ( css::lang::IllegalArgumentException,
- css::lang::IllegalAccessException,
- css::uno::RuntimeException, std::exception)
{
m_pImpl->replaceImages(nImageType,aCommandURLSequence,aGraphicsSequence);
}
void SAL_CALL ModuleImageManager::removeImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence )
-throw ( css::lang::IllegalArgumentException,
- css::lang::IllegalAccessException,
- css::uno::RuntimeException, std::exception)
{
m_pImpl->removeImages(nImageType,aCommandURLSequence);
}
void SAL_CALL ModuleImageManager::insertImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence, const Sequence< uno::Reference< XGraphic > >& aGraphicSequence )
-throw ( css::container::ElementExistException,
- css::lang::IllegalArgumentException,
- css::lang::IllegalAccessException,
- css::uno::RuntimeException, std::exception)
{
m_pImpl->insertImages(nImageType,aCommandURLSequence,aGraphicSequence);
}
// XUIConfiguration
void SAL_CALL ModuleImageManager::addConfigurationListener( const uno::Reference< css::ui::XUIConfigurationListener >& xListener )
-throw (css::uno::RuntimeException, std::exception)
{
m_pImpl->addConfigurationListener(xListener);
}
void SAL_CALL ModuleImageManager::removeConfigurationListener( const uno::Reference< css::ui::XUIConfigurationListener >& xListener )
-throw (css::uno::RuntimeException, std::exception)
{
m_pImpl->removeConfigurationListener(xListener);
}
// XUIConfigurationPersistence
void SAL_CALL ModuleImageManager::reload()
-throw ( css::uno::Exception,
- css::uno::RuntimeException, std::exception )
{
m_pImpl->reload();
}
void SAL_CALL ModuleImageManager::store()
-throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
{
m_pImpl->store();
}
void SAL_CALL ModuleImageManager::storeToStorage( const uno::Reference< XStorage >& Storage )
-throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
{
m_pImpl->storeToStorage(Storage);
}
sal_Bool SAL_CALL ModuleImageManager::isModified()
-throw (css::uno::RuntimeException, std::exception)
{
return m_pImpl->isModified();
}
-sal_Bool SAL_CALL ModuleImageManager::isReadOnly() throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ModuleImageManager::isReadOnly()
{
return m_pImpl->isReadOnly();
}
diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
index 7fe50526c919..b4d1a0e6fffd 100644
--- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
+++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
@@ -65,27 +65,23 @@ public:
explicit ModuleUIConfigurationManagerSupplier( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
virtual ~ModuleUIConfigurationManagerSupplier() override;
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.framework.ModuleUIConfigurationManagerSupplier");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
return {"com.sun.star.ui.ModuleUIConfigurationManagerSupplier"};
}
// XModuleUIConfigurationManagerSupplier
- virtual css::uno::Reference< css::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager( const OUString& ModuleIdentifier )
- throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager( const OUString& ModuleIdentifier ) override;
private:
virtual void SAL_CALL disposing() final override;
@@ -142,7 +138,6 @@ void SAL_CALL ModuleUIConfigurationManagerSupplier::disposing()
// XModuleUIConfigurationManagerSupplier
Reference< XUIConfigurationManager > SAL_CALL ModuleUIConfigurationManagerSupplier::getUIConfigurationManager( const OUString& sModuleIdentifier )
-throw ( NoSuchElementException, RuntimeException, std::exception)
{
osl::MutexGuard g(rBHelper.rMutex);
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index 5b57820985e4..dd6cf09050a9 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -80,56 +80,53 @@ public:
virtual ~ModuleUIConfigurationManager() override;
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.framework.ModuleUIConfigurationManager");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
return {"com.sun.star.ui.ModuleUIConfigurationManager"};
}
// XComponent
- virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose() override;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
// XUIConfiguration
- virtual void SAL_CALL addConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) override;
+ virtual void SAL_CALL removeConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) override;
// XUIConfigurationManager
- virtual void SAL_CALL reset() throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getUIElementsInfo( sal_Int16 ElementType ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::container::XIndexContainer > SAL_CALL createSettings( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL hasSettings( const OUString& ResourceURL ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getSettings( const OUString& ResourceURL, sal_Bool bWriteable ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL replaceSettings( const OUString& ResourceURL, const css::uno::Reference< css::container::XIndexAccess >& aNewData ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeSettings( const OUString& ResourceURL ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL insertSettings( const OUString& NewResourceURL, const css::uno::Reference< css::container::XIndexAccess >& aNewData ) throw (css::container::ElementExistException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getImageManager() throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::ui::XAcceleratorConfiguration > SAL_CALL getShortCutManager() throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getEventsManager() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL reset() override;
+ virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getUIElementsInfo( sal_Int16 ElementType ) override;
+ virtual css::uno::Reference< css::container::XIndexContainer > SAL_CALL createSettings( ) override;
+ virtual sal_Bool SAL_CALL hasSettings( const OUString& ResourceURL ) override;
+ virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getSettings( const OUString& ResourceURL, sal_Bool bWriteable ) override;
+ virtual void SAL_CALL replaceSettings( const OUString& ResourceURL, const css::uno::Reference< css::container::XIndexAccess >& aNewData ) override;
+ virtual void SAL_CALL removeSettings( const OUString& ResourceURL ) override;
+ virtual void SAL_CALL insertSettings( const OUString& NewResourceURL, const css::uno::Reference< css::container::XIndexAccess >& aNewData ) override;
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getImageManager() override;
+ virtual css::uno::Reference< css::ui::XAcceleratorConfiguration > SAL_CALL getShortCutManager() override;
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getEventsManager() override;
// XModuleUIConfigurationManager
- virtual sal_Bool SAL_CALL isDefaultSettings( const OUString& ResourceURL ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getDefaultSettings( const OUString& ResourceURL ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isDefaultSettings( const OUString& ResourceURL ) override;
+ virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getDefaultSettings( const OUString& ResourceURL ) override;
// XUIConfigurationPersistence
- virtual void SAL_CALL reload() throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL store() throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL reload() override;
+ virtual void SAL_CALL store() override;
+ virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) override;
+ virtual sal_Bool SAL_CALL isModified() override;
+ virtual sal_Bool SAL_CALL isReadOnly() override;
private:
// private data types
@@ -927,7 +924,7 @@ ModuleUIConfigurationManager::~ModuleUIConfigurationManager()
}
// XComponent
-void SAL_CALL ModuleUIConfigurationManager::dispose() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ModuleUIConfigurationManager::dispose()
{
Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
@@ -962,7 +959,7 @@ void SAL_CALL ModuleUIConfigurationManager::dispose() throw (css::uno::RuntimeEx
}
}
-void SAL_CALL ModuleUIConfigurationManager::addEventListener( const Reference< XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ModuleUIConfigurationManager::addEventListener( const Reference< XEventListener >& xListener )
{
{
SolarMutexGuard g;
@@ -975,14 +972,14 @@ void SAL_CALL ModuleUIConfigurationManager::addEventListener( const Reference< X
m_aListenerContainer.addInterface( cppu::UnoType<XEventListener>::get(), xListener );
}
-void SAL_CALL ModuleUIConfigurationManager::removeEventListener( const Reference< XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ModuleUIConfigurationManager::removeEventListener( const Reference< XEventListener >& xListener )
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
m_aListenerContainer.removeInterface( cppu::UnoType<XEventListener>::get(), xListener );
}
// XUIConfiguration
-void SAL_CALL ModuleUIConfigurationManager::addConfigurationListener( const Reference< css::ui::XUIConfigurationListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ModuleUIConfigurationManager::addConfigurationListener( const Reference< css::ui::XUIConfigurationListener >& xListener )
{
{
SolarMutexGuard g;
@@ -995,14 +992,14 @@ void SAL_CALL ModuleUIConfigurationManager::addConfigurationListener( const Refe
m_aListenerContainer.addInterface( cppu::UnoType<ui::XUIConfigurationListener>::get(), xListener );
}
-void SAL_CALL ModuleUIConfigurationManager::removeConfigurationListener( const Reference< css::ui::XUIConfigurationListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ModuleUIConfigurationManager::removeConfigurationListener( const Reference< css::ui::XUIConfigurationListener >& xListener )
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
m_aListenerContainer.removeInterface( cppu::UnoType<ui::XUIConfigurationListener>::get(), xListener );
}
// XUIConfigurationManager
-void SAL_CALL ModuleUIConfigurationManager::reset() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ModuleUIConfigurationManager::reset()
{
SolarMutexClearableGuard aGuard;
@@ -1090,7 +1087,6 @@ void SAL_CALL ModuleUIConfigurationManager::reset() throw (css::uno::RuntimeExce
}
Sequence< Sequence< PropertyValue > > SAL_CALL ModuleUIConfigurationManager::getUIElementsInfo( sal_Int16 ElementType )
-throw ( IllegalArgumentException, RuntimeException, std::exception )
{
if (( ElementType < 0 ) || ( ElementType >= css::ui::UIElementType::COUNT ))
throw IllegalArgumentException();
@@ -1129,7 +1125,7 @@ throw ( IllegalArgumentException, RuntimeException, std::exception )
return comphelper::containerToSequence(aElementInfoSeq);
}
-Reference< XIndexContainer > SAL_CALL ModuleUIConfigurationManager::createSettings() throw (css::uno::RuntimeException, std::exception)
+Reference< XIndexContainer > SAL_CALL ModuleUIConfigurationManager::createSettings()
{
SolarMutexGuard g;
@@ -1141,7 +1137,6 @@ Reference< XIndexContainer > SAL_CALL ModuleUIConfigurationManager::createSettin
}
sal_Bool SAL_CALL ModuleUIConfigurationManager::hasSettings( const OUString& ResourceURL )
-throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
{
sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
@@ -1164,7 +1159,6 @@ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exc
}
Reference< XIndexAccess > SAL_CALL ModuleUIConfigurationManager::getSettings( const OUString& ResourceURL, sal_Bool bWriteable )
-throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
{
sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
@@ -1193,7 +1187,6 @@ throw (css::container::NoSuchElementException, css::lang::IllegalArgumentExcepti
}
void SAL_CALL ModuleUIConfigurationManager::replaceSettings( const OUString& ResourceURL, const Reference< css::container::XIndexAccess >& aNewData )
-throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception)
{
sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
@@ -1302,7 +1295,6 @@ throw (css::container::NoSuchElementException, css::lang::IllegalArgumentExcepti
}
void SAL_CALL ModuleUIConfigurationManager::removeSettings( const OUString& ResourceURL )
-throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException, RuntimeException, std::exception)
{
sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
@@ -1381,7 +1373,6 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException
}
void SAL_CALL ModuleUIConfigurationManager::insertSettings( const OUString& NewResourceURL, const Reference< XIndexAccess >& aNewData )
-throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, RuntimeException, std::exception )
{
sal_Int16 nElementType = RetrieveTypeFromResourceURL( NewResourceURL );
@@ -1442,7 +1433,7 @@ throw ( ElementExistException, IllegalArgumentException, IllegalAccessException,
}
}
-Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getImageManager() throw (css::uno::RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getImageManager()
{
SolarMutexGuard g;
@@ -1473,7 +1464,7 @@ Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getImageManager()
return Reference< XInterface >( m_xModuleImageManager, UNO_QUERY );
}
-Reference< ui::XAcceleratorConfiguration > SAL_CALL ModuleUIConfigurationManager::getShortCutManager() throw (css::uno::RuntimeException, std::exception)
+Reference< ui::XAcceleratorConfiguration > SAL_CALL ModuleUIConfigurationManager::getShortCutManager()
{
SolarMutexGuard g;
@@ -1494,14 +1485,13 @@ Reference< ui::XAcceleratorConfiguration > SAL_CALL ModuleUIConfigurationManager
return m_xModuleAcceleratorManager;
}
-Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getEventsManager() throw (css::uno::RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getEventsManager()
{
return Reference< XInterface >();
}
// XModuleUIConfigurationManager
sal_Bool SAL_CALL ModuleUIConfigurationManager::isDefaultSettings( const OUString& ResourceURL )
-throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
{
sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
@@ -1524,7 +1514,6 @@ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exc
}
Reference< XIndexAccess > SAL_CALL ModuleUIConfigurationManager::getDefaultSettings( const OUString& ResourceURL )
-throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
{
sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
@@ -1557,7 +1546,7 @@ throw (css::container::NoSuchElementException, css::lang::IllegalArgumentExcepti
}
// XUIConfigurationPersistence
-void SAL_CALL ModuleUIConfigurationManager::reload() throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
+void SAL_CALL ModuleUIConfigurationManager::reload()
{
SolarMutexClearableGuard aGuard;
@@ -1598,7 +1587,7 @@ void SAL_CALL ModuleUIConfigurationManager::reload() throw (css::uno::Exception,
}
}
-void SAL_CALL ModuleUIConfigurationManager::store() throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
+void SAL_CALL ModuleUIConfigurationManager::store()
{
SolarMutexGuard g;
@@ -1631,7 +1620,7 @@ void SAL_CALL ModuleUIConfigurationManager::store() throw (css::uno::Exception,
}
}
-void SAL_CALL ModuleUIConfigurationManager::storeToStorage( const Reference< XStorage >& Storage ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
+void SAL_CALL ModuleUIConfigurationManager::storeToStorage( const Reference< XStorage >& Storage )
{
SolarMutexGuard g;
@@ -1664,14 +1653,14 @@ void SAL_CALL ModuleUIConfigurationManager::storeToStorage( const Reference< XSt
}
}
-sal_Bool SAL_CALL ModuleUIConfigurationManager::isModified() throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ModuleUIConfigurationManager::isModified()
{
SolarMutexGuard g;
return m_bModified;
}
-sal_Bool SAL_CALL ModuleUIConfigurationManager::isReadOnly() throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL ModuleUIConfigurationManager::isReadOnly()
{
SolarMutexGuard g;
diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx
index 4efa5a8c2c9c..c121d1ab3e57 100644
--- a/framework/source/uiconfiguration/uicategorydescription.cxx
+++ b/framework/source/uiconfiguration/uicategorydescription.cxx
@@ -59,29 +59,24 @@ class ConfigurationAccess_UICategory : public ::cppu::WeakImplHelper<XNameAccess
virtual ~ConfigurationAccess_UICategory() override;
// XNameAccess
- virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
- throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
- virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
// XElementAccess
- virtual css::uno::Type SAL_CALL getElementType()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Type SAL_CALL getElementType() override;
- virtual sal_Bool SAL_CALL hasElements()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasElements() override;
// container.XContainerListener
- virtual void SAL_CALL elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception) override;
- virtual void SAL_CALL elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception) override;
- virtual void SAL_CALL elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception) override;
+ virtual void SAL_CALL elementInserted( const ContainerEvent& aEvent ) override;
+ virtual void SAL_CALL elementRemoved ( const ContainerEvent& aEvent ) override;
+ virtual void SAL_CALL elementReplaced( const ContainerEvent& aEvent ) override;
// lang.XEventListener
- virtual void SAL_CALL disposing( const EventObject& aEvent ) throw(RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( const EventObject& aEvent ) override;
protected:
Any getUINameFromID( const OUString& rId );
@@ -133,7 +128,6 @@ ConfigurationAccess_UICategory::~ConfigurationAccess_UICategory()
// XNameAccess
Any SAL_CALL ConfigurationAccess_UICategory::getByName( const OUString& rId )
-throw ( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
{
osl::MutexGuard g(aMutex);
if ( !m_bConfigAccessInitialized )
@@ -153,26 +147,22 @@ throw ( NoSuchElementException, WrappedTargetException, RuntimeException, std::e
}
Sequence< OUString > SAL_CALL ConfigurationAccess_UICategory::getElementNames()
-throw ( RuntimeException, std::exception )
{
return getAllIds();
}
sal_Bool SAL_CALL ConfigurationAccess_UICategory::hasByName( const OUString& rId )
-throw (css::uno::RuntimeException, std::exception)
{
return getByName( rId ).hasValue();
}
// XElementAccess
Type SAL_CALL ConfigurationAccess_UICategory::getElementType()
-throw ( RuntimeException, std::exception )
{
return( cppu::UnoType<OUString>::get());
}
sal_Bool SAL_CALL ConfigurationAccess_UICategory::hasElements()
-throw ( RuntimeException, std::exception )
{
// There must be global categories!
return true;
@@ -338,20 +328,20 @@ void ConfigurationAccess_UICategory::initializeConfigAccess()
}
// container.XContainerListener
-void SAL_CALL ConfigurationAccess_UICategory::elementInserted( const ContainerEvent& ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_UICategory::elementInserted( const ContainerEvent& )
{
}
-void SAL_CALL ConfigurationAccess_UICategory::elementRemoved ( const ContainerEvent& ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_UICategory::elementRemoved ( const ContainerEvent& )
{
}
-void SAL_CALL ConfigurationAccess_UICategory::elementReplaced( const ContainerEvent& ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_UICategory::elementReplaced( const ContainerEvent& )
{
}
// lang.XEventListener
-void SAL_CALL ConfigurationAccess_UICategory::disposing( const EventObject& aEvent ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_UICategory::disposing( const EventObject& aEvent )
{
// SAFE
// remove our reference to the config access
@@ -368,20 +358,17 @@ class UICategoryDescription : public UICommandDescription
public:
explicit UICategoryDescription( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.framework.UICategoryDescription");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
return {"com.sun.star.ui.UICategoryDescription"};
}
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index fa0ee57bdfd0..cf746c77faa5 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -65,20 +65,17 @@ class UIConfigurationManager : public ::cppu::WeakImplHelper<
css::ui::XUIConfigurationManager2 >
{
public:
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.framework.UIConfigurationManager");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
return {"com.sun.star.ui.UIConfigurationManager"};
}
@@ -86,37 +83,37 @@ public:
explicit UIConfigurationManager( const css::uno::Reference< css::uno::XComponentContext > & rxContext );
// XComponent
- virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose() override;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
// XUIConfiguration
- virtual void SAL_CALL addConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) override;
+ virtual void SAL_CALL removeConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) override;
// XUIConfigurationManager
- virtual void SAL_CALL reset() throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getUIElementsInfo( sal_Int16 ElementType ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::container::XIndexContainer > SAL_CALL createSettings( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL hasSettings( const OUString& ResourceURL ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getSettings( const OUString& ResourceURL, sal_Bool bWriteable ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL replaceSettings( const OUString& ResourceURL, const css::uno::Reference< css::container::XIndexAccess >& aNewData ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeSettings( const OUString& ResourceURL ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL insertSettings( const OUString& NewResourceURL, const css::uno::Reference< css::container::XIndexAccess >& aNewData ) throw (css::container::ElementExistException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getImageManager() throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::ui::XAcceleratorConfiguration > SAL_CALL getShortCutManager() throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getEventsManager() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL reset() override;
+ virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getUIElementsInfo( sal_Int16 ElementType ) override;
+ virtual css::uno::Reference< css::container::XIndexContainer > SAL_CALL createSettings( ) override;
+ virtual sal_Bool SAL_CALL hasSettings( const OUString& ResourceURL ) override;
+ virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getSettings( const OUString& ResourceURL, sal_Bool bWriteable ) override;
+ virtual void SAL_CALL replaceSettings( const OUString& ResourceURL, const css::uno::Reference< css::container::XIndexAccess >& aNewData ) override;
+ virtual void SAL_CALL removeSettings( const OUString& ResourceURL ) override;
+ virtual void SAL_CALL insertSettings( const OUString& NewResourceURL, const css::uno::Reference< css::container::XIndexAccess >& aNewData ) override;
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getImageManager() override;
+ virtual css::uno::Reference< css::ui::XAcceleratorConfiguration > SAL_CALL getShortCutManager() override;
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getEventsManager() override;
// XUIConfigurationPersistence
- virtual void SAL_CALL reload() throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL store() throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL reload() override;
+ virtual void SAL_CALL store() override;
+ virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) override;
+ virtual sal_Bool SAL_CALL isModified() override;
+ virtual sal_Bool SAL_CALL isReadOnly() override;
// XUIConfigurationStorage
- virtual void SAL_CALL setStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL hasStorage() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) override;
+ virtual sal_Bool SAL_CALL hasStorage() override;
private:
// private data types
@@ -693,7 +690,7 @@ UIConfigurationManager::UIConfigurationManager( const css::uno::Reference< css::
}
// XComponent
-void SAL_CALL UIConfigurationManager::dispose() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigurationManager::dispose()
{
Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
@@ -719,7 +716,7 @@ void SAL_CALL UIConfigurationManager::dispose() throw (css::uno::RuntimeExceptio
}
}
-void SAL_CALL UIConfigurationManager::addEventListener( const Reference< XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigurationManager::addEventListener( const Reference< XEventListener >& xListener )
{
{
SolarMutexGuard g;
@@ -732,14 +729,14 @@ void SAL_CALL UIConfigurationManager::addEventListener( const Reference< XEventL
m_aListenerContainer.addInterface( cppu::UnoType<XEventListener>::get(), xListener );
}
-void SAL_CALL UIConfigurationManager::removeEventListener( const Reference< XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigurationManager::removeEventListener( const Reference< XEventListener >& xListener )
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
m_aListenerContainer.removeInterface( cppu::UnoType<XEventListener>::get(), xListener );
}
// XUIConfigurationManager
-void SAL_CALL UIConfigurationManager::addConfigurationListener( const Reference< css::ui::XUIConfigurationListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigurationManager::addConfigurationListener( const Reference< css::ui::XUIConfigurationListener >& xListener )
{
{
SolarMutexGuard g;
@@ -752,13 +749,13 @@ void SAL_CALL UIConfigurationManager::addConfigurationListener( const Reference<
m_aListenerContainer.addInterface( cppu::UnoType<XUIConfigurationListener>::get(), xListener );
}
-void SAL_CALL UIConfigurationManager::removeConfigurationListener( const Reference< css::ui::XUIConfigurationListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigurationManager::removeConfigurationListener( const Reference< css::ui::XUIConfigurationListener >& xListener )
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
m_aListenerContainer.removeInterface( cppu::UnoType<XUIConfigurationListener>::get(), xListener );
}
-void SAL_CALL UIConfigurationManager::reset() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigurationManager::reset()
{
SolarMutexClearableGuard aGuard;
@@ -844,7 +841,6 @@ void SAL_CALL UIConfigurationManager::reset() throw (css::uno::RuntimeException,
}
Sequence< Sequence< PropertyValue > > SAL_CALL UIConfigurationManager::getUIElementsInfo( sal_Int16 ElementType )
-throw ( IllegalArgumentException, RuntimeException, std::exception )
{
if (( ElementType < 0 ) || ( ElementType >= css::ui::UIElementType::COUNT ))
throw IllegalArgumentException();
@@ -883,7 +879,7 @@ throw ( IllegalArgumentException, RuntimeException, std::exception )
return comphelper::containerToSequence(aElementInfoSeq);
}
-Reference< XIndexContainer > SAL_CALL UIConfigurationManager::createSettings() throw (css::uno::RuntimeException, std::exception)
+Reference< XIndexContainer > SAL_CALL UIConfigurationManager::createSettings()
{
SolarMutexGuard g;
@@ -895,7 +891,6 @@ Reference< XIndexContainer > SAL_CALL UIConfigurationManager::createSettings() t
}
sal_Bool SAL_CALL UIConfigurationManager::hasSettings( const OUString& ResourceURL )
-throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
{
sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
@@ -913,7 +908,6 @@ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exc
}
Reference< XIndexAccess > SAL_CALL UIConfigurationManager::getSettings( const OUString& ResourceURL, sal_Bool bWriteable )
-throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
{
sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
@@ -942,7 +936,6 @@ throw (css::container::NoSuchElementException, css::lang::IllegalArgumentExcepti
}
void SAL_CALL UIConfigurationManager::replaceSettings( const OUString& ResourceURL, const Reference< css::container::XIndexAccess >& aNewData )
-throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception)
{
sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
@@ -1001,7 +994,6 @@ throw (css::container::NoSuchElementException, css::lang::IllegalArgumentExcepti
}
void SAL_CALL UIConfigurationManager::removeSettings( const OUString& ResourceURL )
-throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException, RuntimeException, std::exception)
{
sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
@@ -1059,7 +1051,6 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException
}
void SAL_CALL UIConfigurationManager::insertSettings( const OUString& NewResourceURL, const Reference< XIndexAccess >& aNewData )
-throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, RuntimeException, std::exception )
{
sal_Int16 nElementType = RetrieveTypeFromResourceURL( NewResourceURL );
@@ -1132,7 +1123,7 @@ throw ( ElementExistException, IllegalArgumentException, IllegalAccessException,
}
}
-Reference< XInterface > SAL_CALL UIConfigurationManager::getImageManager() throw (css::uno::RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL UIConfigurationManager::getImageManager()
{
if ( m_bDisposed )
throw DisposedException();
@@ -1158,7 +1149,7 @@ Reference< XInterface > SAL_CALL UIConfigurationManager::getImageManager() throw
return Reference< XInterface >( m_xImageManager, UNO_QUERY );
}
-Reference< XAcceleratorConfiguration > SAL_CALL UIConfigurationManager::getShortCutManager() throw (css::uno::RuntimeException, std::exception)
+Reference< XAcceleratorConfiguration > SAL_CALL UIConfigurationManager::getShortCutManager()
{
// SAFE ->
SolarMutexGuard g;
@@ -1177,13 +1168,13 @@ Reference< XAcceleratorConfiguration > SAL_CALL UIConfigurationManager::getShort
return m_xAccConfig;
}
-Reference< XInterface > SAL_CALL UIConfigurationManager::getEventsManager() throw (css::uno::RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL UIConfigurationManager::getEventsManager()
{
return Reference< XInterface >();
}
// XUIConfigurationStorage
-void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& Storage ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& Storage )
{
SolarMutexGuard g;
@@ -1243,7 +1234,7 @@ void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& S
impl_Initialize();
}
-sal_Bool SAL_CALL UIConfigurationManager::hasStorage() throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL UIConfigurationManager::hasStorage()
{
SolarMutexGuard g;
@@ -1254,7 +1245,7 @@ sal_Bool SAL_CALL UIConfigurationManager::hasStorage() throw (css::uno::RuntimeE
}
// XUIConfigurationPersistence
-void SAL_CALL UIConfigurationManager::reload() throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigurationManager::reload()
{
SolarMutexClearableGuard aGuard;
@@ -1293,7 +1284,7 @@ void SAL_CALL UIConfigurationManager::reload() throw (css::uno::Exception, css::
}
}
-void SAL_CALL UIConfigurationManager::store() throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigurationManager::store()
{
SolarMutexGuard g;
@@ -1326,7 +1317,7 @@ void SAL_CALL UIConfigurationManager::store() throw (css::uno::Exception, css::u
}
}
-void SAL_CALL UIConfigurationManager::storeToStorage( const Reference< XStorage >& Storage ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigurationManager::storeToStorage( const Reference< XStorage >& Storage )
{
SolarMutexGuard g;
@@ -1359,14 +1350,14 @@ void SAL_CALL UIConfigurationManager::storeToStorage( const Reference< XStorage
}
}
-sal_Bool SAL_CALL UIConfigurationManager::isModified() throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL UIConfigurationManager::isModified()
{
SolarMutexGuard g;
return m_bModified;
}
-sal_Bool SAL_CALL UIConfigurationManager::isReadOnly() throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL UIConfigurationManager::isReadOnly()
{
SolarMutexGuard g;
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index 614df9f71df0..9194f45ccdc6 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -107,40 +107,32 @@ class ConfigurationAccess_WindowState : public ::cppu::WeakImplHelper< XNameCon
virtual ~ConfigurationAccess_WindowState() override;
// XNameAccess
- virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
- throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
- virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
// XNameContainer
- virtual void SAL_CALL removeByName( const OUString& sName )
- throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL removeByName( const OUString& sName ) override;
- virtual void SAL_CALL insertByName( const OUString& sName, const css::uno::Any& aPropertySet )
- throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL insertByName( const OUString& sName, const css::uno::Any& aPropertySet ) override;
// XNameReplace
- virtual void SAL_CALL replaceByName( const OUString& sName, const css::uno::Any& aPropertySet )
- throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL replaceByName( const OUString& sName, const css::uno::Any& aPropertySet ) override;
// XElementAccess
- virtual css::uno::Type SAL_CALL getElementType()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Type SAL_CALL getElementType() override;
- virtual sal_Bool SAL_CALL hasElements()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasElements() override;
// container.XContainerListener
- virtual void SAL_CALL elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception) override;
- virtual void SAL_CALL elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception) override;
- virtual void SAL_CALL elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception) override;
+ virtual void SAL_CALL elementInserted( const ContainerEvent& aEvent ) override;
+ virtual void SAL_CALL elementRemoved ( const ContainerEvent& aEvent ) override;
+ virtual void SAL_CALL elementReplaced( const ContainerEvent& aEvent ) override;
// lang.XEventListener
- virtual void SAL_CALL disposing( const EventObject& aEvent ) throw(RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( const EventObject& aEvent ) override;
protected:
enum WindowStateMask
@@ -251,7 +243,6 @@ ConfigurationAccess_WindowState::~ConfigurationAccess_WindowState()
// XNameAccess
Any SAL_CALL ConfigurationAccess_WindowState::getByName( const OUString& rResourceURL )
-throw ( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
{
// SAFE
osl::MutexGuard g(m_aMutex);
@@ -270,7 +261,6 @@ throw ( NoSuchElementException, WrappedTargetException, RuntimeException, std::e
}
Sequence< OUString > SAL_CALL ConfigurationAccess_WindowState::getElementNames()
-throw ( RuntimeException, std::exception )
{
// SAFE
osl::MutexGuard g(m_aMutex);
@@ -288,7 +278,6 @@ throw ( RuntimeException, std::exception )
}
sal_Bool SAL_CALL ConfigurationAccess_WindowState::hasByName( const OUString& rResourceURL )
-throw (css::uno::RuntimeException, std::exception)
{
// SAFE
osl::MutexGuard g(m_aMutex);
@@ -308,13 +297,11 @@ throw (css::uno::RuntimeException, std::exception)
// XElementAccess
Type SAL_CALL ConfigurationAccess_WindowState::getElementType()
-throw ( RuntimeException, std::exception )
{
return( cppu::UnoType<Sequence< PropertyValue >>::get() );
}
sal_Bool SAL_CALL ConfigurationAccess_WindowState::hasElements()
-throw ( RuntimeException, std::exception )
{
// SAFE
osl::MutexGuard g(m_aMutex);
@@ -333,7 +320,6 @@ throw ( RuntimeException, std::exception )
// XNameContainer
void SAL_CALL ConfigurationAccess_WindowState::removeByName( const OUString& rResourceURL )
-throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception )
{
// SAFE
osl::ResettableMutexGuard g(m_aMutex);
@@ -368,7 +354,6 @@ throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::ex
}
void SAL_CALL ConfigurationAccess_WindowState::insertByName( const OUString& rResourceURL, const css::uno::Any& aPropertySet )
-throw( IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception )
{
// SAFE
osl::ResettableMutexGuard g(m_aMutex);
@@ -433,7 +418,6 @@ throw( IllegalArgumentException, ElementExistException, WrappedTargetException,
// XNameReplace
void SAL_CALL ConfigurationAccess_WindowState::replaceByName( const OUString& rResourceURL, const css::uno::Any& aPropertySet )
-throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception )
{
// SAFE
osl::ResettableMutexGuard g(m_aMutex);
@@ -504,21 +488,21 @@ throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException,
}
// container.XContainerListener
-void SAL_CALL ConfigurationAccess_WindowState::elementInserted( const ContainerEvent& ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_WindowState::elementInserted( const ContainerEvent& )
{
// do nothing - next time someone wants to retrieve this node we will find it in the configuration
}
-void SAL_CALL ConfigurationAccess_WindowState::elementRemoved ( const ContainerEvent& ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_WindowState::elementRemoved ( const ContainerEvent& )
{
}
-void SAL_CALL ConfigurationAccess_WindowState::elementReplaced( const ContainerEvent& ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_WindowState::elementReplaced( const ContainerEvent& )
{
}
// lang.XEventListener
-void SAL_CALL ConfigurationAccess_WindowState::disposing( const EventObject& aEvent ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_WindowState::disposing( const EventObject& aEvent )
{
// SAFE
// remove our reference to the config access
@@ -1269,39 +1253,31 @@ public:
explicit WindowStateConfiguration( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
virtual ~WindowStateConfiguration() override;
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.framework.WindowStateConfiguration");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
return {"com.sun.star.ui.WindowStateConfiguration"};
}
// XNameAccess
- virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
- throw ( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
- virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
// XElementAccess
- virtual css::uno::Type SAL_CALL getElementType()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL hasElements()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Type SAL_CALL getElementType() override;
+ virtual sal_Bool SAL_CALL hasElements() override;
typedef std::unordered_map< OUString,
OUString,
@@ -1372,7 +1348,6 @@ WindowStateConfiguration::~WindowStateConfiguration()
}
Any SAL_CALL WindowStateConfiguration::getByName( const OUString& aModuleIdentifier )
-throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex);
@@ -1404,7 +1379,6 @@ throw (css::container::NoSuchElementException, css::lang::WrappedTargetException
}
Sequence< OUString > SAL_CALL WindowStateConfiguration::getElementNames()
-throw (css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex);
@@ -1412,7 +1386,6 @@ throw (css::uno::RuntimeException, std::exception)
}
sal_Bool SAL_CALL WindowStateConfiguration::hasByName( const OUString& aName )
-throw (css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex);
@@ -1422,13 +1395,11 @@ throw (css::uno::RuntimeException, std::exception)
// XElementAccess
Type SAL_CALL WindowStateConfiguration::getElementType()
-throw (css::uno::RuntimeException, std::exception)
{
return( cppu::UnoType<XNameAccess>::get());
}
sal_Bool SAL_CALL WindowStateConfiguration::hasElements()
-throw (css::uno::RuntimeException, std::exception)
{
// We always have at least one module. So it is valid to return true!
return true;
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index b3074486d898..9458d2f6e45f 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -136,7 +136,7 @@ static Image RetrieveImage( Reference< css::frame::XFrame >& rFrame,
}
// XComponent
-void SAL_CALL AddonsToolBarManager::dispose() throw( RuntimeException, std::exception )
+void SAL_CALL AddonsToolBarManager::dispose()
{
Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx
index 0214754d0dca..ce9c61ede525 100644
--- a/framework/source/uielement/addonstoolbarwrapper.cxx
+++ b/framework/source/uielement/addonstoolbarwrapper.cxx
@@ -63,7 +63,7 @@ AddonsToolBarWrapper::~AddonsToolBarWrapper()
}
// XComponent
-void SAL_CALL AddonsToolBarWrapper::dispose() throw ( RuntimeException, std::exception )
+void SAL_CALL AddonsToolBarWrapper::dispose()
{
Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
@@ -80,7 +80,7 @@ void SAL_CALL AddonsToolBarWrapper::dispose() throw ( RuntimeException, std::exc
}
// XInitialization
-void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception )
+void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArguments )
{
SolarMutexGuard g;
@@ -142,7 +142,7 @@ void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArgument
}
// XUIElement interface
-Reference< XInterface > SAL_CALL AddonsToolBarWrapper::getRealInterface() throw (css::uno::RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL AddonsToolBarWrapper::getRealInterface()
{
SolarMutexGuard g;
diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx
index fef0d1da3c9e..f79eb470bfc6 100644
--- a/framework/source/uielement/buttontoolbarcontroller.cxx
+++ b/framework/source/uielement/buttontoolbarcontroller.cxx
@@ -73,7 +73,6 @@ ButtonToolbarController::~ButtonToolbarController()
// XInterface
uno::Any SAL_CALL ButtonToolbarController::queryInterface( const uno::Type& rType )
-throw (css::uno::RuntimeException, std::exception)
{
Any a = ::cppu::queryInterface(
rType ,
@@ -102,7 +101,6 @@ void SAL_CALL ButtonToolbarController::release() throw ()
// XInitialization
void SAL_CALL ButtonToolbarController::initialize(
const css::uno::Sequence< css::uno::Any >& aArguments )
-throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
{
bool bInitialized( true );
@@ -140,7 +138,7 @@ throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
}
// XComponent
-void SAL_CALL ButtonToolbarController::dispose() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ButtonToolbarController::dispose()
{
Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
@@ -159,21 +157,18 @@ void SAL_CALL ButtonToolbarController::dispose() throw (css::uno::RuntimeExcepti
void SAL_CALL ButtonToolbarController::addEventListener(
const css::uno::Reference< css::lang::XEventListener >& )
-throw (css::uno::RuntimeException, std::exception)
{
// do nothing
}
void SAL_CALL ButtonToolbarController::removeEventListener(
const css::uno::Reference< css::lang::XEventListener >& )
-throw (css::uno::RuntimeException, std::exception)
{
// do nothing
}
// XUpdatable
void SAL_CALL ButtonToolbarController::update()
-throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aSolarMutexGuard;
if ( m_bDisposed )
@@ -183,7 +178,6 @@ throw (css::uno::RuntimeException, std::exception)
// XEventListener
void SAL_CALL ButtonToolbarController::disposing(
const css::lang::EventObject& Source )
-throw ( css::uno::RuntimeException, std::exception )
{
uno::Reference< uno::XInterface > xSource( Source.Source );
@@ -198,7 +192,6 @@ throw ( css::uno::RuntimeException, std::exception )
}
void SAL_CALL ButtonToolbarController::statusChanged( const css::frame::FeatureStateEvent& )
-throw ( css::uno::RuntimeException, std::exception )
{
// do nothing
if ( m_bDisposed )
@@ -207,7 +200,6 @@ throw ( css::uno::RuntimeException, std::exception )
// XToolbarController
void SAL_CALL ButtonToolbarController::execute( sal_Int16 KeyModifier )
-throw (css::uno::RuntimeException, std::exception)
{
uno::Reference< frame::XDispatch > xDispatch;
uno::Reference< frame::XFrame > xFrame;
@@ -264,7 +256,6 @@ throw (css::uno::RuntimeException, std::exception)
}
void SAL_CALL ButtonToolbarController::click()
-throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aSolarMutexGuard;
@@ -276,7 +267,6 @@ throw (css::uno::RuntimeException, std::exception)
}
void SAL_CALL ButtonToolbarController::doubleClick()
-throw (css::uno::RuntimeException, std::exception)
{
// do nothing
if ( m_bDisposed )
@@ -284,7 +274,6 @@ throw (css::uno::RuntimeException, std::exception)
}
uno::Reference< awt::XWindow > SAL_CALL ButtonToolbarController::createPopupWindow()
-throw (css::uno::RuntimeException, std::exception)
{
if ( m_bDisposed )
throw DisposedException();
@@ -294,7 +283,6 @@ throw (css::uno::RuntimeException, std::exception)
uno::Reference< awt::XWindow > SAL_CALL ButtonToolbarController::createItemWindow(
const css::uno::Reference< css::awt::XWindow >& )
-throw (css::uno::RuntimeException, std::exception)
{
if ( m_bDisposed )
throw DisposedException();
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx
index 416c2f86e7da..d6d42b1fb75a 100644
--- a/framework/source/uielement/comboboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx
@@ -150,7 +150,6 @@ ComboboxToolbarController::~ComboboxToolbarController()
}
void SAL_CALL ComboboxToolbarController::dispose()
-throw ( RuntimeException, std::exception )
{
SolarMutexGuard aSolarMutexGuard;
diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx
index fc8003ce58dd..6296fed95174 100644
--- a/framework/source/uielement/complextoolbarcontroller.cxx
+++ b/framework/source/uielement/complextoolbarcontroller.cxx
@@ -68,7 +68,6 @@ ComplexToolbarController::~ComplexToolbarController()
}
void SAL_CALL ComplexToolbarController::dispose()
-throw ( RuntimeException, std::exception )
{
SolarMutexGuard aSolarMutexGuard;
@@ -91,7 +90,6 @@ Sequence<PropertyValue> ComplexToolbarController::getExecuteArgs(sal_Int16 KeyMo
}
void SAL_CALL ComplexToolbarController::execute( sal_Int16 KeyModifier )
-throw ( RuntimeException, std::exception )
{
Reference< XDispatch > xDispatch;
Reference< XURLTransformer > xURLTransformer;
@@ -129,7 +127,6 @@ throw ( RuntimeException, std::exception )
}
void ComplexToolbarController::statusChanged( const FeatureStateEvent& Event )
-throw ( RuntimeException, std::exception )
{
SolarMutexGuard aSolarMutexGuard;
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index c90926447e25..0cd54b70c70b 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -137,38 +137,35 @@ public:
explicit ControlMenuController( const uno::Reference< uno::XComponentContext >& xContext );
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.framework.ControlMenuController");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
return {"com.sun.star.frame.PopupMenuController"};
}
// XPopupMenuController
- virtual void SAL_CALL updatePopupMenu() throw (uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL updatePopupMenu() override;
// XInitialization
- virtual void SAL_CALL initialize( const uno::Sequence< uno::Any >& aArguments ) throw (uno::Exception, uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL initialize( const uno::Sequence< uno::Any >& aArguments ) override;
// XStatusListener
- virtual void SAL_CALL statusChanged( const frame::FeatureStateEvent& Event ) throw ( uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL statusChanged( const frame::FeatureStateEvent& Event ) override;
// XMenuListener
- virtual void SAL_CALL itemActivated( const awt::MenuEvent& rEvent ) throw (uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL itemActivated( const awt::MenuEvent& rEvent ) override;
// XEventListener
- virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw ( uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL disposing( const lang::EventObject& Source ) override;
private:
virtual void impl_setPopupMenu() override;
@@ -232,7 +229,7 @@ void ControlMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rP
}
// XEventListener
-void SAL_CALL ControlMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception )
+void SAL_CALL ControlMenuController::disposing( const EventObject& )
{
Reference< css::awt::XMenuListener > xHolder(static_cast<OWeakObject *>(this), UNO_QUERY );
@@ -247,7 +244,7 @@ void SAL_CALL ControlMenuController::disposing( const EventObject& ) throw ( Run
}
// XStatusListener
-void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception )
+void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Event )
{
osl::ResettableMutexGuard aLock( m_aMutex );
@@ -301,7 +298,7 @@ void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Eve
}
// XMenuListener
-void SAL_CALL ControlMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException, std::exception)
+void SAL_CALL ControlMenuController::itemActivated( const css::awt::MenuEvent& )
{
osl::ResettableMutexGuard aLock( m_aMutex );
@@ -348,7 +345,7 @@ void ControlMenuController::impl_setPopupMenu()
} // if ( m_pResPopupMenu == 0 )
}
-void SAL_CALL ControlMenuController::updatePopupMenu() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ControlMenuController::updatePopupMenu()
{
osl::ResettableMutexGuard aLock( m_aMutex );
@@ -378,7 +375,7 @@ void SAL_CALL ControlMenuController::updatePopupMenu() throw (css::uno::RuntimeE
}
// XInitialization
-void SAL_CALL ControlMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception )
+void SAL_CALL ControlMenuController::initialize( const Sequence< Any >& aArguments )
{
osl::ResettableMutexGuard aLock( m_aMutex );
svt::PopupMenuControllerBase::initialize(aArguments);
diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
index dc66c3a93e03..b33049e2fcd6 100644
--- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
@@ -142,7 +142,6 @@ DropdownToolbarController::~DropdownToolbarController()
}
void SAL_CALL DropdownToolbarController::dispose()
-throw ( RuntimeException, std::exception )
{
SolarMutexGuard aSolarMutexGuard;
diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx
index ccd7a383e42f..c5dce26b90ed 100644
--- a/framework/source/uielement/edittoolbarcontroller.cxx
+++ b/framework/source/uielement/edittoolbarcontroller.cxx
@@ -139,7 +139,6 @@ EditToolbarController::~EditToolbarController()
}
void SAL_CALL EditToolbarController::dispose()
-throw ( RuntimeException, std::exception )
{
SolarMutexGuard aSolarMutexGuard;
diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx
index 10232221805e..ae090316b330 100644
--- a/framework/source/uielement/fontmenucontroller.cxx
+++ b/framework/source/uielement/fontmenucontroller.cxx
@@ -113,7 +113,7 @@ void FontMenuController::fillPopupMenu( const Sequence< OUString >& rFontNameSeq
}
// XEventListener
-void SAL_CALL FontMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception )
+void SAL_CALL FontMenuController::disposing( const EventObject& )
{
Reference< css::awt::XMenuListener > xHolder(static_cast<OWeakObject *>(this), UNO_QUERY );
@@ -128,7 +128,7 @@ void SAL_CALL FontMenuController::disposing( const EventObject& ) throw ( Runtim
}
// XStatusListener
-void SAL_CALL FontMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception )
+void SAL_CALL FontMenuController::statusChanged( const FeatureStateEvent& Event )
{
css::awt::FontDescriptor aFontDescriptor;
Sequence< OUString > aFontNameSeq;
@@ -147,7 +147,7 @@ void SAL_CALL FontMenuController::statusChanged( const FeatureStateEvent& Event
}
// XMenuListener
-void SAL_CALL FontMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException, std::exception)
+void SAL_CALL FontMenuController::itemActivated( const css::awt::MenuEvent& )
{
osl::MutexGuard aLock( m_aMutex );
@@ -195,7 +195,7 @@ void FontMenuController::impl_setPopupMenu()
m_xFontListDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
}
-void SAL_CALL FontMenuController::updatePopupMenu() throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL FontMenuController::updatePopupMenu()
{
svt::PopupMenuControllerBase::updatePopupMenu();
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index 8345f0f31a92..6977e827b3c1 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -235,7 +235,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
}
// XEventListener
-void SAL_CALL FontSizeMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception )
+void SAL_CALL FontSizeMenuController::disposing( const EventObject& )
{
Reference< css::awt::XMenuListener > xHolder(static_cast<OWeakObject *>(this), UNO_QUERY );
@@ -249,7 +249,7 @@ void SAL_CALL FontSizeMenuController::disposing( const EventObject& ) throw ( Ru
}
// XStatusListener
-void SAL_CALL FontSizeMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception )
+void SAL_CALL FontSizeMenuController::statusChanged( const FeatureStateEvent& Event )
{
css::awt::FontDescriptor aFontDescriptor;
css::frame::status::FontHeight aFontHeight;
@@ -287,7 +287,7 @@ void FontSizeMenuController::impl_setPopupMenu()
m_xCurrentFontDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
}
-void SAL_CALL FontSizeMenuController::updatePopupMenu() throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL FontSizeMenuController::updatePopupMenu()
{
osl::ClearableMutexGuard aLock( m_aMutex );
diff --git a/framework/source/uielement/genericstatusbarcontroller.cxx b/framework/source/uielement/genericstatusbarcontroller.cxx
index 2ab06947effc..b73648102971 100644
--- a/framework/source/uielement/genericstatusbarcontroller.cxx
+++ b/framework/source/uielement/genericstatusbarcontroller.cxx
@@ -70,7 +70,6 @@ GenericStatusbarController::~GenericStatusbarController()
}
void SAL_CALL GenericStatusbarController::dispose()
-throw ( RuntimeException, std::exception )
{
svt::StatusbarController::dispose();
@@ -83,7 +82,6 @@ throw ( RuntimeException, std::exception )
void SAL_CALL GenericStatusbarController::statusChanged(
const FeatureStateEvent& rEvent)
-throw ( RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
@@ -124,7 +122,6 @@ void SAL_CALL GenericStatusbarController::paint(
const Reference< awt::XGraphics >& xGraphics,
const awt::Rectangle& rOutputRectangle,
::sal_Int32 /*nStyle*/ )
-throw ( RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index fe601ab72f96..56d24bf95724 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -112,7 +112,6 @@ GenericToolbarController::~GenericToolbarController()
}
void SAL_CALL GenericToolbarController::dispose()
-throw ( RuntimeException, std::exception )
{
SolarMutexGuard aSolarMutexGuard;
@@ -123,7 +122,6 @@ throw ( RuntimeException, std::exception )
}
void SAL_CALL GenericToolbarController::execute( sal_Int16 KeyModifier )
-throw ( RuntimeException, std::exception )
{
Reference< XDispatch > xDispatch;
Reference< XURLTransformer > xURLTransformer;
@@ -170,7 +168,6 @@ throw ( RuntimeException, std::exception )
}
void GenericToolbarController::statusChanged( const FeatureStateEvent& Event )
-throw ( RuntimeException, std::exception )
{
SolarMutexGuard aSolarMutexGuard;
@@ -333,13 +330,13 @@ void Toolbarmenu::dispose()
::PopupMenu::dispose();
}
-void SAL_CALL MenuToolbarController::click() throw (RuntimeException, std::exception)
+void SAL_CALL MenuToolbarController::click()
{
createPopupWindow();
}
Reference< XWindow > SAL_CALL
-MenuToolbarController::createPopupWindow() throw (css::uno::RuntimeException, std::exception)
+MenuToolbarController::createPopupWindow()
{
if ( !pMenu )
{
diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx
index 7a10e8572f43..030574b822f8 100644
--- a/framework/source/uielement/headermenucontroller.cxx
+++ b/framework/source/uielement/headermenucontroller.cxx
@@ -182,7 +182,7 @@ void HeaderMenuController::fillPopupMenu( const Reference< css::frame::XModel >&
}
// XEventListener
-void SAL_CALL HeaderMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception )
+void SAL_CALL HeaderMenuController::disposing( const EventObject& )
{
Reference< css::awt::XMenuListener > xHolder(static_cast<OWeakObject *>(this), UNO_QUERY );
@@ -196,7 +196,7 @@ void SAL_CALL HeaderMenuController::disposing( const EventObject& ) throw ( Runt
}
// XStatusListener
-void SAL_CALL HeaderMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception )
+void SAL_CALL HeaderMenuController::statusChanged( const FeatureStateEvent& Event )
{
Reference< css::frame::XModel > xModel;
@@ -210,7 +210,7 @@ void SAL_CALL HeaderMenuController::statusChanged( const FeatureStateEvent& Even
}
// XMenuListener
-void SAL_CALL HeaderMenuController::updatePopupMenu() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL HeaderMenuController::updatePopupMenu()
{
osl::ResettableMutexGuard aLock( m_aMutex );
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
index 39db8a0712ba..54762061bda9 100644
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
@@ -82,7 +82,6 @@ ImageButtonToolbarController::~ImageButtonToolbarController()
}
void SAL_CALL ImageButtonToolbarController::dispose()
-throw ( RuntimeException, std::exception )
{
SolarMutexGuard aSolarMutexGuard;
ComplexToolbarController::dispose();
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index a9c2a2239d6b..e524361c2834 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -83,7 +83,7 @@ LanguageSelectionMenuController::~LanguageSelectionMenuController()
}
// XEventListener
-void SAL_CALL LanguageSelectionMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception )
+void SAL_CALL LanguageSelectionMenuController::disposing( const EventObject& )
{
Reference< css::awt::XMenuListener > xHolder(static_cast<OWeakObject *>(this), UNO_QUERY );
@@ -98,7 +98,7 @@ void SAL_CALL LanguageSelectionMenuController::disposing( const EventObject& ) t
}
// XStatusListener
-void SAL_CALL LanguageSelectionMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception )
+void SAL_CALL LanguageSelectionMenuController::statusChanged( const FeatureStateEvent& Event )
{
SolarMutexGuard aSolarMutexGuard;
@@ -240,7 +240,7 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup
pPopupMenu->SetItemCommand( nItemId, aCmd_Dialog );
}
-void SAL_CALL LanguageSelectionMenuController::updatePopupMenu() throw ( css::uno::RuntimeException, std::exception )
+void SAL_CALL LanguageSelectionMenuController::updatePopupMenu()
{
svt::PopupMenuControllerBase::updatePopupMenu();
@@ -275,7 +275,7 @@ void SAL_CALL LanguageSelectionMenuController::updatePopupMenu() throw ( css::un
}
// XInitialization
-void SAL_CALL LanguageSelectionMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception )
+void SAL_CALL LanguageSelectionMenuController::initialize( const Sequence< Any >& aArguments )
{
osl::MutexGuard aLock( m_aMutex );
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index 93319bff9533..8b2e69d4f8f7 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -82,17 +82,17 @@ public:
LangSelectionStatusbarController& operator=(const LangSelectionStatusbarController&) = delete;
// XInitialization
- virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
// XStatusListener
- virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override;
// XStatusbarController
virtual void SAL_CALL command( const css::awt::Point& aPos,
::sal_Int32 nCommand,
sal_Bool bMouseEvent,
- const css::uno::Any& aData ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL click( const css::awt::Point& aPos ) throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Any& aData ) override;
+ virtual void SAL_CALL click( const css::awt::Point& aPos ) override;
private:
virtual ~LangSelectionStatusbarController() override {}
@@ -105,7 +105,7 @@ private:
LanguageGuessingHelper m_aLangGuessHelper;
/// @throws css::uno::RuntimeException
- void LangMenu( const css::awt::Point& aPos ) throw (css::uno::RuntimeException, std::exception);
+ void LangMenu( const css::awt::Point& aPos );
};
LangSelectionStatusbarController::LangSelectionStatusbarController( const uno::Reference< uno::XComponentContext >& xContext ) :
@@ -117,7 +117,6 @@ LangSelectionStatusbarController::LangSelectionStatusbarController( const uno::R
}
void SAL_CALL LangSelectionStatusbarController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aSolarMutexGuard;
@@ -132,7 +131,6 @@ throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
void LangSelectionStatusbarController::LangMenu(
const css::awt::Point& aPos )
-throw (css::uno::RuntimeException, std::exception)
{
if (!m_bShowMenu)
return;
@@ -267,7 +265,6 @@ void SAL_CALL LangSelectionStatusbarController::command(
::sal_Int32 nCommand,
sal_Bool /*bMouseEvent*/,
const css::uno::Any& /*aData*/ )
-throw (css::uno::RuntimeException, std::exception)
{
if ( nCommand & ::awt::Command::CONTEXTMENU )
{
@@ -277,14 +274,12 @@ throw (css::uno::RuntimeException, std::exception)
void SAL_CALL LangSelectionStatusbarController::click(
const css::awt::Point& aPos )
-throw (css::uno::RuntimeException, std::exception)
{
LangMenu( aPos );
}
// XStatusListener
void SAL_CALL LangSelectionStatusbarController::statusChanged( const FeatureStateEvent& Event )
-throw ( RuntimeException, std::exception )
{
// This function will be called when observed data changes,
// for example the selection or keyboard language.
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx
index bbfaf0ee8510..b8880b8e7321 100644
--- a/framework/source/uielement/macrosmenucontroller.cxx
+++ b/framework/source/uielement/macrosmenucontroller.cxx
@@ -92,7 +92,7 @@ void MacrosMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPo
}
// XEventListener
-void SAL_CALL MacrosMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception )
+void SAL_CALL MacrosMenuController::disposing( const EventObject& )
{
Reference< css::awt::XMenuListener > xHolder(static_cast<OWeakObject *>(this), UNO_QUERY );
@@ -109,7 +109,7 @@ void SAL_CALL MacrosMenuController::disposing( const EventObject& ) throw ( Runt
}
// XStatusListener
-void SAL_CALL MacrosMenuController::statusChanged( const FeatureStateEvent& ) throw ( RuntimeException, std::exception )
+void SAL_CALL MacrosMenuController::statusChanged( const FeatureStateEvent& )
{
osl::MutexGuard aLock( m_aMutex );
if ( m_xPopupMenu.is() )
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index f9a5ebd24676..2d4137d6ea1f 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -162,7 +162,7 @@ MenuBarManager::MenuBarManager(
Init(rFrame,pAddonMenu, popup);
}
-Any SAL_CALL MenuBarManager::queryInterface( const Type & rType ) throw ( RuntimeException, std::exception )
+Any SAL_CALL MenuBarManager::queryInterface( const Type & rType )
{
Any a = ::cppu::queryInterface(
rType ,
@@ -189,7 +189,7 @@ void SAL_CALL MenuBarManager::release() throw()
OWeakObject::release();
}
-Any SAL_CALL MenuBarManager::getMenuHandle( const Sequence< sal_Int8 >& /*ProcessId*/, sal_Int16 SystemType ) throw (RuntimeException, std::exception)
+Any SAL_CALL MenuBarManager::getMenuHandle( const Sequence< sal_Int8 >& /*ProcessId*/, sal_Int16 SystemType )
{
SolarMutexGuard aSolarGuard;
@@ -257,7 +257,7 @@ void MenuBarManager::Destroy()
}
// XComponent
-void SAL_CALL MenuBarManager::dispose() throw( RuntimeException, std::exception )
+void SAL_CALL MenuBarManager::dispose()
{
Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
@@ -307,7 +307,7 @@ void SAL_CALL MenuBarManager::dispose() throw( RuntimeException, std::exception
}
}
-void SAL_CALL MenuBarManager::addEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException, std::exception )
+void SAL_CALL MenuBarManager::addEventListener( const Reference< XEventListener >& xListener )
{
SolarMutexGuard g;
@@ -318,7 +318,7 @@ void SAL_CALL MenuBarManager::addEventListener( const Reference< XEventListener
m_aListenerContainer.addInterface( cppu::UnoType<XEventListener>::get(), xListener );
}
-void SAL_CALL MenuBarManager::removeEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException, std::exception )
+void SAL_CALL MenuBarManager::removeEventListener( const Reference< XEventListener >& xListener )
{
SolarMutexGuard g;
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
@@ -326,7 +326,6 @@ void SAL_CALL MenuBarManager::removeEventListener( const Reference< XEventListen
}
void SAL_CALL MenuBarManager::elementInserted( const css::ui::ConfigurationEvent& Event )
-throw (RuntimeException, std::exception)
{
SolarMutexGuard g;
@@ -342,20 +341,17 @@ throw (RuntimeException, std::exception)
}
void SAL_CALL MenuBarManager::elementRemoved( const css::ui::ConfigurationEvent& Event )
-throw (RuntimeException, std::exception)
{
elementInserted(Event);
}
void SAL_CALL MenuBarManager::elementReplaced( const css::ui::ConfigurationEvent& Event )
-throw (RuntimeException, std::exception)
{
elementInserted(Event);
}
// XFrameActionListener
void SAL_CALL MenuBarManager::frameAction( const FrameActionEvent& Action )
-throw ( RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -376,7 +372,6 @@ throw ( RuntimeException, std::exception )
// XStatusListener
void SAL_CALL MenuBarManager::statusChanged( const FeatureStateEvent& Event )
-throw ( RuntimeException, std::exception )
{
OUString aFeatureURL = Event.FeatureURL.Complete;
@@ -603,7 +598,7 @@ void MenuBarManager::RemoveListener()
m_xFrame = nullptr;
}
-void SAL_CALL MenuBarManager::disposing( const EventObject& Source ) throw ( RuntimeException, std::exception )
+void SAL_CALL MenuBarManager::disposing( const EventObject& Source )
{
MenuItemHandler* pMenuItemDisposing = nullptr;
@@ -721,8 +716,7 @@ private:
virtual ~QuietInteractionContext() override {}
virtual css::uno::Any SAL_CALL getValueByName(
- OUString const & Name)
- throw (css::uno::RuntimeException, std::exception) override
+ OUString const & Name) override
{
return Name != JAVA_INTERACTION_HANDLER_NAME && context_.is()
? context_->getValueByName(Name)
diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx
index 3e45a3e02189..9fc4ccee6167 100644
--- a/framework/source/uielement/menubarwrapper.cxx
+++ b/framework/source/uielement/menubarwrapper.cxx
@@ -91,7 +91,7 @@ MenuBarWrapper::~MenuBarWrapper()
{
}
-void SAL_CALL MenuBarWrapper::dispose() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL MenuBarWrapper::dispose()
{
Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
@@ -110,7 +110,7 @@ void SAL_CALL MenuBarWrapper::dispose() throw (css::uno::RuntimeException, std::
}
// XInitialization
-void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception )
+void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments )
{
SolarMutexGuard g;
@@ -198,7 +198,7 @@ void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) th
}
// XUIElementSettings
-void SAL_CALL MenuBarWrapper::updateSettings() throw ( RuntimeException, std::exception )
+void SAL_CALL MenuBarWrapper::updateSettings()
{
SolarMutexGuard g;
@@ -250,13 +250,11 @@ void MenuBarWrapper::fillPopupControllerCache()
// XElementAccess
Type SAL_CALL MenuBarWrapper::getElementType()
-throw (css::uno::RuntimeException, std::exception)
{
return cppu::UnoType<XDispatchProvider>::get();
}
sal_Bool SAL_CALL MenuBarWrapper::hasElements()
-throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
@@ -270,9 +268,6 @@ throw (css::uno::RuntimeException, std::exception)
// XNameAccess
Any SAL_CALL MenuBarWrapper::getByName(
const OUString& aName )
-throw ( container::NoSuchElementException,
- lang::WrappedTargetException,
- uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
@@ -293,7 +288,6 @@ throw ( container::NoSuchElementException,
}
Sequence< OUString > SAL_CALL MenuBarWrapper::getElementNames()
-throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
@@ -307,7 +301,6 @@ throw (css::uno::RuntimeException, std::exception)
sal_Bool SAL_CALL MenuBarWrapper::hasByName(
const OUString& aName )
-throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
@@ -324,7 +317,7 @@ throw (css::uno::RuntimeException, std::exception)
}
// XUIElement
-Reference< XInterface > SAL_CALL MenuBarWrapper::getRealInterface() throw ( RuntimeException, std::exception )
+Reference< XInterface > SAL_CALL MenuBarWrapper::getRealInterface()
{
if ( m_bDisposed )
throw DisposedException();
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index e8963fd76e88..bde828e250c1 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -367,7 +367,7 @@ void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopup
}
// XEventListener
-void SAL_CALL NewMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception )
+void SAL_CALL NewMenuController::disposing( const EventObject& )
{
Reference< css::awt::XMenuListener > xHolder(static_cast<OWeakObject *>(this), UNO_QUERY );
@@ -382,12 +382,12 @@ void SAL_CALL NewMenuController::disposing( const EventObject& ) throw ( Runtime
}
// XStatusListener
-void SAL_CALL NewMenuController::statusChanged( const FeatureStateEvent& ) throw ( RuntimeException, std::exception )
+void SAL_CALL NewMenuController::statusChanged( const FeatureStateEvent& )
{
}
// XMenuListener
-void SAL_CALL NewMenuController::itemSelected( const css::awt::MenuEvent& rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL NewMenuController::itemSelected( const css::awt::MenuEvent& rEvent )
{
Reference< css::awt::XPopupMenu > xPopupMenu;
Reference< XComponentContext > xContext;
@@ -424,7 +424,7 @@ void SAL_CALL NewMenuController::itemSelected( const css::awt::MenuEvent& rEvent
}
}
-void SAL_CALL NewMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException, std::exception)
+void SAL_CALL NewMenuController::itemActivated( const css::awt::MenuEvent& )
{
SolarMutexGuard aSolarMutexGuard;
if ( m_xFrame.is() && m_xPopupMenu.is() )
@@ -491,7 +491,7 @@ void NewMenuController::impl_setPopupMenu()
}
// XInitialization
-void SAL_CALL NewMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception )
+void SAL_CALL NewMenuController::initialize( const Sequence< Any >& aArguments )
{
osl::MutexGuard aLock( m_aMutex );
diff --git a/framework/source/uielement/notebookbarmenucontroller.cxx b/framework/source/uielement/notebookbarmenucontroller.cxx
index f1e85696af9b..af87f3132f4e 100644
--- a/framework/source/uielement/notebookbarmenucontroller.cxx
+++ b/framework/source/uielement/notebookbarmenucontroller.cxx
@@ -128,7 +128,7 @@ void NotebookbarMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >
}
// XEventListener
-void SAL_CALL NotebookbarMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception )
+void SAL_CALL NotebookbarMenuController::disposing( const EventObject& )
{
Reference< css::awt::XMenuListener > xHolder(static_cast<OWeakObject *>(this), UNO_QUERY );
@@ -142,7 +142,7 @@ void SAL_CALL NotebookbarMenuController::disposing( const EventObject& ) throw (
}
// XStatusListener
-void SAL_CALL NotebookbarMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception )
+void SAL_CALL NotebookbarMenuController::statusChanged( const FeatureStateEvent& Event )
{
OUString aFeatureURL( Event.FeatureURL.Complete );
@@ -194,7 +194,7 @@ void SAL_CALL NotebookbarMenuController::statusChanged( const FeatureStateEvent&
}
// XMenuListener
-void SAL_CALL NotebookbarMenuController::itemSelected( const css::awt::MenuEvent& rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL NotebookbarMenuController::itemSelected( const css::awt::MenuEvent& rEvent )
{
Reference< css::awt::XPopupMenu > xPopupMenu;
Reference< XURLTransformer > xURLTransformer;
@@ -240,7 +240,7 @@ void SAL_CALL NotebookbarMenuController::itemSelected( const css::awt::MenuEvent
}
}
-void SAL_CALL NotebookbarMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException, std::exception)
+void SAL_CALL NotebookbarMenuController::itemActivated( const css::awt::MenuEvent& )
{
OUString aActive;
@@ -284,7 +284,7 @@ void SAL_CALL NotebookbarMenuController::itemActivated( const css::awt::MenuEven
}
// XPopupMenuController
-void SAL_CALL NotebookbarMenuController::setPopupMenu( const Reference< css::awt::XPopupMenu >& xPopupMenu ) throw ( RuntimeException, std::exception )
+void SAL_CALL NotebookbarMenuController::setPopupMenu( const Reference< css::awt::XPopupMenu >& xPopupMenu )
{
osl::MutexGuard aLock( m_aMutex );
diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx
index 6404416913c5..1d03d0807739 100644
--- a/framework/source/uielement/objectmenucontroller.cxx
+++ b/framework/source/uielement/objectmenucontroller.cxx
@@ -59,29 +59,26 @@ public:
explicit ObjectMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext );
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.framework.ObjectMenuController");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
return {"com.sun.star.frame.PopupMenuController"};
}
// XStatusListener
- virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override;
// XEventListener
- virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
private:
void fillPopupMenu( const css::uno::Sequence< css::embed::VerbDescriptor >& rVerbCommandSeq, css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu );
@@ -127,7 +124,7 @@ void ObjectMenuController::fillPopupMenu( const Sequence< css::embed::VerbDescri
}
// XEventListener
-void SAL_CALL ObjectMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception )
+void SAL_CALL ObjectMenuController::disposing( const EventObject& )
{
Reference< css::awt::XMenuListener > xHolder(static_cast<OWeakObject *>(this), UNO_QUERY );
@@ -142,7 +139,7 @@ void SAL_CALL ObjectMenuController::disposing( const EventObject& ) throw ( Runt
}
// XStatusListener
-void SAL_CALL ObjectMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception )
+void SAL_CALL ObjectMenuController::statusChanged( const FeatureStateEvent& Event )
{
Sequence < css::embed::VerbDescriptor > aVerbCommandSeq;
if ( Event.State >>= aVerbCommandSeq )
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx
index 98b6b47b735c..b04c831e7a12 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -74,13 +74,13 @@ class PopupMenuToolbarController : public ToolBarBase
{
public:
// XComponent
- virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL dispose() override;
// XInitialization
- virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
// XToolbarController
- virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() override;
// XStatusListener
- virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) override;
protected:
PopupMenuToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
@@ -109,7 +109,6 @@ PopupMenuToolbarController::PopupMenuToolbarController(
}
void SAL_CALL PopupMenuToolbarController::dispose()
-throw ( css::uno::RuntimeException, std::exception )
{
svt::ToolboxController::dispose();
@@ -137,7 +136,6 @@ throw ( css::uno::RuntimeException, std::exception )
void SAL_CALL PopupMenuToolbarController::initialize(
const css::uno::Sequence< css::uno::Any >& aArguments )
-throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
{
ToolboxController::initialize( aArguments );
@@ -172,7 +170,6 @@ throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
}
void SAL_CALL PopupMenuToolbarController::statusChanged( const css::frame::FeatureStateEvent& rEvent )
- throw ( css::uno::RuntimeException, std::exception )
{
ToolBox* pToolBox = nullptr;
sal_uInt16 nItemId = 0;
@@ -187,7 +184,6 @@ void SAL_CALL PopupMenuToolbarController::statusChanged( const css::frame::Featu
css::uno::Reference< css::awt::XWindow > SAL_CALL
PopupMenuToolbarController::createPopupWindow()
- throw ( css::uno::RuntimeException, std::exception )
{
css::uno::Reference< css::awt::XWindow > xRet;
@@ -270,17 +266,17 @@ public:
const css::uno::Sequence< css::uno::Any >& rxArgs );
// XInitialization
- virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& rxArgs ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& rxArgs ) override;
// XStatusListener
- virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException) override;
+ virtual OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService(OUString const & rServiceName) throw (css::uno::RuntimeException) override;
+ virtual sal_Bool SAL_CALL supportsService(OUString const & rServiceName) override;
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException) override;
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
private:
bool m_bSplitButton, m_bReplaceWithLast;
@@ -310,25 +306,21 @@ GenericPopupToolbarController::GenericPopupToolbarController(
}
OUString GenericPopupToolbarController::getImplementationName()
- throw (css::uno::RuntimeException)
{
return OUString("com.sun.star.comp.framework.GenericPopupToolbarController");
}
sal_Bool GenericPopupToolbarController::supportsService(OUString const & rServiceName)
- throw (css::uno::RuntimeException)
{
return cppu::supportsService( this, rServiceName );
}
css::uno::Sequence<OUString> GenericPopupToolbarController::getSupportedServiceNames()
- throw (css::uno::RuntimeException)
{
return {"com.sun.star.frame.ToolbarController"};
}
void GenericPopupToolbarController::initialize( const css::uno::Sequence< css::uno::Any >& rxArgs )
- throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
{
PopupMenuToolbarController::initialize( rxArgs );
if ( m_bReplaceWithLast )
@@ -337,7 +329,6 @@ void GenericPopupToolbarController::initialize( const css::uno::Sequence< css::u
}
void GenericPopupToolbarController::statusChanged( const css::frame::FeatureStateEvent& rEvent )
- throw ( css::uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
@@ -408,31 +399,31 @@ public:
explicit SaveToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
// XInitialization
- virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
// XSubToolbarController
// Ugly HACK to cause ToolBarManager ask our controller for updated image, in case of icon theme change.
- virtual sal_Bool SAL_CALL opensSubToolbar() throw ( css::uno::RuntimeException, std::exception ) override;
- virtual OUString SAL_CALL getSubToolbarName() throw ( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL functionSelected( const OUString& aCommand ) throw ( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL updateImage() throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL opensSubToolbar() override;
+ virtual OUString SAL_CALL getSubToolbarName() override;
+ virtual void SAL_CALL functionSelected( const OUString& aCommand ) override;
+ virtual void SAL_CALL updateImage() override;
// XStatusListener
- virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) override;
// XModifyListener
- virtual void SAL_CALL modified( const css::lang::EventObject& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL modified( const css::lang::EventObject& rEvent ) override;
// XEventListener
- virtual void SAL_CALL disposing( const css::lang::EventObject& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& rEvent ) override;
// XComponent
- virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL dispose() override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw ( css::uno::RuntimeException ) override;
- virtual sal_Bool SAL_CALL supportsService( OUString const & rServiceName ) throw ( css::uno::RuntimeException ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( css::uno::RuntimeException ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( OUString const & rServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
private:
bool m_bReadOnly;
@@ -449,7 +440,6 @@ SaveToolbarController::SaveToolbarController( const css::uno::Reference< css::un
}
void SaveToolbarController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
- throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
{
PopupMenuToolbarController::initialize( aArguments );
@@ -480,24 +470,20 @@ void SaveToolbarController::initialize( const css::uno::Sequence< css::uno::Any
}
sal_Bool SaveToolbarController::opensSubToolbar()
- throw ( css::uno::RuntimeException, std::exception )
{
return true;
}
OUString SaveToolbarController::getSubToolbarName()
- throw ( css::uno::RuntimeException, std::exception )
{
return OUString();
}
void SaveToolbarController::functionSelected( const OUString& /*aCommand*/ )
- throw ( css::uno::RuntimeException, std::exception )
{
}
void SaveToolbarController::updateImage()
- throw ( css::uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
ToolBox* pToolBox = nullptr;
@@ -527,7 +513,6 @@ void SaveToolbarController::updateImage()
}
void SaveToolbarController::statusChanged( const css::frame::FeatureStateEvent& rEvent )
- throw ( css::uno::RuntimeException, std::exception )
{
ToolBox* pToolBox = nullptr;
sal_uInt16 nId = 0;
@@ -550,7 +535,6 @@ void SaveToolbarController::statusChanged( const css::frame::FeatureStateEvent&
}
void SaveToolbarController::modified( const css::lang::EventObject& /*rEvent*/ )
- throw ( css::uno::RuntimeException, std::exception )
{
bool bLastModified = m_bModified;
m_bModified = m_xModifiable->isModified();
@@ -559,7 +543,6 @@ void SaveToolbarController::modified( const css::lang::EventObject& /*rEvent*/ )
}
void SaveToolbarController::disposing( const css::lang::EventObject& rEvent )
- throw ( css::uno::RuntimeException, std::exception )
{
if ( rEvent.Source == m_xModifiable )
{
@@ -571,7 +554,6 @@ void SaveToolbarController::disposing( const css::lang::EventObject& rEvent )
}
void SaveToolbarController::dispose()
- throw ( css::uno::RuntimeException, std::exception )
{
PopupMenuToolbarController::dispose();
if ( m_xModifiable.is() )
@@ -583,19 +565,16 @@ void SaveToolbarController::dispose()
}
OUString SaveToolbarController::getImplementationName()
- throw ( css::uno::RuntimeException )
{
return OUString("com.sun.star.comp.framework.SaveToolbarController");
}
sal_Bool SaveToolbarController::supportsService( OUString const & rServiceName )
- throw ( css::uno::RuntimeException )
{
return cppu::supportsService( this, rServiceName );
}
css::uno::Sequence< OUString > SaveToolbarController::getSupportedServiceNames()
- throw ( css::uno::RuntimeException )
{
return {"com.sun.star.frame.ToolbarController"};
}
@@ -606,20 +585,18 @@ public:
explicit NewToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
// XServiceInfo
- OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException) override;
+ OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService(OUString const & rServiceName) throw (css::uno::RuntimeException) override;
+ virtual sal_Bool SAL_CALL supportsService(OUString const & rServiceName) override;
- css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException) override;
+ css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
- void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
private:
void functionExecuted( const OUString &rCommand ) override;
- void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
- void SAL_CALL execute( sal_Int16 KeyModifier ) throw (css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) override;
+ void SAL_CALL execute( sal_Int16 KeyModifier ) override;
void setItemImage( const OUString &rCommand );
OUString m_aLastURL;
@@ -632,25 +609,21 @@ NewToolbarController::NewToolbarController(
}
OUString NewToolbarController::getImplementationName()
- throw (css::uno::RuntimeException)
{
return OUString("org.apache.openoffice.comp.framework.NewToolbarController");
}
sal_Bool NewToolbarController::supportsService(OUString const & rServiceName)
- throw (css::uno::RuntimeException)
{
return cppu::supportsService( this, rServiceName );
}
css::uno::Sequence<OUString> NewToolbarController::getSupportedServiceNames()
- throw (css::uno::RuntimeException)
{
return {"com.sun.star.frame.ToolbarController"};
}
void SAL_CALL NewToolbarController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
-throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
{
PopupMenuToolbarController::initialize( aArguments );
@@ -659,7 +632,6 @@ throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
}
void SAL_CALL NewToolbarController::statusChanged( const css::frame::FeatureStateEvent& rEvent )
- throw ( css::uno::RuntimeException, std::exception )
{
if ( rEvent.IsEnabled )
{
@@ -683,7 +655,6 @@ void SAL_CALL NewToolbarController::statusChanged( const css::frame::FeatureStat
}
void SAL_CALL NewToolbarController::execute( sal_Int16 /*KeyModifier*/ )
-throw ( css::uno::RuntimeException, std::exception )
{
osl::MutexGuard aGuard( m_aMutex );
if ( !m_aLastURL.getLength() )
diff --git a/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx
index c858484ad715..07f34520c5aa 100644
--- a/framework/source/uielement/progressbarwrapper.cxx
+++ b/framework/source/uielement/progressbarwrapper.cxx
@@ -84,7 +84,6 @@ uno::Reference< awt::XWindow > ProgressBarWrapper::getStatusBar() const
// wrapped methods of css::task::XStatusIndicator
void ProgressBarWrapper::start( const OUString& Text, ::sal_Int32 Range )
- throw (uno::RuntimeException, std::exception)
{
uno::Reference< awt::XWindow > xWindow;
sal_Int32 nValue( 0 );
@@ -124,7 +123,6 @@ void ProgressBarWrapper::start( const OUString& Text, ::sal_Int32 Range )
}
void ProgressBarWrapper::end()
- throw (uno::RuntimeException, std::exception)
{
uno::Reference< awt::XWindow > xWindow;
@@ -153,7 +151,6 @@ void ProgressBarWrapper::end()
}
void ProgressBarWrapper::setText( const OUString& Text )
- throw (uno::RuntimeException, std::exception)
{
uno::Reference< awt::XWindow > xWindow;
sal_Int32 nValue( 0 );
@@ -191,7 +188,6 @@ void ProgressBarWrapper::setText( const OUString& Text )
}
void ProgressBarWrapper::setValue( ::sal_Int32 nValue )
- throw (uno::RuntimeException, std::exception)
{
uno::Reference< awt::XWindow > xWindow;
OUString aText;
@@ -237,7 +233,6 @@ void ProgressBarWrapper::setValue( ::sal_Int32 nValue )
}
void ProgressBarWrapper::reset()
- throw (uno::RuntimeException, std::exception)
{
setText( OUString() );
setValue( 0 );
@@ -245,21 +240,18 @@ void ProgressBarWrapper::reset()
// XInitialization
void SAL_CALL ProgressBarWrapper::initialize( const uno::Sequence< uno::Any >& )
-throw (uno::Exception, uno::RuntimeException, std::exception)
{
// dummy - do nothing
}
// XUpdatable
void SAL_CALL ProgressBarWrapper::update()
-throw (uno::RuntimeException, std::exception)
{
// dummy - do nothing
}
// XComponent
void SAL_CALL ProgressBarWrapper::dispose()
-throw (uno::RuntimeException, std::exception)
{
uno::Reference< lang::XComponent > xThis(
static_cast< cppu::OWeakObject* >(this),
@@ -297,7 +289,6 @@ throw (uno::RuntimeException, std::exception)
// XUIElement
uno::Reference< uno::XInterface > SAL_CALL ProgressBarWrapper::getRealInterface()
-throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index c7380cae9891..a4bf6e447b2b 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -56,39 +56,36 @@ public:
const uno::Sequence< uno::Any >& args );
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.framework.RecentFilesMenuController");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
return {"com.sun.star.frame.PopupMenuController"};
}
// XStatusListener
- virtual void SAL_CALL statusChanged( const frame::FeatureStateEvent& Event ) throw ( uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL statusChanged( const frame::FeatureStateEvent& Event ) override;
// XMenuListener
- virtual void SAL_CALL itemSelected( const awt::MenuEvent& rEvent ) throw (uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL itemActivated( const awt::MenuEvent& rEvent ) throw (uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL itemSelected( const awt::MenuEvent& rEvent ) override;
+ virtual void SAL_CALL itemActivated( const awt::MenuEvent& rEvent ) override;
// XDispatchProvider
- virtual uno::Reference< frame::XDispatch > SAL_CALL queryDispatch( const util::URL& aURL, const OUString& sTarget, sal_Int32 nFlags ) throw( uno::RuntimeException, std::exception ) override;
+ virtual uno::Reference< frame::XDispatch > SAL_CALL queryDispatch( const util::URL& aURL, const OUString& sTarget, sal_Int32 nFlags ) override;
// XDispatch
- virtual void SAL_CALL dispatch( const util::URL& aURL, const uno::Sequence< beans::PropertyValue >& seqProperties ) throw( uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL dispatch( const util::URL& aURL, const uno::Sequence< beans::PropertyValue >& seqProperties ) override;
// XEventListener
- virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
private:
virtual void impl_setPopupMenu() override;
@@ -262,7 +259,7 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex )
}
// XEventListener
-void SAL_CALL RecentFilesMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception )
+void SAL_CALL RecentFilesMenuController::disposing( const EventObject& )
{
Reference< css::awt::XMenuListener > xHolder(static_cast<OWeakObject *>(this), UNO_QUERY );
@@ -276,13 +273,13 @@ void SAL_CALL RecentFilesMenuController::disposing( const EventObject& ) throw (
}
// XStatusListener
-void SAL_CALL RecentFilesMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception )
+void SAL_CALL RecentFilesMenuController::statusChanged( const FeatureStateEvent& Event )
{
osl::MutexGuard aLock( m_aMutex );
m_bDisabled = !Event.IsEnabled;
}
-void SAL_CALL RecentFilesMenuController::itemSelected( const css::awt::MenuEvent& rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL RecentFilesMenuController::itemSelected( const css::awt::MenuEvent& rEvent )
{
Reference< css::awt::XPopupMenu > xPopupMenu;
@@ -316,7 +313,7 @@ void SAL_CALL RecentFilesMenuController::itemSelected( const css::awt::MenuEvent
}
}
-void SAL_CALL RecentFilesMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException, std::exception)
+void SAL_CALL RecentFilesMenuController::itemActivated( const css::awt::MenuEvent& )
{
osl::MutexGuard aLock( m_aMutex );
impl_setPopupMenu();
@@ -334,7 +331,6 @@ Reference< XDispatch > SAL_CALL RecentFilesMenuController::queryDispatch(
const URL& aURL,
const OUString& /*sTarget*/,
sal_Int32 /*nFlags*/ )
-throw( RuntimeException, std::exception )
{
osl::MutexGuard aLock( m_aMutex );
@@ -350,7 +346,6 @@ throw( RuntimeException, std::exception )
void SAL_CALL RecentFilesMenuController::dispatch(
const URL& aURL,
const Sequence< PropertyValue >& /*seqProperties*/ )
-throw( RuntimeException, std::exception )
{
osl::MutexGuard aLock( m_aMutex );
diff --git a/framework/source/uielement/resourcemenucontroller.cxx b/framework/source/uielement/resourcemenucontroller.cxx
index 9633a7fa5bc0..735b5ae64d65 100644
--- a/framework/source/uielement/resourcemenucontroller.cxx
+++ b/framework/source/uielement/resourcemenucontroller.cxx
@@ -30,26 +30,26 @@ public:
const css::uno::Sequence< css::uno::Any >& rxArgs, bool bToolbarContainer );
// XPopupMenuController
- virtual void SAL_CALL updatePopupMenu() throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL updatePopupMenu() override;
// XStatusListener
- virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) override;
// XEventListener
- virtual void SAL_CALL disposing( const css::lang::EventObject& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& rEvent ) override;
// XUIConfigurationListener
- virtual void SAL_CALL elementInserted( const css::ui::ConfigurationEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL elementRemoved( const css::ui::ConfigurationEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL elementReplaced( const css::ui::ConfigurationEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL elementInserted( const css::ui::ConfigurationEvent& rEvent ) override;
+ virtual void SAL_CALL elementRemoved( const css::ui::ConfigurationEvent& rEvent ) override;
+ virtual void SAL_CALL elementReplaced( const css::ui::ConfigurationEvent& rEvent ) override;
// XMenuListener
- virtual void SAL_CALL itemActivated( const css::awt::MenuEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL itemSelected( const css::awt::MenuEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL itemActivated( const css::awt::MenuEvent& rEvent ) override;
+ virtual void SAL_CALL itemSelected( const css::awt::MenuEvent& rEvent ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw ( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
private:
OUString m_aMenuURL;
@@ -108,7 +108,6 @@ ResourceMenuController::ResourceMenuController( const css::uno::Reference< css::
}
void ResourceMenuController::updatePopupMenu()
- throw ( css::uno::RuntimeException, std::exception )
{
if ( ( m_xMenuContainer.is() && !m_bContextMenu ) || m_aMenuURL.isEmpty() )
return;
@@ -227,7 +226,6 @@ void ResourceMenuController::updatePopupMenu()
}
void ResourceMenuController::statusChanged( const css::frame::FeatureStateEvent& rEvent )
- throw ( css::uno::RuntimeException, std::exception )
{
css::uno::Sequence< css::embed::VerbDescriptor > aVerbs;
if ( rEvent.IsEnabled && ( rEvent.State >>= aVerbs ) )
@@ -313,7 +311,6 @@ void ResourceMenuController::fillToolbarData()
}
void ResourceMenuController::itemActivated( const css::awt::MenuEvent& /*rEvent*/ )
- throw ( css::uno::RuntimeException, std::exception )
{
// Must initialize MenuBarManager here, because we want to let the app do context menu interception before.
if ( !m_xMenuBarManager.is() )
@@ -327,32 +324,27 @@ void ResourceMenuController::itemActivated( const css::awt::MenuEvent& /*rEvent*
}
void ResourceMenuController::itemSelected( const css::awt::MenuEvent& /*rEvent*/ )
- throw ( css::uno::RuntimeException, std::exception )
{
// Must override this, because we are managed by MenuBarManager, so don't want the handler found in the base class.
}
void ResourceMenuController::elementInserted( const css::ui::ConfigurationEvent& rEvent )
- throw ( css::uno::RuntimeException, std::exception )
{
if ( rEvent.ResourceURL == m_aMenuURL )
m_xMenuContainer.clear();
}
void ResourceMenuController::elementRemoved( const css::ui::ConfigurationEvent& rEvent )
- throw ( css::uno::RuntimeException, std::exception )
{
elementInserted( rEvent );
}
void ResourceMenuController::elementReplaced( const css::ui::ConfigurationEvent& rEvent )
- throw ( css::uno::RuntimeException, std::exception )
{
elementInserted( rEvent );
}
void ResourceMenuController::disposing( const css::lang::EventObject& rEvent )
- throw ( css::uno::RuntimeException, std::exception )
{
if ( rEvent.Source == m_xConfigManager )
m_xConfigManager.clear();
@@ -392,7 +384,6 @@ void ResourceMenuController::disposing()
}
OUString ResourceMenuController::getImplementationName()
- throw ( css::uno::RuntimeException, std::exception )
{
if ( m_bToolbarContainer )
return OUString( "com.sun.star.comp.framework.ToolbarAsMenuController" );
@@ -401,7 +392,6 @@ OUString ResourceMenuController::getImplementationName()
}
css::uno::Sequence< OUString > ResourceMenuController::getSupportedServiceNames()
- throw ( css::uno::RuntimeException, std::exception )
{
return { "com.sun.star.frame.PopupMenuController" };
}
@@ -413,7 +403,7 @@ public:
const css::uno::Sequence< css::uno::Any >& rArgs );
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
private:
virtual void impl_setPopupMenu() override;
@@ -446,7 +436,6 @@ void SaveAsMenuController::impl_setPopupMenu()
}
OUString SaveAsMenuController::getImplementationName()
- throw ( css::uno::RuntimeException, std::exception )
{
return OUString( "com.sun.star.comp.framework.SaveAsMenuController" );
}
diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
index 799e44407c84..7b3750797712 100644
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
@@ -183,7 +183,6 @@ SpinfieldToolbarController::~SpinfieldToolbarController()
}
void SAL_CALL SpinfieldToolbarController::dispose()
-throw ( RuntimeException, std::exception )
{
SolarMutexGuard aSolarMutexGuard;
diff --git a/framework/source/uielement/statusbaritem.cxx b/framework/source/uielement/statusbaritem.cxx
index 3c11376ca6b8..ddc25d37d0ff 100644
--- a/framework/source/uielement/statusbaritem.cxx
+++ b/framework/source/uielement/statusbaritem.cxx
@@ -90,21 +90,18 @@ void SAL_CALL StatusbarItem::disposing()
}
OUString SAL_CALL StatusbarItem::getCommand()
-throw (RuntimeException, std::exception)
{
osl::MutexGuard aGuard( m_aMutex );
return m_aCommand;
}
::sal_uInt16 SAL_CALL StatusbarItem::getItemId()
-throw (RuntimeException, std::exception)
{
osl::MutexGuard aGuard( m_aMutex );
return m_nId;
}
::sal_uInt32 SAL_CALL StatusbarItem::getWidth()
-throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if ( m_pStatusBar )
@@ -114,14 +111,12 @@ throw (RuntimeException, std::exception)
}
::sal_uInt16 SAL_CALL StatusbarItem::getStyle()
-throw (RuntimeException, std::exception)
{
osl::MutexGuard aGuard( m_aMutex );
return m_nStyle;
}
::sal_Int32 SAL_CALL StatusbarItem::getOffset()
-throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if ( m_pStatusBar )
@@ -131,7 +126,6 @@ throw (RuntimeException, std::exception)
}
css::awt::Rectangle SAL_CALL StatusbarItem::getItemRect()
-throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
css::awt::Rectangle aAWTRect;
@@ -148,7 +142,6 @@ throw (RuntimeException, std::exception)
}
OUString SAL_CALL StatusbarItem::getText()
-throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if ( m_pStatusBar )
@@ -158,7 +151,6 @@ throw (RuntimeException, std::exception)
}
void SAL_CALL StatusbarItem::setText( const OUString& rText )
-throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if ( m_pStatusBar )
@@ -166,7 +158,6 @@ throw (RuntimeException, std::exception)
}
OUString SAL_CALL StatusbarItem::getHelpText()
-throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if ( m_pStatusBar )
@@ -176,7 +167,6 @@ throw (RuntimeException, std::exception)
}
void SAL_CALL StatusbarItem::setHelpText( const OUString& rHelpText )
-throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if ( m_pStatusBar )
@@ -184,7 +174,6 @@ throw (RuntimeException, std::exception)
}
OUString SAL_CALL StatusbarItem::getQuickHelpText()
-throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if ( m_pStatusBar )
@@ -194,7 +183,6 @@ throw (RuntimeException, std::exception)
}
void SAL_CALL StatusbarItem::setQuickHelpText( const OUString& rQuickHelpText )
-throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if ( m_pStatusBar )
@@ -202,7 +190,6 @@ throw (RuntimeException, std::exception)
}
OUString SAL_CALL StatusbarItem::getAccessibleName()
-throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if ( m_pStatusBar )
@@ -212,7 +199,6 @@ throw (RuntimeException, std::exception)
}
void SAL_CALL StatusbarItem::setAccessibleName( const OUString& rAccessibleName )
-throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if ( m_pStatusBar )
@@ -220,7 +206,6 @@ throw (RuntimeException, std::exception)
}
sal_Bool SAL_CALL StatusbarItem::getVisible()
-throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if ( m_pStatusBar )
@@ -230,7 +215,6 @@ throw (RuntimeException, std::exception)
}
void SAL_CALL StatusbarItem::setVisible( sal_Bool bVisible )
-throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if ( !m_pStatusBar )
@@ -246,7 +230,6 @@ throw (RuntimeException, std::exception)
}
void SAL_CALL StatusbarItem::repaint( )
-throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if ( m_pStatusBar )
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index 0c0e0e6b87ee..1b63608a4d31 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -153,14 +153,13 @@ StatusBar* StatusBarManager::GetStatusBar() const
}
void StatusBarManager::frameAction( const frame::FrameActionEvent& Action )
-throw ( uno::RuntimeException, std::exception )
{
SolarMutexGuard g;
if ( Action.Action == frame::FrameAction_CONTEXT_CHANGED )
UpdateControllers();
}
-void SAL_CALL StatusBarManager::disposing( const lang::EventObject& Source ) throw ( uno::RuntimeException, std::exception )
+void SAL_CALL StatusBarManager::disposing( const lang::EventObject& Source )
{
SolarMutexGuard g;
@@ -176,7 +175,7 @@ void SAL_CALL StatusBarManager::disposing( const lang::EventObject& Source ) thr
}
// XComponent
-void SAL_CALL StatusBarManager::dispose() throw( uno::RuntimeException, std::exception )
+void SAL_CALL StatusBarManager::dispose()
{
uno::Reference< lang::XComponent > xThis(
static_cast< OWeakObject* >(this), uno::UNO_QUERY );
@@ -221,7 +220,7 @@ void SAL_CALL StatusBarManager::dispose() throw( uno::RuntimeException, std::exc
}
}
-void SAL_CALL StatusBarManager::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) throw( uno::RuntimeException, std::exception )
+void SAL_CALL StatusBarManager::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
{
SolarMutexGuard g;
@@ -232,13 +231,13 @@ void SAL_CALL StatusBarManager::addEventListener( const uno::Reference< lang::XE
m_aListenerContainer.addInterface( cppu::UnoType<lang::XEventListener>::get(), xListener );
}
-void SAL_CALL StatusBarManager::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) throw( uno::RuntimeException, std::exception )
+void SAL_CALL StatusBarManager::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
{
m_aListenerContainer.removeInterface( cppu::UnoType<lang::XEventListener>::get(), xListener );
}
// XUIConfigurationListener
-void SAL_CALL StatusBarManager::elementInserted( const css::ui::ConfigurationEvent& ) throw ( uno::RuntimeException, std::exception )
+void SAL_CALL StatusBarManager::elementInserted( const css::ui::ConfigurationEvent& )
{
SolarMutexGuard g;
@@ -246,7 +245,7 @@ void SAL_CALL StatusBarManager::elementInserted( const css::ui::ConfigurationEve
return;
}
-void SAL_CALL StatusBarManager::elementRemoved( const css::ui::ConfigurationEvent& ) throw ( uno::RuntimeException, std::exception )
+void SAL_CALL StatusBarManager::elementRemoved( const css::ui::ConfigurationEvent& )
{
SolarMutexGuard g;
@@ -254,7 +253,7 @@ void SAL_CALL StatusBarManager::elementRemoved( const css::ui::ConfigurationEven
return;
}
-void SAL_CALL StatusBarManager::elementReplaced( const css::ui::ConfigurationEvent& ) throw ( uno::RuntimeException, std::exception )
+void SAL_CALL StatusBarManager::elementReplaced( const css::ui::ConfigurationEvent& )
{
SolarMutexGuard g;
diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx
index 3456dc78e529..2cf60b555e1a 100644
--- a/framework/source/uielement/statusbarwrapper.cxx
+++ b/framework/source/uielement/statusbarwrapper.cxx
@@ -61,7 +61,7 @@ StatusBarWrapper::~StatusBarWrapper()
{
}
-void SAL_CALL StatusBarWrapper::dispose() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL StatusBarWrapper::dispose()
{
Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
@@ -85,7 +85,7 @@ void SAL_CALL StatusBarWrapper::dispose() throw (css::uno::RuntimeException, std
}
// XInitialization
-void SAL_CALL StatusBarWrapper::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception )
+void SAL_CALL StatusBarWrapper::initialize( const Sequence< Any >& aArguments )
{
SolarMutexGuard g;
@@ -133,7 +133,7 @@ void SAL_CALL StatusBarWrapper::initialize( const Sequence< Any >& aArguments )
}
// XUIElementSettings
-void SAL_CALL StatusBarWrapper::updateSettings() throw ( RuntimeException, std::exception )
+void SAL_CALL StatusBarWrapper::updateSettings()
{
SolarMutexGuard g;
@@ -158,7 +158,7 @@ void SAL_CALL StatusBarWrapper::updateSettings() throw ( RuntimeException, std::
}
}
-Reference< XInterface > SAL_CALL StatusBarWrapper::getRealInterface() throw ( RuntimeException, std::exception )
+Reference< XInterface > SAL_CALL StatusBarWrapper::getRealInterface()
{
SolarMutexGuard g;
diff --git a/framework/source/uielement/statusindicatorinterfacewrapper.cxx b/framework/source/uielement/statusindicatorinterfacewrapper.cxx
index 1ff930941b19..69951565d352 100644
--- a/framework/source/uielement/statusindicatorinterfacewrapper.cxx
+++ b/framework/source/uielement/statusindicatorinterfacewrapper.cxx
@@ -44,7 +44,6 @@ StatusIndicatorInterfaceWrapper::~StatusIndicatorInterfaceWrapper()
void SAL_CALL StatusIndicatorInterfaceWrapper::start(
const OUString& sText,
sal_Int32 nRange )
-throw( css::uno::RuntimeException, std::exception )
{
Reference< XComponent > xComp( m_xStatusIndicatorImpl );
if ( xComp.is() )
@@ -56,7 +55,6 @@ throw( css::uno::RuntimeException, std::exception )
}
void SAL_CALL StatusIndicatorInterfaceWrapper::end()
-throw( css::uno::RuntimeException, std::exception )
{
Reference< XComponent > xComp( m_xStatusIndicatorImpl );
if ( xComp.is() )
@@ -68,7 +66,6 @@ throw( css::uno::RuntimeException, std::exception )
}
void SAL_CALL StatusIndicatorInterfaceWrapper::reset()
-throw( css::uno::RuntimeException, std::exception )
{
Reference< XComponent > xComp( m_xStatusIndicatorImpl );
if ( xComp.is() )
@@ -81,7 +78,6 @@ throw( css::uno::RuntimeException, std::exception )
void SAL_CALL StatusIndicatorInterfaceWrapper::setText(
const OUString& sText )
-throw( css::uno::RuntimeException, std::exception )
{
Reference< XComponent > xComp( m_xStatusIndicatorImpl );
if ( xComp.is() )
@@ -94,7 +90,6 @@ throw( css::uno::RuntimeException, std::exception )
void SAL_CALL StatusIndicatorInterfaceWrapper::setValue(
sal_Int32 nValue )
-throw( css::uno::RuntimeException, std::exception )
{
Reference< XComponent > xComp( m_xStatusIndicatorImpl );
if ( xComp.is() )
diff --git a/framework/source/uielement/subtoolbarcontroller.cxx b/framework/source/uielement/subtoolbarcontroller.cxx
index 36f679a11a79..de8dffd16875 100644
--- a/framework/source/uielement/subtoolbarcontroller.cxx
+++ b/framework/source/uielement/subtoolbarcontroller.cxx
@@ -51,40 +51,40 @@ public:
virtual ~SubToolBarController() override;
// XInitialization
- virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& rxArgs ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& rxArgs ) override;
// XStatusListener
- virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override;
// XToolbarController
- virtual void SAL_CALL execute( sal_Int16 nKeyModifier ) throw ( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL execute( sal_Int16 nKeyModifier ) override;
+ virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() override;
// XSubToolbarController
- virtual sal_Bool SAL_CALL opensSubToolbar() throw ( css::uno::RuntimeException, std::exception ) override;
- virtual OUString SAL_CALL getSubToolbarName() throw ( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL functionSelected( const OUString& rCommand ) throw ( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL updateImage() throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL opensSubToolbar() override;
+ virtual OUString SAL_CALL getSubToolbarName() override;
+ virtual void SAL_CALL functionSelected( const OUString& rCommand ) override;
+ virtual void SAL_CALL updateImage() override;
// XDockableWindowListener
- virtual void SAL_CALL startDocking( const css::awt::DockingEvent& e ) throw ( css::uno::RuntimeException, std::exception ) override;
- virtual css::awt::DockingData SAL_CALL docking( const css::awt::DockingEvent& e ) throw ( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL endDocking( const css::awt::EndDockingEvent& e ) throw ( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL prepareToggleFloatingMode( const css::lang::EventObject& e ) throw ( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL toggleFloatingMode( const css::lang::EventObject& e ) throw ( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL closed( const css::lang::EventObject& e ) throw ( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL endPopupMode( const css::awt::EndPopupModeEvent& e ) throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL startDocking( const css::awt::DockingEvent& e ) override;
+ virtual css::awt::DockingData SAL_CALL docking( const css::awt::DockingEvent& e ) override;
+ virtual void SAL_CALL endDocking( const css::awt::EndDockingEvent& e ) override;
+ virtual sal_Bool SAL_CALL prepareToggleFloatingMode( const css::lang::EventObject& e ) override;
+ virtual void SAL_CALL toggleFloatingMode( const css::lang::EventObject& e ) override;
+ virtual void SAL_CALL closed( const css::lang::EventObject& e ) override;
+ virtual void SAL_CALL endPopupMode( const css::awt::EndPopupModeEvent& e ) override;
// XEventListener
- virtual void SAL_CALL disposing( const css::lang::EventObject& e ) throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& e ) override;
// XComponent
- virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL dispose() override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw ( css::uno::RuntimeException ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw ( css::uno::RuntimeException ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( css::uno::RuntimeException ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
};
SubToolBarController::SubToolBarController( const css::uno::Sequence< css::uno::Any >& rxArgs )
@@ -122,7 +122,6 @@ void SubToolBarController::disposeUIElement()
}
void SubToolBarController::statusChanged( const css::frame::FeatureStateEvent& Event )
- throw ( css::uno::RuntimeException, std::exception )
{
SolarMutexGuard aSolarMutexGuard;
@@ -176,7 +175,6 @@ void SubToolBarController::statusChanged( const css::frame::FeatureStateEvent& E
}
void SubToolBarController::execute( sal_Int16 nKeyModifier )
- throw ( css::uno::RuntimeException, std::exception )
{
if ( !m_aLastCommand.isEmpty() )
{
@@ -188,7 +186,6 @@ void SubToolBarController::execute( sal_Int16 nKeyModifier )
}
css::uno::Reference< css::awt::XWindow > SubToolBarController::createPopupWindow()
- throw ( css::uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
@@ -258,19 +255,16 @@ css::uno::Reference< css::awt::XWindow > SubToolBarController::createPopupWindow
}
sal_Bool SubToolBarController::opensSubToolbar()
- throw ( css::uno::RuntimeException, std::exception )
{
return !m_aLastCommand.isEmpty();
}
OUString SubToolBarController::getSubToolbarName()
- throw ( css::uno::RuntimeException, std::exception )
{
return m_aSubTbName;
}
void SubToolBarController::functionSelected( const OUString& rCommand )
- throw ( css::uno::RuntimeException, std::exception )
{
if ( !m_aLastCommand.isEmpty() && m_aLastCommand != rCommand )
{
@@ -282,7 +276,6 @@ void SubToolBarController::functionSelected( const OUString& rCommand )
}
void SubToolBarController::updateImage()
- throw ( css::uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
if ( !m_aLastCommand.isEmpty() )
@@ -305,39 +298,32 @@ void SubToolBarController::updateImage()
}
void SubToolBarController::startDocking( const css::awt::DockingEvent& )
- throw ( css::uno::RuntimeException, std::exception )
{
}
css::awt::DockingData SubToolBarController::docking( const css::awt::DockingEvent& )
- throw ( css::uno::RuntimeException, std::exception )
{
return css::awt::DockingData();
}
void SubToolBarController::endDocking( const css::awt::EndDockingEvent& )
- throw ( css::uno::RuntimeException, std::exception )
{
}
sal_Bool SubToolBarController::prepareToggleFloatingMode( const css::lang::EventObject& )
- throw ( css::uno::RuntimeException, std::exception )
{
return false;
}
void SubToolBarController::toggleFloatingMode( const css::lang::EventObject& )
- throw ( css::uno::RuntimeException, std::exception )
{
}
void SubToolBarController::closed( const css::lang::EventObject& )
- throw ( css::uno::RuntimeException, std::exception )
{
}
void SubToolBarController::endPopupMode( const css::awt::EndPopupModeEvent& e )
- throw ( css::uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
@@ -408,13 +394,11 @@ void SubToolBarController::endPopupMode( const css::awt::EndPopupModeEvent& e )
}
void SubToolBarController::disposing( const css::lang::EventObject& e )
- throw ( css::uno::RuntimeException, std::exception )
{
svt::ToolboxController::disposing( e );
}
void SubToolBarController::initialize( const css::uno::Sequence< css::uno::Any >& rxArgs )
- throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
{
svt::ToolboxController::initialize( rxArgs );
@@ -431,7 +415,6 @@ void SubToolBarController::initialize( const css::uno::Sequence< css::uno::Any >
}
void SubToolBarController::dispose()
- throw ( css::uno::RuntimeException, std::exception )
{
if ( m_bDisposed )
return;
@@ -442,19 +425,16 @@ void SubToolBarController::dispose()
}
OUString SubToolBarController::getImplementationName()
- throw ( css::uno::RuntimeException )
{
return OUString( "com.sun.star.comp.framework.SubToolBarController" );
}
sal_Bool SubToolBarController::supportsService( const OUString& rServiceName )
- throw ( css::uno::RuntimeException )
{
return cppu::supportsService( this, rServiceName );
}
css::uno::Sequence< OUString > SubToolBarController::getSupportedServiceNames()
- throw ( css::uno::RuntimeException )
{
return {"com.sun.star.frame.ToolbarController"};
}
diff --git a/framework/source/uielement/thesaurusmenucontroller.cxx b/framework/source/uielement/thesaurusmenucontroller.cxx
index 360fd2f5cb20..c6832fa714c1 100644
--- a/framework/source/uielement/thesaurusmenucontroller.cxx
+++ b/framework/source/uielement/thesaurusmenucontroller.cxx
@@ -32,11 +32,11 @@ public:
explicit ThesaurusMenuController( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
// XStatusListener
- virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw ( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
private:
void fillPopupMenu();
@@ -55,7 +55,6 @@ ThesaurusMenuController::ThesaurusMenuController( const css::uno::Reference< css
}
void ThesaurusMenuController::statusChanged( const css::frame::FeatureStateEvent& rEvent )
- throw ( css::uno::RuntimeException, std::exception )
{
rEvent.State >>= m_aLastWord;
m_xPopupMenu->clear();
@@ -146,13 +145,11 @@ OUString ThesaurusMenuController::getThesImplName( const css::lang::Locale& rLoc
}
OUString ThesaurusMenuController::getImplementationName()
- throw ( css::uno::RuntimeException, std::exception )
{
return OUString( "com.sun.star.comp.framework.ThesaurusMenuController" );
}
css::uno::Sequence< OUString > ThesaurusMenuController::getSupportedServiceNames()
- throw ( css::uno::RuntimeException, std::exception )
{
return { "com.sun.star.frame.PopupMenuController" };
}
diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
index c0a19ff4a33c..4f822198c476 100644
--- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
@@ -74,7 +74,6 @@ ToggleButtonToolbarController::~ToggleButtonToolbarController()
}
void SAL_CALL ToggleButtonToolbarController::dispose()
-throw ( RuntimeException, std::exception )
{
SolarMutexGuard aSolarMutexGuard;
ComplexToolbarController::dispose();
@@ -93,7 +92,6 @@ Sequence<PropertyValue> ToggleButtonToolbarController::getExecuteArgs(sal_Int16
}
uno::Reference< awt::XWindow > SAL_CALL ToggleButtonToolbarController::createPopupWindow()
-throw (css::uno::RuntimeException, std::exception)
{
uno::Reference< awt::XWindow > xWindow;
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 4b9768d88ab2..1dec71d4b763 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -395,7 +395,6 @@ void ToolBarManager::UpdateController( const css::uno::Reference< css::frame::XT
}
void ToolBarManager::frameAction( const FrameActionEvent& Action )
-throw ( RuntimeException, std::exception )
{
SolarMutexGuard g;
if ( Action.Action == FrameAction_CONTEXT_CHANGED && !m_bDisposed )
@@ -404,7 +403,7 @@ throw ( RuntimeException, std::exception )
}
}
-void SAL_CALL ToolBarManager::disposing( const EventObject& Source ) throw ( RuntimeException, std::exception )
+void SAL_CALL ToolBarManager::disposing( const EventObject& Source )
{
SolarMutexGuard g;
@@ -449,7 +448,7 @@ void SAL_CALL ToolBarManager::disposing( const EventObject& Source ) throw ( Run
}
// XComponent
-void SAL_CALL ToolBarManager::dispose() throw( RuntimeException, std::exception )
+void SAL_CALL ToolBarManager::dispose()
{
Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
@@ -522,7 +521,7 @@ void SAL_CALL ToolBarManager::dispose() throw( RuntimeException, std::exception
}
}
-void SAL_CALL ToolBarManager::addEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException, std::exception )
+void SAL_CALL ToolBarManager::addEventListener( const Reference< XEventListener >& xListener )
{
SolarMutexGuard g;
@@ -533,18 +532,18 @@ void SAL_CALL ToolBarManager::addEventListener( const Reference< XEventListener
m_aListenerContainer.addInterface( cppu::UnoType<XEventListener>::get(), xListener );
}
-void SAL_CALL ToolBarManager::removeEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException, std::exception )
+void SAL_CALL ToolBarManager::removeEventListener( const Reference< XEventListener >& xListener )
{
m_aListenerContainer.removeInterface( cppu::UnoType<XEventListener>::get(), xListener );
}
// XUIConfigurationListener
-void SAL_CALL ToolBarManager::elementInserted( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ToolBarManager::elementInserted( const css::ui::ConfigurationEvent& Event )
{
impl_elementChanged(false,Event);
}
-void SAL_CALL ToolBarManager::elementRemoved( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ToolBarManager::elementRemoved( const css::ui::ConfigurationEvent& Event )
{
impl_elementChanged(true,Event);
}
@@ -618,7 +617,7 @@ void ToolBarManager::setToolBarImage(const Image& rImage,
}
}
-void SAL_CALL ToolBarManager::elementReplaced( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ToolBarManager::elementReplaced( const css::ui::ConfigurationEvent& Event )
{
impl_elementChanged(false,Event);
}
diff --git a/framework/source/uielement/toolbarmodemenucontroller.cxx b/framework/source/uielement/toolbarmodemenucontroller.cxx
index c7eba87087a1..69aa1a6a027f 100644
--- a/framework/source/uielement/toolbarmodemenucontroller.cxx
+++ b/framework/source/uielement/toolbarmodemenucontroller.cxx
@@ -134,7 +134,7 @@ void ToolbarModeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >
}
// XEventListener
-void SAL_CALL ToolbarModeMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception )
+void SAL_CALL ToolbarModeMenuController::disposing( const EventObject& )
{
Reference< css::awt::XMenuListener > xHolder(static_cast<OWeakObject *>(this), UNO_QUERY );
@@ -148,7 +148,7 @@ void SAL_CALL ToolbarModeMenuController::disposing( const EventObject& ) throw (
}
// XStatusListener
-void SAL_CALL ToolbarModeMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception )
+void SAL_CALL ToolbarModeMenuController::statusChanged( const FeatureStateEvent& Event )
{
OUString aFeatureURL( Event.FeatureURL.Complete );
@@ -200,7 +200,7 @@ void SAL_CALL ToolbarModeMenuController::statusChanged( const FeatureStateEvent&
}
// XMenuListener
-void SAL_CALL ToolbarModeMenuController::itemSelected( const css::awt::MenuEvent& rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL ToolbarModeMenuController::itemSelected( const css::awt::MenuEvent& rEvent )
{
Reference< css::awt::XPopupMenu > xPopupMenu;
Reference< XURLTransformer > xURLTransformer;
@@ -245,7 +245,7 @@ void SAL_CALL ToolbarModeMenuController::itemSelected( const css::awt::MenuEvent
}
}
-void SAL_CALL ToolbarModeMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException, std::exception)
+void SAL_CALL ToolbarModeMenuController::itemActivated( const css::awt::MenuEvent& )
{
const Reference<frame::XModuleManager> xModuleManager = frame::ModuleManager::create( m_xContext );
vcl::EnumContext::Application eApp = vcl::EnumContext::GetApplicationEnum(xModuleManager->identify(m_xFrame));
@@ -283,7 +283,7 @@ void SAL_CALL ToolbarModeMenuController::itemActivated( const css::awt::MenuEven
}
// XPopupMenuController
-void SAL_CALL ToolbarModeMenuController::setPopupMenu( const Reference< css::awt::XPopupMenu >& xPopupMenu ) throw ( RuntimeException, std::exception )
+void SAL_CALL ToolbarModeMenuController::setPopupMenu( const Reference< css::awt::XPopupMenu >& xPopupMenu )
{
osl::MutexGuard aLock( m_aMutex );
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index 003c74c07723..d10ec62091f9 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -467,7 +467,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
}
// XEventListener
-void SAL_CALL ToolbarsMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception )
+void SAL_CALL ToolbarsMenuController::disposing( const EventObject& )
{
Reference< css::awt::XMenuListener > xHolder(static_cast<OWeakObject *>(this), UNO_QUERY );
@@ -484,7 +484,7 @@ void SAL_CALL ToolbarsMenuController::disposing( const EventObject& ) throw ( Ru
}
// XStatusListener
-void SAL_CALL ToolbarsMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception )
+void SAL_CALL ToolbarsMenuController::statusChanged( const FeatureStateEvent& Event )
{
OUString aFeatureURL( Event.FeatureURL.Complete );
@@ -536,7 +536,7 @@ void SAL_CALL ToolbarsMenuController::statusChanged( const FeatureStateEvent& Ev
}
// XMenuListener
-void SAL_CALL ToolbarsMenuController::itemSelected( const css::awt::MenuEvent& rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL ToolbarsMenuController::itemSelected( const css::awt::MenuEvent& rEvent )
{
Reference< css::awt::XPopupMenu > xPopupMenu;
Reference< XComponentContext > xContext;
@@ -695,7 +695,7 @@ void SAL_CALL ToolbarsMenuController::itemSelected( const css::awt::MenuEvent& r
}
}
-void SAL_CALL ToolbarsMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException, std::exception)
+void SAL_CALL ToolbarsMenuController::itemActivated( const css::awt::MenuEvent& )
{
std::vector< OUString > aCmdVector;
Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
@@ -736,7 +736,7 @@ void SAL_CALL ToolbarsMenuController::itemActivated( const css::awt::MenuEvent&
}
// XPopupMenuController
-void SAL_CALL ToolbarsMenuController::setPopupMenu( const Reference< css::awt::XPopupMenu >& xPopupMenu ) throw ( RuntimeException, std::exception )
+void SAL_CALL ToolbarsMenuController::setPopupMenu( const Reference< css::awt::XPopupMenu >& xPopupMenu )
{
osl::MutexGuard aLock( m_aMutex );
@@ -754,7 +754,7 @@ void SAL_CALL ToolbarsMenuController::setPopupMenu( const Reference< css::awt::X
}
// XInitialization
-void SAL_CALL ToolbarsMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception )
+void SAL_CALL ToolbarsMenuController::initialize( const Sequence< Any >& aArguments )
{
osl::MutexGuard aLock( m_aMutex );
bool bInitalized( m_bInitialized );
diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx
index 288294ada9ac..1e3faaaef15d 100644
--- a/framework/source/uielement/toolbarwrapper.cxx
+++ b/framework/source/uielement/toolbarwrapper.cxx
@@ -74,7 +74,6 @@ void SAL_CALL ToolBarWrapper::release() throw()
}
uno::Any SAL_CALL ToolBarWrapper::queryInterface( const uno::Type & rType )
-throw( css::uno::RuntimeException, std::exception )
{
Any a = ::cppu::queryInterface(
rType ,
@@ -87,7 +86,7 @@ throw( css::uno::RuntimeException, std::exception )
}
// XComponent
-void SAL_CALL ToolBarWrapper::dispose() throw ( RuntimeException, std::exception )
+void SAL_CALL ToolBarWrapper::dispose()
{
Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
@@ -112,7 +111,7 @@ void SAL_CALL ToolBarWrapper::dispose() throw ( RuntimeException, std::exception
}
// XInitialization
-void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception )
+void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments )
{
SolarMutexGuard g;
@@ -192,13 +191,13 @@ void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) th
}
// XEventListener
-void SAL_CALL ToolBarWrapper::disposing( const css::lang::EventObject& ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ToolBarWrapper::disposing( const css::lang::EventObject& )
{
// nothing todo
}
// XUpdatable
-void SAL_CALL ToolBarWrapper::update() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ToolBarWrapper::update()
{
SolarMutexGuard g;
@@ -211,7 +210,7 @@ void SAL_CALL ToolBarWrapper::update() throw (css::uno::RuntimeException, std::e
}
// XUIElementSettings
-void SAL_CALL ToolBarWrapper::updateSettings() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL ToolBarWrapper::updateSettings()
{
SolarMutexGuard g;
@@ -250,7 +249,7 @@ void ToolBarWrapper::impl_fillNewData()
}
// XUIElement interface
-Reference< XInterface > SAL_CALL ToolBarWrapper::getRealInterface( ) throw (css::uno::RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL ToolBarWrapper::getRealInterface( )
{
SolarMutexGuard g;
@@ -271,7 +270,6 @@ Reference< XInterface > SAL_CALL ToolBarWrapper::getRealInterface( ) throw (css
void SAL_CALL ToolBarWrapper::functionExecute(
const OUString& aUIElementName,
const OUString& aCommand )
-throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
@@ -283,7 +281,7 @@ throw (css::uno::RuntimeException, std::exception)
}
}
-void SAL_CALL ToolBarWrapper::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& aValue ) throw( css::uno::Exception, std::exception )
+void SAL_CALL ToolBarWrapper::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& aValue )
{
SolarMutexResettableGuard aLock;
bool bNoClose( m_bNoClose );
diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index 4d80ec0ceb02..b900f2c40176 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -71,29 +71,24 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa
virtual ~ConfigurationAccess_UICommand() override;
// XNameAccess
- virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
- throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
- virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
// XElementAccess
- virtual css::uno::Type SAL_CALL getElementType()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Type SAL_CALL getElementType() override;
- virtual sal_Bool SAL_CALL hasElements()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasElements() override;
// container.XContainerListener
- virtual void SAL_CALL elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception) override;
- virtual void SAL_CALL elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception) override;
- virtual void SAL_CALL elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception) override;
+ virtual void SAL_CALL elementInserted( const ContainerEvent& aEvent ) override;
+ virtual void SAL_CALL elementRemoved ( const ContainerEvent& aEvent ) override;
+ virtual void SAL_CALL elementReplaced( const ContainerEvent& aEvent ) override;
// lang.XEventListener
- virtual void SAL_CALL disposing( const EventObject& aEvent ) throw(RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( const EventObject& aEvent ) override;
protected:
css::uno::Any SAL_CALL getByNameImpl( const OUString& aName );
@@ -249,7 +244,6 @@ Any SAL_CALL ConfigurationAccess_UICommand::getByNameImpl( const OUString& rComm
}
Any SAL_CALL ConfigurationAccess_UICommand::getByName( const OUString& rCommandURL )
-throw ( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
{
Any aRet( getByNameImpl( rCommandURL ) );
if( !aRet.hasValue() )
@@ -259,26 +253,22 @@ throw ( NoSuchElementException, WrappedTargetException, RuntimeException, std::e
}
Sequence< OUString > SAL_CALL ConfigurationAccess_UICommand::getElementNames()
-throw ( RuntimeException, std::exception )
{
return getAllCommands();
}
sal_Bool SAL_CALL ConfigurationAccess_UICommand::hasByName( const OUString& rCommandURL )
-throw (css::uno::RuntimeException, std::exception)
{
return getByNameImpl( rCommandURL ).hasValue();
}
// XElementAccess
Type SAL_CALL ConfigurationAccess_UICommand::getElementType()
-throw ( RuntimeException, std::exception )
{
return( cppu::UnoType<Sequence< PropertyValue >>::get() );
}
sal_Bool SAL_CALL ConfigurationAccess_UICommand::hasElements()
-throw ( RuntimeException, std::exception )
{
// There must are global commands!
return true;
@@ -558,21 +548,21 @@ void ConfigurationAccess_UICommand::initializeConfigAccess()
}
// container.XContainerListener
-void SAL_CALL ConfigurationAccess_UICommand::elementInserted( const ContainerEvent& ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_UICommand::elementInserted( const ContainerEvent& )
{
osl::MutexGuard g(m_aMutex);
m_bCacheFilled = false;
fillCache();
}
-void SAL_CALL ConfigurationAccess_UICommand::elementRemoved( const ContainerEvent& ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_UICommand::elementRemoved( const ContainerEvent& )
{
osl::MutexGuard g(m_aMutex);
m_bCacheFilled = false;
fillCache();
}
-void SAL_CALL ConfigurationAccess_UICommand::elementReplaced( const ContainerEvent& ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_UICommand::elementReplaced( const ContainerEvent& )
{
osl::MutexGuard g(m_aMutex);
m_bCacheFilled = false;
@@ -580,7 +570,7 @@ void SAL_CALL ConfigurationAccess_UICommand::elementReplaced( const ContainerEve
}
// lang.XEventListener
-void SAL_CALL ConfigurationAccess_UICommand::disposing( const EventObject& aEvent ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_UICommand::disposing( const EventObject& aEvent )
{
// SAFE
// remove our reference to the config access
@@ -662,7 +652,6 @@ void UICommandDescription::impl_fillElements(const sal_Char* _pName)
}
Any SAL_CALL UICommandDescription::getByName( const OUString& aName )
-throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
Any a;
@@ -703,7 +692,6 @@ throw (css::container::NoSuchElementException, css::lang::WrappedTargetException
}
Sequence< OUString > SAL_CALL UICommandDescription::getElementNames()
-throw (css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(rBHelper.rMutex);
@@ -711,7 +699,6 @@ throw (css::uno::RuntimeException, std::exception)
}
sal_Bool SAL_CALL UICommandDescription::hasByName( const OUString& aName )
-throw (css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(rBHelper.rMutex);
@@ -721,13 +708,11 @@ throw (css::uno::RuntimeException, std::exception)
// XElementAccess
Type SAL_CALL UICommandDescription::getElementType()
-throw (css::uno::RuntimeException, std::exception)
{
return( cppu::UnoType<XNameAccess>::get());
}
sal_Bool SAL_CALL UICommandDescription::hasElements()
-throw (css::uno::RuntimeException, std::exception)
{
// generic UI commands are always available!
return true;
diff --git a/framework/source/uifactory/addonstoolbarfactory.cxx b/framework/source/uifactory/addonstoolbarfactory.cxx
index c304859d7acc..b79357daa4ef 100644
--- a/framework/source/uifactory/addonstoolbarfactory.cxx
+++ b/framework/source/uifactory/addonstoolbarfactory.cxx
@@ -56,26 +56,23 @@ class AddonsToolBarFactory : public ::cppu::WeakImplHelper< css::lang::XService
public:
explicit AddonsToolBarFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext );
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.framework.AddonsToolBarFactory");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
return {"com.sun.star.ui.ToolBarFactory"};
}
// XUIElementFactory
- virtual css::uno::Reference< css::ui::XUIElement > SAL_CALL createUIElement( const OUString& ResourceURL, const css::uno::Sequence< css::beans::PropertyValue >& Args ) throw ( css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::ui::XUIElement > SAL_CALL createUIElement( const OUString& ResourceURL, const css::uno::Sequence< css::beans::PropertyValue >& Args ) override;
bool hasButtonsInContext( const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& rPropSeq,
const css::uno::Reference< css::frame::XFrame >& rFrame );
@@ -164,9 +161,6 @@ bool AddonsToolBarFactory::hasButtonsInContext(
Reference< XUIElement > SAL_CALL AddonsToolBarFactory::createUIElement(
const OUString& ResourceURL,
const Sequence< PropertyValue >& Args )
-throw ( css::container::NoSuchElementException,
- css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception )
{
SolarMutexGuard g;
diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx
index fdc06a6e4d0a..1a600b0ea75a 100644
--- a/framework/source/uifactory/factoryconfiguration.cxx
+++ b/framework/source/uifactory/factoryconfiguration.cxx
@@ -134,7 +134,7 @@ void ConfigurationAccess_ControllerFactory::removeServiceFromCommandModule(
}
// container.XContainerListener
-void SAL_CALL ConfigurationAccess_ControllerFactory::elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_ControllerFactory::elementInserted( const ContainerEvent& aEvent )
{
OUString aCommand;
OUString aModule;
@@ -154,7 +154,7 @@ void SAL_CALL ConfigurationAccess_ControllerFactory::elementInserted( const Cont
}
}
-void SAL_CALL ConfigurationAccess_ControllerFactory::elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_ControllerFactory::elementRemoved ( const ContainerEvent& aEvent )
{
OUString aCommand;
OUString aModule;
@@ -172,13 +172,13 @@ void SAL_CALL ConfigurationAccess_ControllerFactory::elementRemoved ( const Cont
}
}
-void SAL_CALL ConfigurationAccess_ControllerFactory::elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_ControllerFactory::elementReplaced( const ContainerEvent& aEvent )
{
elementInserted(aEvent);
}
// lang.XEventListener
-void SAL_CALL ConfigurationAccess_ControllerFactory::disposing( const EventObject& ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_ControllerFactory::disposing( const EventObject& )
{
// remove our reference to the config access
osl::MutexGuard g(m_mutex);
diff --git a/framework/source/uifactory/menubarfactory.cxx b/framework/source/uifactory/menubarfactory.cxx
index e9d9f79ce5ab..05709675997a 100644
--- a/framework/source/uifactory/menubarfactory.cxx
+++ b/framework/source/uifactory/menubarfactory.cxx
@@ -56,7 +56,6 @@ MenuBarFactory::~MenuBarFactory()
Reference< XUIElement > SAL_CALL MenuBarFactory::createUIElement(
const OUString& ResourceURL,
const Sequence< PropertyValue >& Args )
-throw ( css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception )
{
Reference< css::ui::XUIElement > xMenuBar(
static_cast<OWeakObject *>(new MenuBarWrapper(m_xContext)), UNO_QUERY);
diff --git a/framework/source/uifactory/statusbarfactory.cxx b/framework/source/uifactory/statusbarfactory.cxx
index 2e3361881d98..0fe245092540 100644
--- a/framework/source/uifactory/statusbarfactory.cxx
+++ b/framework/source/uifactory/statusbarfactory.cxx
@@ -42,26 +42,23 @@ class StatusBarFactory : public MenuBarFactory
public:
explicit StatusBarFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext );
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.framework.StatusBarFactory");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
return {"com.sun.star.ui.StatusBarFactory"};
}
// XUIElementFactory
- virtual css::uno::Reference< css::ui::XUIElement > SAL_CALL createUIElement( const OUString& ResourceURL, const css::uno::Sequence< css::beans::PropertyValue >& Args ) throw ( css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::ui::XUIElement > SAL_CALL createUIElement( const OUString& ResourceURL, const css::uno::Sequence< css::beans::PropertyValue >& Args ) override;
};
StatusBarFactory::StatusBarFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext ) :
@@ -73,7 +70,6 @@ StatusBarFactory::StatusBarFactory( const css::uno::Reference< css::uno::XCompon
Reference< XUIElement > SAL_CALL StatusBarFactory::createUIElement(
const OUString& ResourceURL,
const Sequence< PropertyValue >& Args )
-throw ( css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception )
{
Reference< css::ui::XUIElement > xStatusBar(
static_cast<OWeakObject *>(new StatusBarWrapper(m_xContext)), UNO_QUERY);
diff --git a/framework/source/uifactory/toolbarfactory.cxx b/framework/source/uifactory/toolbarfactory.cxx
index 63811997c53a..3ccf7f16dcd9 100644
--- a/framework/source/uifactory/toolbarfactory.cxx
+++ b/framework/source/uifactory/toolbarfactory.cxx
@@ -40,28 +40,24 @@ class ToolBarFactory : public MenuBarFactory
public:
explicit ToolBarFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext );
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.framework.ToolBarFactory");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
return {"com.sun.star.ui.ToolBarFactory"};
}
// XUIElementFactory
virtual css::uno::Reference< css::ui::XUIElement > SAL_CALL createUIElement(
- const OUString& ResourceURL, const css::uno::Sequence< css::beans::PropertyValue >& Args )
- throw ( css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
+ const OUString& ResourceURL, const css::uno::Sequence< css::beans::PropertyValue >& Args ) override;
};
ToolBarFactory::ToolBarFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext ) :
@@ -73,7 +69,6 @@ ToolBarFactory::ToolBarFactory( const css::uno::Reference< css::uno::XComponentC
Reference< XUIElement > SAL_CALL ToolBarFactory::createUIElement(
const OUString& ResourceURL,
const Sequence< PropertyValue >& Args )
-throw ( css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception )
{
Reference< css::ui::XUIElement > xToolBar(
static_cast<OWeakObject *>(new ToolBarWrapper(m_xContext)), UNO_QUERY);
diff --git a/framework/source/uifactory/uicontrollerfactory.cxx b/framework/source/uifactory/uicontrollerfactory.cxx
index 25114ce32fb7..490cd92948be 100644
--- a/framework/source/uifactory/uicontrollerfactory.cxx
+++ b/framework/source/uifactory/uicontrollerfactory.cxx
@@ -50,14 +50,14 @@ public:
virtual ~UIControllerFactory() override;
// XMultiComponentFactory
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext( const OUString& aServiceSpecifier, const css::uno::Reference< css::uno::XComponentContext >& Context ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments, const css::uno::Reference< css::uno::XComponentContext >& Context ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext( const OUString& aServiceSpecifier, const css::uno::Reference< css::uno::XComponentContext >& Context ) override;
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments, const css::uno::Reference< css::uno::XComponentContext >& Context ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() override;
// XUIControllerRegistration
- virtual sal_Bool SAL_CALL hasController( const OUString& aCommandURL, const OUString& aModuleName ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL registerController( const OUString& aCommandURL, const OUString& aModuleName, const OUString& aControllerImplementationName ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL deregisterController( const OUString& aCommandURL, const OUString& aModuleName ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasController( const OUString& aCommandURL, const OUString& aModuleName ) override;
+ virtual void SAL_CALL registerController( const OUString& aCommandURL, const OUString& aModuleName, const OUString& aControllerImplementationName ) override;
+ virtual void SAL_CALL deregisterController( const OUString& aCommandURL, const OUString& aModuleName ) override;
protected:
UIControllerFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext, const rtl::OUString &rUINode );
@@ -96,7 +96,6 @@ void SAL_CALL UIControllerFactory::disposing()
Reference< XInterface > SAL_CALL UIControllerFactory::createInstanceWithContext(
const OUString& aServiceSpecifier,
const Reference< XComponentContext >& )
-throw (Exception, RuntimeException, std::exception)
{
// SAFE
osl::MutexGuard g(rBHelper.rMutex);
@@ -119,7 +118,6 @@ Reference< XInterface > SAL_CALL UIControllerFactory::createInstanceWithArgument
const OUString& ServiceSpecifier,
const Sequence< Any >& Arguments,
const Reference< XComponentContext >& )
-throw (Exception, RuntimeException, std::exception)
{
const OUString aPropModuleName( "ModuleIdentifier" );
const OUString aPropValueName( "Value" );
@@ -179,7 +177,6 @@ throw (Exception, RuntimeException, std::exception)
}
Sequence< OUString > SAL_CALL UIControllerFactory::getAvailableServiceNames()
-throw (RuntimeException, std::exception)
{
return Sequence< OUString >();
}
@@ -188,7 +185,6 @@ throw (RuntimeException, std::exception)
sal_Bool SAL_CALL UIControllerFactory::hasController(
const OUString& aCommandURL,
const OUString& aModuleName )
-throw (css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(rBHelper.rMutex);
@@ -205,7 +201,6 @@ void SAL_CALL UIControllerFactory::registerController(
const OUString& aCommandURL,
const OUString& aModuleName,
const OUString& aControllerImplementationName )
-throw (RuntimeException, std::exception)
{
// SAFE
osl::MutexGuard g(rBHelper.rMutex);
@@ -223,7 +218,6 @@ throw (RuntimeException, std::exception)
void SAL_CALL UIControllerFactory::deregisterController(
const OUString& aCommandURL,
const OUString& aModuleName )
-throw (RuntimeException, std::exception)
{
// SAFE
osl::MutexGuard g(rBHelper.rMutex);
@@ -243,20 +237,17 @@ class PopupMenuControllerFactory : public UIControllerFactory
public:
explicit PopupMenuControllerFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext );
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.framework.PopupMenuControllerFactory");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
return {"com.sun.star.frame.PopupMenuControllerFactory"};
}
@@ -293,20 +284,17 @@ class ToolbarControllerFactory : public UIControllerFactory
public:
explicit ToolbarControllerFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext );
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.framework.ToolBarControllerFactory");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
return {"com.sun.star.frame.ToolbarControllerFactory"};
}
@@ -343,20 +331,17 @@ class StatusbarControllerFactory : public UIControllerFactory
public:
explicit StatusbarControllerFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext );
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.framework.StatusBarControllerFactory");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
return {"com.sun.star.frame.StatusbarControllerFactory"};
}
diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx
index 747f1cf76f45..d908a359c4a3 100644
--- a/framework/source/uifactory/uielementfactorymanager.cxx
+++ b/framework/source/uifactory/uielementfactorymanager.cxx
@@ -188,7 +188,7 @@ Sequence< Sequence< PropertyValue > > ConfigurationAccess_FactoryManager::getFac
}
// container.XContainerListener
-void SAL_CALL ConfigurationAccess_FactoryManager::elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_FactoryManager::elementInserted( const ContainerEvent& aEvent )
{
OUString aType;
OUString aName;
@@ -207,7 +207,7 @@ void SAL_CALL ConfigurationAccess_FactoryManager::elementInserted( const Contain
}
}
-void SAL_CALL ConfigurationAccess_FactoryManager::elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_FactoryManager::elementRemoved ( const ContainerEvent& aEvent )
{
OUString aType;
OUString aName;
@@ -226,7 +226,7 @@ void SAL_CALL ConfigurationAccess_FactoryManager::elementRemoved ( const Contain
}
}
-void SAL_CALL ConfigurationAccess_FactoryManager::elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_FactoryManager::elementReplaced( const ContainerEvent& aEvent )
{
OUString aType;
OUString aName;
@@ -247,7 +247,7 @@ void SAL_CALL ConfigurationAccess_FactoryManager::elementReplaced( const Contain
}
// lang.XEventListener
-void SAL_CALL ConfigurationAccess_FactoryManager::disposing( const EventObject& ) throw(RuntimeException, std::exception)
+void SAL_CALL ConfigurationAccess_FactoryManager::disposing( const EventObject& )
{
// SAFE
// remove our reference to the config access
@@ -353,32 +353,29 @@ class UIElementFactoryManager : private cppu::BaseMutex,
public:
explicit UIElementFactoryManager( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.framework.UIElementFactoryManager");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
return {"com.sun.star.ui.UIElementFactoryManager"};
}
// XUIElementFactory
- virtual css::uno::Reference< css::ui::XUIElement > SAL_CALL createUIElement( const OUString& ResourceURL, const css::uno::Sequence< css::beans::PropertyValue >& Args ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::ui::XUIElement > SAL_CALL createUIElement( const OUString& ResourceURL, const css::uno::Sequence< css::beans::PropertyValue >& Args ) override;
// XUIElementFactoryRegistration
- virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getRegisteredFactories( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::ui::XUIElementFactory > SAL_CALL getFactory( const OUString& ResourceURL, const OUString& ModuleIdentifier ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL registerFactory( const OUString& aType, const OUString& aName, const OUString& aModuleIdentifier, const OUString& aFactoryImplementationName ) throw (css::container::ElementExistException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL deregisterFactory( const OUString& aType, const OUString& aName, const OUString& aModuleIdentifier ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getRegisteredFactories( ) override;
+ virtual css::uno::Reference< css::ui::XUIElementFactory > SAL_CALL getFactory( const OUString& ResourceURL, const OUString& ModuleIdentifier ) override;
+ virtual void SAL_CALL registerFactory( const OUString& aType, const OUString& aName, const OUString& aModuleIdentifier, const OUString& aFactoryImplementationName ) override;
+ virtual void SAL_CALL deregisterFactory( const OUString& aType, const OUString& aName, const OUString& aModuleIdentifier ) override;
private:
bool m_bConfigRead;
@@ -405,7 +402,6 @@ void SAL_CALL UIElementFactoryManager::disposing()
Reference< XUIElement > SAL_CALL UIElementFactoryManager::createUIElement(
const OUString& ResourceURL,
const Sequence< PropertyValue >& Args )
-throw ( css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception )
{
Reference< XFrame > xFrame;
OUString aModuleId;
@@ -455,7 +451,6 @@ throw ( css::container::NoSuchElementException, css::lang::IllegalArgumentExcept
// XUIElementFactoryRegistration
Sequence< Sequence< PropertyValue > > SAL_CALL UIElementFactoryManager::getRegisteredFactories()
-throw ( RuntimeException, std::exception )
{
// SAFE
osl::MutexGuard g(rBHelper.rMutex);
@@ -474,7 +469,6 @@ throw ( RuntimeException, std::exception )
}
Reference< XUIElementFactory > SAL_CALL UIElementFactoryManager::getFactory( const OUString& aResourceURL, const OUString& aModuleId )
-throw ( RuntimeException, std::exception )
{
OUString aServiceSpecifier;
{ // SAFE
@@ -514,7 +508,6 @@ throw ( RuntimeException, std::exception )
}
void SAL_CALL UIElementFactoryManager::registerFactory( const OUString& aType, const OUString& aName, const OUString& aModuleId, const OUString& aFactoryImplementationName )
-throw ( ElementExistException, RuntimeException, std::exception )
{
// SAFE
osl::MutexGuard g(rBHelper.rMutex);
@@ -534,7 +527,6 @@ throw ( ElementExistException, RuntimeException, std::exception )
}
void SAL_CALL UIElementFactoryManager::deregisterFactory( const OUString& aType, const OUString& aName, const OUString& aModuleId )
-throw ( NoSuchElementException, RuntimeException, std::exception )
{
// SAFE
osl::MutexGuard g(rBHelper.rMutex);
diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx
index e41ea0af90de..15c478b89d61 100644
--- a/framework/source/uifactory/windowcontentfactorymanager.cxx
+++ b/framework/source/uifactory/windowcontentfactorymanager.cxx
@@ -51,27 +51,24 @@ class WindowContentFactoryManager : private cppu::BaseMutex,
public:
explicit WindowContentFactoryManager( const css::uno::Reference< css::uno::XComponentContext>& rxContext );
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.framework.WindowContentFactoryManager");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
return {"com.sun.star.ui.WindowContentFactoryManager"};
}
// XSingleComponentFactory
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext( const css::uno::Reference< css::uno::XComponentContext >& Context ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( const css::uno::Sequence< css::uno::Any >& Arguments, const css::uno::Reference< css::uno::XComponentContext >& Context ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext( const css::uno::Reference< css::uno::XComponentContext >& Context ) override;
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( const css::uno::Sequence< css::uno::Any >& Arguments, const css::uno::Reference< css::uno::XComponentContext >& Context ) override;
private:
virtual void SAL_CALL disposing() override;
@@ -99,7 +96,6 @@ void SAL_CALL WindowContentFactoryManager::disposing()
// XSingleComponentFactory
uno::Reference< uno::XInterface > SAL_CALL WindowContentFactoryManager::createInstanceWithContext(
const uno::Reference< uno::XComponentContext >& /*xContext*/ )
-throw (uno::Exception, uno::RuntimeException, std::exception)
{
uno::Reference< uno::XInterface > xWindow;
return xWindow;
@@ -107,7 +103,6 @@ throw (uno::Exception, uno::RuntimeException, std::exception)
uno::Reference< uno::XInterface > SAL_CALL WindowContentFactoryManager::createInstanceWithArgumentsAndContext(
const uno::Sequence< uno::Any >& Arguments, const uno::Reference< uno::XComponentContext >& Context )
-throw (uno::Exception, uno::RuntimeException, std::exception)
{
uno::Reference< uno::XInterface > xWindow;
uno::Reference< frame::XFrame > xFrame;
diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx
index fe58cc78a529..b73f1f71f02e 100644
--- a/framework/source/xml/acceleratorconfigurationreader.cxx
+++ b/framework/source/xml/acceleratorconfigurationreader.cxx
@@ -69,14 +69,10 @@ AcceleratorConfigurationReader::~AcceleratorConfigurationReader()
}
void SAL_CALL AcceleratorConfigurationReader::startDocument()
- throw(css::xml::sax::SAXException,
- css::uno::RuntimeException, std::exception )
{
}
void SAL_CALL AcceleratorConfigurationReader::endDocument()
- throw(css::xml::sax::SAXException,
- css::uno::RuntimeException, std::exception )
{
// The xml file seems to be corrupted.
// Because we found no end-tags ... at least for
@@ -92,8 +88,6 @@ void SAL_CALL AcceleratorConfigurationReader::endDocument()
void SAL_CALL AcceleratorConfigurationReader::startElement(const OUString& sElement ,
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttributeList)
- throw(css::xml::sax::SAXException,
- css::uno::RuntimeException, std::exception )
{
EXMLElement eElement = AcceleratorConfigurationReader::implst_classifyElement(sElement);
@@ -182,8 +176,6 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const OUString&
}
void SAL_CALL AcceleratorConfigurationReader::endElement(const OUString& sElement)
- throw(css::xml::sax::SAXException,
- css::uno::RuntimeException, std::exception )
{
EXMLElement eElement = AcceleratorConfigurationReader::implst_classifyElement(sElement);
@@ -205,27 +197,19 @@ void SAL_CALL AcceleratorConfigurationReader::endElement(const OUString& sElemen
}
void SAL_CALL AcceleratorConfigurationReader::characters(const OUString&)
- throw(css::xml::sax::SAXException,
- css::uno::RuntimeException, std::exception )
{
}
void SAL_CALL AcceleratorConfigurationReader::ignorableWhitespace(const OUString&)
- throw(css::xml::sax::SAXException,
- css::uno::RuntimeException, std::exception )
{
}
void SAL_CALL AcceleratorConfigurationReader::processingInstruction(const OUString& /*sTarget*/,
const OUString& /*sData*/ )
- throw(css::xml::sax::SAXException,
- css::uno::RuntimeException, std::exception )
{
}
void SAL_CALL AcceleratorConfigurationReader::setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator >& xLocator)
- throw(css::xml::sax::SAXException,
- css::uno::RuntimeException, std::exception )
{
m_xLocator = xLocator;
}
diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx
index 96ff940024ae..5a7e002446f9 100644
--- a/framework/source/xml/imagesdocumenthandler.cxx
+++ b/framework/source/xml/imagesdocumenthandler.cxx
@@ -139,12 +139,10 @@ OReadImagesDocumentHandler::~OReadImagesDocumentHandler()
// XDocumentHandler
void SAL_CALL OReadImagesDocumentHandler::startDocument()
-throw ( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadImagesDocumentHandler::endDocument()
-throw( SAXException, RuntimeException, std::exception )
{
SolarMutexGuard g;
@@ -159,9 +157,6 @@ throw( SAXException, RuntimeException, std::exception )
void SAL_CALL OReadImagesDocumentHandler::startElement(
const OUString& aName, const Reference< XAttributeList > &xAttribs )
- throw(SAXException,
- RuntimeException,
- std::exception)
{
SolarMutexGuard g;
@@ -486,9 +481,6 @@ void SAL_CALL OReadImagesDocumentHandler::startElement(
}
void SAL_CALL OReadImagesDocumentHandler::endElement(const OUString& aName)
- throw(SAXException,
- RuntimeException,
- std::exception)
{
SolarMutexGuard g;
@@ -547,24 +539,20 @@ void SAL_CALL OReadImagesDocumentHandler::endElement(const OUString& aName)
}
void SAL_CALL OReadImagesDocumentHandler::characters(const OUString&)
-throw( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadImagesDocumentHandler::ignorableWhitespace(const OUString&)
-throw( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadImagesDocumentHandler::processingInstruction(
const OUString& /*aTarget*/, const OUString& /*aData*/ )
-throw( SAXException, RuntimeException, std::exception )
{
}
void SAL_CALL OReadImagesDocumentHandler::setDocumentLocator(
const Reference< XLocator > &xLocator)
-throw( SAXException, RuntimeException, std::exception )
{
SolarMutexGuard g;
m_xLocator = xLocator;
@@ -605,8 +593,7 @@ OWriteImagesDocumentHandler::~OWriteImagesDocumentHandler()
{
}
-void OWriteImagesDocumentHandler::WriteImagesDocument() throw
-( SAXException, RuntimeException )
+void OWriteImagesDocumentHandler::WriteImagesDocument()
{
SolarMutexGuard g;
@@ -658,8 +645,7 @@ void OWriteImagesDocumentHandler::WriteImagesDocument() throw
// protected member functions
-void OWriteImagesDocumentHandler::WriteImageList( const ImageListItemDescriptor* pImageList ) throw
-( SAXException, RuntimeException )
+void OWriteImagesDocumentHandler::WriteImageList( const ImageListItemDescriptor* pImageList )
{
::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
Reference< XAttributeList > xList( static_cast<XAttributeList *>(pList) , UNO_QUERY );
@@ -728,8 +714,7 @@ void OWriteImagesDocumentHandler::WriteImageList( const ImageListItemDescriptor*
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
}
-void OWriteImagesDocumentHandler::WriteImage( const ImageItemDescriptor* pImage ) throw
-( SAXException, RuntimeException )
+void OWriteImagesDocumentHandler::WriteImage( const ImageItemDescriptor* pImage )
{
::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
Reference< XAttributeList > xList( static_cast<XAttributeList *>(pList) , UNO_QUERY );
@@ -749,8 +734,7 @@ void OWriteImagesDocumentHandler::WriteImage( const ImageItemDescriptor* pImage
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
}
-void OWriteImagesDocumentHandler::WriteExternalImageList( const ExternalImageItemListDescriptor* pExternalImageList ) throw
-( SAXException, RuntimeException )
+void OWriteImagesDocumentHandler::WriteExternalImageList( const ExternalImageItemListDescriptor* pExternalImageList )
{
m_xWriteDocumentHandler->startElement( ELEMENT_NS_EXTERNALIMAGES, m_xEmptyList );
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
@@ -766,8 +750,7 @@ void OWriteImagesDocumentHandler::WriteExternalImageList( const ExternalImageIte
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
}
-void OWriteImagesDocumentHandler::WriteExternalImage( const ExternalImageItemDescriptor* pExternalImage ) throw
-( SAXException, RuntimeException )
+void OWriteImagesDocumentHandler::WriteExternalImage( const ExternalImageItemDescriptor* pExternalImage )
{
::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
Reference< XAttributeList > xList( static_cast<XAttributeList *>(pList) , UNO_QUERY );