diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-25 21:31:58 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-26 18:22:20 +0100 |
| commit | 5e21a413c788f839a66d9e4c14e745ed18058db8 (patch) | |
| tree | d4451246461346a425ad6f796e08bf1514cdd942 /framework/source | |
| parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) | |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'framework/source')
130 files changed, 1509 insertions, 1509 deletions
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx index 8baaea10af91..51078b5773df 100644 --- a/framework/source/accelerators/acceleratorconfiguration.cxx +++ b/framework/source/accelerators/acceleratorconfiguration.cxx @@ -90,7 +90,7 @@ XMLBasedAcceleratorConfiguration::~XMLBasedAcceleratorConfiguration() css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfiguration::getAllKeyEvents() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); @@ -105,7 +105,7 @@ 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 ) + css::uno::RuntimeException, std::exception ) { // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); @@ -124,7 +124,7 @@ 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 ) + css::uno::RuntimeException, std::exception ) { if ( (aKeyEvent.KeyCode == 0) && @@ -156,7 +156,7 @@ 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 ) + css::uno::RuntimeException, std::exception ) { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); @@ -175,7 +175,7 @@ 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 ) + css::uno::RuntimeException, std::exception ) { if (sCommand.isEmpty()) throw css::lang::IllegalArgumentException( @@ -201,7 +201,7 @@ 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::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); @@ -241,7 +241,7 @@ 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 ) + css::uno::RuntimeException, std::exception ) { if (sCommand.isEmpty()) throw css::lang::IllegalArgumentException( @@ -266,7 +266,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co void SAL_CALL XMLBasedAcceleratorConfiguration::reload() throw(css::uno::Exception , - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { css::uno::Reference< css::io::XStream > xStreamNoLang; @@ -311,7 +311,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::reload() void SAL_CALL XMLBasedAcceleratorConfiguration::store() throw(css::uno::Exception , - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); @@ -339,7 +339,7 @@ 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) + css::uno::RuntimeException, std::exception) { css::uno::Reference< css::io::XStream > xStream = StorageHolder::openSubStreamWithFallback( xStorage, @@ -362,7 +362,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::R ::sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::isModified() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); @@ -372,7 +372,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::R ::sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::isReadOnly() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); @@ -388,14 +388,14 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::R void SAL_CALL XMLBasedAcceleratorConfiguration::setStorage(const css::uno::Reference< css::embed::XStorage >& /*xStorage*/) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::setStorage(): implement this HACK .-)"); } ::sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::hasStorage() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::hasStorage(): implement this HACK .-)"); return sal_False; @@ -403,21 +403,21 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::setStorage(const css::uno::Refer void SAL_CALL XMLBasedAcceleratorConfiguration::addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::addConfigurationListener(): implement me"); } void SAL_CALL XMLBasedAcceleratorConfiguration::removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::removeConfigurationListener(): implement me"); } void SAL_CALL XMLBasedAcceleratorConfiguration::reset() -throw(css::uno::RuntimeException) +throw(css::uno::RuntimeException, std::exception) { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); @@ -430,14 +430,14 @@ throw(css::uno::RuntimeException) void SAL_CALL XMLBasedAcceleratorConfiguration::addResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::addResetListener(): implement me"); } void SAL_CALL XMLBasedAcceleratorConfiguration::removeResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::removeResetListener(): implement me"); } @@ -612,7 +612,7 @@ XCUBasedAcceleratorConfiguration::~XCUBasedAcceleratorConfiguration() css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfiguration::getAllKeyEvents() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); @@ -634,7 +634,7 @@ 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 ) + css::uno::RuntimeException, std::exception ) { // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); @@ -659,7 +659,7 @@ 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::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { SAL_INFO( "fwk.accelerators", "XCUBasedAcceleratorConfiguration::setKeyEvent" ); @@ -745,7 +745,7 @@ 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 ) + css::uno::RuntimeException, std::exception ) { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); @@ -789,7 +789,7 @@ 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 ) + css::uno::RuntimeException, std::exception ) { if (sCommand.isEmpty()) throw css::lang::IllegalArgumentException( @@ -842,7 +842,7 @@ 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::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); @@ -886,7 +886,7 @@ 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 ) + css::uno::RuntimeException, std::exception ) { if (sCommand.isEmpty()) throw css::lang::IllegalArgumentException( @@ -917,7 +917,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co void SAL_CALL XCUBasedAcceleratorConfiguration::reload() throw(css::uno::Exception , - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { SAL_INFO( "fwk.accelerators", "XCUBasedAcceleratorConfiguration::reload()" ); @@ -958,7 +958,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reload() void SAL_CALL XCUBasedAcceleratorConfiguration::store() throw(css::uno::Exception , - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { SAL_INFO( "fwk.accelerators", "XCUBasedAcceleratorConfiguration::store()" ); @@ -987,7 +987,7 @@ 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) + css::uno::RuntimeException, std::exception) { // use m_aCache + old AcceleratorXMLWriter to store data directly on storage given as parameter ... if (!xStorage.is()) @@ -1053,28 +1053,28 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::storeToStorage(const css::uno::R ::sal_Bool SAL_CALL XCUBasedAcceleratorConfiguration::isModified() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { return sal_False; } ::sal_Bool SAL_CALL XCUBasedAcceleratorConfiguration::isReadOnly() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { return sal_False; } void SAL_CALL XCUBasedAcceleratorConfiguration::setStorage(const css::uno::Reference< css::embed::XStorage >& /*xStorage*/) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::setStorage(): implement this HACK .-)"); } ::sal_Bool SAL_CALL XCUBasedAcceleratorConfiguration::hasStorage() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::hasStorage(): implement this HACK .-)"); return sal_False; @@ -1082,21 +1082,21 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setStorage(const css::uno::Refer void SAL_CALL XCUBasedAcceleratorConfiguration::addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::addConfigurationListener(): implement me"); } void SAL_CALL XCUBasedAcceleratorConfiguration::removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::removeConfigurationListener(): implement me"); } void SAL_CALL XCUBasedAcceleratorConfiguration::reset() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { css::uno::Reference< css::container::XNamed > xNamed(m_xCfg, css::uno::UNO_QUERY); OUString sConfig = xNamed->getName(); @@ -1118,21 +1118,21 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reset() void SAL_CALL XCUBasedAcceleratorConfiguration::addResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::addResetListener(): implement me"); } void SAL_CALL XCUBasedAcceleratorConfiguration::removeResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::removeResetListener(): implement me"); } void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util::ChangesEvent& aEvent) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { SAL_INFO( "fwk.accelerators", "XCUBasedAcceleratorConfiguration::changesOccurred()" ); @@ -1184,27 +1184,27 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util: void SAL_CALL XCUBasedAcceleratorConfiguration::disposing(const css::lang::EventObject& /*aSource*/) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { } void SAL_CALL XCUBasedAcceleratorConfiguration::dispose() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // nop } void SAL_CALL XCUBasedAcceleratorConfiguration::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& /*xListener*/ ) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // nop } void SAL_CALL XCUBasedAcceleratorConfiguration::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& /*xListener*/ ) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // nop } diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx index adb14034efb1..e3881f8248f2 100644 --- a/framework/source/accelerators/documentacceleratorconfiguration.cxx +++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx @@ -74,19 +74,19 @@ public: virtual ~DocumentAcceleratorConfiguration(); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.DocumentAcceleratorConfiguration"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.ui.DocumentAcceleratorConfiguration"); @@ -95,10 +95,10 @@ public: // XUIConfigurationStorage virtual void SAL_CALL setStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasStorage() - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); private: @@ -144,7 +144,7 @@ DocumentAcceleratorConfiguration::~DocumentAcceleratorConfiguration() void SAL_CALL DocumentAcceleratorConfiguration::setStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // Attention! xStorage must be accepted too, if it's NULL ! @@ -164,7 +164,7 @@ void SAL_CALL DocumentAcceleratorConfiguration::setStorage(const css::uno::Refer sal_Bool SAL_CALL DocumentAcceleratorConfiguration::hasStorage() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx b/framework/source/accelerators/globalacceleratorconfiguration.cxx index 762dd15d500e..ca2977a8b989 100644 --- a/framework/source/accelerators/globalacceleratorconfiguration.cxx +++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx @@ -59,19 +59,19 @@ public: virtual ~GlobalAcceleratorConfiguration() {} virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.GlobalAcceleratorConfiguration"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.ui.GlobalAcceleratorConfiguration"); @@ -79,7 +79,7 @@ public: } // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception); /// This has to be called after when the instance is acquire()'d. void fillCache(); @@ -130,7 +130,7 @@ void GlobalAcceleratorConfiguration::fillCache() // XComponent.dispose(), #i120029#, to release the cyclic reference // void SAL_CALL GlobalAcceleratorConfiguration::dispose() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { try { diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx index 84c2cb19658f..a33a2e64de87 100644 --- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx +++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx @@ -75,19 +75,19 @@ public: virtual ~ModuleAcceleratorConfiguration(); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.ModuleAcceleratorConfiguration"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.ui.ModuleAcceleratorConfiguration"); @@ -95,7 +95,7 @@ public: } // XComponent - virtual void SAL_CALL dispose() throw (css::uno::RuntimeException); + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception); /// This has to be called after when the instance is acquire()'d. void SAL_CALL fillCache(); @@ -173,7 +173,7 @@ void ModuleAcceleratorConfiguration::fillCache() // XComponent.dispose(), #i120029#, to release the cyclic reference // void SAL_CALL ModuleAcceleratorConfiguration::dispose() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { try { diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index bbef40e7e87b..aadf0bc2871a 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -73,7 +73,7 @@ class StringLength : public ::cppu::WeakImplHelper1< XStringWidth > // XStringWidth sal_Int32 SAL_CALL queryStringWidth( const OUString& aString ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return aString.getLength(); } @@ -308,7 +308,7 @@ MenuManager::MenuItemHandler* MenuManager::GetMenuItemHandler( sal_uInt16 nItemI void SAL_CALL MenuManager::statusChanged( const FeatureStateEvent& Event ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { OUString aFeatureURL = Event.FeatureURL.Complete; MenuItemHandler* pStatusChangedMenu = NULL; @@ -407,7 +407,7 @@ void MenuManager::ClearMenuDispatch(const EventObject& Source,bool _bRemoveOnly) } -void SAL_CALL MenuManager::disposing( const EventObject& Source ) throw ( RuntimeException ) +void SAL_CALL MenuManager::disposing( const EventObject& Source ) throw ( RuntimeException, std::exception ) { if ( Source.Source == m_xFrame ) { diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index 696a7518ded8..042250975ecc 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -89,14 +89,14 @@ CloseDispatcher::~CloseDispatcher() void SAL_CALL CloseDispatcher::dispatch(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments) - throw(css::uno::RuntimeException) + 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) + throw(css::uno::RuntimeException, std::exception) { css::uno::Sequence< sal_Int16 > lGroups(2); lGroups[0] = css::frame::CommandGroup::VIEW; @@ -106,7 +106,7 @@ 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) + throw(css::uno::RuntimeException, std::exception) { if (nCommandGroup == css::frame::CommandGroup::VIEW) { @@ -132,14 +132,14 @@ 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) + 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) + throw(css::uno::RuntimeException, std::exception) { } @@ -147,7 +147,7 @@ void SAL_CALL CloseDispatcher::removeStatusListener(const css::uno::Reference< c 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) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx index e65b925a22d7..84eb4316ab87 100644 --- a/framework/source/dispatch/dispatchinformationprovider.cxx +++ b/framework/source/dispatch/dispatchinformationprovider.cxx @@ -48,7 +48,7 @@ DispatchInformationProvider::~DispatchInformationProvider() css::uno::Sequence< sal_Int16 > SAL_CALL DispatchInformationProvider::getSupportedCommandGroups() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvider > > lProvider = implts_getAllSubProvider(); sal_Int32 c1 = lProvider.getLength(); @@ -80,7 +80,7 @@ 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) + 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 8ef54766be83..2f855dfd5e10 100644 --- a/framework/source/dispatch/dispatchprovider.cxx +++ b/framework/source/dispatch/dispatchprovider.cxx @@ -102,7 +102,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 ) + sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException, std::exception ) { css::uno::Reference< css::frame::XDispatch > xDispatcher; @@ -137,7 +137,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 ) +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 ) { // 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 37ff33e95d40..370d07674063 100644 --- a/framework/source/dispatch/interceptionhelper.cxx +++ b/framework/source/dispatch/interceptionhelper.cxx @@ -50,7 +50,7 @@ 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) + throw(css::uno::RuntimeException, std::exception) { // SAFE { ReadGuard aReadLock(m_aLock); @@ -89,7 +89,7 @@ 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) + throw(css::uno::RuntimeException, std::exception) { sal_Int32 c = lDescriptor.getLength(); css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > lDispatches (c); @@ -103,7 +103,7 @@ 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) + 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); @@ -183,7 +183,7 @@ void SAL_CALL InterceptionHelper::registerDispatchProviderInterceptor(const css: } void SAL_CALL InterceptionHelper::releaseDispatchProviderInterceptor(const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor) - throw(css::uno::RuntimeException) + 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); @@ -231,7 +231,7 @@ 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) + 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 8b0610bcbc0e..68a6524fe4c6 100644 --- a/framework/source/dispatch/loaddispatcher.cxx +++ b/framework/source/dispatch/loaddispatcher.cxx @@ -46,34 +46,34 @@ 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) + 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) + 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 ) + 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) + 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) + throw(css::uno::RuntimeException, std::exception) { } diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx index 80d642d0962e..bd1c2c622a91 100644 --- a/framework/source/dispatch/mailtodispatcher.cxx +++ b/framework/source/dispatch/mailtodispatcher.cxx @@ -89,7 +89,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 ) + sal_Int32 /*nFlags*/ ) throw( css::uno::RuntimeException, std::exception ) { css::uno::Reference< css::frame::XDispatch > xDispatcher; if (aURL.Complete.startsWith("mailto:")) @@ -103,7 +103,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 @descr - */ -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 ) +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 ) { sal_Int32 nCount = lDescriptor.getLength(); css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > lDispatcher( nCount ); @@ -131,7 +131,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 ) + const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception ) { // 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. @@ -156,7 +156,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 ) + const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) { // 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. @@ -240,7 +240,7 @@ sal_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 ) + const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException, std::exception ) { // not suported yet } @@ -248,7 +248,7 @@ void SAL_CALL MailToDispatcher::addStatusListener( const css::uno::Reference< cs void SAL_CALL MailToDispatcher::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ , - const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException ) + const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException, std::exception ) { // not suported yet } diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx index 6742625c6029..c5e006ba4719 100644 --- a/framework/source/dispatch/menudispatcher.cxx +++ b/framework/source/dispatch/menudispatcher.cxx @@ -102,7 +102,7 @@ MenuDispatcher::~MenuDispatcher() // XDispatch //***************************************************************************************************************** void SAL_CALL MenuDispatcher::dispatch( const URL& /*aURL*/ , - const Sequence< PropertyValue >& /*seqProperties*/ ) throw( RuntimeException ) + const Sequence< PropertyValue >& /*seqProperties*/ ) throw( RuntimeException, std::exception ) { } @@ -110,7 +110,7 @@ void SAL_CALL MenuDispatcher::dispatch( const URL& / // XDispatch //***************************************************************************************************************** void SAL_CALL MenuDispatcher::addStatusListener( const uno::Reference< XStatusListener >& xControl, - const URL& aURL ) throw( RuntimeException ) + const URL& aURL ) throw( RuntimeException, std::exception ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -125,7 +125,7 @@ void SAL_CALL MenuDispatcher::addStatusListener( const uno::Reference< XStat // XDispatch //***************************************************************************************************************** void SAL_CALL MenuDispatcher::removeStatusListener( const uno::Reference< XStatusListener >& xControl, - const URL& aURL ) throw( RuntimeException ) + const URL& aURL ) throw( RuntimeException, std::exception ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -140,7 +140,7 @@ void SAL_CALL MenuDispatcher::removeStatusListener( const uno::Reference< X // XFrameActionListener //***************************************************************************************************************** -void SAL_CALL MenuDispatcher::frameAction( const FrameActionEvent& aEvent ) throw ( RuntimeException ) +void SAL_CALL MenuDispatcher::frameAction( const FrameActionEvent& aEvent ) throw ( RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -178,7 +178,7 @@ void SAL_CALL MenuDispatcher::frameAction( const FrameActionEvent& aEvent ) thro //***************************************************************************************************************** // XEventListener //***************************************************************************************************************** -void SAL_CALL MenuDispatcher::disposing( const EventObject& ) throw( RuntimeException ) +void SAL_CALL MenuDispatcher::disposing( const EventObject& ) throw( RuntimeException, std::exception ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx index c659162dc286..2227ddf94413 100644 --- a/framework/source/dispatch/oxt_handler.cxx +++ b/framework/source/dispatch/oxt_handler.cxx @@ -116,7 +116,7 @@ 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 ) + throw( css::uno::RuntimeException, std::exception ) { // SAFE { ResetableGuard aLock( m_aLock ); @@ -145,7 +145,7 @@ 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 ) + throw( css::uno::RuntimeException, std::exception ) { dispatchWithNotification( aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >() ); } @@ -175,7 +175,7 @@ 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 ) + throw( css::uno::RuntimeException, std::exception ) { // Our default is "nothing". So we can return it, if detection failed or fily type is really unknown. OUString sTypeName; diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx index 0ba7e6c01888..bc12aa3c9d1d 100644 --- a/framework/source/dispatch/popupmenudispatcher.cxx +++ b/framework/source/dispatch/popupmenudispatcher.cxx @@ -79,19 +79,19 @@ PopupMenuDispatcher::~PopupMenuDispatcher() // and a dtor isn't the best place to do that! } -OUString SAL_CALL PopupMenuDispatcher::getImplementationName() throw( css::uno::RuntimeException ) +OUString SAL_CALL PopupMenuDispatcher::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { return impl_getStaticImplementationName(); } sal_Bool SAL_CALL PopupMenuDispatcher::supportsService( const OUString& sServiceName ) - throw( css::uno::RuntimeException ) + throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, sServiceName); } css::uno::Sequence< OUString > SAL_CALL PopupMenuDispatcher::getSupportedServiceNames() - throw( css::uno::RuntimeException ) + throw( css::uno::RuntimeException, std::exception ) { return impl_getStaticSupportedServiceNames(); } @@ -145,7 +145,7 @@ DEFINE_INIT_SERVICE(PopupMenuDispatcher, ) void SAL_CALL PopupMenuDispatcher::initialize( const css::uno::Sequence< css::uno::Any >& lArguments ) -throw( css::uno::Exception, css::uno::RuntimeException) +throw( css::uno::Exception, css::uno::RuntimeException, std::exception) { css::uno::Reference< css::frame::XFrame > xFrame; @@ -175,7 +175,7 @@ SAL_CALL PopupMenuDispatcher::queryDispatch( const css::util::URL& rURL , const OUString& sTarget , sal_Int32 nFlags ) -throw( css::uno::RuntimeException ) +throw( css::uno::RuntimeException, std::exception ) { css::uno::Reference< css::frame::XDispatch > xDispatch; @@ -237,7 +237,7 @@ throw( css::uno::RuntimeException ) 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 ) +throw( css::uno::RuntimeException, std::exception ) { sal_Int32 nCount = lDescriptor.getLength(); css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > lDispatcher( nCount ); @@ -252,13 +252,13 @@ throw( css::uno::RuntimeException ) } void SAL_CALL PopupMenuDispatcher::dispatch( const URL& /*aURL*/, const Sequence< PropertyValue >& /*seqProperties*/ ) -throw( RuntimeException ) +throw( RuntimeException, std::exception ) { } void SAL_CALL PopupMenuDispatcher::addStatusListener( const uno::Reference< XStatusListener >& xControl, const URL& aURL ) -throw( RuntimeException ) +throw( RuntimeException, std::exception ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -269,7 +269,7 @@ throw( RuntimeException ) void SAL_CALL PopupMenuDispatcher::removeStatusListener( const uno::Reference< XStatusListener >& xControl, const URL& aURL ) -throw( RuntimeException ) +throw( RuntimeException, std::exception ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -279,7 +279,7 @@ throw( RuntimeException ) } void SAL_CALL PopupMenuDispatcher::frameAction( const FrameActionEvent& aEvent ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -291,7 +291,7 @@ throw ( RuntimeException ) } } -void SAL_CALL PopupMenuDispatcher::disposing( const EventObject& ) throw( RuntimeException ) +void SAL_CALL PopupMenuDispatcher::disposing( const EventObject& ) throw( RuntimeException, std::exception ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx index bd4f2ccc104a..b6ee2f5155e6 100644 --- a/framework/source/dispatch/servicehandler.cxx +++ b/framework/source/dispatch/servicehandler.cxx @@ -91,7 +91,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 ) + sal_Int32 /*nFlags*/ ) throw( css::uno::RuntimeException, std::exception ) { css::uno::Reference< css::frame::XDispatch > xDispatcher; if (aURL.Complete.startsWith(PROTOCOL_VALUE)) @@ -105,7 +105,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 @descr - */ -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 ) +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 ) { sal_Int32 nCount = lDescriptor.getLength(); css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > lDispatcher( nCount ); @@ -132,7 +132,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 ) + const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception ) { // 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. @@ -157,7 +157,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 ) + const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) { // 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. @@ -270,7 +270,7 @@ 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 ) + const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException, std::exception ) { // not suported yet } @@ -278,7 +278,7 @@ void SAL_CALL ServiceHandler::addStatusListener( const css::uno::Reference< css: void SAL_CALL ServiceHandler::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ , - const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException ) + const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException, std::exception ) { // not suported yet } diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx index a7627ab17580..90c5b6e613c4 100644 --- a/framework/source/dispatch/startmoduledispatcher.cxx +++ b/framework/source/dispatch/startmoduledispatcher.cxx @@ -73,7 +73,7 @@ StartModuleDispatcher::~StartModuleDispatcher() void SAL_CALL StartModuleDispatcher::dispatch(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { dispatchWithNotification(aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >()); } @@ -82,7 +82,7 @@ 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) + throw(css::uno::RuntimeException, std::exception) { ::sal_Int16 nResult = css::frame::DispatchResultState::DONTKNOW; if ( aURL.Complete == CMD_UNO_SHOWSTARTMODULE ) @@ -100,14 +100,14 @@ void SAL_CALL StartModuleDispatcher::dispatchWithNotification(const css::util::U css::uno::Sequence< ::sal_Int16 > SAL_CALL StartModuleDispatcher::getSupportedCommandGroups() - throw(css::uno::RuntimeException) + 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) + throw(css::uno::RuntimeException, std::exception) { return css::uno::Sequence< css::frame::DispatchInformation >(); } @@ -115,14 +115,14 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL StartModuleDispat void SAL_CALL StartModuleDispatcher::addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/, const css::util::URL& /*aURL*/ ) - throw(css::uno::RuntimeException) + 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) + throw(css::uno::RuntimeException, std::exception) { } diff --git a/framework/source/dispatch/systemexec.cxx b/framework/source/dispatch/systemexec.cxx index cd6d9d83736a..7ae5c5f91914 100644 --- a/framework/source/dispatch/systemexec.cxx +++ b/framework/source/dispatch/systemexec.cxx @@ -75,7 +75,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 ) + sal_Int32 ) throw( css::uno::RuntimeException, std::exception ) { css::uno::Reference< css::frame::XDispatch > xDispatcher; if (aURL.Complete.startsWith(PROTOCOL_VALUE)) @@ -85,7 +85,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL SystemExec::queryDispatch( -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 ) +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 ) { sal_Int32 nCount = lDescriptor.getLength(); css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > lDispatcher( nCount ); @@ -102,7 +102,7 @@ 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 ) + const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception ) { dispatchWithNotification(aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >()); } @@ -111,7 +111,7 @@ void SAL_CALL SystemExec::dispatch( const css::util::URL& 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 ) + const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) { // convert "systemexec:file:///c:/temp/test.html" => "file:///c:/temp/test.html" sal_Int32 c = aURL.Complete.getLength()-PROTOCOL_LENGTH; @@ -150,7 +150,7 @@ 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 ) + const css::util::URL& ) throw( css::uno::RuntimeException, std::exception ) { // not suported yet } @@ -158,7 +158,7 @@ void SAL_CALL SystemExec::addStatusListener( const css::uno::Reference< css::fra void SAL_CALL SystemExec::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >&, - const css::util::URL& ) throw( css::uno::RuntimeException ) + const css::util::URL& ) throw( css::uno::RuntimeException, std::exception ) { // not suported yet } diff --git a/framework/source/fwe/classes/actiontriggercontainer.cxx b/framework/source/fwe/classes/actiontriggercontainer.cxx index 9889ed9bbae7..815bcfb61859 100644 --- a/framework/source/fwe/classes/actiontriggercontainer.cxx +++ b/framework/source/fwe/classes/actiontriggercontainer.cxx @@ -43,7 +43,7 @@ ActionTriggerContainer::~ActionTriggerContainer() // XInterface Any SAL_CALL ActionTriggerContainer::queryInterface( const Type& aType ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { Any a = ::cppu::queryInterface( aType , @@ -71,7 +71,7 @@ void ActionTriggerContainer::release() throw() // XMultiServiceFactory Reference< XInterface > SAL_CALL ActionTriggerContainer::createInstance( const OUString& aServiceSpecifier ) -throw ( ::com::sun::star::uno::Exception, RuntimeException) +throw ( ::com::sun::star::uno::Exception, RuntimeException, std::exception) { if ( aServiceSpecifier.equalsAscii( SERVICENAME_ACTIONTRIGGER )) return (OWeakObject *)( new ActionTriggerPropertySet()); @@ -84,13 +84,13 @@ throw ( ::com::sun::star::uno::Exception, RuntimeException) } Reference< XInterface > SAL_CALL ActionTriggerContainer::createInstanceWithArguments( const OUString& ServiceSpecifier, const Sequence< Any >& /*Arguments*/ ) -throw ( Exception, RuntimeException) +throw ( Exception, RuntimeException, std::exception) { return createInstance( ServiceSpecifier ); } Sequence< OUString > SAL_CALL ActionTriggerContainer::getAvailableServiceNames() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { Sequence< OUString > aSeq( 3 ); @@ -103,19 +103,19 @@ throw ( RuntimeException ) // XServiceInfo OUString SAL_CALL ActionTriggerContainer::getImplementationName() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { return OUString( IMPLEMENTATIONNAME_ACTIONTRIGGERCONTAINER ); } sal_Bool SAL_CALL ActionTriggerContainer::supportsService( const OUString& ServiceName ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL ActionTriggerContainer::getSupportedServiceNames() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { Sequence< OUString > seqServiceNames( 1 ); @@ -124,7 +124,7 @@ throw ( RuntimeException ) } // XTypeProvider -Sequence< Type > SAL_CALL ActionTriggerContainer::getTypes() throw ( RuntimeException ) +Sequence< Type > SAL_CALL ActionTriggerContainer::getTypes() 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! @@ -154,7 +154,7 @@ Sequence< Type > SAL_CALL ActionTriggerContainer::getTypes() throw ( RuntimeExce return pTypeCollection->getTypes() ; } -Sequence< sal_Int8 > SAL_CALL ActionTriggerContainer::getImplementationId() throw ( RuntimeException ) +Sequence< sal_Int8 > SAL_CALL ActionTriggerContainer::getImplementationId() throw ( RuntimeException, std::exception ) { // Create one Id for all instances of this class. // Use ethernet address to do this! (sal_True) diff --git a/framework/source/fwe/classes/actiontriggerpropertyset.cxx b/framework/source/fwe/classes/actiontriggerpropertyset.cxx index 228345e4c72a..6e649f74a5c0 100644 --- a/framework/source/fwe/classes/actiontriggerpropertyset.cxx +++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx @@ -68,7 +68,7 @@ ActionTriggerPropertySet::~ActionTriggerPropertySet() // XInterface Any SAL_CALL ActionTriggerPropertySet::queryInterface( const Type& aType ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { Any a = ::cppu::queryInterface( aType, @@ -100,19 +100,19 @@ void SAL_CALL ActionTriggerPropertySet::release() throw () // XServiceInfo OUString SAL_CALL ActionTriggerPropertySet::getImplementationName() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { return OUString( IMPLEMENTATIONNAME_ACTIONTRIGGER ); } sal_Bool SAL_CALL ActionTriggerPropertySet::supportsService( const OUString& ServiceName ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL ActionTriggerPropertySet::getSupportedServiceNames() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { Sequence< OUString > seqServiceNames( 1 ); seqServiceNames[0] = OUString( SERVICENAME_ACTIONTRIGGER ); @@ -120,7 +120,7 @@ throw ( RuntimeException ) } // XTypeProvider -Sequence< Type > SAL_CALL ActionTriggerPropertySet::getTypes() throw ( RuntimeException ) +Sequence< Type > SAL_CALL ActionTriggerPropertySet::getTypes() 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! @@ -151,7 +151,7 @@ Sequence< Type > SAL_CALL ActionTriggerPropertySet::getTypes() throw ( RuntimeEx return pTypeCollection->getTypes() ; } -Sequence< sal_Int8 > SAL_CALL ActionTriggerPropertySet::getImplementationId() throw ( RuntimeException ) +Sequence< sal_Int8 > SAL_CALL ActionTriggerPropertySet::getImplementationId() throw ( RuntimeException, std::exception ) { // Create one Id for all instances of this class. // Use ethernet address to do this! (sal_True) @@ -222,7 +222,7 @@ throw( IllegalArgumentException ) void SAL_CALL ActionTriggerPropertySet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& aValue ) -throw( Exception ) +throw( Exception, std::exception ) { ::osl::MutexGuard aGuard( LockHelper::getGlobalLock().getShareableOslMutex() ); @@ -307,7 +307,7 @@ void SAL_CALL ActionTriggerPropertySet::getFastPropertyValue( } Reference< XPropertySetInfo > SAL_CALL ActionTriggerPropertySet::getPropertySetInfo() -throw ( RuntimeException ) +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! diff --git a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx index c234772b8ce3..5917b2a5a201 100644 --- a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx +++ b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx @@ -61,7 +61,7 @@ ActionTriggerSeparatorPropertySet::~ActionTriggerSeparatorPropertySet() // XInterface Any SAL_CALL ActionTriggerSeparatorPropertySet::queryInterface( const Type& aType ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { Any a = ::cppu::queryInterface( aType, @@ -93,19 +93,19 @@ void ActionTriggerSeparatorPropertySet::release() throw() // XServiceInfo OUString SAL_CALL ActionTriggerSeparatorPropertySet::getImplementationName() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { return OUString( IMPLEMENTATIONNAME_ACTIONTRIGGERSEPARATOR ); } sal_Bool SAL_CALL ActionTriggerSeparatorPropertySet::supportsService( const OUString& ServiceName ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL ActionTriggerSeparatorPropertySet::getSupportedServiceNames() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { Sequence< OUString > seqServiceNames( 1 ); seqServiceNames[0] = OUString( SERVICENAME_ACTIONTRIGGERSEPARATOR ); @@ -113,7 +113,7 @@ throw ( RuntimeException ) } // XTypeProvider -Sequence< Type > SAL_CALL ActionTriggerSeparatorPropertySet::getTypes() throw ( RuntimeException ) +Sequence< Type > SAL_CALL ActionTriggerSeparatorPropertySet::getTypes() 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! @@ -144,7 +144,7 @@ Sequence< Type > SAL_CALL ActionTriggerSeparatorPropertySet::getTypes() throw ( return pTypeCollection->getTypes() ; } -Sequence< sal_Int8 > SAL_CALL ActionTriggerSeparatorPropertySet::getImplementationId() throw ( RuntimeException ) +Sequence< sal_Int8 > SAL_CALL ActionTriggerSeparatorPropertySet::getImplementationId() throw ( RuntimeException, std::exception ) { // Create one Id for all instances of this class. // Use ethernet address to do this! (sal_True) @@ -199,7 +199,7 @@ throw( IllegalArgumentException ) void SAL_CALL ActionTriggerSeparatorPropertySet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& aValue ) -throw( Exception ) +throw( Exception, std::exception ) { ::osl::MutexGuard aGuard( LockHelper::getGlobalLock().getShareableOslMutex() ); @@ -252,7 +252,7 @@ void SAL_CALL ActionTriggerSeparatorPropertySet::getFastPropertyValue( } Reference< XPropertySetInfo > SAL_CALL ActionTriggerSeparatorPropertySet::getPropertySetInfo() -throw ( RuntimeException ) +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! diff --git a/framework/source/fwe/classes/imagewrapper.cxx b/framework/source/fwe/classes/imagewrapper.cxx index 42b2586d10a5..77a1988663d3 100644 --- a/framework/source/fwe/classes/imagewrapper.cxx +++ b/framework/source/fwe/classes/imagewrapper.cxx @@ -58,7 +58,7 @@ Sequence< sal_Int8 > ImageWrapper::GetUnoTunnelId() } // XBitmap -com::sun::star::awt::Size SAL_CALL ImageWrapper::getSize() throw ( RuntimeException ) +com::sun::star::awt::Size SAL_CALL ImageWrapper::getSize() throw ( RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -68,7 +68,7 @@ com::sun::star::awt::Size SAL_CALL ImageWrapper::getSize() throw ( RuntimeExcept return com::sun::star::awt::Size( aBitmapSize.Width(), aBitmapSize.Height() ); } -Sequence< sal_Int8 > SAL_CALL ImageWrapper::getDIB() throw ( RuntimeException ) +Sequence< sal_Int8 > SAL_CALL ImageWrapper::getDIB() throw ( RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -77,7 +77,7 @@ Sequence< sal_Int8 > SAL_CALL ImageWrapper::getDIB() throw ( RuntimeException ) return Sequence< sal_Int8 >( (sal_Int8*) aMem.GetData(), aMem.Tell() ); } -Sequence< sal_Int8 > SAL_CALL ImageWrapper::getMaskDIB() throw ( RuntimeException ) +Sequence< sal_Int8 > SAL_CALL ImageWrapper::getMaskDIB() throw ( RuntimeException, std::exception ) { SolarMutexGuard aGuard; BitmapEx aBmpEx( m_aImage.GetBitmapEx() ); @@ -99,7 +99,7 @@ Sequence< sal_Int8 > SAL_CALL ImageWrapper::getMaskDIB() throw ( RuntimeExceptio } // XUnoTunnel -sal_Int64 SAL_CALL ImageWrapper::getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw ( RuntimeException ) +sal_Int64 SAL_CALL ImageWrapper::getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw ( RuntimeException, std::exception ) { 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 45802e16a0b6..6a951dcf2dab 100644 --- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx +++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx @@ -62,7 +62,7 @@ RootActionTriggerContainer::~RootActionTriggerContainer() // XInterface Any SAL_CALL RootActionTriggerContainer::queryInterface( const Type& aType ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { Any a = ::cppu::queryInterface( aType , @@ -92,7 +92,7 @@ void SAL_CALL RootActionTriggerContainer::release() throw () // XMultiServiceFactory Reference< XInterface > SAL_CALL RootActionTriggerContainer::createInstance( const OUString& aServiceSpecifier ) -throw ( Exception, RuntimeException ) +throw ( Exception, RuntimeException, std::exception ) { if ( aServiceSpecifier.equalsAscii( SERVICENAME_ACTIONTRIGGER )) return (OWeakObject *)( new ActionTriggerPropertySet()); @@ -105,13 +105,13 @@ throw ( Exception, RuntimeException ) } Reference< XInterface > SAL_CALL RootActionTriggerContainer::createInstanceWithArguments( const OUString& ServiceSpecifier, const Sequence< Any >& /*Arguments*/ ) -throw ( Exception, RuntimeException ) +throw ( Exception, RuntimeException, std::exception ) { return createInstance( ServiceSpecifier ); } Sequence< OUString > SAL_CALL RootActionTriggerContainer::getAvailableServiceNames() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { Sequence< OUString > aSeq( 3 ); @@ -124,7 +124,7 @@ throw ( RuntimeException ) // XIndexContainer void SAL_CALL RootActionTriggerContainer::insertByIndex( sal_Int32 Index, const Any& Element ) -throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) +throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -137,7 +137,7 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept } void SAL_CALL RootActionTriggerContainer::removeByIndex( sal_Int32 Index ) -throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) +throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -151,7 +151,7 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) // XIndexReplace void SAL_CALL RootActionTriggerContainer::replaceByIndex( sal_Int32 Index, const Any& Element ) -throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) +throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -165,7 +165,7 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept // XIndexAccess sal_Int32 SAL_CALL RootActionTriggerContainer::getCount() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -186,7 +186,7 @@ throw ( RuntimeException ) } Any SAL_CALL RootActionTriggerContainer::getByIndex( sal_Int32 Index ) -throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) +throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -198,13 +198,13 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) // XElementAccess Type SAL_CALL RootActionTriggerContainer::getElementType() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return ::getCppuType(( Reference< XPropertySet >*)0); } sal_Bool SAL_CALL RootActionTriggerContainer::hasElements() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { if ( m_pMenu ) { @@ -217,19 +217,19 @@ throw (::com::sun::star::uno::RuntimeException) // XServiceInfo OUString SAL_CALL RootActionTriggerContainer::getImplementationName() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { return OUString( IMPLEMENTATIONNAME_ROOTACTIONTRIGGERCONTAINER ); } sal_Bool SAL_CALL RootActionTriggerContainer::supportsService( const OUString& ServiceName ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL RootActionTriggerContainer::getSupportedServiceNames() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { Sequence< OUString > seqServiceNames( 1 ); @@ -238,7 +238,7 @@ throw ( RuntimeException ) } // XUnoTunnel -sal_Int64 SAL_CALL RootActionTriggerContainer::getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw ( RuntimeException ) +sal_Int64 SAL_CALL RootActionTriggerContainer::getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw ( RuntimeException, std::exception ) { if ( aIdentifier == impl_getStaticIdentifier() ) return reinterpret_cast< sal_Int64 >( this ); @@ -247,7 +247,7 @@ sal_Int64 SAL_CALL RootActionTriggerContainer::getSomething( const Sequence< sal } // XTypeProvider -Sequence< Type > SAL_CALL RootActionTriggerContainer::getTypes() throw ( RuntimeException ) +Sequence< Type > SAL_CALL RootActionTriggerContainer::getTypes() 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! @@ -279,7 +279,7 @@ Sequence< Type > SAL_CALL RootActionTriggerContainer::getTypes() throw ( Runtime return pTypeCollection->getTypes() ; } -Sequence< sal_Int8 > SAL_CALL RootActionTriggerContainer::getImplementationId() throw ( RuntimeException ) +Sequence< sal_Int8 > SAL_CALL RootActionTriggerContainer::getImplementationId() throw ( RuntimeException, std::exception ) { // Create one Id for all instances of this class. // Use ethernet address to do this! (sal_True) @@ -318,7 +318,7 @@ void RootActionTriggerContainer::FillContainer() m_pMenu ); m_bInContainerCreation = sal_False; } -OUString RootActionTriggerContainer::getName() throw ( RuntimeException ) +OUString RootActionTriggerContainer::getName() throw ( RuntimeException, std::exception ) { OUString sRet; if( m_pMenuIdentifier ) @@ -326,7 +326,7 @@ OUString RootActionTriggerContainer::getName() throw ( RuntimeException ) return sRet; } -void RootActionTriggerContainer::setName( const OUString& ) throw ( RuntimeException) +void RootActionTriggerContainer::setName( const OUString& ) throw ( RuntimeException, std::exception) { throw RuntimeException(); } diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx index 61dc5bed6b97..68eb2c7f3f57 100644 --- a/framework/source/fwe/dispatch/interaction.cxx +++ b/framework/source/fwe/dispatch/interaction.cxx @@ -53,8 +53,8 @@ class ContinuationFilterSelect : public comphelper::OInteraction< ::com::sun::st // uno interface public: - virtual void SAL_CALL setFilter( const OUString& sFilter ) throw( ::com::sun::star::uno::RuntimeException ); - virtual OUString SAL_CALL getFilter( ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setFilter( const OUString& sFilter ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getFilter( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // member private: @@ -74,7 +74,7 @@ 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 ) +void SAL_CALL ContinuationFilterSelect::setFilter( const OUString& sFilter ) throw( css::uno::RuntimeException, std::exception ) { m_sFilter = sFilter; } @@ -82,7 +82,7 @@ void SAL_CALL ContinuationFilterSelect::setFilter( const OUString& sFilter ) thr // read access to transported filter -OUString SAL_CALL ContinuationFilterSelect::getFilter() throw( css::uno::RuntimeException ) +OUString SAL_CALL ContinuationFilterSelect::getFilter() throw( css::uno::RuntimeException, std::exception ) { return m_sFilter; } @@ -95,8 +95,8 @@ public: OUString getFilter() const; public: - virtual ::com::sun::star::uno::Any SAL_CALL getRequest() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Any SAL_CALL getRequest() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( ::com::sun::star::uno::RuntimeException, std::exception ); private: ::com::sun::star::uno::Any m_aRequest ; @@ -148,7 +148,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 ) +css::uno::Any SAL_CALL RequestFilterSelect_Impl::getRequest() throw( css::uno::RuntimeException, std::exception ) { return m_aRequest; } @@ -159,7 +159,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 ) +css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL RequestFilterSelect_Impl::getContinuations() throw( css::uno::RuntimeException, std::exception ) { return m_lContinuations; } @@ -213,18 +213,18 @@ public: m_lContinuations = lContinuations; } - virtual uno::Any SAL_CALL getRequest() throw( uno::RuntimeException ); + virtual uno::Any SAL_CALL getRequest() throw( uno::RuntimeException, std::exception ); virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations() - throw( uno::RuntimeException ); + throw( uno::RuntimeException, std::exception ); }; -uno::Any SAL_CALL InteractionRequest_Impl::getRequest() throw( uno::RuntimeException ) +uno::Any SAL_CALL InteractionRequest_Impl::getRequest() throw( uno::RuntimeException, std::exception ) { return m_aRequest; } uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL InteractionRequest_Impl::getContinuations() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return m_lContinuations; } diff --git a/framework/source/fwe/helper/documentundoguard.cxx b/framework/source/fwe/helper/documentundoguard.cxx index 2e839c62ee9a..95910a7e7e98 100644 --- a/framework/source/fwe/helper/documentundoguard.cxx +++ b/framework/source/fwe/helper/documentundoguard.cxx @@ -89,20 +89,20 @@ namespace framework } // XUndoManagerListener - virtual void SAL_CALL undoActionAdded( const UndoManagerEvent& i_event ) throw (RuntimeException); - virtual void SAL_CALL actionUndone( const UndoManagerEvent& i_event ) throw (RuntimeException); - virtual void SAL_CALL actionRedone( const UndoManagerEvent& i_event ) throw (RuntimeException); - virtual void SAL_CALL allActionsCleared( const EventObject& i_event ) throw (RuntimeException); - virtual void SAL_CALL redoActionsCleared( const EventObject& i_event ) throw (RuntimeException); - virtual void SAL_CALL resetAll( const EventObject& i_event ) throw (RuntimeException); - virtual void SAL_CALL enteredContext( const UndoManagerEvent& i_event ) throw (RuntimeException); - virtual void SAL_CALL enteredHiddenContext( const UndoManagerEvent& i_event ) throw (RuntimeException); - virtual void SAL_CALL leftContext( const UndoManagerEvent& i_event ) throw (RuntimeException); - virtual void SAL_CALL leftHiddenContext( const UndoManagerEvent& i_event ) throw (RuntimeException); - virtual void SAL_CALL cancelledContext( const UndoManagerEvent& i_event ) throw (RuntimeException); + virtual void SAL_CALL undoActionAdded( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception); + virtual void SAL_CALL actionUndone( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception); + virtual void SAL_CALL actionRedone( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception); + virtual void SAL_CALL allActionsCleared( const EventObject& i_event ) throw (RuntimeException, std::exception); + virtual void SAL_CALL redoActionsCleared( const EventObject& i_event ) throw (RuntimeException, std::exception); + virtual void SAL_CALL resetAll( const EventObject& i_event ) throw (RuntimeException, std::exception); + virtual void SAL_CALL enteredContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception); + virtual void SAL_CALL enteredHiddenContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception); + virtual void SAL_CALL leftContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception); + virtual void SAL_CALL leftHiddenContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception); + virtual void SAL_CALL cancelledContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception); // XEventListener - virtual void SAL_CALL disposing( const EventObject& i_event ) throw (RuntimeException); + virtual void SAL_CALL disposing( const EventObject& i_event ) throw (RuntimeException, std::exception); private: Reference< XUndoManager > const m_xUndoManager; @@ -111,84 +111,84 @@ namespace framework }; - void SAL_CALL UndoManagerContextListener::undoActionAdded( const UndoManagerEvent& i_event ) throw (RuntimeException) + void SAL_CALL UndoManagerContextListener::undoActionAdded( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) { (void)i_event; // not interested in } - void SAL_CALL UndoManagerContextListener::actionUndone( const UndoManagerEvent& i_event ) throw (RuntimeException) + void SAL_CALL UndoManagerContextListener::actionUndone( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) { (void)i_event; // not interested in } - void SAL_CALL UndoManagerContextListener::actionRedone( const UndoManagerEvent& i_event ) throw (RuntimeException) + void SAL_CALL UndoManagerContextListener::actionRedone( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) { (void)i_event; // not interested in } - void SAL_CALL UndoManagerContextListener::allActionsCleared( const EventObject& i_event ) throw (RuntimeException) + void SAL_CALL UndoManagerContextListener::allActionsCleared( const EventObject& i_event ) throw (RuntimeException, std::exception) { (void)i_event; // not interested in } - void SAL_CALL UndoManagerContextListener::redoActionsCleared( const EventObject& i_event ) throw (RuntimeException) + void SAL_CALL UndoManagerContextListener::redoActionsCleared( const EventObject& i_event ) throw (RuntimeException, std::exception) { (void)i_event; // not interested in } - void SAL_CALL UndoManagerContextListener::resetAll( const EventObject& i_event ) throw (RuntimeException) + void SAL_CALL UndoManagerContextListener::resetAll( const EventObject& i_event ) throw (RuntimeException, std::exception) { (void)i_event; m_nRelativeContextDepth = 0; } - void SAL_CALL UndoManagerContextListener::enteredContext( const UndoManagerEvent& i_event ) throw (RuntimeException) + void SAL_CALL UndoManagerContextListener::enteredContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) { (void)i_event; osl_atomic_increment( &m_nRelativeContextDepth ); } - void SAL_CALL UndoManagerContextListener::enteredHiddenContext( const UndoManagerEvent& i_event ) throw (RuntimeException) + void SAL_CALL UndoManagerContextListener::enteredHiddenContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) { (void)i_event; osl_atomic_increment( &m_nRelativeContextDepth ); } - void SAL_CALL UndoManagerContextListener::leftContext( const UndoManagerEvent& i_event ) throw (RuntimeException) + void SAL_CALL UndoManagerContextListener::leftContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) { (void)i_event; osl_atomic_decrement( &m_nRelativeContextDepth ); } - void SAL_CALL UndoManagerContextListener::leftHiddenContext( const UndoManagerEvent& i_event ) throw (RuntimeException) + void SAL_CALL UndoManagerContextListener::leftHiddenContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) { (void)i_event; osl_atomic_decrement( &m_nRelativeContextDepth ); } - void SAL_CALL UndoManagerContextListener::cancelledContext( const UndoManagerEvent& i_event ) throw (RuntimeException) + void SAL_CALL UndoManagerContextListener::cancelledContext( const UndoManagerEvent& i_event ) throw (RuntimeException, std::exception) { (void)i_event; osl_atomic_decrement( &m_nRelativeContextDepth ); } - void SAL_CALL UndoManagerContextListener::disposing( const EventObject& i_event ) throw (RuntimeException) + void SAL_CALL UndoManagerContextListener::disposing( const EventObject& i_event ) throw (RuntimeException, std::exception) { (void)i_event; m_documentDisposed = true; diff --git a/framework/source/fwe/helper/propertysetcontainer.cxx b/framework/source/fwe/helper/propertysetcontainer.cxx index 52df1deb5c46..670359af05fc 100644 --- a/framework/source/fwe/helper/propertysetcontainer.cxx +++ b/framework/source/fwe/helper/propertysetcontainer.cxx @@ -58,7 +58,7 @@ void SAL_CALL PropertySetContainer::release() throw () } Any SAL_CALL PropertySetContainer::queryInterface( const Type& rType ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { Any a = ::cppu::queryInterface( rType , @@ -77,7 +77,7 @@ throw ( RuntimeException ) // XIndexContainer void SAL_CALL PropertySetContainer::insertByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) - throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) + throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -110,7 +110,7 @@ void SAL_CALL PropertySetContainer::insertByIndex( sal_Int32 Index, const ::com: } void SAL_CALL PropertySetContainer::removeByIndex( sal_Int32 nIndex ) - throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) + throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -124,7 +124,7 @@ void SAL_CALL PropertySetContainer::removeByIndex( sal_Int32 nIndex ) // XIndexReplace void SAL_CALL PropertySetContainer::replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) - throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException) + throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { if ( (sal_Int32)m_aPropertySetVector.size() > Index ) { @@ -147,7 +147,7 @@ void SAL_CALL PropertySetContainer::replaceByIndex( sal_Int32 Index, const ::com // XIndexAccess sal_Int32 SAL_CALL PropertySetContainer::getCount() - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -155,7 +155,7 @@ sal_Int32 SAL_CALL PropertySetContainer::getCount() } Any SAL_CALL PropertySetContainer::getByIndex( sal_Int32 Index ) - throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) + throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -172,7 +172,7 @@ Any SAL_CALL PropertySetContainer::getByIndex( sal_Int32 Index ) // XElementAccess sal_Bool SAL_CALL PropertySetContainer::hasElements() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx index 9588a0af6905..306b6fd8d2b3 100644 --- a/framework/source/fwe/helper/titlehelper.cxx +++ b/framework/source/fwe/helper/titlehelper.cxx @@ -92,7 +92,7 @@ void TitleHelper::setOwner(const css::uno::Reference< css::uno::XInterface >& xO OUString SAL_CALL TitleHelper::getTitle() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { // SYNCHRONIZED -> ::osl::ResettableMutexGuard aLock(m_aMutex); @@ -128,7 +128,7 @@ void TitleHelper::connectWithUntitledNumbers (const css::uno::Reference< css::fr void SAL_CALL TitleHelper::setTitle(const OUString& sTitle) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { // SYNCHRONIZED -> ::osl::ResettableMutexGuard aLock(m_aMutex); @@ -144,7 +144,7 @@ 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) + throw (css::uno::RuntimeException, std::exception) { // container is threadsafe by himself m_aListener.addInterface( ::getCppuType( (const css::uno::Reference< css::frame::XTitleChangeListener >*)NULL ), xListener ); @@ -152,7 +152,7 @@ void SAL_CALL TitleHelper::addTitleChangeListener(const css::uno::Reference< css void SAL_CALL TitleHelper::removeTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { // container is threadsafe by himself m_aListener.removeInterface( ::getCppuType( (const css::uno::Reference< css::frame::XTitleChangeListener >*)NULL ), xListener ); @@ -160,7 +160,7 @@ void SAL_CALL TitleHelper::removeTitleChangeListener(const css::uno::Reference< void SAL_CALL TitleHelper::titleChanged(const css::frame::TitleChangedEvent& aEvent) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { // SYNCHRONIZED -> ::osl::ResettableMutexGuard aLock(m_aMutex); @@ -178,7 +178,7 @@ void SAL_CALL TitleHelper::titleChanged(const css::frame::TitleChangedEvent& aEv void SAL_CALL TitleHelper::notifyEvent(const css::document::EventObject& aEvent) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { if ( ! aEvent.EventName.equalsIgnoreAsciiCase("OnSaveAsDone") && ! aEvent.EventName.equalsIgnoreAsciiCase("OnModeChanged") @@ -206,7 +206,7 @@ void SAL_CALL TitleHelper::notifyEvent(const css::document::EventObject& aEvent) void SAL_CALL TitleHelper::frameAction(const css::frame::FrameActionEvent& aEvent) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SYNCHRONIZED -> ::osl::ResettableMutexGuard aLock(m_aMutex); @@ -234,7 +234,7 @@ void SAL_CALL TitleHelper::frameAction(const css::frame::FrameActionEvent& aEven void SAL_CALL TitleHelper::disposing(const css::lang::EventObject& aEvent) - throw (css::uno::RuntimeException) + 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 f6124b96e943..cdf58098c5bb 100644 --- a/framework/source/fwe/interaction/preventduplicateinteraction.cxx +++ b/framework/source/fwe/interaction/preventduplicateinteraction.cxx @@ -68,7 +68,7 @@ void PreventDuplicateInteraction::useDefaultUUIHandler() css::uno::Any SAL_CALL PreventDuplicateInteraction::queryInterface( const css::uno::Type& aType ) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { if ( aType.equals( cppu::UnoType<XInteractionHandler2>::get() ) ) { @@ -83,7 +83,7 @@ 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) + throw(css::uno::RuntimeException, std::exception) { css::uno::Any aRequest = xRequest->getRequest(); sal_Bool bHandleIt = sal_True; @@ -139,7 +139,7 @@ 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) + throw (css::uno::RuntimeException, std::exception) { css::uno::Any aRequest = xRequest->getRequest(); sal_Bool bHandleIt = sal_True; diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx index 1be57a8b96ee..85479e99aaa3 100644 --- a/framework/source/fwe/xml/menudocumenthandler.cxx +++ b/framework/source/fwe/xml/menudocumenthandler.cxx @@ -172,19 +172,19 @@ ReadMenuDocumentHandlerBase::~ReadMenuDocumentHandlerBase() void SAL_CALL ReadMenuDocumentHandlerBase::ignorableWhitespace( const OUString& ) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException, std::exception ) { } void SAL_CALL ReadMenuDocumentHandlerBase::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ ) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException, std::exception ) { } void SAL_CALL ReadMenuDocumentHandlerBase::setDocumentLocator( const Reference< XLocator > &xLocator) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException, std::exception ) { m_xLocator = xLocator; } @@ -239,13 +239,13 @@ OReadMenuDocumentHandler::~OReadMenuDocumentHandler() void SAL_CALL OReadMenuDocumentHandler::startDocument(void) - throw ( SAXException, RuntimeException ) + throw ( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadMenuDocumentHandler::endDocument(void) - throw( SAXException, RuntimeException ) + throw( SAXException, RuntimeException, std::exception ) { if ( m_nElementDepth > 0 ) { @@ -258,7 +258,7 @@ void SAL_CALL OReadMenuDocumentHandler::endDocument(void) void SAL_CALL OReadMenuDocumentHandler::startElement( const OUString& aName, const Reference< XAttributeList > &xAttrList ) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException, std::exception ) { if ( m_bMenuBarMode ) { @@ -277,13 +277,13 @@ throw( SAXException, RuntimeException ) void SAL_CALL OReadMenuDocumentHandler::characters(const OUString&) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadMenuDocumentHandler::endElement( const OUString& aName ) - throw( SAXException, RuntimeException ) + throw( SAXException, RuntimeException, std::exception ) { if ( m_bMenuBarMode ) { @@ -324,20 +324,20 @@ OReadMenuBarHandler::~OReadMenuBarHandler() void SAL_CALL OReadMenuBarHandler::startDocument(void) - throw ( SAXException, RuntimeException ) + throw ( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadMenuBarHandler::endDocument(void) - throw( SAXException, RuntimeException ) + throw( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadMenuBarHandler::startElement( const OUString& rName, const Reference< XAttributeList > &xAttrList ) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException, std::exception ) { if ( m_bMenuMode ) { @@ -426,13 +426,13 @@ throw( SAXException, RuntimeException ) void SAL_CALL OReadMenuBarHandler::characters(const OUString&) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException, std::exception ) { } void OReadMenuBarHandler::endElement( const OUString& aName ) - throw( SAXException, RuntimeException ) + throw( SAXException, RuntimeException, std::exception ) { if ( m_bMenuMode ) { @@ -475,20 +475,20 @@ OReadMenuHandler::~OReadMenuHandler() void SAL_CALL OReadMenuHandler::startDocument(void) - throw ( SAXException, RuntimeException ) + throw ( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadMenuHandler::endDocument(void) - throw( SAXException, RuntimeException) + throw( SAXException, RuntimeException, std::exception) { } void SAL_CALL OReadMenuHandler::startElement( const OUString& aName, const Reference< XAttributeList > &xAttrList ) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException, std::exception ) { if ( m_bMenuPopupMode ) { @@ -512,13 +512,13 @@ throw( SAXException, RuntimeException ) void SAL_CALL OReadMenuHandler::characters(const OUString&) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadMenuHandler::endElement( const OUString& aName ) - throw( SAXException, RuntimeException ) + throw( SAXException, RuntimeException, std::exception ) { if ( m_bMenuPopupMode ) { @@ -563,19 +563,19 @@ OReadMenuPopupHandler::~OReadMenuPopupHandler() void SAL_CALL OReadMenuPopupHandler::startDocument(void) - throw ( SAXException, RuntimeException ) + throw ( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadMenuPopupHandler::endDocument(void) - throw( SAXException, RuntimeException) + throw( SAXException, RuntimeException, std::exception) { } void SAL_CALL OReadMenuPopupHandler::startElement( const OUString& rName, const Reference< XAttributeList > &xAttrList ) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException, std::exception ) { ++m_nElementDepth; @@ -716,13 +716,13 @@ throw( SAXException, RuntimeException ) void SAL_CALL OReadMenuPopupHandler::characters(const OUString&) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadMenuPopupHandler::endElement( const OUString& aName ) - throw( SAXException, RuntimeException ) + throw( SAXException, RuntimeException, std::exception ) { --m_nElementDepth; if ( m_bMenuMode ) diff --git a/framework/source/fwe/xml/saxnamespacefilter.cxx b/framework/source/fwe/xml/saxnamespacefilter.cxx index bf97c5066447..4cc22c5089c1 100644 --- a/framework/source/fwe/xml/saxnamespacefilter.cxx +++ b/framework/source/fwe/xml/saxnamespacefilter.cxx @@ -53,18 +53,18 @@ SaxNamespaceFilter::~SaxNamespaceFilter() // XDocumentHandler void SAL_CALL SaxNamespaceFilter::startDocument(void) - throw ( SAXException, RuntimeException ) + throw ( SAXException, RuntimeException, std::exception ) { } void SAL_CALL SaxNamespaceFilter::endDocument(void) - throw( SAXException, RuntimeException ) + throw( SAXException, RuntimeException, std::exception ) { } void SAL_CALL SaxNamespaceFilter::startElement( const OUString& rName, const Reference< XAttributeList > &xAttribs ) - throw( SAXException, RuntimeException ) + throw( SAXException, RuntimeException, std::exception ) { XMLNamespaces aXMLNamespaces; if ( !m_aNamespaceStack.empty() ) @@ -123,7 +123,7 @@ void SAL_CALL SaxNamespaceFilter::startElement( } void SAL_CALL SaxNamespaceFilter::endElement(const OUString& aName) - throw( SAXException, RuntimeException ) + throw( SAXException, RuntimeException, std::exception ) { XMLNamespaces& aXMLNamespaces = m_aNamespaceStack.top(); OUString aNamespaceElementName; @@ -143,27 +143,27 @@ void SAL_CALL SaxNamespaceFilter::endElement(const OUString& aName) } void SAL_CALL SaxNamespaceFilter::characters(const OUString& aChars) - throw( SAXException, RuntimeException ) + throw( SAXException, RuntimeException, std::exception ) { xDocumentHandler->characters( aChars ); } void SAL_CALL SaxNamespaceFilter::ignorableWhitespace(const OUString& aWhitespaces) - throw( SAXException, RuntimeException ) + throw( SAXException, RuntimeException, std::exception ) { xDocumentHandler->ignorableWhitespace( aWhitespaces ); } void SAL_CALL SaxNamespaceFilter::processingInstruction( const OUString& aTarget, const OUString& aData) - throw( SAXException, RuntimeException ) + throw( SAXException, RuntimeException, std::exception ) { xDocumentHandler->processingInstruction( aTarget, aData ); } void SAL_CALL SaxNamespaceFilter::setDocumentLocator( const Reference< XLocator > &xLocator) - throw( SAXException, RuntimeException ) + 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 2a799f3b962d..93fdbb2f4658 100644 --- a/framework/source/fwe/xml/statusbardocumenthandler.cxx +++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx @@ -184,12 +184,12 @@ OReadStatusBarDocumentHandler::~OReadStatusBarDocumentHandler() // XDocumentHandler void SAL_CALL OReadStatusBarDocumentHandler::startDocument(void) -throw ( SAXException, RuntimeException ) +throw ( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadStatusBarDocumentHandler::endDocument(void) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -204,7 +204,7 @@ throw( SAXException, RuntimeException ) void SAL_CALL OReadStatusBarDocumentHandler::startElement( const OUString& aName, const Reference< XAttributeList > &xAttribs ) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -403,7 +403,7 @@ throw( SAXException, RuntimeException ) } void SAL_CALL OReadStatusBarDocumentHandler::endElement(const OUString& aName) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -445,24 +445,24 @@ throw( SAXException, RuntimeException ) } void SAL_CALL OReadStatusBarDocumentHandler::characters(const OUString&) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadStatusBarDocumentHandler::ignorableWhitespace(const OUString&) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadStatusBarDocumentHandler::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ ) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadStatusBarDocumentHandler::setDocumentLocator( const Reference< XLocator > &xLocator) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx index 19e94c9ac1e1..07367a49f784 100644 --- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx +++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx @@ -197,12 +197,12 @@ OReadToolBoxDocumentHandler::~OReadToolBoxDocumentHandler() // XDocumentHandler void SAL_CALL OReadToolBoxDocumentHandler::startDocument(void) -throw ( SAXException, RuntimeException ) +throw ( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadToolBoxDocumentHandler::endDocument(void) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -217,7 +217,7 @@ throw( SAXException, RuntimeException ) void SAL_CALL OReadToolBoxDocumentHandler::startElement( const OUString& aName, const Reference< XAttributeList > &xAttribs ) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -535,7 +535,7 @@ throw( SAXException, RuntimeException ) } void SAL_CALL OReadToolBoxDocumentHandler::endElement(const OUString& aName) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -616,24 +616,24 @@ throw( SAXException, RuntimeException ) } void SAL_CALL OReadToolBoxDocumentHandler::characters(const OUString&) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadToolBoxDocumentHandler::ignorableWhitespace(const OUString&) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadToolBoxDocumentHandler::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ ) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadToolBoxDocumentHandler::setDocumentLocator( const Reference< XLocator > &xLocator) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); diff --git a/framework/source/fwi/classes/propertysethelper.cxx b/framework/source/fwi/classes/propertysethelper.cxx index c0805ffd7274..dc11383da943 100644 --- a/framework/source/fwi/classes/propertysethelper.cxx +++ b/framework/source/fwi/classes/propertysethelper.cxx @@ -173,7 +173,7 @@ void PropertySetHelper::impl_notifyChangeListener(const css::beans::PropertyChan css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL PropertySetHelper::getPropertySetInfo() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { TransactionGuard aTransaction(m_rTransactionManager, E_HARDEXCEPTIONS); @@ -188,7 +188,7 @@ void SAL_CALL PropertySetHelper::setPropertyValue(const OUString& sProperty, css::beans::PropertyVetoException , css::lang::IllegalArgumentException , css::lang::WrappedTargetException , - css::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { // TODO look for e.g. readonly props and reject setProp() call! @@ -251,7 +251,7 @@ void SAL_CALL PropertySetHelper::setPropertyValue(const OUString& sProperty, css::uno::Any SAL_CALL PropertySetHelper::getPropertyValue(const OUString& sProperty) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException , - css::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { TransactionGuard aTransaction(m_rTransactionManager, E_HARDEXCEPTIONS); @@ -275,7 +275,7 @@ void SAL_CALL PropertySetHelper::addPropertyChangeListener(const OUString& const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException , - css::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { TransactionGuard aTransaction(m_rTransactionManager, E_HARDEXCEPTIONS); @@ -297,7 +297,7 @@ void SAL_CALL PropertySetHelper::removePropertyChangeListener(const OUString& const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException , - css::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { TransactionGuard aTransaction(m_rTransactionManager, E_SOFTEXCEPTIONS); @@ -319,7 +319,7 @@ void SAL_CALL PropertySetHelper::addVetoableChangeListener(const OUString& const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException , - css::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { TransactionGuard aTransaction(m_rTransactionManager, E_HARDEXCEPTIONS); @@ -341,7 +341,7 @@ void SAL_CALL PropertySetHelper::removeVetoableChangeListener(const OUString& const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException , - css::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { TransactionGuard aTransaction(m_rTransactionManager, E_SOFTEXCEPTIONS); @@ -360,7 +360,7 @@ void SAL_CALL PropertySetHelper::removeVetoableChangeListener(const OUString& css::uno::Sequence< css::beans::Property > SAL_CALL PropertySetHelper::getProperties() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { TransactionGuard aTransaction(m_rTransactionManager, E_HARDEXCEPTIONS); @@ -385,7 +385,7 @@ css::uno::Sequence< css::beans::Property > SAL_CALL PropertySetHelper::getProper css::beans::Property SAL_CALL PropertySetHelper::getPropertyByName(const OUString& sName) throw(css::beans::UnknownPropertyException, - css::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { TransactionGuard aTransaction(m_rTransactionManager, E_HARDEXCEPTIONS); @@ -402,7 +402,7 @@ css::beans::Property SAL_CALL PropertySetHelper::getPropertyByName(const OUStrin sal_Bool SAL_CALL PropertySetHelper::hasPropertyByName(const OUString& sName) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { TransactionGuard aTransaction(m_rTransactionManager, E_HARDEXCEPTIONS); diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx index 4d471325ede8..2c758ab172a7 100644 --- a/framework/source/fwi/uielement/constitemcontainer.cxx +++ b/framework/source/fwi/uielement/constitemcontainer.cxx @@ -62,9 +62,9 @@ public: OPropertySetHelperInfo_Impl( IPropertyArrayHelper & rHelper_ ) SAL_THROW(()); // XPropertySetInfo-Methoden - virtual Sequence< Property > SAL_CALL getProperties(void) throw(::com::sun::star::uno::RuntimeException); - virtual Property SAL_CALL getPropertyByName(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& PropertyName) throw(::com::sun::star::uno::RuntimeException); + virtual Sequence< Property > SAL_CALL getProperties(void) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual Property SAL_CALL getPropertyByName(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& PropertyName) throw(::com::sun::star::uno::RuntimeException, std::exception); }; @@ -81,7 +81,7 @@ OPropertySetHelperInfo_Impl::OPropertySetHelperInfo_Impl( /** * Return the sequence of properties, which are provided throug the constructor. */ -Sequence< Property > OPropertySetHelperInfo_Impl::getProperties(void) throw(::com::sun::star::uno::RuntimeException) +Sequence< Property > OPropertySetHelperInfo_Impl::getProperties(void) throw(::com::sun::star::uno::RuntimeException, std::exception) { return aInfos; } @@ -89,7 +89,7 @@ Sequence< Property > OPropertySetHelperInfo_Impl::getProperties(void) throw(::co /** * Return the sequence of properties, which are provided throug the constructor. */ -Property OPropertySetHelperInfo_Impl::getPropertyByName( const OUString & PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) +Property OPropertySetHelperInfo_Impl::getPropertyByName( const OUString & PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) { Property * pR; pR = (Property *)bsearch( &PropertyName, aInfos.getConstArray(), aInfos.getLength(), @@ -105,7 +105,7 @@ Property OPropertySetHelperInfo_Impl::getPropertyByName( const OUString & Proper /** * Return the sequence of properties, which are provided throug the constructor. */ -sal_Bool OPropertySetHelperInfo_Impl::hasPropertyByName( const OUString & PropertyName ) throw(::com::sun::star::uno::RuntimeException) +sal_Bool OPropertySetHelperInfo_Impl::hasPropertyByName( const OUString & PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) { Property * pR; pR = (Property *)bsearch( &PropertyName, aInfos.getConstArray(), aInfos.getLength(), @@ -235,7 +235,7 @@ Reference< XIndexAccess > ConstItemContainer::deepCopyContainer( const Reference } // XUnoTunnel -sal_Int64 ConstItemContainer::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException) +sal_Int64 ConstItemContainer::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) { if( ( rIdentifier.getLength() == 16 ) && ( 0 == memcmp( ConstItemContainer::GetUnoTunnelId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) ) { @@ -263,20 +263,20 @@ ConstItemContainer* ConstItemContainer::GetImplementation( const ::com::sun::sta // XElementAccess sal_Bool SAL_CALL ConstItemContainer::hasElements() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { return ( !m_aItemVector.empty() ); } // XIndexAccess sal_Int32 SAL_CALL ConstItemContainer::getCount() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { return m_aItemVector.size(); } Any SAL_CALL ConstItemContainer::getByIndex( sal_Int32 Index ) -throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) +throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { if ( sal_Int32( m_aItemVector.size()) > Index ) return makeAny( m_aItemVector[Index] ); @@ -286,7 +286,7 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) // XPropertySet Reference< XPropertySetInfo > SAL_CALL ConstItemContainer::getPropertySetInfo() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::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! @@ -311,12 +311,12 @@ throw (::com::sun::star::uno::RuntimeException) } void SAL_CALL ConstItemContainer::setPropertyValue( const OUString&, const Any& ) -throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { } Any SAL_CALL ConstItemContainer::getPropertyValue( const OUString& PropertyName ) -throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { if ( PropertyName == PROPNAME_UINAME ) return makeAny( m_aUIName ); @@ -325,36 +325,36 @@ throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang } void SAL_CALL ConstItemContainer::addPropertyChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) -throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { } void SAL_CALL ConstItemContainer::removePropertyChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) -throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { // Only read-only properties - do nothing } void SAL_CALL ConstItemContainer::addVetoableChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) -throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { // Only read-only properties - do nothing } void SAL_CALL ConstItemContainer::removeVetoableChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) -throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { // Only read-only properties - do nothing } // XFastPropertySet void SAL_CALL ConstItemContainer::setFastPropertyValue( sal_Int32, const ::com::sun::star::uno::Any& ) -throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { } Any SAL_CALL ConstItemContainer::getFastPropertyValue( sal_Int32 nHandle ) -throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::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 2f9cce58a671..154c2432cf91 100644 --- a/framework/source/fwi/uielement/itemcontainer.cxx +++ b/framework/source/fwi/uielement/itemcontainer.cxx @@ -152,7 +152,7 @@ ItemContainer* ItemContainer::GetImplementation( const ::com::sun::star::uno::Re // XElementAccess sal_Bool SAL_CALL ItemContainer::hasElements() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { ShareGuard aLock( m_aShareMutex ); return ( !m_aItemVector.empty() ); @@ -160,14 +160,14 @@ throw ( RuntimeException ) // XIndexAccess sal_Int32 SAL_CALL ItemContainer::getCount() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { ShareGuard aLock( m_aShareMutex ); return m_aItemVector.size(); } Any SAL_CALL ItemContainer::getByIndex( sal_Int32 Index ) -throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) +throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { ShareGuard aLock( m_aShareMutex ); if ( sal_Int32( m_aItemVector.size()) > Index ) @@ -178,7 +178,7 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) // XIndexContainer void SAL_CALL ItemContainer::insertByIndex( sal_Int32 Index, const Any& aItem ) -throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) +throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { Sequence< PropertyValue > aSeq; if ( aItem >>= aSeq ) @@ -201,7 +201,7 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept } void SAL_CALL ItemContainer::removeByIndex( sal_Int32 nIndex ) -throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) +throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { ShareGuard aLock( m_aShareMutex ); if ( (sal_Int32)m_aItemVector.size() > nIndex ) @@ -213,7 +213,7 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) } void SAL_CALL ItemContainer::replaceByIndex( sal_Int32 Index, const Any& aItem ) -throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) +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 1b64c385501d..275b68d4c287 100644 --- a/framework/source/fwi/uielement/rootitemcontainer.cxx +++ b/framework/source/fwi/uielement/rootitemcontainer.cxx @@ -109,7 +109,7 @@ RootItemContainer::~RootItemContainer() { } -Any SAL_CALL RootItemContainer::queryInterface( const Type& _rType ) throw(RuntimeException) +Any SAL_CALL RootItemContainer::queryInterface( const Type& _rType ) throw(RuntimeException, std::exception) { Any aRet = RootItemContainer_BASE::queryInterface( _rType ); if ( !aRet.hasValue() ) @@ -117,7 +117,7 @@ Any SAL_CALL RootItemContainer::queryInterface( const Type& _rType ) throw(Runti return aRet; } -Sequence< Type > SAL_CALL RootItemContainer::getTypes( ) throw(RuntimeException) +Sequence< Type > SAL_CALL RootItemContainer::getTypes( ) throw(RuntimeException, std::exception) { return comphelper::concatSequences( RootItemContainer_BASE::getTypes(), @@ -143,7 +143,7 @@ Reference< XIndexAccess > RootItemContainer::deepCopyContainer( const Reference< } // XUnoTunnel -sal_Int64 RootItemContainer::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException) +sal_Int64 RootItemContainer::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) { if( ( rIdentifier.getLength() == 16 ) && ( 0 == memcmp( RootItemContainer::GetUnoTunnelId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) ) return sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >( this )); @@ -169,7 +169,7 @@ RootItemContainer* RootItemContainer::GetImplementation( const ::com::sun::star: // XElementAccess sal_Bool SAL_CALL RootItemContainer::hasElements() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { ShareGuard aLock( m_aShareMutex ); return ( !m_aItemVector.empty() ); @@ -177,14 +177,14 @@ throw ( RuntimeException ) // XIndexAccess sal_Int32 SAL_CALL RootItemContainer::getCount() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { ShareGuard aLock( m_aShareMutex ); return m_aItemVector.size(); } Any SAL_CALL RootItemContainer::getByIndex( sal_Int32 Index ) -throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) +throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { ShareGuard aLock( m_aShareMutex ); if ( sal_Int32( m_aItemVector.size()) > Index ) @@ -195,7 +195,7 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) // XIndexContainer void SAL_CALL RootItemContainer::insertByIndex( sal_Int32 Index, const Any& aItem ) -throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) +throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { Sequence< PropertyValue > aSeq; if ( aItem >>= aSeq ) @@ -218,7 +218,7 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept } void SAL_CALL RootItemContainer::removeByIndex( sal_Int32 nIndex ) -throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) +throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { ShareGuard aLock( m_aShareMutex ); if ( (sal_Int32)m_aItemVector.size() > nIndex ) @@ -230,7 +230,7 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) } void SAL_CALL RootItemContainer::replaceByIndex( sal_Int32 Index, const Any& aItem ) -throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) +throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { Sequence< PropertyValue > aSeq; if ( aItem >>= aSeq ) @@ -247,13 +247,13 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept } Reference< XInterface > SAL_CALL RootItemContainer::createInstanceWithContext( const Reference< XComponentContext >& ) -throw ( Exception, RuntimeException) +throw ( Exception, RuntimeException, std::exception) { return (OWeakObject *)(new ItemContainer( m_aShareMutex )); } Reference< XInterface > SAL_CALL RootItemContainer::createInstanceWithArgumentsAndContext( const Sequence< Any >&, const Reference< XComponentContext >& ) -throw (Exception, RuntimeException) +throw (Exception, RuntimeException, std::exception) { return (OWeakObject *)(new ItemContainer( m_aShareMutex )); } @@ -286,7 +286,7 @@ throw( com::sun::star::lang::IllegalArgumentException ) void SAL_CALL RootItemContainer::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , const com::sun::star::uno::Any& aValue ) -throw( com::sun::star::uno::Exception ) +throw( com::sun::star::uno::Exception, std::exception ) { switch( nHandle ) { @@ -334,7 +334,7 @@ void SAL_CALL RootItemContainer::getFastPropertyValue( com::sun::star::uno::Any& } com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL RootItemContainer::getPropertySetInfo() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::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 651f3002cc95..47fd34fd6041 100644 --- a/framework/source/helper/dockingareadefaultacceptor.cxx +++ b/framework/source/helper/dockingareadefaultacceptor.cxx @@ -56,7 +56,7 @@ DockingAreaDefaultAcceptor::~DockingAreaDefaultAcceptor() //***************************************************************************************************************** // XDockingAreaAcceptor //***************************************************************************************************************** -css::uno::Reference< css::awt::XWindow > SAL_CALL DockingAreaDefaultAcceptor::getContainerWindow() throw (css::uno::RuntimeException) +css::uno::Reference< css::awt::XWindow > SAL_CALL DockingAreaDefaultAcceptor::getContainerWindow() throw (css::uno::RuntimeException, std::exception) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -68,7 +68,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) +sal_Bool SAL_CALL DockingAreaDefaultAcceptor::requestDockingAreaSpace( const css::awt::Rectangle& RequestedSpace ) throw (css::uno::RuntimeException, std::exception) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -105,7 +105,7 @@ sal_Bool SAL_CALL DockingAreaDefaultAcceptor::requestDockingAreaSpace( const css return sal_False; } -void SAL_CALL DockingAreaDefaultAcceptor::setDockingAreaSpace( const css::awt::Rectangle& BorderSpace ) throw (css::uno::RuntimeException) +void SAL_CALL DockingAreaDefaultAcceptor::setDockingAreaSpace( const css::awt::Rectangle& BorderSpace ) throw (css::uno::RuntimeException, std::exception) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx index 5e5d3397ffde..6bc4685a8cb3 100644 --- a/framework/source/helper/ocomponentaccess.cxx +++ b/framework/source/helper/ocomponentaccess.cxx @@ -59,7 +59,7 @@ OComponentAccess::~OComponentAccess() //***************************************************************************************************************** // XEnumerationAccess //***************************************************************************************************************** -css::uno::Reference< XEnumeration > SAL_CALL OComponentAccess::createEnumeration() throw( RuntimeException ) +css::uno::Reference< XEnumeration > SAL_CALL OComponentAccess::createEnumeration() throw( RuntimeException, std::exception ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -89,7 +89,7 @@ css::uno::Reference< XEnumeration > SAL_CALL OComponentAccess::createEnumeration //***************************************************************************************************************** // XElementAccess //***************************************************************************************************************** -Type SAL_CALL OComponentAccess::getElementType() throw( RuntimeException ) +Type SAL_CALL OComponentAccess::getElementType() throw( RuntimeException, std::exception ) { // Elements in list an enumeration are components! // Return the uno-type of XComponent. @@ -99,7 +99,7 @@ Type SAL_CALL OComponentAccess::getElementType() throw( RuntimeException ) //***************************************************************************************************************** // XElementAccess //***************************************************************************************************************** -sal_Bool SAL_CALL OComponentAccess::hasElements() throw( RuntimeException ) +sal_Bool SAL_CALL OComponentAccess::hasElements() throw( RuntimeException, std::exception ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); diff --git a/framework/source/helper/ocomponentenumeration.cxx b/framework/source/helper/ocomponentenumeration.cxx index 80b64c6fa646..2c1f9e1b5db2 100644 --- a/framework/source/helper/ocomponentenumeration.cxx +++ b/framework/source/helper/ocomponentenumeration.cxx @@ -64,7 +64,7 @@ OComponentEnumeration::~OComponentEnumeration() //***************************************************************************************************************** // XEventListener //***************************************************************************************************************** -void SAL_CALL OComponentEnumeration::disposing( const EventObject& aEvent ) throw( RuntimeException ) +void SAL_CALL OComponentEnumeration::disposing( const EventObject& aEvent ) throw( RuntimeException, std::exception ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -81,7 +81,7 @@ void SAL_CALL OComponentEnumeration::disposing( const EventObject& aEvent ) thro //***************************************************************************************************************** // XEnumeration //***************************************************************************************************************** -sal_Bool SAL_CALL OComponentEnumeration::hasMoreElements() throw( RuntimeException ) +sal_Bool SAL_CALL OComponentEnumeration::hasMoreElements() throw( RuntimeException, std::exception ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -98,7 +98,7 @@ sal_Bool SAL_CALL OComponentEnumeration::hasMoreElements() throw( RuntimeExcepti //***************************************************************************************************************** Any SAL_CALL OComponentEnumeration::nextElement() throw( NoSuchElementException , WrappedTargetException , - RuntimeException ) + RuntimeException, std::exception ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx index 7c60eaae9b1e..4ba1b88f1d75 100644 --- a/framework/source/helper/oframes.cxx +++ b/framework/source/helper/oframes.cxx @@ -66,7 +66,7 @@ OFrames::~OFrames() //***************************************************************************************************************** // XFrames //***************************************************************************************************************** -void SAL_CALL OFrames::append( const css::uno::Reference< XFrame >& xFrame ) throw( RuntimeException ) +void SAL_CALL OFrames::append( const css::uno::Reference< XFrame >& xFrame ) throw( RuntimeException, std::exception ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -92,7 +92,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 ) +void SAL_CALL OFrames::remove( const css::uno::Reference< XFrame >& xFrame ) throw( RuntimeException, std::exception ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -119,7 +119,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 ) +Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearchFlags ) throw( RuntimeException, std::exception ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -226,7 +226,7 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int //***************************************************************************************************************** // XIndexAccess //***************************************************************************************************************** -sal_Int32 SAL_CALL OFrames::getCount() throw( RuntimeException ) +sal_Int32 SAL_CALL OFrames::getCount() throw( RuntimeException, std::exception ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -252,7 +252,7 @@ sal_Int32 SAL_CALL OFrames::getCount() throw( RuntimeException ) //***************************************************************************************************************** Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsException , WrappedTargetException , - RuntimeException ) + RuntimeException, std::exception ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -282,7 +282,7 @@ Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsExce //***************************************************************************************************************** // XElementAccess //***************************************************************************************************************** -Type SAL_CALL OFrames::getElementType() throw( RuntimeException ) +Type SAL_CALL OFrames::getElementType() throw( RuntimeException, std::exception ) { // This "container" support XFrame-interfaces only! return ::getCppuType( (const css::uno::Reference< XFrame >*)NULL ); @@ -291,7 +291,7 @@ Type SAL_CALL OFrames::getElementType() throw( RuntimeException ) //***************************************************************************************************************** // XElementAccess //***************************************************************************************************************** -sal_Bool SAL_CALL OFrames::hasElements() throw( RuntimeException ) +sal_Bool SAL_CALL OFrames::hasElements() throw( RuntimeException, std::exception ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx index 1b5f6ce72491..634583b52ea6 100644 --- a/framework/source/helper/persistentwindowstate.cxx +++ b/framework/source/helper/persistentwindowstate.cxx @@ -60,7 +60,7 @@ PersistentWindowState::~PersistentWindowState() //***************************************************************************************************************** void SAL_CALL PersistentWindowState::initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { // check arguments css::uno::Reference< css::frame::XFrame > xFrame; @@ -90,7 +90,7 @@ 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) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); @@ -151,7 +151,7 @@ void SAL_CALL PersistentWindowState::frameAction(const css::frame::FrameActionEv //***************************************************************************************************************** void SAL_CALL PersistentWindowState::disposing(const css::lang::EventObject&) - throw(css::uno::RuntimeException) + 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 b3f7fc2a4cb7..8585679d214f 100644 --- a/framework/source/helper/statusindicator.cxx +++ b/framework/source/helper/statusindicator.cxx @@ -43,7 +43,7 @@ StatusIndicator::~StatusIndicator() //*********************************************** void SAL_CALL StatusIndicator::start(const OUString& sText , sal_Int32 nRange) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ReadGuard aReadLock(m_aLock); @@ -59,7 +59,7 @@ void SAL_CALL StatusIndicator::start(const OUString& sText , //*********************************************** void SAL_CALL StatusIndicator::end() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ReadGuard aReadLock(m_aLock); @@ -75,7 +75,7 @@ void SAL_CALL StatusIndicator::end() //*********************************************** void SAL_CALL StatusIndicator::reset() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ReadGuard aReadLock(m_aLock); @@ -91,7 +91,7 @@ void SAL_CALL StatusIndicator::reset() //*********************************************** void SAL_CALL StatusIndicator::setText(const OUString& sText) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ReadGuard aReadLock(m_aLock); @@ -107,7 +107,7 @@ void SAL_CALL StatusIndicator::setText(const OUString& sText) //*********************************************** void SAL_CALL StatusIndicator::setValue(sal_Int32 nValue) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ReadGuard aReadLock(m_aLock); diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx index 9610ba17710d..3b55f7c6e7c1 100644 --- a/framework/source/helper/statusindicatorfactory.cxx +++ b/framework/source/helper/statusindicatorfactory.cxx @@ -74,7 +74,7 @@ StatusIndicatorFactory::~StatusIndicatorFactory() void SAL_CALL StatusIndicatorFactory::initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { if (lArguments.getLength() > 0) { // SAFE -> ---------------------------------- @@ -113,7 +113,7 @@ void SAL_CALL StatusIndicatorFactory::initialize(const css::uno::Sequence< css:: css::uno::Reference< css::task::XStatusIndicator > SAL_CALL StatusIndicatorFactory::createStatusIndicator() - throw(css::uno::RuntimeException) + 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); @@ -123,7 +123,7 @@ css::uno::Reference< css::task::XStatusIndicator > SAL_CALL StatusIndicatorFacto void SAL_CALL StatusIndicatorFactory::update() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); diff --git a/framework/source/helper/tagwindowasmodified.cxx b/framework/source/helper/tagwindowasmodified.cxx index 758092b016b7..538b789d8a7e 100644 --- a/framework/source/helper/tagwindowasmodified.cxx +++ b/framework/source/helper/tagwindowasmodified.cxx @@ -56,7 +56,7 @@ TagWindowAsModified::~TagWindowAsModified() //***************************************************************************************************************** void SAL_CALL TagWindowAsModified::initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { css::uno::Reference< css::frame::XFrame > xFrame; @@ -78,7 +78,7 @@ 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) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); @@ -118,7 +118,7 @@ void SAL_CALL TagWindowAsModified::modified(const css::lang::EventObject& aEvent //***************************************************************************************************************** void SAL_CALL TagWindowAsModified::frameAction(const css::frame::FrameActionEvent& aEvent) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { if ( (aEvent.Action != css::frame::FrameAction_COMPONENT_REATTACHED) && @@ -144,7 +144,7 @@ void SAL_CALL TagWindowAsModified::frameAction(const css::frame::FrameActionEven //***************************************************************************************************************** void SAL_CALL TagWindowAsModified::disposing(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx index b958b94de25f..188d09512bdc 100644 --- a/framework/source/helper/titlebarupdate.cxx +++ b/framework/source/helper/titlebarupdate.cxx @@ -69,7 +69,7 @@ TitleBarUpdate::~TitleBarUpdate() //***************************************************************************************************************** void SAL_CALL TitleBarUpdate::initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { // check arguments css::uno::Reference< css::frame::XFrame > xFrame; @@ -103,7 +103,7 @@ 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) + throw(css::uno::RuntimeException, std::exception) { // we are interested on events only, which must trigger a title bar update // because component was changed. @@ -119,14 +119,14 @@ void SAL_CALL TitleBarUpdate::frameAction(const css::frame::FrameActionEvent& aE //***************************************************************************************************************** void SAL_CALL TitleBarUpdate::titleChanged(const css::frame::TitleChangedEvent& /* aEvent */) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { impl_forceUpdate (); } //***************************************************************************************************************** void SAL_CALL TitleBarUpdate::disposing(const css::lang::EventObject&) - throw(css::uno::RuntimeException) + 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 df0ddf867276..e9229ed2d369 100644 --- a/framework/source/helper/uiconfigelementwrapperbase.cxx +++ b/framework/source/helper/uiconfigelementwrapperbase.cxx @@ -78,7 +78,7 @@ UIConfigElementWrapperBase::~UIConfigElementWrapperBase() { } -Any SAL_CALL UIConfigElementWrapperBase::queryInterface( const Type& _rType ) throw(RuntimeException) +Any SAL_CALL UIConfigElementWrapperBase::queryInterface( const Type& _rType ) throw(RuntimeException, std::exception) { Any aRet = UIConfigElementWrapperBase_BASE::queryInterface( _rType ); if ( !aRet.hasValue() ) @@ -86,7 +86,7 @@ Any SAL_CALL UIConfigElementWrapperBase::queryInterface( const Type& _rType ) th return aRet; } -Sequence< Type > SAL_CALL UIConfigElementWrapperBase::getTypes( ) throw(RuntimeException) +Sequence< Type > SAL_CALL UIConfigElementWrapperBase::getTypes( ) throw(RuntimeException, std::exception) { return comphelper::concatSequences( UIConfigElementWrapperBase_BASE::getTypes(), @@ -95,26 +95,26 @@ Sequence< Type > SAL_CALL UIConfigElementWrapperBase::getTypes( ) throw(Runtime } // XComponent -void SAL_CALL UIConfigElementWrapperBase::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UIConfigElementWrapperBase::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { m_aListenerContainer.addInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >* ) NULL ), xListener ); } -void SAL_CALL UIConfigElementWrapperBase::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UIConfigElementWrapperBase::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { m_aListenerContainer.removeInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >* ) NULL ), aListener ); } // XEventListener void SAL_CALL UIConfigElementWrapperBase::disposing( const EventObject& ) -throw( RuntimeException ) +throw( RuntimeException, std::exception ) { ResetableGuard aLock( m_aLock ); m_xConfigSource.clear(); } void SAL_CALL UIConfigElementWrapperBase::initialize( const Sequence< Any >& aArguments ) -throw ( Exception, RuntimeException ) +throw ( Exception, RuntimeException, std::exception ) { ResetableGuard aLock( m_aLock ); @@ -147,22 +147,22 @@ throw ( Exception, RuntimeException ) } // XUpdatable -void SAL_CALL UIConfigElementWrapperBase::update() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UIConfigElementWrapperBase::update() throw (::com::sun::star::uno::RuntimeException, std::exception) { // can be implemented by derived class } -void SAL_CALL UIConfigElementWrapperBase::elementInserted( const ::com::sun::star::ui::ConfigurationEvent& ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UIConfigElementWrapperBase::elementInserted( const ::com::sun::star::ui::ConfigurationEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) { // can be implemented by derived class } -void SAL_CALL UIConfigElementWrapperBase::elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UIConfigElementWrapperBase::elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) { // can be implemented by derived class } -void SAL_CALL UIConfigElementWrapperBase::elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UIConfigElementWrapperBase::elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) { // can be implemented by derived class } @@ -252,7 +252,7 @@ sal_Bool SAL_CALL UIConfigElementWrapperBase::convertFastPropertyValue( Any& } void SAL_CALL UIConfigElementWrapperBase::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , - const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception ) + const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception, std::exception ) { switch( nHandle ) { @@ -401,7 +401,7 @@ void SAL_CALL UIConfigElementWrapperBase::getFastPropertyValue( com::sun::star:: return(*pInfoHelper); } -com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL UIConfigElementWrapperBase::getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException) +com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL UIConfigElementWrapperBase::getPropertySetInfo() throw (::com::sun::star::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! @@ -450,7 +450,7 @@ const com::sun::star::uno::Sequence< com::sun::star::beans::Property > UIConfigE // Return "PropertyDescriptor" return lPropertyDescriptor; } -void SAL_CALL UIConfigElementWrapperBase::setSettings( const Reference< XIndexAccess >& xSettings ) throw ( RuntimeException ) +void SAL_CALL UIConfigElementWrapperBase::setSettings( const Reference< XIndexAccess >& xSettings ) throw ( RuntimeException, std::exception ) { ResetableGuard aLock( m_aLock ); @@ -489,7 +489,7 @@ void SAL_CALL UIConfigElementWrapperBase::setSettings( const Reference< XIndexAc void UIConfigElementWrapperBase::impl_fillNewData() { } -Reference< XIndexAccess > SAL_CALL UIConfigElementWrapperBase::getSettings( sal_Bool bWriteable ) throw ( RuntimeException ) +Reference< XIndexAccess > SAL_CALL UIConfigElementWrapperBase::getSettings( sal_Bool bWriteable ) throw ( RuntimeException, std::exception ) { ResetableGuard aLock( m_aLock ); @@ -500,20 +500,20 @@ Reference< XIndexAccess > SAL_CALL UIConfigElementWrapperBase::getSettings( sal_ return m_xConfigData; } -Reference< XFrame > SAL_CALL UIConfigElementWrapperBase::getFrame() throw (RuntimeException) +Reference< XFrame > SAL_CALL UIConfigElementWrapperBase::getFrame() throw (RuntimeException, std::exception) { ResetableGuard aLock( m_aLock ); Reference< XFrame > xFrame( m_xWeakFrame ); return xFrame; } -OUString SAL_CALL UIConfigElementWrapperBase::getResourceURL() throw (RuntimeException) +OUString SAL_CALL UIConfigElementWrapperBase::getResourceURL() throw (RuntimeException, std::exception) { ResetableGuard aLock( m_aLock ); return m_aResourceURL; } -::sal_Int16 SAL_CALL UIConfigElementWrapperBase::getType() throw (RuntimeException) +::sal_Int16 SAL_CALL UIConfigElementWrapperBase::getType() throw (RuntimeException, std::exception) { ResetableGuard aLock( m_aLock ); return m_nType; diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx index 2dd1a63c6f58..45f37902ef03 100644 --- a/framework/source/helper/uielementwrapperbase.cxx +++ b/framework/source/helper/uielementwrapperbase.cxx @@ -59,7 +59,7 @@ UIElementWrapperBase::~UIElementWrapperBase() { } -Any SAL_CALL UIElementWrapperBase::queryInterface( const Type& _rType ) throw(RuntimeException) +Any SAL_CALL UIElementWrapperBase::queryInterface( const Type& _rType ) throw(RuntimeException, std::exception) { Any aRet = UIElementWrapperBase_BASE::queryInterface( _rType ); if ( !aRet.hasValue() ) @@ -67,7 +67,7 @@ Any SAL_CALL UIElementWrapperBase::queryInterface( const Type& _rType ) throw(Ru return aRet; } -Sequence< Type > SAL_CALL UIElementWrapperBase::getTypes( ) throw(RuntimeException) +Sequence< Type > SAL_CALL UIElementWrapperBase::getTypes( ) throw(RuntimeException, std::exception) { return comphelper::concatSequences( UIElementWrapperBase_BASE::getTypes(), @@ -75,18 +75,18 @@ Sequence< Type > SAL_CALL UIElementWrapperBase::getTypes( ) throw(RuntimeExcept ); } -void SAL_CALL UIElementWrapperBase::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UIElementWrapperBase::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { m_aListenerContainer.addInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >* ) NULL ), xListener ); } -void SAL_CALL UIElementWrapperBase::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UIElementWrapperBase::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { m_aListenerContainer.removeInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >* ) NULL ), xListener ); } void SAL_CALL UIElementWrapperBase::initialize( const Sequence< Any >& aArguments ) -throw ( Exception, RuntimeException ) +throw ( Exception, RuntimeException, std::exception ) { ResetableGuard aLock( m_aLock ); @@ -113,24 +113,24 @@ throw ( Exception, RuntimeException ) } // XUIElement -::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL UIElementWrapperBase::getFrame() throw (::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL UIElementWrapperBase::getFrame() throw (::com::sun::star::uno::RuntimeException, std::exception) { ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame( m_xWeakFrame ); return xFrame; } -OUString SAL_CALL UIElementWrapperBase::getResourceURL() throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL UIElementWrapperBase::getResourceURL() throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_aResourceURL; } -::sal_Int16 SAL_CALL UIElementWrapperBase::getType() throw (::com::sun::star::uno::RuntimeException) +::sal_Int16 SAL_CALL UIElementWrapperBase::getType() throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_nType; } // XUpdatable -void SAL_CALL UIElementWrapperBase::update() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UIElementWrapperBase::update() throw (::com::sun::star::uno::RuntimeException, std::exception) { // can be implemented by derived class } @@ -147,7 +147,7 @@ sal_Bool SAL_CALL UIElementWrapperBase::convertFastPropertyValue( Any& /*a } void SAL_CALL UIElementWrapperBase::setFastPropertyValue_NoBroadcast( sal_Int32 /*nHandle*/ , - const com::sun::star::uno::Any& /*aValue*/ ) throw( com::sun::star::uno::Exception ) + const com::sun::star::uno::Any& /*aValue*/ ) throw( com::sun::star::uno::Exception, std::exception ) { } @@ -195,7 +195,7 @@ void SAL_CALL UIElementWrapperBase::getFastPropertyValue( com::sun::star::uno::A return(*pInfoHelper); } -com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL UIElementWrapperBase::getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException) +com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL UIElementWrapperBase::getPropertySetInfo() throw (::com::sun::star::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/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx index 4a2b2b2422f9..3e66b5dc87b4 100644 --- a/framework/source/helper/vclstatusindicator.cxx +++ b/framework/source/helper/vclstatusindicator.cxx @@ -51,7 +51,7 @@ VCLStatusIndicator::~VCLStatusIndicator() void SAL_CALL VCLStatusIndicator::start(const OUString& sText , sal_Int32 nRange) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); @@ -91,7 +91,7 @@ void SAL_CALL VCLStatusIndicator::start(const OUString& sText , void SAL_CALL VCLStatusIndicator::reset() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SOLAR SAFE -> ---------------------------- SolarMutexGuard aSolarGuard; @@ -105,7 +105,7 @@ void SAL_CALL VCLStatusIndicator::reset() void SAL_CALL VCLStatusIndicator::end() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); @@ -132,7 +132,7 @@ void SAL_CALL VCLStatusIndicator::end() void SAL_CALL VCLStatusIndicator::setText(const OUString& sText) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); @@ -151,7 +151,7 @@ void SAL_CALL VCLStatusIndicator::setText(const OUString& sText) void SAL_CALL VCLStatusIndicator::setValue(sal_Int32 nValue) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx index 4e4d6b9586af..535f87358c91 100644 --- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx @@ -118,78 +118,78 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase, // XAcceleratorConfiguration virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getAllKeyEvents() - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent) throw(css::container::NoSuchElementException, - css::uno::RuntimeException ); + css::uno::RuntimeException, std::exception ); virtual void SAL_CALL setKeyEvent(const css::awt::KeyEvent& aKeyEvent, const OUString& sCommand ) throw(css::lang::IllegalArgumentException, - css::uno::RuntimeException ); + css::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeKeyEvent(const css::awt::KeyEvent& aKeyEvent) throw(css::container::NoSuchElementException, - css::uno::RuntimeException ); + css::uno::RuntimeException, std::exception ); virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getKeyEventsByCommand(const OUString& sCommand) throw(css::lang::IllegalArgumentException , css::container::NoSuchElementException, - css::uno::RuntimeException ); + css::uno::RuntimeException, std::exception ); virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList) throw(css::lang::IllegalArgumentException , - css::uno::RuntimeException ); + css::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeCommandFromAllKeyEvents(const OUString& sCommand) throw(css::lang::IllegalArgumentException , css::container::NoSuchElementException, - css::uno::RuntimeException ); + css::uno::RuntimeException, std::exception ); // XUIConfigurationPersistence virtual void SAL_CALL reload() throw(css::uno::Exception , - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual void SAL_CALL store() throw(css::uno::Exception , - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual void SAL_CALL storeToStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) throw(css::uno::Exception , - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL isModified() - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL isReadOnly() - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // XUIConfigurationStorage virtual void SAL_CALL setStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL hasStorage() - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // XUIConfiguration virtual void SAL_CALL addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& xListener) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& xListener) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // XReset // TODO use XPresetHandler instead if available virtual void SAL_CALL reset() - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL addResetListener(const css::uno::Reference< css::form::XResetListener >& xListener) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeResetListener(const css::uno::Reference< css::form::XResetListener >& xListener) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // IStorageListener virtual void changesOccurred(const OUString& sPath); @@ -327,91 +327,91 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase, // XAcceleratorConfiguration virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getAllKeyEvents() - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent) throw(css::container::NoSuchElementException, - css::uno::RuntimeException ); + css::uno::RuntimeException, std::exception ); virtual void SAL_CALL setKeyEvent(const css::awt::KeyEvent& aKeyEvent, const OUString& sCommand ) throw(css::lang::IllegalArgumentException, - css::uno::RuntimeException ); + css::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeKeyEvent(const css::awt::KeyEvent& aKeyEvent) throw(css::container::NoSuchElementException, - css::uno::RuntimeException ); + css::uno::RuntimeException, std::exception ); virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getKeyEventsByCommand(const OUString& sCommand) throw(css::lang::IllegalArgumentException , css::container::NoSuchElementException, - css::uno::RuntimeException ); + css::uno::RuntimeException, std::exception ); virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList) throw(css::lang::IllegalArgumentException , - css::uno::RuntimeException ); + css::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeCommandFromAllKeyEvents(const OUString& sCommand) throw(css::lang::IllegalArgumentException , css::container::NoSuchElementException, - css::uno::RuntimeException ); + css::uno::RuntimeException, std::exception ); // XUIConfigurationPersistence virtual void SAL_CALL reload() throw(css::uno::Exception , - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual void SAL_CALL store() throw(css::uno::Exception , - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual void SAL_CALL storeToStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) throw(css::uno::Exception , - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL isModified() - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL isReadOnly() - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // XUIConfigurationStorage virtual void SAL_CALL setStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL hasStorage() - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // XUIConfiguration virtual void SAL_CALL addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& xListener) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& xListener) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // XReset // TODO use XPresetHandler instead if available virtual void SAL_CALL reset() - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL addResetListener(const css::uno::Reference< css::form::XResetListener >& xListener) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeResetListener(const css::uno::Reference< css::form::XResetListener >& xListener) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // css.util.XChangesListener virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // css.lang.XEventListener virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); //______________________________________ // helper for derived classes diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx index 10e41090c58d..9d13717418f0 100644 --- a/framework/source/inc/dispatch/loaddispatcher.hxx +++ b/framework/source/inc/dispatch/loaddispatcher.hxx @@ -103,25 +103,25 @@ class LoadDispatcher : private ThreadHelpBase 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); + throw(css::uno::RuntimeException, std::exception); // XDispatch virtual void SAL_CALL dispatch(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // 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 ); + throw( css::uno::RuntimeException, std::exception ); private: css::uno::Any impl_dispatch( const css::util::URL& rURL, diff --git a/framework/source/interaction/quietinteraction.cxx b/framework/source/interaction/quietinteraction.cxx index 41da0e2ddd38..4c359121a438 100644 --- a/framework/source/interaction/quietinteraction.cxx +++ b/framework/source/interaction/quietinteraction.cxx @@ -51,7 +51,7 @@ QuietInteraction::QuietInteraction() -void SAL_CALL QuietInteraction::handle( const css::uno::Reference< css::task::XInteractionRequest >& xRequest ) throw( css::uno::RuntimeException ) +void SAL_CALL QuietInteraction::handle( const css::uno::Reference< css::task::XInteractionRequest >& xRequest ) throw( css::uno::RuntimeException, std::exception ) { // safe the request for outside analyzing everytime! css::uno::Any aRequest = xRequest->getRequest(); diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx index ff915e2032aa..56d9acef8a3a 100644 --- a/framework/source/jobs/helponstartup.cxx +++ b/framework/source/jobs/helponstartup.cxx @@ -116,7 +116,7 @@ HelpOnStartup::~HelpOnStartup() 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 ) + css::uno::RuntimeException, std::exception ) { // Analyze the given arguments; try to locate a model there and // classify it's used application module. @@ -161,7 +161,7 @@ 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) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ResetableGuard aLock(m_aLock); diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx index e89cde7fd1ea..454bd695e1b3 100644 --- a/framework/source/jobs/job.cxx +++ b/framework/source/jobs/job.cxx @@ -655,7 +655,7 @@ void Job::impl_stopListening() it's 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) + /*IN*/ const css::uno::Any& aResult ) throw(css::uno::RuntimeException, std::exception) { /* SAFE { */ WriteGuard aWriteLock(m_aLock); @@ -699,7 +699,7 @@ void SAL_CALL Job::jobFinished( /*IN*/ const css::uno::Reference< css::task::XAs 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 ) + css::uno::RuntimeException, std::exception ) { /* SAFE { */ ReadGuard aReadLock(m_aLock); @@ -742,7 +742,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) +void SAL_CALL Job::notifyTermination( /*IN*/ const css::lang::EventObject& ) throw(css::uno::RuntimeException, std::exception) { die(); // Do nothing else here. Our internal resources was released ... @@ -769,7 +769,7 @@ void SAL_CALL Job::notifyTermination( /*IN*/ const css::lang::EventObject& ) thr */ void SAL_CALL Job::queryClosing( const css::lang::EventObject& aEvent , sal_Bool bGetsOwnership ) throw(css::util::CloseVetoException, - css::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { /* SAFE { */ WriteGuard aWriteLock(m_aLock); @@ -842,7 +842,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) +void SAL_CALL Job::notifyClosing( const css::lang::EventObject& ) throw(css::uno::RuntimeException, std::exception) { die(); // Do nothing else here. Our internal resources was released ... @@ -857,7 +857,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) +void SAL_CALL Job::disposing( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) { /* SAFE { */ WriteGuard aWriteLock(m_aLock); diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx index 03cd4a9bea40..a7e13e1063fa 100644 --- a/framework/source/jobs/jobdispatch.cxx +++ b/framework/source/jobs/jobdispatch.cxx @@ -98,19 +98,19 @@ public: public: virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.jobs.JobDispatch"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.frame.ProtocolHandler"); @@ -119,26 +119,26 @@ public: // Xinitialization virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& lArguments ) throw(css::uno::Exception , - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); // 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); - 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); + sal_Int32 nSearchFlags ) throw(css::uno::RuntimeException, std::exception); + virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw(css::uno::RuntimeException, std::exception); // 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); + const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException, std::exception); // XDispatch virtual void SAL_CALL dispatch ( const css::util::URL& aURL , - const css::uno::Sequence< css::beans::PropertyValue >& lArgs ) throw(css::uno::RuntimeException); + const css::uno::Sequence< css::beans::PropertyValue >& lArgs ) throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL addStatusListener ( const css::uno::Reference< css::frame::XStatusListener >& xListener , - const css::util::URL& aURL ) throw(css::uno::RuntimeException); + const css::util::URL& aURL ) throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener , - const css::util::URL& aURL ) throw(css::uno::RuntimeException); + const css::util::URL& aURL ) throw(css::uno::RuntimeException, std::exception); }; @@ -178,7 +178,7 @@ JobDispatch::~JobDispatch() 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) + css::uno::RuntimeException, std::exception) { /* SAFE { */ WriteGuard aWriteLock(m_aLock); @@ -224,7 +224,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) + /*IN*/ sal_Int32 /*nSearchFlags*/ ) throw(css::uno::RuntimeException, std::exception) { css::uno::Reference< css::frame::XDispatch > xDispatch; @@ -248,7 +248,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) +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) { // don't pack resulting list! sal_Int32 nCount = lDescriptor.getLength(); @@ -288,7 +288,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) + /*IN*/ const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException, std::exception) { JobURL aAnalyzedURL(aURL.Complete); if (aAnalyzedURL.isValid()) @@ -506,7 +506,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) + /*IN*/ const css::uno::Sequence< css::beans::PropertyValue >& lArgs ) throw(css::uno::RuntimeException, std::exception) { dispatchWithNotification(aURL, lArgs, css::uno::Reference< css::frame::XDispatchResultListener >()); } @@ -516,7 +516,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) + /*IN*/ const css::util::URL& ) throw(css::uno::RuntimeException, std::exception) { } @@ -525,7 +525,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) + /*IN*/ const css::util::URL& ) throw(css::uno::RuntimeException, std::exception) { } diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx index 98ac5ae6163d..04c5cf34f319 100644 --- a/framework/source/jobs/jobexecutor.cxx +++ b/framework/source/jobs/jobexecutor.cxx @@ -85,19 +85,19 @@ public: virtual ~JobExecutor(); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.JobExecutor"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.task.JobExecutor"); @@ -105,21 +105,21 @@ public: } // task.XJobExecutor - virtual void SAL_CALL trigger( const OUString& sEvent ) throw(css::uno::RuntimeException); + virtual void SAL_CALL trigger( const OUString& sEvent ) throw(css::uno::RuntimeException, std::exception); /// Initialization function after having acquire()'d. void initListeners(); // document.XEventListener - virtual void SAL_CALL notifyEvent( const css::document::EventObject& aEvent ) throw(css::uno::RuntimeException); + virtual void SAL_CALL notifyEvent( const css::document::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception); // container.XContainerListener - virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& aEvent ) throw(css::uno::RuntimeException); - virtual void SAL_CALL elementRemoved ( const css::container::ContainerEvent& aEvent ) throw(css::uno::RuntimeException); - virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& aEvent ) throw(css::uno::RuntimeException); + virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& aEvent ) throw(css::uno::RuntimeException, std::exception); + virtual void SAL_CALL elementRemoved ( const css::container::ContainerEvent& aEvent ) throw(css::uno::RuntimeException, std::exception); + virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& aEvent ) throw(css::uno::RuntimeException, std::exception); // lang.XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException); + virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception); }; /** @@ -199,7 +199,7 @@ void JobExecutor::disposing() { @param sEvent is used to locate registered jobs */ -void SAL_CALL JobExecutor::trigger( const OUString& sEvent ) throw(css::uno::RuntimeException) +void SAL_CALL JobExecutor::trigger( const OUString& sEvent ) throw(css::uno::RuntimeException, std::exception) { SAL_INFO( "fwk", "fwk (as96863) JobExecutor::trigger()"); @@ -248,7 +248,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) +void SAL_CALL JobExecutor::notifyEvent( const css::document::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) { const char EVENT_ON_NEW[] = "OnNew"; // Doc UI event const char EVENT_ON_LOAD[] = "OnLoad"; // Doc UI event @@ -337,7 +337,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) +void SAL_CALL JobExecutor::elementInserted( const css::container::ContainerEvent& aEvent ) throw(css::uno::RuntimeException, std::exception) { OUString sValue; if (aEvent.Accessor >>= sValue) @@ -352,7 +352,7 @@ void SAL_CALL JobExecutor::elementInserted( const css::container::ContainerEvent } } -void SAL_CALL JobExecutor::elementRemoved ( const css::container::ContainerEvent& aEvent ) throw(css::uno::RuntimeException) +void SAL_CALL JobExecutor::elementRemoved ( const css::container::ContainerEvent& aEvent ) throw(css::uno::RuntimeException, std::exception) { OUString sValue; if (aEvent.Accessor >>= sValue) @@ -367,7 +367,7 @@ void SAL_CALL JobExecutor::elementRemoved ( const css::container::ContainerEvent } } -void SAL_CALL JobExecutor::elementReplaced( const css::container::ContainerEvent& ) throw(css::uno::RuntimeException) +void SAL_CALL JobExecutor::elementReplaced( const css::container::ContainerEvent& ) throw(css::uno::RuntimeException, std::exception) { // I'm not interested on changed items :-) } @@ -388,7 +388,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) +void SAL_CALL JobExecutor::disposing( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) { /* SAFE { */ osl::MutexGuard g(rBHelper.rMutex); diff --git a/framework/source/jobs/shelljob.cxx b/framework/source/jobs/shelljob.cxx index 508ad1680628..346f2d9ee15c 100644 --- a/framework/source/jobs/shelljob.cxx +++ b/framework/source/jobs/shelljob.cxx @@ -94,7 +94,7 @@ 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 ) + css::uno::RuntimeException, std::exception ) { ::comphelper::SequenceAsHashMap lArgs (lJobArguments); ::comphelper::SequenceAsHashMap lOwnCfg(lArgs.getUnpackedValueOrDefault(PROP_JOBCONFIG, css::uno::Sequence< css::beans::NamedValue >())); diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 17160890e46a..697d8df38468 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -1207,14 +1207,14 @@ throw (uno::RuntimeException) } void SAL_CALL LayoutManager::attachFrame( const Reference< XFrame >& xFrame ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { WriteGuard aWriteLock( m_aLock ); m_xFrame = xFrame; } void SAL_CALL LayoutManager::reset() -throw (RuntimeException) +throw (RuntimeException, std::exception) { implts_reset( sal_True ); } @@ -1224,7 +1224,7 @@ throw (RuntimeException) sal_Bool SAL_CALL LayoutManager::setMergedMenuBar( const Reference< XIndexAccess >& xMergedMenuBar ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { implts_setInplaceMenuBar( xMergedMenuBar ); @@ -1234,27 +1234,27 @@ throw (uno::RuntimeException) } void SAL_CALL LayoutManager::removeMergedMenuBar() -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { implts_resetInplaceMenuBar(); } awt::Rectangle SAL_CALL LayoutManager::getCurrentDockingArea() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { ReadGuard aReadLock( m_aLock ); return m_aDockingArea; } Reference< XDockingAreaAcceptor > SAL_CALL LayoutManager::getDockingAreaAcceptor() -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { ReadGuard aReadLock( m_aLock ); return m_xDockingAreaAcceptor; } void SAL_CALL LayoutManager::setDockingAreaAcceptor( const Reference< ui::XDockingAreaAcceptor >& xDockingAreaAcceptor ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ WriteGuard aWriteLock( m_aLock ); @@ -1421,7 +1421,7 @@ IMPL_LINK( LayoutManager, WindowEventListener, VclSimpleEvent*, pEvent ) } void SAL_CALL LayoutManager::createElement( const OUString& aName ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO( "fwk", "framework (cd100003) ::LayoutManager::createElement" ); @@ -1555,7 +1555,7 @@ throw (RuntimeException) } void SAL_CALL LayoutManager::destroyElement( const OUString& aName ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO( "fwk", "framework (cd100003) ::LayoutManager::destroyElement" ); @@ -1624,7 +1624,7 @@ throw (RuntimeException) } ::sal_Bool SAL_CALL LayoutManager::requestElement( const OUString& rResourceURL ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { bool bResult( false ); bool bNotify( false ); @@ -1701,7 +1701,7 @@ throw (uno::RuntimeException) } Reference< XUIElement > SAL_CALL LayoutManager::getElement( const OUString& aName ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { Reference< XUIElement > xUIElement = implts_findElement( aName ); if ( !xUIElement.is() ) @@ -1718,7 +1718,7 @@ throw (RuntimeException) } Sequence< Reference< ui::XUIElement > > SAL_CALL LayoutManager::getElements() -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { ReadGuard aReadLock( m_aLock ); uno::Reference< ui::XUIElement > xMenuBar( m_xMenuBar ); @@ -1754,7 +1754,7 @@ throw (uno::RuntimeException) } sal_Bool SAL_CALL LayoutManager::showElement( const OUString& aName ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO( "fwk", "framework (cd100003) ::LayoutManager::showElement" ); @@ -1839,7 +1839,7 @@ throw (RuntimeException) } sal_Bool SAL_CALL LayoutManager::hideElement( const OUString& aName ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SAL_INFO( "fwk", "framework (cd100003) ::LayoutManager::hideElement" ); @@ -1924,7 +1924,7 @@ throw (RuntimeException) } sal_Bool SAL_CALL LayoutManager::dockWindow( const OUString& aName, DockingArea DockingArea, const awt::Point& Pos ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { OUString aElementType; OUString aElementName; @@ -1946,7 +1946,7 @@ throw (RuntimeException) return sal_False; } -::sal_Bool SAL_CALL LayoutManager::dockAllWindows( ::sal_Int16 /*nElementType*/ ) throw (uno::RuntimeException) +::sal_Bool SAL_CALL LayoutManager::dockAllWindows( ::sal_Int16 /*nElementType*/ ) throw (uno::RuntimeException, std::exception) { ReadGuard aReadLock( m_aLock ); bool bResult( false ); @@ -1963,7 +1963,7 @@ throw (RuntimeException) } sal_Bool SAL_CALL LayoutManager::floatWindow( const OUString& aName ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { bool bResult( false ); if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) @@ -1983,7 +1983,7 @@ throw (RuntimeException) } ::sal_Bool SAL_CALL LayoutManager::lockWindow( const OUString& aName ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { bool bResult( false ); if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) @@ -2003,7 +2003,7 @@ throw (uno::RuntimeException) } ::sal_Bool SAL_CALL LayoutManager::unlockWindow( const OUString& aName ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { bool bResult( false ); if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) @@ -2023,7 +2023,7 @@ throw (uno::RuntimeException) } void SAL_CALL LayoutManager::setElementSize( const OUString& aName, const awt::Size& aSize ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) { @@ -2041,7 +2041,7 @@ throw (RuntimeException) } void SAL_CALL LayoutManager::setElementPos( const OUString& aName, const awt::Point& aPos ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) { @@ -2059,7 +2059,7 @@ throw (RuntimeException) } void SAL_CALL LayoutManager::setElementPosSize( const OUString& aName, const awt::Point& aPos, const awt::Size& aSize ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) { @@ -2077,7 +2077,7 @@ throw (RuntimeException) } sal_Bool SAL_CALL LayoutManager::isElementVisible( const OUString& aName ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { OUString aElementType; OUString aElementName; @@ -2151,7 +2151,7 @@ throw (RuntimeException) } sal_Bool SAL_CALL LayoutManager::isElementFloating( const OUString& aName ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) { @@ -2167,7 +2167,7 @@ throw (RuntimeException) } sal_Bool SAL_CALL LayoutManager::isElementDocked( const OUString& aName ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) { @@ -2183,7 +2183,7 @@ throw (RuntimeException) } ::sal_Bool SAL_CALL LayoutManager::isElementLocked( const OUString& aName ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) { @@ -2199,7 +2199,7 @@ throw (uno::RuntimeException) } awt::Size SAL_CALL LayoutManager::getElementSize( const OUString& aName ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) { @@ -2215,7 +2215,7 @@ throw (RuntimeException) } awt::Point SAL_CALL LayoutManager::getElementPos( const OUString& aName ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { if ( getElementTypeFromResourceURL( aName ).equalsIgnoreAsciiCase( UIRESOURCETYPE_TOOLBAR )) { @@ -2231,7 +2231,7 @@ throw (RuntimeException) } void SAL_CALL LayoutManager::lock() -throw (RuntimeException) +throw (RuntimeException, std::exception) { implts_lock(); @@ -2253,7 +2253,7 @@ throw (RuntimeException) } void SAL_CALL LayoutManager::unlock() -throw (RuntimeException) +throw (RuntimeException, std::exception) { sal_Bool bDoLayout( implts_unlock() ); @@ -2284,7 +2284,7 @@ throw (RuntimeException) } void SAL_CALL LayoutManager::doLayout() -throw (RuntimeException) +throw (RuntimeException, std::exception) { implts_doLayout_notify( sal_True ); } @@ -2457,7 +2457,7 @@ sal_Bool LayoutManager::implts_resizeContainerWindow( const awt::Size& rContaine } void SAL_CALL LayoutManager::setVisible( sal_Bool bVisible ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { WriteGuard aWriteLock( m_aLock ); sal_Bool bWasVisible( m_bVisible ); @@ -2469,7 +2469,7 @@ throw (uno::RuntimeException) } sal_Bool SAL_CALL LayoutManager::isVisible() -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { ReadGuard aReadLock( m_aLock ); return m_bVisible; @@ -2630,13 +2630,13 @@ IMPL_LINK_NOARG(LayoutManager, SettingsChanged) // XLayoutManagerEventBroadcaster void SAL_CALL LayoutManager::addLayoutManagerEventListener( const uno::Reference< frame::XLayoutManagerListener >& xListener ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { m_aListenerContainer.addInterface( ::getCppuType( (const uno::Reference< frame::XLayoutManagerListener >*)NULL ), xListener ); } void SAL_CALL LayoutManager::removeLayoutManagerEventListener( const uno::Reference< frame::XLayoutManagerListener >& xListener ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { m_aListenerContainer.removeInterface( ::getCppuType( (const uno::Reference< frame::XLayoutManagerListener >*)NULL ), xListener ); } @@ -2666,7 +2666,7 @@ void LayoutManager::implts_notifyListeners( short nEvent, uno::Any aInfoParam ) // XWindowListener void SAL_CALL LayoutManager::windowResized( const awt::WindowEvent& aEvent ) -throw( uno::RuntimeException ) +throw( uno::RuntimeException, std::exception ) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ WriteGuard aWriteLock( m_aLock ); @@ -2715,11 +2715,11 @@ throw( uno::RuntimeException ) } } -void SAL_CALL LayoutManager::windowMoved( const awt::WindowEvent& ) throw( uno::RuntimeException ) +void SAL_CALL LayoutManager::windowMoved( const awt::WindowEvent& ) throw( uno::RuntimeException, std::exception ) { } -void SAL_CALL LayoutManager::windowShown( const lang::EventObject& aEvent ) throw( uno::RuntimeException ) +void SAL_CALL LayoutManager::windowShown( const lang::EventObject& aEvent ) throw( uno::RuntimeException, std::exception ) { ReadGuard aReadLock( m_aLock ); Reference< awt::XWindow > xContainerWindow( m_xContainerWindow ); @@ -2739,7 +2739,7 @@ void SAL_CALL LayoutManager::windowShown( const lang::EventObject& aEvent ) thro } } -void SAL_CALL LayoutManager::windowHidden( const lang::EventObject& aEvent ) throw( uno::RuntimeException ) +void SAL_CALL LayoutManager::windowHidden( const lang::EventObject& aEvent ) throw( uno::RuntimeException, std::exception ) { ReadGuard aReadLock( m_aLock ); Reference< awt::XWindow > xContainerWindow( m_xContainerWindow ); @@ -2784,7 +2784,7 @@ IMPL_LINK_NOARG(LayoutManager, AsyncLayoutHdl) // XFrameActionListener void SAL_CALL LayoutManager::frameAction( const FrameActionEvent& aEvent ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { if (( aEvent.Action == FrameAction_COMPONENT_ATTACHED ) || ( aEvent.Action == FrameAction_COMPONENT_REATTACHED )) { @@ -2824,7 +2824,7 @@ throw ( RuntimeException ) // ______________________________________________ void SAL_CALL LayoutManager::disposing( const lang::EventObject& rEvent ) -throw( RuntimeException ) +throw( RuntimeException, std::exception ) { sal_Bool bDisposeAndClear( sal_False ); @@ -2927,7 +2927,7 @@ throw( RuntimeException ) } } -void SAL_CALL LayoutManager::elementInserted( const ui::ConfigurationEvent& Event ) throw (uno::RuntimeException) +void SAL_CALL LayoutManager::elementInserted( const ui::ConfigurationEvent& Event ) throw (uno::RuntimeException, std::exception) { ReadGuard aReadLock( m_aLock ); Reference< XFrame > xFrame( m_xFrame ); @@ -2972,7 +2972,7 @@ void SAL_CALL LayoutManager::elementInserted( const ui::ConfigurationEvent& Even } } -void SAL_CALL LayoutManager::elementRemoved( const ui::ConfigurationEvent& Event ) throw (uno::RuntimeException) +void SAL_CALL LayoutManager::elementRemoved( const ui::ConfigurationEvent& Event ) throw (uno::RuntimeException, std::exception) { ReadGuard aReadLock( m_aLock ); Reference< frame::XFrame > xFrame( m_xFrame ); @@ -3060,7 +3060,7 @@ void SAL_CALL LayoutManager::elementRemoved( const ui::ConfigurationEvent& Event } } -void SAL_CALL LayoutManager::elementReplaced( const ui::ConfigurationEvent& Event ) throw (uno::RuntimeException) +void SAL_CALL LayoutManager::elementReplaced( const ui::ConfigurationEvent& Event ) throw (uno::RuntimeException, std::exception) { ReadGuard aReadLock( m_aLock ); Reference< XFrame > xFrame( m_xFrame ); @@ -3122,7 +3122,7 @@ sal_Bool SAL_CALL LayoutManager::convertFastPropertyValue( Any& aConverted } void SAL_CALL LayoutManager::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const uno::Any& aValue ) throw( uno::Exception ) + const uno::Any& aValue ) throw( uno::Exception, std::exception ) { if ( nHandle != LAYOUTMANAGER_PROPHANDLE_REFRESHVISIBILITY ) LayoutManager_PBase::setFastPropertyValue_NoBroadcast( nHandle, aValue ); @@ -3196,7 +3196,7 @@ namespace return theInfoHelper::get(*this).getHelper(); } -uno::Reference< beans::XPropertySetInfo > SAL_CALL LayoutManager::getPropertySetInfo() throw (uno::RuntimeException) +uno::Reference< beans::XPropertySetInfo > SAL_CALL LayoutManager::getPropertySetInfo() throw (uno::RuntimeException, std::exception) { static uno::Reference< beans::XPropertySetInfo >* pInfo = NULL; diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index d9ebead05d60..851b6838b6c5 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -95,7 +95,7 @@ void SAL_CALL ToolbarLayoutManager::release() throw() OWeakObject::release(); } -uno::Any SAL_CALL ToolbarLayoutManager::queryInterface( const uno::Type & rType ) throw( uno::RuntimeException ) +uno::Any SAL_CALL ToolbarLayoutManager::queryInterface( const uno::Type & rType ) throw( uno::RuntimeException, std::exception ) { uno::Any a = ::cppu::queryInterface( rType, (static_cast< awt::XDockableWindowListener* >(this)), @@ -108,7 +108,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 ) +void SAL_CALL ToolbarLayoutManager::disposing( const lang::EventObject& aEvent ) throw( uno::RuntimeException, std::exception ) { if ( aEvent.Source == m_xFrame ) { @@ -3219,7 +3219,7 @@ void ToolbarLayoutManager::implts_renumberRowColumnData( // XWindowListener void SAL_CALL ToolbarLayoutManager::windowResized( const awt::WindowEvent& aEvent ) -throw( uno::RuntimeException ) +throw( uno::RuntimeException, std::exception ) { WriteGuard aWriteLock( m_aLock ); bool bLocked( m_bDockingInProgress ); @@ -3269,17 +3269,17 @@ throw( uno::RuntimeException ) } void SAL_CALL ToolbarLayoutManager::windowMoved( const awt::WindowEvent& /*aEvent*/ ) -throw( uno::RuntimeException ) +throw( uno::RuntimeException, std::exception ) { } void SAL_CALL ToolbarLayoutManager::windowShown( const lang::EventObject& /*aEvent*/ ) -throw( uno::RuntimeException ) +throw( uno::RuntimeException, std::exception ) { } void SAL_CALL ToolbarLayoutManager::windowHidden( const lang::EventObject& /*aEvent*/ ) -throw( uno::RuntimeException ) +throw( uno::RuntimeException, std::exception ) { } @@ -3287,7 +3287,7 @@ throw( uno::RuntimeException ) // XDockableWindowListener void SAL_CALL ToolbarLayoutManager::startDocking( const awt::DockingEvent& e ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { bool bWinFound( false ); @@ -3342,7 +3342,7 @@ throw (uno::RuntimeException) } awt::DockingData SAL_CALL ToolbarLayoutManager::docking( const awt::DockingEvent& e ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { const sal_Int32 MAGNETIC_DISTANCE_UNDOCK = 25; const sal_Int32 MAGNETIC_DISTANCE_DOCK = 20; @@ -3520,7 +3520,7 @@ throw (uno::RuntimeException) } void SAL_CALL ToolbarLayoutManager::endDocking( const awt::EndDockingEvent& e ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { bool bDockingInProgress( false ); bool bStartDockFloated( false ); @@ -3616,7 +3616,7 @@ throw (uno::RuntimeException) } sal_Bool SAL_CALL ToolbarLayoutManager::prepareToggleFloatingMode( const lang::EventObject& e ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { ReadGuard aReadLock( m_aLock ); bool bDockingInProgress = m_bDockingInProgress; @@ -3658,7 +3658,7 @@ throw (uno::RuntimeException) } void SAL_CALL ToolbarLayoutManager::toggleFloatingMode( const lang::EventObject& e ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { UIElement aUIDockingElement; @@ -3789,7 +3789,7 @@ throw (uno::RuntimeException) } void SAL_CALL ToolbarLayoutManager::closed( const lang::EventObject& e ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { OUString aName; UIElement aUIElement; @@ -3836,7 +3836,7 @@ throw (uno::RuntimeException) } void SAL_CALL ToolbarLayoutManager::endPopupMode( const awt::EndPopupModeEvent& /*e*/ ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { } @@ -3844,7 +3844,7 @@ throw (uno::RuntimeException) // XUIConfigurationListener void SAL_CALL ToolbarLayoutManager::elementInserted( const ui::ConfigurationEvent& rEvent ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { UIElement aUIElement = implts_findToolbar( rEvent.ResourceURL ); @@ -3908,7 +3908,7 @@ throw (uno::RuntimeException) } void SAL_CALL ToolbarLayoutManager::elementRemoved( const ui::ConfigurationEvent& rEvent ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { ReadGuard aReadLock( m_aLock ); uno::Reference< awt::XWindow > xContainerWindow( m_xContainerWindow, uno::UNO_QUERY ); @@ -3956,7 +3956,7 @@ throw (uno::RuntimeException) } void SAL_CALL ToolbarLayoutManager::elementReplaced( const ui::ConfigurationEvent& rEvent ) -throw (uno::RuntimeException) +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 aa79775c1969..2e1fd8d560c8 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx @@ -146,38 +146,38 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a //--------------------------------------------------------------------------------------------------------- virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); //--------------------------------------------------------------------------------------------------------- // XEventListener //--------------------------------------------------------------------------------------------------------- - virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ); //--------------------------------------------------------------------------------------------------------- // XWindowListener //--------------------------------------------------------------------------------------------------------- - virtual void SAL_CALL windowResized( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL windowShown( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL windowHidden( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL windowResized( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL windowShown( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL windowHidden( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ); //--------------------------------------------------------------------------------------------------------- // XDockableWindowListener //--------------------------------------------------------------------------------------------------------- - virtual void SAL_CALL startDocking( const ::com::sun::star::awt::DockingEvent& e ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::DockingData SAL_CALL docking( const ::com::sun::star::awt::DockingEvent& e ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL endDocking( const ::com::sun::star::awt::EndDockingEvent& e ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL prepareToggleFloatingMode( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL toggleFloatingMode( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL closed( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL endPopupMode( const ::com::sun::star::awt::EndPopupModeEvent& e ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL startDocking( const ::com::sun::star::awt::DockingEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::DockingData SAL_CALL docking( const ::com::sun::star::awt::DockingEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL endDocking( const ::com::sun::star::awt::EndDockingEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL prepareToggleFloatingMode( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL toggleFloatingMode( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL closed( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL endPopupMode( const ::com::sun::star::awt::EndPopupModeEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); //--------------------------------------------------------------------------------------------------------- // XUIConfigurationListener //--------------------------------------------------------------------------------------------------------- - virtual void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); private: enum DockingOperation diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 5085f37874a1..b766143b5fd4 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -116,20 +116,20 @@ class LoadEnvListener : private ThreadHelpBase // frame.XLoadEventListener virtual void SAL_CALL loadFinished(const css::uno::Reference< css::frame::XFrameLoader >& xLoader) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL loadCancelled(const css::uno::Reference< css::frame::XFrameLoader >& xLoader) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // frame.XDispatchResultListener virtual void SAL_CALL dispatchFinished(const css::frame::DispatchResultEvent& aEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // lang.XEventListener virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); }; @@ -469,7 +469,7 @@ 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) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); @@ -484,7 +484,7 @@ 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) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); @@ -499,7 +499,7 @@ 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) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); @@ -529,7 +529,7 @@ void SAL_CALL LoadEnvListener::dispatchFinished(const css::frame::DispatchResult void SAL_CALL LoadEnvListener::disposing(const css::lang::EventObject&) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx index 72e024636e11..36f8a7d10310 100644 --- a/framework/source/recording/dispatchrecorder.cxx +++ b/framework/source/recording/dispatchrecorder.cxx @@ -114,7 +114,7 @@ DispatchRecorder::~DispatchRecorder() //************************************************************************* // generate header -void SAL_CALL DispatchRecorder::startRecording( const css::uno::Reference< css::frame::XFrame >& ) throw( css::uno::RuntimeException ) +void SAL_CALL DispatchRecorder::startRecording( const css::uno::Reference< css::frame::XFrame >& ) throw( css::uno::RuntimeException, std::exception ) { /* SAFE{ */ /* } */ @@ -122,7 +122,7 @@ void SAL_CALL DispatchRecorder::startRecording( const css::uno::Reference< css:: //************************************************************************* void SAL_CALL DispatchRecorder::recordDispatch( 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 ) throw( css::uno::RuntimeException, std::exception ) { OUString aTarget; @@ -132,7 +132,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 ) + const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception ) { OUString aTarget; @@ -142,7 +142,7 @@ void SAL_CALL DispatchRecorder::recordDispatchAsComment( const css::util::URL& } //************************************************************************* -void SAL_CALL DispatchRecorder::endRecording() throw( css::uno::RuntimeException ) +void SAL_CALL DispatchRecorder::endRecording() throw( css::uno::RuntimeException, std::exception ) { /* SAFE{ */ WriteGuard aWriteLock(m_aLock); @@ -151,7 +151,7 @@ void SAL_CALL DispatchRecorder::endRecording() throw( css::uno::RuntimeException } //************************************************************************* -OUString SAL_CALL DispatchRecorder::getRecordedMacro() throw( css::uno::RuntimeException ) +OUString SAL_CALL DispatchRecorder::getRecordedMacro() throw( css::uno::RuntimeException, std::exception ) { /* SAFE{ */ WriteGuard aWriteLock(m_aLock); @@ -398,22 +398,22 @@ void SAL_CALL DispatchRecorder::implts_recordMacro( const OUString& aURL, /* } */ } -com::sun::star::uno::Type SAL_CALL DispatchRecorder::getElementType() throw (::com::sun::star::uno::RuntimeException) +com::sun::star::uno::Type SAL_CALL DispatchRecorder::getElementType() throw (::com::sun::star::uno::RuntimeException, std::exception) { return ::getCppuType((const com::sun::star::frame::DispatchStatement *)NULL); } -sal_Bool SAL_CALL DispatchRecorder::hasElements() throw (::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL DispatchRecorder::hasElements() throw (::com::sun::star::uno::RuntimeException, std::exception) { return (! m_aStatements.empty()); } -sal_Int32 SAL_CALL DispatchRecorder::getCount() throw (::com::sun::star::uno::RuntimeException) +sal_Int32 SAL_CALL DispatchRecorder::getCount() throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_aStatements.size(); } -com::sun::star::uno::Any SAL_CALL DispatchRecorder::getByIndex(sal_Int32 idx) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +com::sun::star::uno::Any SAL_CALL DispatchRecorder::getByIndex(sal_Int32 idx) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { if (idx >= (sal_Int32)m_aStatements.size()) { throw com::sun::star::lang::IndexOutOfBoundsException( @@ -428,7 +428,7 @@ com::sun::star::uno::Any SAL_CALL DispatchRecorder::getByIndex(sal_Int32 idx) t return element; } -void SAL_CALL DispatchRecorder::replaceByIndex(sal_Int32 idx, const com::sun::star::uno::Any& element) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL DispatchRecorder::replaceByIndex(sal_Int32 idx, const com::sun::star::uno::Any& element) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { if (element.getValueType() != ::getCppuType((const com::sun::star::frame::DispatchStatement *)NULL)) { diff --git a/framework/source/recording/dispatchrecordersupplier.cxx b/framework/source/recording/dispatchrecordersupplier.cxx index 9a205b1a7faf..9db2b7d3125d 100644 --- a/framework/source/recording/dispatchrecordersupplier.cxx +++ b/framework/source/recording/dispatchrecordersupplier.cxx @@ -94,7 +94,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) +void SAL_CALL DispatchRecorderSupplier::setDispatchRecorder( const css::uno::Reference< css::frame::XDispatchRecorder >& xRecorder ) throw (css::uno::RuntimeException, std::exception) { // SAFE => WriteGuard aWriteLock(m_aLock); @@ -116,7 +116,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) +css::uno::Reference< css::frame::XDispatchRecorder > SAL_CALL DispatchRecorderSupplier::getDispatchRecorder() throw (css::uno::RuntimeException, std::exception) { // SAFE => ReadGuard aReadLock(m_aLock); @@ -140,7 +140,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) + const css::uno::Reference< css::frame::XDispatch >& xDispatcher ) throw (css::uno::RuntimeException, std::exception) { // SAFE => ReadGuard aReadLock(m_aLock); diff --git a/framework/source/services/ContextChangeEventMultiplexer.cxx b/framework/source/services/ContextChangeEventMultiplexer.cxx index 5bdcaf03f33f..24ad2dd865ea 100644 --- a/framework/source/services/ContextChangeEventMultiplexer.cxx +++ b/framework/source/services/ContextChangeEventMultiplexer.cxx @@ -61,32 +61,32 @@ public: virtual void SAL_CALL addContextChangeEventListener ( const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener, const cssu::Reference<cssu::XInterface>& rxEventFocus) - throw(cssu::RuntimeException, cssl::IllegalArgumentException); + throw(cssu::RuntimeException, cssl::IllegalArgumentException, std::exception); virtual void SAL_CALL removeContextChangeEventListener ( const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener, const cssu::Reference<cssu::XInterface>& rxEventFocus) - throw(cssu::RuntimeException, cssl::IllegalArgumentException); + throw(cssu::RuntimeException, cssl::IllegalArgumentException, std::exception); virtual void SAL_CALL removeAllContextChangeEventListeners ( const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener) - throw(cssu::RuntimeException, cssl::IllegalArgumentException); + throw(cssu::RuntimeException, cssl::IllegalArgumentException, std::exception); virtual void SAL_CALL broadcastContextChangeEvent ( const css::ui::ContextChangeEventObject& rContextChangeEventObject, const cssu::Reference<cssu::XInterface>& rxEventFocus) - throw(cssu::RuntimeException); + throw(cssu::RuntimeException, std::exception); // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService ( const ::rtl::OUString& rsServiceName) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); virtual cssu::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); // XEventListener virtual void SAL_CALL disposing ( const css::lang::EventObject& rEvent) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); private: typedef ::std::vector<cssu::Reference<css::ui::XContextChangeEventListener> > ListenerContainer; @@ -157,7 +157,7 @@ void SAL_CALL ContextChangeEventMultiplexer::disposing (void) void SAL_CALL ContextChangeEventMultiplexer::addContextChangeEventListener ( const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener, const cssu::Reference<cssu::XInterface>& rxEventFocus) - throw(cssu::RuntimeException,cssl::IllegalArgumentException) + throw(cssu::RuntimeException,cssl::IllegalArgumentException, std::exception) { if ( ! rxListener.is()) throw css::lang::IllegalArgumentException( @@ -194,7 +194,7 @@ 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) + throw(cssu::RuntimeException,cssl::IllegalArgumentException, std::exception) { if ( ! rxListener.is()) throw cssl::IllegalArgumentException( @@ -220,7 +220,7 @@ void SAL_CALL ContextChangeEventMultiplexer::removeContextChangeEventListener ( void SAL_CALL ContextChangeEventMultiplexer::removeAllContextChangeEventListeners ( const cssu::Reference<css::ui::XContextChangeEventListener>& rxListener) - throw(cssu::RuntimeException,cssl::IllegalArgumentException) + throw(cssu::RuntimeException,cssl::IllegalArgumentException, std::exception) { if ( ! rxListener.is()) throw cssl::IllegalArgumentException( @@ -248,7 +248,7 @@ void SAL_CALL ContextChangeEventMultiplexer::removeAllContextChangeEventListener void SAL_CALL ContextChangeEventMultiplexer::broadcastContextChangeEvent ( const css::ui::ContextChangeEventObject& rEventObject, const cssu::Reference<cssu::XInterface>& rxEventFocus) - throw(cssu::RuntimeException) + throw(cssu::RuntimeException, std::exception) { // Remember the current context. if (rxEventFocus.is()) @@ -312,26 +312,26 @@ ContextChangeEventMultiplexer::FocusDescriptor* ContextChangeEventMultiplexer::G } OUString SAL_CALL ContextChangeEventMultiplexer::getImplementationName() - throw(cssu::RuntimeException) + 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) + throw (cssu::RuntimeException, std::exception) { return cppu::supportsService(this, rsServiceName); } css::uno::Sequence<OUString> SAL_CALL ContextChangeEventMultiplexer::getSupportedServiceNames() - throw (cssu::RuntimeException) + 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) + 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 1e79c177b3d5..980e92b09e2f 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -489,19 +489,19 @@ public: virtual ~AutoRecovery( ); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.AutoRecovery"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.frame.AutoRecovery"); @@ -513,27 +513,27 @@ public: { OWeakObject::acquire(); } virtual void SAL_CALL release() throw () { OWeakObject::release(); } - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) throw ( css::uno::RuntimeException ); + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) throw ( css::uno::RuntimeException, std::exception ); /// Initialization function after having acquire()'d. void initListeners(); // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException); + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception); // 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); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // css.document.XEventListener @@ -547,22 +547,22 @@ public: points to the new created/opened document. */ virtual void SAL_CALL notifyEvent(const css::document::EventObject& aEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // css.util.XChangesListener virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // css.util.XModifyListener virtual void SAL_CALL modified(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // css.lang.XEventListener virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); protected: @@ -577,7 +577,7 @@ protected: virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& aValue ) - throw(css::uno::Exception); + throw(css::uno::Exception, std::exception); using cppu::OPropertySetHelper::getFastPropertyValue; virtual void SAL_CALL getFastPropertyValue(css::uno::Any& aValue , sal_Int32 nHandle) const; @@ -585,7 +585,7 @@ protected: virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); private: virtual void SAL_CALL disposing() SAL_OVERRIDE; @@ -1407,7 +1407,7 @@ void AutoRecovery::disposing() implts_stopTimer(); } -Any SAL_CALL AutoRecovery::queryInterface( const css::uno::Type& _rType ) throw(css::uno::RuntimeException) +Any SAL_CALL AutoRecovery::queryInterface( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) { Any aRet = AutoRecovery_BASE::queryInterface( _rType ); if ( !aRet.hasValue() ) @@ -1415,7 +1415,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) +Sequence< css::uno::Type > SAL_CALL AutoRecovery::getTypes( ) throw(css::uno::RuntimeException, std::exception) { return comphelper::concatSequences( AutoRecovery_BASE::getTypes(), @@ -1426,7 +1426,7 @@ 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) + throw(css::uno::RuntimeException, std::exception) { SAL_INFO("fwk.autorecovery", "AutoRecovery::dispatch() starts ..." << aURL.Complete); @@ -1661,7 +1661,7 @@ 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) + throw(css::uno::RuntimeException, std::exception) { if (!xListener.is()) throw css::uno::RuntimeException("Invalid listener reference.", static_cast< css::frame::XDispatch* >(this)); @@ -1695,7 +1695,7 @@ 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) + throw(css::uno::RuntimeException, std::exception) { if (!xListener.is()) throw css::uno::RuntimeException("Invalid listener reference.", static_cast< css::frame::XDispatch* >(this)); @@ -1705,7 +1705,7 @@ void SAL_CALL AutoRecovery::removeStatusListener(const css::uno::Reference< css: void SAL_CALL AutoRecovery::notifyEvent(const css::document::EventObject& aEvent) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { css::uno::Reference< css::frame::XModel > xDocument(aEvent.Source, css::uno::UNO_QUERY); @@ -1774,7 +1774,7 @@ void SAL_CALL AutoRecovery::notifyEvent(const css::document::EventObject& aEvent void SAL_CALL AutoRecovery::changesOccurred(const css::util::ChangesEvent& aEvent) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { const css::uno::Sequence< css::util::ElementChange > lChanges (aEvent.Changes); const css::util::ElementChange* pChanges = lChanges.getConstArray(); @@ -1828,7 +1828,7 @@ void SAL_CALL AutoRecovery::changesOccurred(const css::util::ChangesEvent& aEven void SAL_CALL AutoRecovery::modified(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { css::uno::Reference< css::frame::XModel > xDocument(aEvent.Source, css::uno::UNO_QUERY); if (! xDocument.is()) @@ -1839,7 +1839,7 @@ void SAL_CALL AutoRecovery::modified(const css::lang::EventObject& aEvent) void SAL_CALL AutoRecovery::disposing(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { /* SAFE */ { osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); @@ -4153,7 +4153,7 @@ 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) + throw(css::uno::Exception, std::exception) { // not needed currently } @@ -4237,7 +4237,7 @@ const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescripto css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL AutoRecovery::getPropertySetInfo() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { static css::uno::Reference< css::beans::XPropertySetInfo >* pInfo = 0; if(!pInfo) diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 6ca2fb3ab3ec..9e083f9436ee 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -71,19 +71,19 @@ namespace framework{ OUString SAL_CALL Desktop::getImplementationName() - throw (css::uno::RuntimeException) + 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) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence<OUString> SAL_CALL Desktop::getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.frame.Desktop"); @@ -199,7 +199,7 @@ Desktop::~Desktop() SAL_WARN_IF( m_aTransactionManager.getWorkingMode()!=E_CLOSE, "fwk", "Desktop::~Desktop(): Who forgot to dispose this service?" ); } -css::uno::Any SAL_CALL Desktop::queryInterface( const css::uno::Type& _rType ) throw(css::uno::RuntimeException) +css::uno::Any SAL_CALL Desktop::queryInterface( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) { css::uno::Any aRet = Desktop_BASE::queryInterface( _rType ); if ( !aRet.hasValue() ) @@ -207,7 +207,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) +css::uno::Sequence< css::uno::Type > SAL_CALL Desktop::getTypes( ) throw(css::uno::RuntimeException, std::exception) { return comphelper::concatSequences( Desktop_BASE::getTypes(), @@ -217,7 +217,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL Desktop::getTypes( ) throw(css::u //============================================================================= sal_Bool SAL_CALL Desktop::terminate() - throw( css::uno::RuntimeException ) + throw( css::uno::RuntimeException, std::exception ) { TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); @@ -379,7 +379,7 @@ bool SAL_CALL Desktop::terminateQuickstarterToo() //============================================================================= void SAL_CALL Desktop::addTerminateListener( const css::uno::Reference< css::frame::XTerminateListener >& xListener ) - throw( css::uno::RuntimeException ) + throw( css::uno::RuntimeException, std::exception ) { TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); @@ -422,7 +422,7 @@ 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 ) + throw( css::uno::RuntimeException, std::exception ) { TransactionGuard aTransaction( m_aTransactionManager, E_SOFTEXCEPTIONS ); @@ -480,7 +480,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 ) +css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getComponents() throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Register transaction and reject wrong calls. @@ -507,7 +507,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 ) +css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::getCurrentComponent() throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Register transaction and reject wrong calls. @@ -544,7 +544,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 ) +css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getCurrentFrame() throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Register transaction and reject wrong calls. @@ -590,7 +590,7 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::loadComponentFrom sal_Int32 nSearchFlags , const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::io::IOException , css::lang::IllegalArgumentException , - css::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Register transaction and reject wrong calls. @@ -624,7 +624,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 ) +css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getTasks() throw( css::uno::RuntimeException, std::exception ) { SAL_INFO("fwk", "Desktop::getTasks(): Use of obsolete interface XTaskSupplier"); return NULL; @@ -648,7 +648,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 ) +css::uno::Reference< css::frame::XTask > SAL_CALL Desktop::getActiveTask() throw( css::uno::RuntimeException, std::exception ) { SAL_INFO("fwk", "Desktop::getActiveTask(): Use of obsolete interface XTaskSupplier"); return NULL; @@ -675,7 +675,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 ) + sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException, std::exception ) { const char UNO_PROTOCOL[] = ".uno:"; @@ -701,7 +701,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 ) +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 ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Register transaction and reject wrong calls. @@ -722,7 +722,7 @@ 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) + throw( css::uno::RuntimeException, std::exception) { TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); @@ -732,7 +732,7 @@ 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) + throw( css::uno::RuntimeException, std::exception) { TransactionGuard aTransaction( m_aTransactionManager, E_SOFTEXCEPTIONS ); @@ -757,7 +757,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 ) +css::uno::Reference< css::frame::XFrames > SAL_CALL Desktop::getFrames() throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Register transaction and reject wrong calls. @@ -783,7 +783,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 ) +void SAL_CALL Desktop::setActiveFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Register transaction and reject wrong calls. @@ -806,7 +806,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 ) +css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getActiveFrame() throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Register transaction and reject wrong calls. @@ -829,29 +829,29 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getActiveFrame() thr @onerror - @threadsafe - *//*-*************************************************************************************************************/ -void SAL_CALL Desktop::initialize( const css::uno::Reference< css::awt::XWindow >& ) throw( css::uno::RuntimeException ) +void SAL_CALL Desktop::initialize( const css::uno::Reference< css::awt::XWindow >& ) throw( css::uno::RuntimeException, std::exception ) { } //***************************************************************************************************************** -css::uno::Reference< css::awt::XWindow > SAL_CALL Desktop::getContainerWindow() throw( css::uno::RuntimeException ) +css::uno::Reference< css::awt::XWindow > SAL_CALL Desktop::getContainerWindow() throw( css::uno::RuntimeException, std::exception ) { return css::uno::Reference< css::awt::XWindow >(); } //***************************************************************************************************************** -void SAL_CALL Desktop::setCreator( const css::uno::Reference< css::frame::XFramesSupplier >& /*xCreator*/ ) throw( css::uno::RuntimeException ) +void SAL_CALL Desktop::setCreator( const css::uno::Reference< css::frame::XFramesSupplier >& /*xCreator*/ ) throw( css::uno::RuntimeException, std::exception ) { } //***************************************************************************************************************** -css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Desktop::getCreator() throw( css::uno::RuntimeException ) +css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Desktop::getCreator() throw( css::uno::RuntimeException, std::exception ) { return css::uno::Reference< css::frame::XFramesSupplier >(); } //***************************************************************************************************************** -OUString SAL_CALL Desktop::getName() throw( css::uno::RuntimeException ) +OUString SAL_CALL Desktop::getName() throw( css::uno::RuntimeException, std::exception ) { /* SAFE { */ ReadGuard aReadLock( m_aLock ); @@ -860,7 +860,7 @@ OUString SAL_CALL Desktop::getName() throw( css::uno::RuntimeException ) } //***************************************************************************************************************** -void SAL_CALL Desktop::setName( const OUString& sName ) throw( css::uno::RuntimeException ) +void SAL_CALL Desktop::setName( const OUString& sName ) throw( css::uno::RuntimeException, std::exception ) { /* SAFE { */ WriteGuard aWriteLock( m_aLock ); @@ -870,13 +870,13 @@ void SAL_CALL Desktop::setName( const OUString& sName ) throw( css::uno::Runtime } //***************************************************************************************************************** -sal_Bool SAL_CALL Desktop::isTop() throw( css::uno::RuntimeException ) +sal_Bool SAL_CALL Desktop::isTop() throw( css::uno::RuntimeException, std::exception ) { return sal_True; } //***************************************************************************************************************** -void SAL_CALL Desktop::activate() throw( css::uno::RuntimeException ) +void SAL_CALL Desktop::activate() throw( css::uno::RuntimeException, std::exception ) { // Desktop is activae always ... but sometimes our frames try to activate // the complete path from bottom to top ... And our desktop is the topest frame :-( @@ -884,7 +884,7 @@ void SAL_CALL Desktop::activate() throw( css::uno::RuntimeException ) } //***************************************************************************************************************** -void SAL_CALL Desktop::deactivate() throw( css::uno::RuntimeException ) +void SAL_CALL Desktop::deactivate() throw( css::uno::RuntimeException, std::exception ) { // Desktop is activae always ... but sometimes our frames try to deactivate // the complete path from bottom to top ... And our desktop is the topest frame :-( @@ -892,44 +892,44 @@ void SAL_CALL Desktop::deactivate() throw( css::uno::RuntimeException ) } //***************************************************************************************************************** -sal_Bool SAL_CALL Desktop::isActive() throw( css::uno::RuntimeException ) +sal_Bool SAL_CALL Desktop::isActive() throw( css::uno::RuntimeException, std::exception ) { return sal_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 ) + const css::uno::Reference< css::frame::XController >& /*xController*/ ) throw( css::uno::RuntimeException, std::exception ) { return sal_False; } //***************************************************************************************************************** -css::uno::Reference< css::awt::XWindow > SAL_CALL Desktop::getComponentWindow() throw( css::uno::RuntimeException ) +css::uno::Reference< css::awt::XWindow > SAL_CALL Desktop::getComponentWindow() throw( css::uno::RuntimeException, std::exception ) { return css::uno::Reference< css::awt::XWindow >(); } //***************************************************************************************************************** -css::uno::Reference< css::frame::XController > SAL_CALL Desktop::getController() throw( css::uno::RuntimeException ) +css::uno::Reference< css::frame::XController > SAL_CALL Desktop::getController() throw( css::uno::RuntimeException, std::exception ) { return css::uno::Reference< css::frame::XController >(); } //***************************************************************************************************************** -void SAL_CALL Desktop::contextChanged() throw( css::uno::RuntimeException ) +void SAL_CALL Desktop::contextChanged() throw( css::uno::RuntimeException, std::exception ) { } //***************************************************************************************************************** -void SAL_CALL Desktop::addFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& ) throw( css::uno::RuntimeException ) +void SAL_CALL Desktop::addFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& ) throw( css::uno::RuntimeException, std::exception ) { } //***************************************************************************************************************** // css::frame::XFrame //***************************************************************************************************************** -void SAL_CALL Desktop::removeFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& ) throw( css::uno::RuntimeException ) +void SAL_CALL Desktop::removeFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& ) throw( css::uno::RuntimeException, std::exception ) { } @@ -961,7 +961,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 ) + sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException, std::exception ) { css::uno::Reference< css::frame::XFrame > xTarget; @@ -1181,7 +1181,7 @@ void SAL_CALL Desktop::disposing() @onerror - @threadsafe yes *//*-*************************************************************************************************************/ -void SAL_CALL Desktop::addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException ) +void SAL_CALL Desktop::addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Safe impossible cases @@ -1194,7 +1194,7 @@ void SAL_CALL Desktop::addEventListener( const css::uno::Reference< css::lang::X } //***************************************************************************************************************** -void SAL_CALL Desktop::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException ) +void SAL_CALL Desktop::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Safe impossible cases @@ -1222,7 +1222,7 @@ void SAL_CALL Desktop::removeEventListener( const css::uno::Reference< css::lang @onerror - @threadsafe yes *//*-*************************************************************************************************************/ -void SAL_CALL Desktop::dispatchFinished( const css::frame::DispatchResultEvent& aEvent ) throw( css::uno::RuntimeException ) +void SAL_CALL Desktop::dispatchFinished( const css::frame::DispatchResultEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Register transaction and reject wrong calls. @@ -1258,7 +1258,7 @@ void SAL_CALL Desktop::dispatchFinished( const css::frame::DispatchResultEvent& @onerror - @threadsafe - *//*-*************************************************************************************************************/ -void SAL_CALL Desktop::disposing( const css::lang::EventObject& ) throw( css::uno::RuntimeException ) +void SAL_CALL Desktop::disposing( const css::lang::EventObject& ) throw( css::uno::RuntimeException, std::exception ) { SAL_WARN( "fwk", "Desktop::disposing(): Algorithm error! Normaly desktop is temp. listener ... not all the time. So this method shouldn't be called." ); } @@ -1286,7 +1286,7 @@ void SAL_CALL Desktop::disposing( const css::lang::EventObject& ) throw( css::un @onerror - @threadsafe yes *//*-*************************************************************************************************************/ -void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractionRequest >& xRequest ) throw( css::uno::RuntimeException ) +void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractionRequest >& xRequest ) throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Register transaction and reject wrong calls. @@ -1369,7 +1369,7 @@ 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 ) + css::uno::RuntimeException, std::exception ) { TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); return m_xTitleNumberGenerator->leaseNumber (xComponent); @@ -1378,7 +1378,7 @@ void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractio void SAL_CALL Desktop::releaseNumber( ::sal_Int32 nNumber ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); m_xTitleNumberGenerator->releaseNumber (nNumber); @@ -1387,7 +1387,7 @@ void SAL_CALL Desktop::releaseNumber( ::sal_Int32 nNumber ) void SAL_CALL Desktop::releaseNumberForComponent( const css::uno::Reference< css::uno::XInterface >& xComponent ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); m_xTitleNumberGenerator->releaseNumberForComponent (xComponent); @@ -1395,7 +1395,7 @@ void SAL_CALL Desktop::releaseNumberForComponent( const css::uno::Reference< css OUString SAL_CALL Desktop::getUntitledPrefix() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); return m_xTitleNumberGenerator->getUntitledPrefix (); @@ -1484,7 +1484,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 ) + const css::uno::Any& aValue ) throw( css::uno::Exception, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Register transaction and reject wrong calls. @@ -1604,7 +1604,7 @@ void SAL_CALL Desktop::getFastPropertyValue( css::uno::Any& aValue , @onerror - @threadsafe yes *//*-*************************************************************************************************************/ -css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL Desktop::getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL Desktop::getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException, std::exception) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Register transaction and reject wrong calls. diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx index a6d51d7f3900..abe5e147b98d 100644 --- a/framework/source/services/dispatchhelper.cxx +++ b/framework/source/services/dispatchhelper.cxx @@ -88,7 +88,7 @@ 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) + throw(css::uno::RuntimeException, std::exception) { css::uno::Reference< css::uno::XInterface > xTHIS(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY); @@ -163,7 +163,7 @@ 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) + throw(css::uno::RuntimeException, std::exception) { /* SAFE { */ WriteGuard aWriteLock(m_aLock); @@ -183,7 +183,7 @@ 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) + throw(css::uno::RuntimeException, std::exception) { /* SAFE { */ WriteGuard aWriteLock(m_aLock); diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index a0f7d274d9fd..0323a0a77125 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -160,19 +160,19 @@ public: FWK_DECLARE_XTYPEPROVIDER virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.Frame"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.frame.Frame"); @@ -189,149 +189,149 @@ public: const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::io::IOException, css::lang::IllegalArgumentException, - css::uno::RuntimeException ); + css::uno::RuntimeException, std::exception ); // XFramesSupplier - virtual css::uno::Reference< css::frame::XFrames > SAL_CALL getFrames ( ) throw( css::uno::RuntimeException ); - virtual css::uno::Reference< css::frame::XFrame > SAL_CALL getActiveFrame ( ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL setActiveFrame ( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException ); + virtual css::uno::Reference< css::frame::XFrames > SAL_CALL getFrames ( ) throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< css::frame::XFrame > SAL_CALL getActiveFrame ( ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setActiveFrame ( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException, std::exception ); // XFrame - virtual void SAL_CALL initialize ( const css::uno::Reference< css::awt::XWindow >& xWindow ) throw( css::uno::RuntimeException ); - virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getContainerWindow ( ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL setCreator ( const css::uno::Reference< css::frame::XFramesSupplier >& xCreator ) throw( css::uno::RuntimeException ); - virtual css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL getCreator ( ) throw( css::uno::RuntimeException ); - virtual OUString SAL_CALL getName ( ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL setName ( const OUString& sName ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL initialize ( const css::uno::Reference< css::awt::XWindow >& xWindow ) throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getContainerWindow ( ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setCreator ( const css::uno::Reference< css::frame::XFramesSupplier >& xCreator ) throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL getCreator ( ) throw( css::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getName ( ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setName ( const OUString& sName ) throw( css::uno::RuntimeException, std::exception ); virtual css::uno::Reference< css::frame::XFrame > SAL_CALL findFrame ( const OUString& sTargetFrameName , - sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL isTop ( ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL activate ( ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL deactivate ( ) throw( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL isActive ( ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL contextChanged ( ) throw( css::uno::RuntimeException ); + sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL isTop ( ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL activate ( ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL deactivate ( ) throw( css::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL isActive ( ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL contextChanged ( ) throw( css::uno::RuntimeException, std::exception ); 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 ); - virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getComponentWindow ( ) throw( css::uno::RuntimeException ); - virtual css::uno::Reference< css::frame::XController > SAL_CALL getController ( ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL addFrameActionListener ( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL removeFrameActionListener ( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) throw( css::uno::RuntimeException ); + const css::uno::Reference< css::frame::XController >& xController ) throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getComponentWindow ( ) throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< css::frame::XController > SAL_CALL getController ( ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL addFrameActionListener ( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL removeFrameActionListener ( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) throw( css::uno::RuntimeException, std::exception ); // XComponent - virtual void SAL_CALL dispose ( ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL addEventListener ( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL removeEventListener ( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL dispose ( ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL addEventListener ( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL removeEventListener ( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ); // XStatusIndicatorFactory - virtual css::uno::Reference< css::task::XStatusIndicator > SAL_CALL createStatusIndicator ( ) throw( css::uno::RuntimeException ); + virtual css::uno::Reference< css::task::XStatusIndicator > SAL_CALL createStatusIndicator ( ) throw( css::uno::RuntimeException, std::exception ); // 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 ); + sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException, std::exception ); virtual css::uno::Sequence< - css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches ( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException ); + css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches ( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ); // XDispatchProviderInterception - virtual void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL releaseDispatchProviderInterceptor ( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL releaseDispatchProviderInterceptor ( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor ) throw( css::uno::RuntimeException, std::exception ); // XDispatchInformationProvider - virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedCommandGroups ( ) throw (css::uno::RuntimeException); - virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation(sal_Int16 nCommandGroup) throw (css::uno::RuntimeException); + virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedCommandGroups ( ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation(sal_Int16 nCommandGroup) throw (css::uno::RuntimeException, std::exception); // 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 ); - virtual void SAL_CALL windowMoved ( const css::awt::WindowEvent& /*aEvent*/ ) throw( css::uno::RuntimeException ) {}; - virtual void SAL_CALL windowShown ( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL windowHidden ( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL windowResized ( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL windowMoved ( const css::awt::WindowEvent& /*aEvent*/ ) throw( css::uno::RuntimeException, std::exception ) {}; + virtual void SAL_CALL windowShown ( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL windowHidden ( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ); // XFocusListener // Attention: focusLost() not implemented yet! - virtual void SAL_CALL focusGained ( const css::awt::FocusEvent& aEvent ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL focusLost ( const css::awt::FocusEvent& /*aEvent*/ ) throw( css::uno::RuntimeException ) {}; + virtual void SAL_CALL focusGained ( const css::awt::FocusEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL focusLost ( const css::awt::FocusEvent& /*aEvent*/ ) throw( css::uno::RuntimeException, std::exception ) {}; // 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 ); - virtual void SAL_CALL windowDeactivated ( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL windowOpened ( const css::lang::EventObject& /*aEvent*/ ) throw( css::uno::RuntimeException ) {}; - virtual void SAL_CALL windowClosing ( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL windowClosed ( const css::lang::EventObject& /*aEvent*/ ) throw( css::uno::RuntimeException ) {}; - virtual void SAL_CALL windowMinimized ( const css::lang::EventObject& /*aEvent*/ ) throw( css::uno::RuntimeException ) {}; - virtual void SAL_CALL windowNormalized ( const css::lang::EventObject& /*aEvent*/ ) throw( css::uno::RuntimeException ) {}; + virtual void SAL_CALL windowActivated ( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL windowDeactivated ( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL windowOpened ( const css::lang::EventObject& /*aEvent*/ ) throw( css::uno::RuntimeException, std::exception ) {}; + virtual void SAL_CALL windowClosing ( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL windowClosed ( const css::lang::EventObject& /*aEvent*/ ) throw( css::uno::RuntimeException, std::exception ) {}; + virtual void SAL_CALL windowMinimized ( const css::lang::EventObject& /*aEvent*/ ) throw( css::uno::RuntimeException, std::exception ) {}; + virtual void SAL_CALL windowNormalized ( const css::lang::EventObject& /*aEvent*/ ) throw( css::uno::RuntimeException, std::exception ) {}; // XEventListener - virtual void SAL_CALL disposing ( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL disposing ( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ); // XActionLockable - virtual sal_Bool SAL_CALL isActionLocked ( ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL addActionLock ( ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL removeActionLock( ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL setActionLocks ( sal_Int16 nLock ) throw( css::uno::RuntimeException ); - virtual sal_Int16 SAL_CALL resetActionLocks( ) throw( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL isActionLocked ( ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL addActionLock ( ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL removeActionLock( ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setActionLocks ( sal_Int16 nLock ) throw( css::uno::RuntimeException, std::exception ); + virtual sal_Int16 SAL_CALL resetActionLocks( ) throw( css::uno::RuntimeException, std::exception ); // XCloseable virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw( css::util::CloseVetoException, - css::uno::RuntimeException ); + css::uno::RuntimeException, std::exception ); // XCloseBroadcaster - virtual void SAL_CALL addCloseListener ( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException); - virtual void SAL_CALL removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException); + virtual void SAL_CALL addCloseListener ( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException, std::exception); // XTitle - virtual OUString SAL_CALL getTitle( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL setTitle( const OUString& sTitle ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getTitle( ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTitle( const OUString& sTitle ) throw (css::uno::RuntimeException, std::exception); // XTitleChangeBroadcaster - virtual void SAL_CALL addTitleChangeListener ( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener) throw (css::uno::RuntimeException); - virtual void SAL_CALL removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListenr ) throw (css::uno::RuntimeException); + virtual void SAL_CALL addTitleChangeListener ( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListenr ) throw (css::uno::RuntimeException, std::exception); // XFrame2 attributes - virtual css::uno::Reference<css::container::XNameContainer> SAL_CALL getUserDefinedAttributes() throw (css::uno::RuntimeException); + virtual css::uno::Reference<css::container::XNameContainer> SAL_CALL getUserDefinedAttributes() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference<css::frame::XDispatchRecorderSupplier> SAL_CALL getDispatchRecorderSupplier() throw (css::uno::RuntimeException); - virtual void SAL_CALL setDispatchRecorderSupplier(const css::uno::Reference<css::frame::XDispatchRecorderSupplier>&) throw (css::uno::RuntimeException); + virtual css::uno::Reference<css::frame::XDispatchRecorderSupplier> SAL_CALL getDispatchRecorderSupplier() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDispatchRecorderSupplier(const css::uno::Reference<css::frame::XDispatchRecorderSupplier>&) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getLayoutManager() throw (css::uno::RuntimeException); - virtual void SAL_CALL setLayoutManager(const css::uno::Reference<css::uno::XInterface>&) throw (css::uno::RuntimeException); + virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getLayoutManager() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setLayoutManager(const css::uno::Reference<css::uno::XInterface>&) throw (css::uno::RuntimeException, std::exception); @@ -682,7 +682,7 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Frame::loadComponentFromUR sal_Int32 nSearchFlags , const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::io::IOException , css::lang::IllegalArgumentException , - css::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { { // If the frame is closed the call might lead to crash even with target "_blank", @@ -714,7 +714,7 @@ 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 ) +css::uno::Reference< css::frame::XFrames > SAL_CALL Frame::getFrames() throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Register transaction and reject wrong calls. @@ -751,7 +751,7 @@ css::uno::Reference< css::frame::XFrames > SAL_CALL Frame::getFrames() throw( cs @onerror A null reference is returned. *//*-*****************************************************************************************************/ -css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::getActiveFrame() throw( css::uno::RuntimeException ) +css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::getActiveFrame() throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Register transaction and reject wrong calls. @@ -779,7 +779,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::getActiveFrame() throw @onerror An assertion is thrown and element is ignored, if given frame is'nt already a child of us. *//*-*****************************************************************************************************/ -void SAL_CALL Frame::setActiveFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException ) +void SAL_CALL Frame::setActiveFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Check incoming parameters. @@ -892,7 +892,7 @@ void lcl_disableLayoutManager(const css::uno::Reference< css::frame::XLayoutMana @onerror We do nothing. *//*-*****************************************************************************************************/ -void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >& xWindow ) throw( css::uno::RuntimeException ) +void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >& xWindow ) throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ if (!xWindow.is()) @@ -975,7 +975,7 @@ 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 ) +css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getContainerWindow() throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Register transaction and reject wrong calls. @@ -1004,7 +1004,7 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getContainerWindow() th @threadsafe yes *//*-*****************************************************************************************************/ -void SAL_CALL Frame::setCreator( const css::uno::Reference< css::frame::XFramesSupplier >& xCreator ) throw( css::uno::RuntimeException ) +void SAL_CALL Frame::setCreator( const css::uno::Reference< css::frame::XFramesSupplier >& xCreator ) throw( css::uno::RuntimeException, std::exception ) { TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); @@ -1029,7 +1029,7 @@ 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 ) +css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Frame::getCreator() throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Register transaction and reject wrong calls. @@ -1052,7 +1052,7 @@ 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 ) +OUString SAL_CALL Frame::getName() throw( css::uno::RuntimeException, std::exception ) { /* SAFE { */ ReadGuard aReadLock( m_aLock ); @@ -1074,7 +1074,7 @@ OUString SAL_CALL Frame::getName() throw( css::uno::RuntimeException ) @onerror We do nothing. *//*-*****************************************************************************************************/ -void SAL_CALL Frame::setName( const OUString& sName ) throw( css::uno::RuntimeException ) +void SAL_CALL Frame::setName( const OUString& sName ) throw( css::uno::RuntimeException, std::exception ) { /* SAFE { */ WriteGuard aWriteLock( m_aLock ); @@ -1112,7 +1112,7 @@ void SAL_CALL Frame::setName( const OUString& sName ) throw( css::uno::RuntimeEx @threadsafe yes *//*-*****************************************************************************************************/ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUString& sTargetFrameName, - sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException ) + sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException, std::exception ) { css::uno::Reference< css::frame::XFrame > xTarget; @@ -1385,7 +1385,7 @@ 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 ) +sal_Bool SAL_CALL Frame::isTop() throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Register transaction and reject wrong calls. @@ -1414,7 +1414,7 @@ sal_Bool SAL_CALL Frame::isTop() throw( css::uno::RuntimeException ) @onerror - *//*-*****************************************************************************************************/ -void SAL_CALL Frame::activate() throw( css::uno::RuntimeException ) +void SAL_CALL Frame::activate() throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Register transaction and reject wrong calls. @@ -1507,7 +1507,7 @@ void SAL_CALL Frame::activate() throw( css::uno::RuntimeException ) @onerror - *//*-*****************************************************************************************************/ -void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException ) +void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Register transaction and reject wrong calls. @@ -1588,7 +1588,7 @@ void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException ) @onerror No error should occur. *//*-*****************************************************************************************************/ -sal_Bool SAL_CALL Frame::isActive() throw( css::uno::RuntimeException ) +sal_Bool SAL_CALL Frame::isActive() throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Register transaction and reject wrong calls. @@ -1614,7 +1614,7 @@ sal_Bool SAL_CALL Frame::isActive() throw( css::uno::RuntimeException ) @onerror - *//*-*****************************************************************************************************/ -void SAL_CALL Frame::contextChanged() throw( css::uno::RuntimeException ) +void SAL_CALL Frame::contextChanged() throw( css::uno::RuntimeException, std::exception ) { // Look for rejected calls! // Sometimes called during closing object... => soft exceptions @@ -1653,7 +1653,7 @@ void SAL_CALL Frame::contextChanged() throw( css::uno::RuntimeException ) @threadsafe yes *//*-*****************************************************************************************************/ 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 ) + const css::uno::Reference< css::frame::XController >& xController ) throw( css::uno::RuntimeException, std::exception ) { // Ignore this HACK of sfx2! @@ -1819,7 +1819,7 @@ sal_Bool SAL_CALL Frame::setComponent( const css::uno::Reference< css::awt::X @onerror A null reference is returned. *//*-*****************************************************************************************************/ -css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getComponentWindow() throw( css::uno::RuntimeException ) +css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getComponentWindow() throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Register transaction and reject wrong calls. @@ -1849,7 +1849,7 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getComponentWindow() th @onerror A null reference is returned. *//*-*****************************************************************************************************/ -css::uno::Reference< css::frame::XController > SAL_CALL Frame::getController() throw( css::uno::RuntimeException ) +css::uno::Reference< css::frame::XController > SAL_CALL Frame::getController() throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ @@ -1872,7 +1872,7 @@ css::uno::Reference< css::frame::XController > SAL_CALL Frame::getController() t @onerror Listener is ignored. *//*-*****************************************************************************************************/ -void SAL_CALL Frame::addFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) throw( css::uno::RuntimeException ) +void SAL_CALL Frame::addFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Check incoming parameter. @@ -1887,7 +1887,7 @@ void SAL_CALL Frame::addFrameActionListener( const css::uno::Reference< css::fra } //***************************************************************************************************************** -void SAL_CALL Frame::removeFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) throw( css::uno::RuntimeException ) +void SAL_CALL Frame::removeFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Check incoming parameter. @@ -1921,7 +1921,7 @@ 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 ) + css::uno::RuntimeException, std::exception ) { TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); @@ -2017,7 +2017,7 @@ void SAL_CALL Frame::close( sal_Bool bDeliverOwnership ) throw( css::util::Close @threadsafe yes *//*-*****************************************************************************************************/ -void SAL_CALL Frame::addCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException) +void SAL_CALL Frame::addCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) { TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); // We don't need any lock here ... @@ -2026,7 +2026,7 @@ void SAL_CALL Frame::addCloseListener( const css::uno::Reference< css::util::XCl } //***************************************************************************************************************** -void SAL_CALL Frame::removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException) +void SAL_CALL Frame::removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) { // Use soft exception mode - moslty this method is called during disposing of this frame ... TransactionGuard aTransaction( m_aTransactionManager, E_SOFTEXCEPTIONS ); @@ -2037,7 +2037,7 @@ void SAL_CALL Frame::removeCloseListener( const css::uno::Reference< css::util:: //***************************************************************************************************************** OUString SAL_CALL Frame::getTitle() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); @@ -2052,7 +2052,7 @@ OUString SAL_CALL Frame::getTitle() //***************************************************************************************************************** void SAL_CALL Frame::setTitle( const OUString& sTitle ) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); @@ -2067,7 +2067,7 @@ 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) + throw (css::uno::RuntimeException, std::exception) { TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); @@ -2082,7 +2082,7 @@ 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) + throw (css::uno::RuntimeException, std::exception) { TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); @@ -2095,19 +2095,19 @@ void SAL_CALL Frame::removeTitleChangeListener( const css::uno::Reference< css:: xTitle->removeTitleChangeListener(xListener); } -css::uno::Reference<css::container::XNameContainer> SAL_CALL Frame::getUserDefinedAttributes() throw (css::uno::RuntimeException) +css::uno::Reference<css::container::XNameContainer> SAL_CALL Frame::getUserDefinedAttributes() throw (css::uno::RuntimeException, std::exception) { // optional attribute return 0; } -css::uno::Reference<css::frame::XDispatchRecorderSupplier> SAL_CALL Frame::getDispatchRecorderSupplier() throw (css::uno::RuntimeException) +css::uno::Reference<css::frame::XDispatchRecorderSupplier> SAL_CALL Frame::getDispatchRecorderSupplier() throw (css::uno::RuntimeException, std::exception) { ReadGuard aReadLock( m_aLock ); return m_xDispatchRecorderSupplier; } -void SAL_CALL Frame::setDispatchRecorderSupplier(const css::uno::Reference<css::frame::XDispatchRecorderSupplier>& p) throw (css::uno::RuntimeException) +void SAL_CALL Frame::setDispatchRecorderSupplier(const css::uno::Reference<css::frame::XDispatchRecorderSupplier>& p) throw (css::uno::RuntimeException, std::exception) { TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); @@ -2118,13 +2118,13 @@ void SAL_CALL Frame::setDispatchRecorderSupplier(const css::uno::Reference<css:: /* } SAFE */ } -css::uno::Reference<css::uno::XInterface> SAL_CALL Frame::getLayoutManager() throw (css::uno::RuntimeException) +css::uno::Reference<css::uno::XInterface> SAL_CALL Frame::getLayoutManager() throw (css::uno::RuntimeException, std::exception) { ReadGuard aReadLock( m_aLock ); return m_xLayoutManager; } -void SAL_CALL Frame::setLayoutManager(const css::uno::Reference<css::uno::XInterface>& p1) throw (css::uno::RuntimeException) +void SAL_CALL Frame::setLayoutManager(const css::uno::Reference<css::uno::XInterface>& p1) throw (css::uno::RuntimeException, std::exception) { TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); @@ -2191,7 +2191,7 @@ void Frame::implts_forgetSubFrames() @onerror - *//*-*****************************************************************************************************/ -void SAL_CALL Frame::dispose() throw( css::uno::RuntimeException ) +void SAL_CALL Frame::dispose() throw( css::uno::RuntimeException, std::exception ) { // We should hold a reference to ourself ... // because our owner dispose us and release our reference ... @@ -2331,7 +2331,7 @@ void SAL_CALL Frame::dispose() throw( css::uno::RuntimeException ) @onerror Listener is ignored. *//*-*****************************************************************************************************/ -void SAL_CALL Frame::addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException ) +void SAL_CALL Frame::addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Check incoming parameter. @@ -2345,7 +2345,7 @@ void SAL_CALL Frame::addEventListener( const css::uno::Reference< css::lang::XEv } //***************************************************************************************************************** -void SAL_CALL Frame::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException ) +void SAL_CALL Frame::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Check incoming parameter. @@ -2372,7 +2372,7 @@ 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 ) +css::uno::Reference< css::task::XStatusIndicator > SAL_CALL Frame::createStatusIndicator() throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA ----------------------------------------------------------------------------------------- */ // Look for rejected calls! @@ -2419,7 +2419,7 @@ 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 ) + sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException, std::exception ) { const char UNO_PROTOCOL[] = ".uno:"; @@ -2456,7 +2456,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL Frame::queryDispatch( cons @onerror An empty list is returned. *//*-*****************************************************************************************************/ -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 ) +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 isn't a good idea to do it more then ones! // But look for rejected calls! @@ -2479,7 +2479,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Fram @onerror Interceptor is ignored. *//*-*****************************************************************************************************/ -void SAL_CALL Frame::registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor ) throw( css::uno::RuntimeException ) +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. @@ -2492,7 +2492,7 @@ void SAL_CALL Frame::registerDispatchProviderInterceptor( const css::uno::Refere } //***************************************************************************************************************** -void SAL_CALL Frame::releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor ) throw( css::uno::RuntimeException ) +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. @@ -2510,14 +2510,14 @@ void SAL_CALL Frame::releaseDispatchProviderInterceptor( const css::uno::Referen inside the currnt frame environment *//*-*****************************************************************************************************/ css::uno::Sequence< sal_Int16 > SAL_CALL Frame::getSupportedCommandGroups() - throw(css::uno::RuntimeException) + 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) + throw(css::uno::RuntimeException, std::exception) { return m_xDispatchInfoHelper->getConfigurableDispatchInformation(nCommandGroup); } @@ -2535,7 +2535,7 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL Frame::getConfigu @onerror - *//*-*****************************************************************************************************/ -void SAL_CALL Frame::windowResized( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException ) +void SAL_CALL Frame::windowResized( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Check incoming parameter. @@ -2552,7 +2552,7 @@ void SAL_CALL Frame::windowResized( const css::awt::WindowEvent& aEvent ) throw( } //***************************************************************************************************************** -void SAL_CALL Frame::focusGained( const css::awt::FocusEvent& aEvent ) throw( css::uno::RuntimeException ) +void SAL_CALL Frame::focusGained( const css::awt::FocusEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Check incoming parameter. @@ -2589,7 +2589,7 @@ void SAL_CALL Frame::focusGained( const css::awt::FocusEvent& aEvent ) throw( cs @onerror - *//*-*****************************************************************************************************/ -void SAL_CALL Frame::windowActivated( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ) +void SAL_CALL Frame::windowActivated( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Check incoming parameter. @@ -2613,7 +2613,7 @@ void SAL_CALL Frame::windowActivated( const css::lang::EventObject& aEvent ) thr } //***************************************************************************************************************** -void SAL_CALL Frame::windowDeactivated( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ) +void SAL_CALL Frame::windowDeactivated( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Check incoming parameter. @@ -2664,7 +2664,7 @@ void SAL_CALL Frame::windowDeactivated( const css::lang::EventObject& aEvent ) t } //***************************************************************************************************************** -void SAL_CALL Frame::windowClosing( const css::lang::EventObject& ) throw( css::uno::RuntimeException ) +void SAL_CALL Frame::windowClosing( const css::lang::EventObject& ) throw( css::uno::RuntimeException, std::exception ) { /* #i62088# Some interceptor objects intercept our "internally asynchronous implemented" dispatch call. @@ -2731,7 +2731,7 @@ void SAL_CALL Frame::windowClosing( const css::lang::EventObject& ) throw( css:: @threadsafe yes *//*-*****************************************************************************************************/ -void SAL_CALL Frame::windowShown( const css::lang::EventObject& ) throw(css::uno::RuntimeException) +void SAL_CALL Frame::windowShown( const css::lang::EventObject& ) throw(css::uno::RuntimeException, std::exception) { static sal_Bool bFirstVisibleTask = sal_True; @@ -2763,7 +2763,7 @@ void SAL_CALL Frame::windowShown( const css::lang::EventObject& ) throw(css::uno } } -void SAL_CALL Frame::windowHidden( const css::lang::EventObject& ) throw(css::uno::RuntimeException) +void SAL_CALL Frame::windowHidden( const css::lang::EventObject& ) throw(css::uno::RuntimeException, std::exception) { /* SAFE { */ ReadGuard aReadLock(m_aLock); @@ -2789,7 +2789,7 @@ void SAL_CALL Frame::windowHidden( const css::lang::EventObject& ) throw(css::un @onerror - *//*-*****************************************************************************************************/ -void SAL_CALL Frame::disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException ) +void SAL_CALL Frame::disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) { /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Check incoming parameter. @@ -2830,7 +2830,7 @@ void SAL_CALL Frame::disposing( const css::lang::EventObject& aEvent ) throw( cs @onerror - @threadsafe yes *//*-*************************************************************************************************************/ -sal_Bool SAL_CALL Frame::isActionLocked() throw( css::uno::RuntimeException ) +sal_Bool SAL_CALL Frame::isActionLocked() throw( css::uno::RuntimeException, std::exception ) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ReadGuard aReadLock( m_aLock ); @@ -2838,7 +2838,7 @@ sal_Bool SAL_CALL Frame::isActionLocked() throw( css::uno::RuntimeException ) } //***************************************************************************************************************** -void SAL_CALL Frame::addActionLock() throw( css::uno::RuntimeException ) +void SAL_CALL Frame::addActionLock() throw( css::uno::RuntimeException, std::exception ) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ WriteGuard aWriteLock( m_aLock ); @@ -2846,7 +2846,7 @@ void SAL_CALL Frame::addActionLock() throw( css::uno::RuntimeException ) } //***************************************************************************************************************** -void SAL_CALL Frame::removeActionLock() throw( css::uno::RuntimeException ) +void SAL_CALL Frame::removeActionLock() throw( css::uno::RuntimeException, std::exception ) { // Register no transaction here! Otherwhise we wait for ever inside possible // implts_checkSuicide()/dispose() request ... @@ -2861,7 +2861,7 @@ void SAL_CALL Frame::removeActionLock() throw( css::uno::RuntimeException ) } //***************************************************************************************************************** -void SAL_CALL Frame::setActionLocks( sal_Int16 nLock ) throw( css::uno::RuntimeException ) +void SAL_CALL Frame::setActionLocks( sal_Int16 nLock ) throw( css::uno::RuntimeException, std::exception ) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ WriteGuard aWriteLock( m_aLock ); @@ -2873,7 +2873,7 @@ void SAL_CALL Frame::setActionLocks( sal_Int16 nLock ) throw( css::uno::RuntimeE } //***************************************************************************************************************** -sal_Int16 SAL_CALL Frame::resetActionLocks() throw( css::uno::RuntimeException ) +sal_Int16 SAL_CALL Frame::resetActionLocks() throw( css::uno::RuntimeException, std::exception ) { // Register no transaction here! Otherwhise we wait for ever inside possible // implts_checkSuicide()/dispose() request ... diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx index 16e8661997d1..70e057f48a1d 100644 --- a/framework/source/services/license.cxx +++ b/framework/source/services/license.cxx @@ -196,7 +196,7 @@ static OUString _getCurrentDateString() // execution of license check... css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::NamedValue >& ) - throw( css::lang::IllegalArgumentException, css::uno::Exception) + throw( css::lang::IllegalArgumentException, css::uno::Exception, std::exception) { // return value Any aRet; aRet <<= sal_False; @@ -303,17 +303,17 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na return aRet; } -void SAL_CALL License::close(sal_Bool /*bDeliverOwnership*/) throw (css::util::CloseVetoException) +void SAL_CALL License::close(sal_Bool /*bDeliverOwnership*/) throw (css::util::CloseVetoException, std::exception) { if (!m_bTerminate) throw CloseVetoException(); } void SAL_CALL License::addCloseListener(const css::uno::Reference< css::util::XCloseListener >&) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { } void SAL_CALL License::removeCloseListener(const css::uno::Reference< css::util::XCloseListener >&) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { } diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx index a19a39ecded0..17da37f73e75 100644 --- a/framework/source/services/modulemanager.cxx +++ b/framework/source/services/modulemanager.cxx @@ -70,20 +70,20 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( OUString const & ServiceName) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException); + getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception); // XModuleManager virtual OUString SAL_CALL identify(const css::uno::Reference< css::uno::XInterface >& xModule) throw(css::lang::IllegalArgumentException, css::frame::UnknownModuleException, - css::uno::RuntimeException ); + css::uno::RuntimeException, std::exception ); // XNameReplace virtual void SAL_CALL replaceByName(const OUString& sName , @@ -91,33 +91,33 @@ public: throw (css::lang::IllegalArgumentException , css::container::NoSuchElementException, css::lang::WrappedTargetException , - css::uno::RuntimeException ); + css::uno::RuntimeException, std::exception ); // XNameAccess virtual css::uno::Any SAL_CALL getByName(const OUString& sName) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException , - css::uno::RuntimeException ); + css::uno::RuntimeException, std::exception ); virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasByName(const OUString& sName) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // XElementAccess virtual css::uno::Type SAL_CALL getElementType() - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasElements() - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // XContainerQuery virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery(const OUString& sQuery) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties(const css::uno::Sequence< css::beans::NamedValue >& lProperties) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); private: @@ -159,19 +159,19 @@ ModuleManager::~ModuleManager() } OUString ModuleManager::getImplementationName() - throw (css::uno::RuntimeException) + 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) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence< OUString > ModuleManager::getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > s(1); s[0] = "com.sun.star.frame.ModuleManager"; @@ -181,7 +181,7 @@ css::uno::Sequence< OUString > ModuleManager::getSupportedServiceNames() OUString SAL_CALL ModuleManager::identify(const css::uno::Reference< css::uno::XInterface >& xModule) throw(css::lang::IllegalArgumentException, css::frame::UnknownModuleException, - css::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { // valid parameter? css::uno::Reference< css::frame::XFrame > xFrame (xModule, css::uno::UNO_QUERY); @@ -236,7 +236,7 @@ void SAL_CALL ModuleManager::replaceByName(const OUString& sName , throw (css::lang::IllegalArgumentException , css::container::NoSuchElementException, css::lang::WrappedTargetException , - css::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { try { @@ -296,7 +296,7 @@ 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 ) + css::uno::RuntimeException, std::exception ) { // get access to the element css::uno::Reference< css::container::XNameAccess > xModule; @@ -323,37 +323,37 @@ css::uno::Any SAL_CALL ModuleManager::getByName(const OUString& sName) } css::uno::Sequence< OUString > SAL_CALL ModuleManager::getElementNames() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { return m_xCFG->getElementNames(); } sal_Bool SAL_CALL ModuleManager::hasByName(const OUString& sName) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { return m_xCFG->hasByName(sName); } css::uno::Type SAL_CALL ModuleManager::getElementType() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { return ::getCppuType((const css::uno::Sequence< css::beans::PropertyValue >*)0); } sal_Bool SAL_CALL ModuleManager::hasElements() - throw(css::uno::RuntimeException) + 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) + 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) + 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 105c5a6fb3f8..b3434ba93885 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -185,19 +185,19 @@ public: virtual ~PathSettings(); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.PathSettings"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.util.PathSettings"); @@ -205,150 +205,150 @@ public: } // XInterface - virtual ::css::uno::Any SAL_CALL queryInterface( const ::css::uno::Type& type) throw ( ::css::uno::RuntimeException ); + virtual ::css::uno::Any SAL_CALL queryInterface( const ::css::uno::Type& type) throw ( ::css::uno::RuntimeException, std::exception ); virtual void SAL_CALL acquire() throw () { OWeakObject::acquire(); } virtual void SAL_CALL release() throw () { OWeakObject::release(); } // XTypeProvider - virtual ::css::uno::Sequence< ::css::uno::Type > SAL_CALL getTypes( ) throw(::css::uno::RuntimeException); + virtual ::css::uno::Sequence< ::css::uno::Type > SAL_CALL getTypes( ) throw(::css::uno::RuntimeException, std::exception); // css::util::XChangesListener - virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent) throw (css::uno::RuntimeException); + virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent) throw (css::uno::RuntimeException, std::exception); // css::lang::XEventListener virtual void SAL_CALL disposing(const css::lang::EventObject& aSource) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); /** * XPathSettings attribute methods */ - virtual OUString SAL_CALL getAddin() throw (css::uno::RuntimeException) + virtual OUString SAL_CALL getAddin() throw (css::uno::RuntimeException, std::exception) { return getStringProperty("Addin"); } - virtual void SAL_CALL setAddin(const OUString& p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setAddin(const OUString& p1) throw (css::uno::RuntimeException, std::exception) { setStringProperty("Addin", p1); } - virtual OUString SAL_CALL getAutoCorrect() throw (css::uno::RuntimeException) + virtual OUString SAL_CALL getAutoCorrect() throw (css::uno::RuntimeException, std::exception) { return getStringProperty("AutoCorrect"); } - virtual void SAL_CALL setAutoCorrect(const OUString& p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setAutoCorrect(const OUString& p1) throw (css::uno::RuntimeException, std::exception) { setStringProperty("AutoCorrect", p1); } - virtual OUString SAL_CALL getAutoText() throw (css::uno::RuntimeException) + virtual OUString SAL_CALL getAutoText() throw (css::uno::RuntimeException, std::exception) { return getStringProperty("AutoText"); } - virtual void SAL_CALL setAutoText(const OUString& p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setAutoText(const OUString& p1) throw (css::uno::RuntimeException, std::exception) { setStringProperty("AutoText", p1); } - virtual OUString SAL_CALL getBackup() throw (css::uno::RuntimeException) + virtual OUString SAL_CALL getBackup() throw (css::uno::RuntimeException, std::exception) { return getStringProperty("Backup"); } - virtual void SAL_CALL setBackup(const OUString& p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setBackup(const OUString& p1) throw (css::uno::RuntimeException, std::exception) { setStringProperty("Backup", p1); } - virtual OUString SAL_CALL getBasic() throw (css::uno::RuntimeException) + virtual OUString SAL_CALL getBasic() throw (css::uno::RuntimeException, std::exception) { return getStringProperty("Basic"); } - virtual void SAL_CALL setBasic(const OUString& p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setBasic(const OUString& p1) throw (css::uno::RuntimeException, std::exception) { setStringProperty("Basic", p1); } - virtual OUString SAL_CALL getBitmap() throw (css::uno::RuntimeException) + virtual OUString SAL_CALL getBitmap() throw (css::uno::RuntimeException, std::exception) { return getStringProperty("Bitmap"); } - virtual void SAL_CALL setBitmap(const OUString& p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setBitmap(const OUString& p1) throw (css::uno::RuntimeException, std::exception) { setStringProperty("Bitmap", p1); } - virtual OUString SAL_CALL getConfig() throw (css::uno::RuntimeException) + virtual OUString SAL_CALL getConfig() throw (css::uno::RuntimeException, std::exception) { return getStringProperty("Config"); } - virtual void SAL_CALL setConfig(const OUString& p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setConfig(const OUString& p1) throw (css::uno::RuntimeException, std::exception) { setStringProperty("Config", p1); } - virtual OUString SAL_CALL getDictionary() throw (css::uno::RuntimeException) + virtual OUString SAL_CALL getDictionary() throw (css::uno::RuntimeException, std::exception) { return getStringProperty("Dictionary"); } - virtual void SAL_CALL setDictionary(const OUString& p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setDictionary(const OUString& p1) throw (css::uno::RuntimeException, std::exception) { setStringProperty("Dictionary", p1); } - virtual OUString SAL_CALL getFavorite() throw (css::uno::RuntimeException) + virtual OUString SAL_CALL getFavorite() throw (css::uno::RuntimeException, std::exception) { return getStringProperty("Favorite"); } - virtual void SAL_CALL setFavorite(const OUString& p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setFavorite(const OUString& p1) throw (css::uno::RuntimeException, std::exception) { setStringProperty("Favorite", p1); } - virtual OUString SAL_CALL getFilter() throw (css::uno::RuntimeException) + virtual OUString SAL_CALL getFilter() throw (css::uno::RuntimeException, std::exception) { return getStringProperty("Filter"); } - virtual void SAL_CALL setFilter(const OUString& p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setFilter(const OUString& p1) throw (css::uno::RuntimeException, std::exception) { setStringProperty("Filter", p1); } - virtual OUString SAL_CALL getGallery() throw (css::uno::RuntimeException) + virtual OUString SAL_CALL getGallery() throw (css::uno::RuntimeException, std::exception) { return getStringProperty("Gallery"); } - virtual void SAL_CALL setGallery(const OUString& p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setGallery(const OUString& p1) throw (css::uno::RuntimeException, std::exception) { setStringProperty("Gallery", p1); } - virtual OUString SAL_CALL getGraphic() throw (css::uno::RuntimeException) + virtual OUString SAL_CALL getGraphic() throw (css::uno::RuntimeException, std::exception) { return getStringProperty("Graphic"); } - virtual void SAL_CALL setGraphic(const OUString& p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setGraphic(const OUString& p1) throw (css::uno::RuntimeException, std::exception) { setStringProperty("Graphic", p1); } - virtual OUString SAL_CALL getHelp() throw (css::uno::RuntimeException) + virtual OUString SAL_CALL getHelp() throw (css::uno::RuntimeException, std::exception) { return getStringProperty("Help"); } - virtual void SAL_CALL setHelp(const OUString& p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setHelp(const OUString& p1) throw (css::uno::RuntimeException, std::exception) { setStringProperty("Help", p1); } - virtual OUString SAL_CALL getLinguistic() throw (css::uno::RuntimeException) + virtual OUString SAL_CALL getLinguistic() throw (css::uno::RuntimeException, std::exception) { return getStringProperty("Linguistic"); } - virtual void SAL_CALL setLinguistic(const OUString& p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setLinguistic(const OUString& p1) throw (css::uno::RuntimeException, std::exception) { setStringProperty("Linguistic", p1); } - virtual OUString SAL_CALL getModule() throw (css::uno::RuntimeException) + virtual OUString SAL_CALL getModule() throw (css::uno::RuntimeException, std::exception) { return getStringProperty("Module"); } - virtual void SAL_CALL setModule(const OUString& p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setModule(const OUString& p1) throw (css::uno::RuntimeException, std::exception) { setStringProperty("Module", p1); } - virtual OUString SAL_CALL getPalette() throw (css::uno::RuntimeException) + virtual OUString SAL_CALL getPalette() throw (css::uno::RuntimeException, std::exception) { return getStringProperty("Palette"); } - virtual void SAL_CALL setPalette(const OUString& p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setPalette(const OUString& p1) throw (css::uno::RuntimeException, std::exception) { setStringProperty("Palette", p1); } - virtual OUString SAL_CALL getPlugin() throw (css::uno::RuntimeException) + virtual OUString SAL_CALL getPlugin() throw (css::uno::RuntimeException, std::exception) { return getStringProperty("Plugin"); } - virtual void SAL_CALL setPlugin(const OUString& p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setPlugin(const OUString& p1) throw (css::uno::RuntimeException, std::exception) { setStringProperty("Plugin", p1); } - virtual OUString SAL_CALL getStorage() throw (css::uno::RuntimeException) + virtual OUString SAL_CALL getStorage() throw (css::uno::RuntimeException, std::exception) { return getStringProperty("Storage"); } - virtual void SAL_CALL setStorage(const OUString& p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setStorage(const OUString& p1) throw (css::uno::RuntimeException, std::exception) { setStringProperty("Storage", p1); } - virtual OUString SAL_CALL getTemp() throw (css::uno::RuntimeException) + virtual OUString SAL_CALL getTemp() throw (css::uno::RuntimeException, std::exception) { return getStringProperty("Temp"); } - virtual void SAL_CALL setTemp(const OUString& p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setTemp(const OUString& p1) throw (css::uno::RuntimeException, std::exception) { setStringProperty("Temp", p1); } - virtual OUString SAL_CALL getTemplate() throw (css::uno::RuntimeException) + virtual OUString SAL_CALL getTemplate() throw (css::uno::RuntimeException, std::exception) { return getStringProperty("Template"); } - virtual void SAL_CALL setTemplate(const OUString& p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setTemplate(const OUString& p1) throw (css::uno::RuntimeException, std::exception) { setStringProperty("Template", p1); } - virtual OUString SAL_CALL getUIConfig() throw (css::uno::RuntimeException) + virtual OUString SAL_CALL getUIConfig() throw (css::uno::RuntimeException, std::exception) { return getStringProperty("UIConfig"); } - virtual void SAL_CALL setUIConfig(const OUString& p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setUIConfig(const OUString& p1) throw (css::uno::RuntimeException, std::exception) { setStringProperty("UIConfig", p1); } - virtual OUString SAL_CALL getUserConfig() throw (css::uno::RuntimeException) + virtual OUString SAL_CALL getUserConfig() throw (css::uno::RuntimeException, std::exception) { return getStringProperty("UserConfig"); } - virtual void SAL_CALL setUserConfig(const OUString& p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setUserConfig(const OUString& p1) throw (css::uno::RuntimeException, std::exception) { setStringProperty("UserConfig", p1); } - virtual OUString SAL_CALL getUserDictionary() throw (css::uno::RuntimeException) + virtual OUString SAL_CALL getUserDictionary() throw (css::uno::RuntimeException, std::exception) { return getStringProperty("UserDictionary"); } - virtual void SAL_CALL setUserDictionary(const OUString& p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setUserDictionary(const OUString& p1) throw (css::uno::RuntimeException, std::exception) { setStringProperty("UserDictionary", p1); } - virtual OUString SAL_CALL getWork() throw (css::uno::RuntimeException) + virtual OUString SAL_CALL getWork() throw (css::uno::RuntimeException, std::exception) { return getStringProperty("Work"); } - virtual void SAL_CALL setWork(const OUString& p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setWork(const OUString& p1) throw (css::uno::RuntimeException, std::exception) { setStringProperty("Work", p1); } - virtual OUString SAL_CALL getBasePathShareLayer() throw (css::uno::RuntimeException) + virtual OUString SAL_CALL getBasePathShareLayer() throw (css::uno::RuntimeException, std::exception) { return getStringProperty("UIConfig"); } - virtual void SAL_CALL setBasePathShareLayer(const OUString& p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setBasePathShareLayer(const OUString& p1) throw (css::uno::RuntimeException, std::exception) { setStringProperty("UIConfig", p1); } - virtual OUString SAL_CALL getBasePathUserLayer() throw (css::uno::RuntimeException) + virtual OUString SAL_CALL getBasePathUserLayer() throw (css::uno::RuntimeException, std::exception) { return getStringProperty("UserConfig"); } - virtual void SAL_CALL setBasePathUserLayer(const OUString& p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setBasePathUserLayer(const OUString& p1) throw (css::uno::RuntimeException, std::exception) { 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) + throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { ::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) + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { 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) + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { ::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) + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { ::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) + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { ::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) + throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { ::cppu::OPropertySetHelper::removeVetoableChangeListener(p1, p2); } /** read all configured paths and create all needed internal structures. */ void impl_readAll(); @@ -440,7 +440,7 @@ private: sal_Int32 nHandle, const css::uno::Any& aValue ) throw(css::lang::IllegalArgumentException); virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const css::uno::Any& aValue ) throw(css::uno::Exception); + const css::uno::Any& aValue ) throw(css::uno::Exception, std::exception); virtual void SAL_CALL getFastPropertyValue( css::uno::Any& aValue, sal_Int32 nHandle ) const; // Avoid: @@ -448,7 +448,7 @@ private: // warning: by ‘virtual void {anonymous}::PathSettings::getFastPropertyValue(com::sun::star::uno::Any&, sal_Int32) const’ [-Woverloaded-virtual] using cppu::OPropertySetHelper::getFastPropertyValue; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::css::uno::RuntimeException); + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::css::uno::RuntimeException, std::exception); /** factory methods to guarantee right (but on demand) initialized members ... */ css::uno::Reference< css::util::XStringSubstitution > fa_getSubstitution(); @@ -492,7 +492,7 @@ void SAL_CALL PathSettings::disposing() css::uno::Any SAL_CALL PathSettings::queryInterface( const css::uno::Type& _rType ) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { css::uno::Any aRet = PathSettings_BASE::queryInterface( _rType ); if ( !aRet.hasValue() ) @@ -502,7 +502,7 @@ 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) + throw(css::uno::RuntimeException, std::exception) { return comphelper::concatSequences( PathSettings_BASE::getTypes(), @@ -512,7 +512,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL PathSettings::getTypes( ) void SAL_CALL PathSettings::changesOccurred(const css::util::ChangesEvent& aEvent) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { sal_Int32 c = aEvent.Changes.getLength(); sal_Int32 i = 0; @@ -543,7 +543,7 @@ void SAL_CALL PathSettings::changesOccurred(const css::util::ChangesEvent& aEven void SAL_CALL PathSettings::disposing(const css::lang::EventObject& aSource) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); @@ -1403,7 +1403,7 @@ 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) + throw(css::uno::Exception, std::exception) { // throws NoSuchElement- and IllegalArgumentException ! impl_setPathValue(nHandle, aValue); @@ -1424,7 +1424,7 @@ void SAL_CALL PathSettings::getFastPropertyValue(css::uno::Any& aValue , css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL PathSettings::getPropertySetInfo() - throw(css::uno::RuntimeException) + 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 d1f7d28915f5..49cd5b542a69 100644 --- a/framework/source/services/sessionlistener.cxx +++ b/framework/source/services/sessionlistener.cxx @@ -113,47 +113,47 @@ public: virtual ~SessionListener(); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.frame.SessionListener"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.frame.SessionListener"); return aSeq; } - virtual void SAL_CALL disposing(const com::sun::star::lang::EventObject&) throw (css::uno::RuntimeException); + virtual void SAL_CALL disposing(const com::sun::star::lang::EventObject&) throw (css::uno::RuntimeException, std::exception); // XInitialization - virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& args) throw (css::uno::RuntimeException); + virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& args) throw (css::uno::RuntimeException, std::exception); // XSessionManagerListener virtual void SAL_CALL doSave( sal_Bool bShutdown, sal_Bool bCancelable ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL approveInteraction( sal_Bool bInteractionGranted ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL shutdownCanceled() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL doRestore() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XSessionManagerListener2 virtual void SAL_CALL doQuit() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XStatusListener virtual void SAL_CALL statusChanged(const com::sun::star::frame::FeatureStateEvent& event) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); void doSaveImpl( sal_Bool bShutdown, sal_Bool bCancelable ) throw (css::uno::RuntimeException); }; @@ -235,13 +235,13 @@ void SessionListener::QuitSessionQuietly() } } -void SAL_CALL SessionListener::disposing(const com::sun::star::lang::EventObject&) throw (RuntimeException) +void SAL_CALL SessionListener::disposing(const com::sun::star::lang::EventObject&) throw (RuntimeException, std::exception) { SAL_INFO("fwk.session", "SessionListener::disposing"); } void SAL_CALL SessionListener::initialize(const Sequence< Any >& args) - throw (RuntimeException) + throw (RuntimeException, std::exception) { SAL_INFO("fwk.session", "SessionListener::initialize"); @@ -275,7 +275,7 @@ void SAL_CALL SessionListener::initialize(const Sequence< Any >& args) } void SAL_CALL SessionListener::statusChanged(const frame::FeatureStateEvent& event) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { SAL_INFO("fwk.session", "SessionListener::statusChanged"); if ( event.FeatureURL.Complete == "vnd.sun.star.autorecovery:/doSessionRestore" ) @@ -296,7 +296,7 @@ void SAL_CALL SessionListener::statusChanged(const frame::FeatureStateEvent& eve sal_Bool SAL_CALL SessionListener::doRestore() - throw (RuntimeException) + throw (RuntimeException, std::exception) { SAL_INFO("fwk.session", "SessionListener::doRestore"); osl::MutexGuard g(m_aMutex); @@ -322,7 +322,7 @@ sal_Bool SAL_CALL SessionListener::doRestore() void SAL_CALL SessionListener::doSave( sal_Bool bShutdown, sal_Bool /*bCancelable*/ ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { SAL_INFO("fwk.session", "SessionListener::doSave"); if (bShutdown) @@ -339,7 +339,7 @@ void SAL_CALL SessionListener::doSave( sal_Bool bShutdown, sal_Bool /*bCancelabl } void SAL_CALL SessionListener::approveInteraction( sal_Bool bInteractionGranted ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { SAL_INFO("fwk.session", "SessionListener::approveInteraction"); // do AutoSave as the first step @@ -393,7 +393,7 @@ void SAL_CALL SessionListener::approveInteraction( sal_Bool bInteractionGranted } void SessionListener::shutdownCanceled() - throw (RuntimeException) + throw (RuntimeException, std::exception) { SAL_INFO("fwk.session", "SessionListener::shutdownCanceled"); // set the state back @@ -401,7 +401,7 @@ void SessionListener::shutdownCanceled() } void SessionListener::doQuit() - throw (RuntimeException) + 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 6734ff030a5b..a87dd8974f92 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -247,19 +247,19 @@ public: virtual ~SubstitutePathVariables(); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.PathSubstitution"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.util.PathSubstitution"); @@ -268,11 +268,11 @@ public: // XStringSubstitution virtual OUString SAL_CALL substituteVariables( const OUString& aText, sal_Bool bSubstRequired ) - throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL reSubstituteVariables( const OUString& aText ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getSubstituteVariableValue( const OUString& variable ) - throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception); protected: DECL_LINK(implts_ConfigurationNotify, void *); @@ -802,21 +802,21 @@ SubstitutePathVariables::~SubstitutePathVariables() // XStringSubstitution OUString SAL_CALL SubstitutePathVariables::substituteVariables( const OUString& aText, sal_Bool bSubstRequired ) -throw ( NoSuchElementException, RuntimeException ) +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 ) +throw ( RuntimeException, std::exception ) { osl::MutexGuard g(rBHelper.rMutex); return impl_reSubstituteVariables( aText ); } OUString SAL_CALL SubstitutePathVariables::getSubstituteVariableValue( const OUString& aVariable ) -throw ( NoSuchElementException, RuntimeException ) +throw ( NoSuchElementException, RuntimeException, std::exception ) { osl::MutexGuard g(rBHelper.rMutex); return impl_getSubstituteVariableValue( aVariable ); diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx index 0e38d780a6a3..ae8c3f4d291e 100644 --- a/framework/source/services/tabwindowservice.cxx +++ b/framework/source/services/tabwindowservice.cxx @@ -103,19 +103,19 @@ public: FWK_DECLARE_XTYPEPROVIDER virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.TabWindowService"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.ui.dialogs.TabContainerWindow"); @@ -126,22 +126,22 @@ public: // XSimpleTabController - virtual sal_Int32 SAL_CALL insertTab() throw ( css::uno::RuntimeException ); - virtual void SAL_CALL removeTab( sal_Int32 nID ) throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException ); - virtual void SAL_CALL setTabProps( sal_Int32 nID, const css::uno::Sequence< css::beans::NamedValue >& aProperties ) throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException ); - virtual css::uno::Sequence< css::beans::NamedValue > SAL_CALL getTabProps( sal_Int32 nID ) throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException ); - virtual void SAL_CALL activateTab( sal_Int32 nID ) throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException ); - virtual sal_Int32 SAL_CALL getActiveTabID() throw ( css::uno::RuntimeException ); - virtual void SAL_CALL addTabListener( const css::uno::Reference< css::awt::XTabListener >& Listener ) throw ( css::uno::RuntimeException ); - virtual void SAL_CALL removeTabListener( const css::uno::Reference< css::awt::XTabListener >& Listener ) throw ( css::uno::RuntimeException ); + virtual sal_Int32 SAL_CALL insertTab() throw ( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL removeTab( sal_Int32 nID ) throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setTabProps( sal_Int32 nID, const css::uno::Sequence< css::beans::NamedValue >& aProperties ) throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ); + virtual css::uno::Sequence< css::beans::NamedValue > SAL_CALL getTabProps( sal_Int32 nID ) throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL activateTab( sal_Int32 nID ) throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ); + virtual sal_Int32 SAL_CALL getActiveTabID() throw ( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL addTabListener( const css::uno::Reference< css::awt::XTabListener >& Listener ) throw ( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL removeTabListener( const css::uno::Reference< css::awt::XTabListener >& Listener ) throw ( css::uno::RuntimeException, std::exception ); // XComponent - virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException ); - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw ( css::uno::RuntimeException ); - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw ( css::uno::RuntimeException ); + virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw ( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw ( css::uno::RuntimeException, std::exception ); private: @@ -251,7 +251,7 @@ TabWindowService::~TabWindowService() // XSimpleTabController //***************************************************************************************************************** ::sal_Int32 SAL_CALL TabWindowService::insertTab() - throw ( css::uno::RuntimeException ) + throw ( css::uno::RuntimeException, std::exception ) { // SAFE -> ResetableGuard aGuard( m_aLock ); @@ -269,7 +269,7 @@ TabWindowService::~TabWindowService() //***************************************************************************************************************** void SAL_CALL TabWindowService::removeTab(::sal_Int32 nID) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { // SAFE -> ResetableGuard aGuard(m_aLock); @@ -289,7 +289,7 @@ void SAL_CALL TabWindowService::removeTab(::sal_Int32 nID) void SAL_CALL TabWindowService::setTabProps( ::sal_Int32 nID , const css::uno::Sequence< css::beans::NamedValue >& lProperties) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { // SAFE -> ResetableGuard aGuard(m_aLock); @@ -315,7 +315,7 @@ void SAL_CALL TabWindowService::setTabProps( ::sal_Int32 //***************************************************************************************************************** css::uno::Sequence< css::beans::NamedValue > SAL_CALL TabWindowService::getTabProps(::sal_Int32 nID) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { // SAFE -> ResetableGuard aGuard(m_aLock); @@ -332,7 +332,7 @@ css::uno::Sequence< css::beans::NamedValue > SAL_CALL TabWindowService::getTabPr //***************************************************************************************************************** void SAL_CALL TabWindowService::activateTab(::sal_Int32 nID) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { // SAFE -> ResetableGuard aGuard(m_aLock); @@ -350,7 +350,7 @@ void SAL_CALL TabWindowService::activateTab(::sal_Int32 nID) // XSimpleTabController //***************************************************************************************************************** ::sal_Int32 SAL_CALL TabWindowService::getActiveTabID() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { // SAFE-> ResetableGuard aGuard( m_aLock ); @@ -361,7 +361,7 @@ void SAL_CALL TabWindowService::activateTab(::sal_Int32 nID) // XSimpleTabController //***************************************************************************************************************** void SAL_CALL TabWindowService::addTabListener(const css::uno::Reference< css::awt::XTabListener >& xListener) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { m_lListener.addInterface(::getCppuType((const css::uno::Reference< css::awt::XTabListener >*)NULL), xListener); } @@ -370,7 +370,7 @@ void SAL_CALL TabWindowService::addTabListener(const css::uno::Reference< css::a // XSimpleTabController //***************************************************************************************************************** void SAL_CALL TabWindowService::removeTabListener(const css::uno::Reference< css::awt::XTabListener >& xListener) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { m_lListener.removeInterface(::getCppuType((const css::uno::Reference< css::awt::XTabListener >*)NULL), xListener); } @@ -379,7 +379,7 @@ void SAL_CALL TabWindowService::removeTabListener(const css::uno::Reference< css // XComponent //***************************************************************************************************************** void SAL_CALL TabWindowService::dispose() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { // SAFE-> ResetableGuard aGuard(m_aLock); @@ -400,7 +400,7 @@ void SAL_CALL TabWindowService::dispose() // XComponent //***************************************************************************************************************** void SAL_CALL TabWindowService::addEventListener(const css::uno::Reference< css::lang::XEventListener >& xListener) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { m_lListener.addInterface(::getCppuType((const css::uno::Reference< css::lang::XEventListener >*)NULL), xListener); } @@ -409,7 +409,7 @@ void SAL_CALL TabWindowService::addEventListener(const css::uno::Reference< css: // XComponent //***************************************************************************************************************** void SAL_CALL TabWindowService::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { m_lListener.removeInterface(::getCppuType((const css::uno::Reference< css::lang::XEventListener >*)NULL), xListener); } diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx index c683ff44bc76..df7d06135995 100644 --- a/framework/source/services/taskcreatorsrv.cxx +++ b/framework/source/services/taskcreatorsrv.cxx @@ -67,19 +67,19 @@ public: virtual ~TaskCreatorService( ); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.TaskCreator"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.frame.TaskCreator"); @@ -89,11 +89,11 @@ public: // XSingleServiceFactory virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance() throw(css::uno::Exception , - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); 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); + css::uno::RuntimeException, std::exception); private: @@ -130,7 +130,7 @@ TaskCreatorService::~TaskCreatorService() css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createInstance() throw(css::uno::Exception , - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { return createInstanceWithArguments(css::uno::Sequence< css::uno::Any >()); } @@ -138,7 +138,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createI 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) + css::uno::RuntimeException, std::exception) { ::comphelper::SequenceAsHashMap lArgs(lArguments); diff --git a/framework/source/services/uriabbreviation.cxx b/framework/source/services/uriabbreviation.cxx index ec25e42ffe73..6af2e8e51b14 100644 --- a/framework/source/services/uriabbreviation.cxx +++ b/framework/source/services/uriabbreviation.cxx @@ -50,7 +50,7 @@ UriAbbreviation::UriAbbreviation(css::uno::Reference< css::uno::XComponentContex } // ::com::sun::star::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) +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 aResult( aString ); if ( xStringWidth.is() ) diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx index 2716740aa69d..e392e980bd07 100644 --- a/framework/source/services/urltransformer.cxx +++ b/framework/source/services/urltransformer.cxx @@ -40,19 +40,19 @@ public: virtual ~URLTransformer() {} virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.URLTransformer"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aRet(1); aRet[0] = "com.sun.star.util.URLTransformer"; @@ -60,16 +60,16 @@ public: } virtual sal_Bool SAL_CALL parseStrict( css::util::URL& aURL ) - throw( css::uno::RuntimeException ); + throw( css::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL parseSmart( css::util::URL& aURL, const OUString& sSmartProtocol ) - throw( css::uno::RuntimeException ); + throw( css::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL assemble( css::util::URL& aURL ) - throw( css::uno::RuntimeException ); + throw( css::uno::RuntimeException, std::exception ); virtual OUString SAL_CALL getPresentation( const css::util::URL& aURL, sal_Bool bWithPassword ) - throw( css::uno::RuntimeException ); + throw( css::uno::RuntimeException, std::exception ); }; namespace @@ -126,7 +126,7 @@ namespace //***************************************************************************************************************** // XURLTransformer //***************************************************************************************************************** -sal_Bool SAL_CALL URLTransformer::parseStrict( css::util::URL& aURL ) throw( css::uno::RuntimeException ) +sal_Bool SAL_CALL URLTransformer::parseStrict( css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception ) { // Safe impossible cases. if (( &aURL == NULL ) || @@ -180,7 +180,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 ) + const OUString& sSmartProtocol ) throw( css::uno::RuntimeException, std::exception ) { // Safe impossible cases. if (( &aURL == NULL ) || @@ -235,7 +235,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 ) +sal_Bool SAL_CALL URLTransformer::assemble( css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception ) { // Safe impossible cases. if ( &aURL == NULL ) @@ -299,7 +299,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 ) + sal_Bool bWithPassword ) throw( css::uno::RuntimeException, std::exception ) { // Safe impossible cases. if (( &aURL == NULL ) || diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx index 21061fe1a0b1..1469e1a53d1b 100644 --- a/framework/source/tabwin/tabwindow.cxx +++ b/framework/source/tabwin/tabwindow.cxx @@ -271,7 +271,7 @@ IMPL_LINK( TabWindow, Deactivate, TabControl*, pTabControl ) void SAL_CALL TabWindow::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) -throw (css::uno::Exception, css::uno::RuntimeException) +throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { const OUString aTopWindowArgName( "TopWindow" ); const OUString aSizeArgName( "Size" ); @@ -426,7 +426,7 @@ throw (css::uno::Exception, css::uno::RuntimeException) // XComponent -void SAL_CALL TabWindow::dispose() throw (css::uno::RuntimeException) +void SAL_CALL TabWindow::dispose() throw (css::uno::RuntimeException, std::exception) { // Send message to all listener and forget her references. css::uno::Reference< css::lang::XComponent > xThis( @@ -466,7 +466,7 @@ void SAL_CALL TabWindow::dispose() throw (css::uno::RuntimeException) } void SAL_CALL TabWindow::addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ResetableGuard aLock( m_aLock ); @@ -479,7 +479,7 @@ throw (css::uno::RuntimeException) } void SAL_CALL TabWindow::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ResetableGuard aLock( m_aLock ); @@ -495,7 +495,7 @@ throw (css::uno::RuntimeException) // XEventListener void SAL_CALL TabWindow::disposing( const css::lang::EventObject& ) -throw( css::uno::RuntimeException ) +throw( css::uno::RuntimeException, std::exception ) { } @@ -503,18 +503,18 @@ throw( css::uno::RuntimeException ) // XWindowListener void SAL_CALL TabWindow::windowResized( const css::awt::WindowEvent& ) -throw( css::uno::RuntimeException ) +throw( css::uno::RuntimeException, std::exception ) { implts_LayoutWindows(); } void SAL_CALL TabWindow::windowMoved( const css::awt::WindowEvent& ) -throw( css::uno::RuntimeException ) +throw( css::uno::RuntimeException, std::exception ) { } void SAL_CALL TabWindow::windowShown( const css::lang::EventObject& ) -throw( css::uno::RuntimeException ) +throw( css::uno::RuntimeException, std::exception ) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ResetableGuard aLock( m_aLock ); @@ -532,7 +532,7 @@ throw( css::uno::RuntimeException ) } void SAL_CALL TabWindow::windowHidden( const css::lang::EventObject& ) -throw( css::uno::RuntimeException ) +throw( css::uno::RuntimeException, std::exception ) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ResetableGuard aLock( m_aLock ); @@ -552,12 +552,12 @@ throw( css::uno::RuntimeException ) // XTopWindowListener void SAL_CALL TabWindow::windowOpened( const css::lang::EventObject& ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { } void SAL_CALL TabWindow::windowClosing( const css::lang::EventObject& ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { css::uno::Reference< css::lang::XComponent > xComponent( (OWeakObject *)this, css::uno::UNO_QUERY ); if ( xComponent.is() ) @@ -565,27 +565,27 @@ throw (css::uno::RuntimeException) } void SAL_CALL TabWindow::windowClosed( const css::lang::EventObject& ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { } void SAL_CALL TabWindow::windowMinimized( const css::lang::EventObject& ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { } void SAL_CALL TabWindow::windowNormalized( const css::lang::EventObject& ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { } void SAL_CALL TabWindow::windowActivated( const css::lang::EventObject& ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { } void SAL_CALL TabWindow::windowDeactivated( const css::lang::EventObject& ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { } @@ -594,7 +594,7 @@ throw (css::uno::RuntimeException) ::sal_Int32 SAL_CALL TabWindow::insertTab() -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ResetableGuard aLock( m_aLock ); @@ -617,7 +617,7 @@ throw (css::uno::RuntimeException) } void SAL_CALL TabWindow::removeTab( ::sal_Int32 ID ) -throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) +throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ResetableGuard aLock( m_aLock ); @@ -650,7 +650,7 @@ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) } void SAL_CALL TabWindow::setTabProps( ::sal_Int32 ID, const css::uno::Sequence< css::beans::NamedValue >& Properties ) -throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) +throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ResetableGuard aLock( m_aLock ); @@ -696,7 +696,7 @@ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) } css::uno::Sequence< css::beans::NamedValue > SAL_CALL TabWindow::getTabProps( ::sal_Int32 ID ) -throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) +throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ResetableGuard aLock( m_aLock ); @@ -731,7 +731,7 @@ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) } void SAL_CALL TabWindow::activateTab( ::sal_Int32 ID ) -throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) +throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ResetableGuard aLock( m_aLock ); @@ -764,7 +764,7 @@ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) } ::sal_Int32 SAL_CALL TabWindow::getActiveTabID() -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ResetableGuard aLock( m_aLock ); @@ -788,7 +788,7 @@ throw (css::uno::RuntimeException) void SAL_CALL TabWindow::addTabListener( const css::uno::Reference< css::awt::XTabListener >& xListener ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ResetableGuard aLock( m_aLock ); @@ -802,7 +802,7 @@ throw (css::uno::RuntimeException) } void SAL_CALL TabWindow::removeTabListener( const css::uno::Reference< css::awt::XTabListener >& xListener ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ResetableGuard aLock( m_aLock ); @@ -855,7 +855,7 @@ throw( css::lang::IllegalArgumentException ) void SAL_CALL TabWindow::setFastPropertyValue_NoBroadcast( sal_Int32, const css::uno::Any&) -throw( css::uno::Exception ) +throw( css::uno::Exception, std::exception ) { } @@ -900,7 +900,7 @@ void SAL_CALL TabWindow::getFastPropertyValue( css::uno::Any& aValue , } css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL TabWindow::getPropertySetInfo() -throw ( css::uno::RuntimeException ) +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 90297d3d876d..48eeffd979ea 100644 --- a/framework/source/tabwin/tabwinfactory.cxx +++ b/framework/source/tabwin/tabwinfactory.cxx @@ -66,7 +66,7 @@ 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 ) +throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) { css::uno::Sequence< css::uno::Any > aArgs; @@ -75,7 +75,7 @@ throw ( css::uno::Exception, css::uno::RuntimeException ) 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 ) +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 7f5f090c43e6..bd6257e04bb7 100644 --- a/framework/source/uiconfiguration/globalsettings.cxx +++ b/framework/source/uiconfiguration/globalsettings.cxx @@ -69,12 +69,12 @@ class GlobalSettings_Access : private ThreadHelpBase , virtual ~GlobalSettings_Access(); // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); // settings access sal_Bool HasStatesInfo( GlobalSettings::UIElementType eElementType ); @@ -116,7 +116,7 @@ GlobalSettings_Access::~GlobalSettings_Access() // XComponent void SAL_CALL GlobalSettings_Access::dispose() -throw ( css::uno::RuntimeException ) +throw ( css::uno::RuntimeException, std::exception ) { // SAFE ResetableGuard aLock( m_aLock ); @@ -126,18 +126,18 @@ throw ( css::uno::RuntimeException ) } void SAL_CALL GlobalSettings_Access::addEventListener( const css::uno::Reference< css::lang::XEventListener >& ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { } void SAL_CALL GlobalSettings_Access::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { } // XEventListener void SAL_CALL GlobalSettings_Access::disposing( const css::lang::EventObject& ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { // SAFE ResetableGuard aLock( m_aLock ); diff --git a/framework/source/uiconfiguration/graphicnameaccess.cxx b/framework/source/uiconfiguration/graphicnameaccess.cxx index 33b7b6ced705..e127152624be 100644 --- a/framework/source/uiconfiguration/graphicnameaccess.cxx +++ b/framework/source/uiconfiguration/graphicnameaccess.cxx @@ -43,7 +43,7 @@ void GraphicNameAccess::addElement( const OUString& rName, const uno::Reference< uno::Any SAL_CALL GraphicNameAccess::getByName( const OUString& aName ) throw( container::NoSuchElementException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { NameGraphicHashMap::const_iterator pIter = m_aNameToElementMap.find( aName ); if ( pIter != m_aNameToElementMap.end() ) @@ -53,7 +53,7 @@ throw( container::NoSuchElementException, } uno::Sequence< OUString > SAL_CALL GraphicNameAccess::getElementNames() -throw(::com::sun::star::uno::RuntimeException) +throw(::com::sun::star::uno::RuntimeException, std::exception) { if ( m_aSeq.getLength() == 0 ) { @@ -72,7 +72,7 @@ throw(::com::sun::star::uno::RuntimeException) } sal_Bool SAL_CALL GraphicNameAccess::hasByName( const OUString& aName ) -throw(::com::sun::star::uno::RuntimeException) +throw(::com::sun::star::uno::RuntimeException, std::exception) { NameGraphicHashMap::const_iterator pIter = m_aNameToElementMap.find( aName ); return ( pIter != m_aNameToElementMap.end() ); @@ -80,13 +80,13 @@ throw(::com::sun::star::uno::RuntimeException) // XElementAccess sal_Bool SAL_CALL GraphicNameAccess::hasElements() -throw( uno::RuntimeException ) +throw( uno::RuntimeException, std::exception ) { return ( !m_aNameToElementMap.empty() ); } uno::Type SAL_CALL GraphicNameAccess::getElementType() -throw( uno::RuntimeException ) +throw( uno::RuntimeException, std::exception ) { return ::getCppuType( (const uno::Reference< graphic::XGraphic > *)NULL ); } diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx index 8540e2400945..b42a0b5319f1 100644 --- a/framework/source/uiconfiguration/imagemanager.cxx +++ b/framework/source/uiconfiguration/imagemanager.cxx @@ -71,17 +71,17 @@ ImageManager::~ImageManager() } // XComponent -void SAL_CALL ImageManager::dispose() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ImageManager::dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->dispose(); } -void SAL_CALL ImageManager::addEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ImageManager::addEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->addEventListener(xListener); } -void SAL_CALL ImageManager::removeEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ImageManager::removeEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ m_pImpl->removeEventListener(xListener); @@ -98,14 +98,14 @@ throw (::com::sun::star::uno::RuntimeException) } // XInitialization -void SAL_CALL ImageManager::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException ) +void SAL_CALL ImageManager::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception ) { m_pImpl->initialize(aArguments); } // XImageManager void SAL_CALL ImageManager::reset() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ @@ -113,13 +113,13 @@ throw (::com::sun::star::uno::RuntimeException) } Sequence< OUString > SAL_CALL ImageManager::getAllImageNames( ::sal_Int16 nImageType ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_pImpl->getAllImageNames( nImageType ); } ::sal_Bool SAL_CALL ImageManager::hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) -throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { return m_pImpl->hasImage(nImageType,aCommandURL); } @@ -127,7 +127,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:: Sequence< uno::Reference< XGraphic > > SAL_CALL ImageManager::getImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence ) -throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ) +throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) { return m_pImpl->getImages(nImageType,aCommandURLSequence); } @@ -138,7 +138,7 @@ void SAL_CALL ImageManager::replaceImages( const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->replaceImages(nImageType,aCommandURLSequence,aGraphicsSequence); } @@ -146,7 +146,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException, void SAL_CALL ImageManager::removeImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->removeImages(nImageType,aCommandURLSequence); } @@ -155,20 +155,20 @@ void SAL_CALL ImageManager::insertImages( ::sal_Int16 nImageType, const Sequence throw ( ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->insertImages(nImageType,aCommandURLSequence,aGraphicSequence); } // XUIConfiguration void SAL_CALL ImageManager::addConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->addConfigurationListener(xListener); } void SAL_CALL ImageManager::removeConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ m_pImpl->removeConfigurationListener(xListener); @@ -177,30 +177,30 @@ throw (::com::sun::star::uno::RuntimeException) // XUIConfigurationPersistence void SAL_CALL ImageManager::reload() throw ( ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException ) + ::com::sun::star::uno::RuntimeException, std::exception ) { m_pImpl->reload(); } void SAL_CALL ImageManager::store() -throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->store(); } void SAL_CALL ImageManager::storeToStorage( const uno::Reference< XStorage >& Storage ) -throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->storeToStorage(Storage); } sal_Bool SAL_CALL ImageManager::isModified() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_pImpl->isModified(); } -sal_Bool SAL_CALL ImageManager::isReadOnly() throw (::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL ImageManager::isReadOnly() throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_pImpl->isReadOnly(); } diff --git a/framework/source/uiconfiguration/moduleimagemanager.cxx b/framework/source/uiconfiguration/moduleimagemanager.cxx index ee8cbe638638..8405d23b5fc2 100644 --- a/framework/source/uiconfiguration/moduleimagemanager.cxx +++ b/framework/source/uiconfiguration/moduleimagemanager.cxx @@ -81,43 +81,43 @@ ModuleImageManager::~ModuleImageManager() } // XComponent -void SAL_CALL ModuleImageManager::dispose() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ModuleImageManager::dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->dispose(); } -void SAL_CALL ModuleImageManager::addEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ModuleImageManager::addEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->addEventListener(xListener); } -void SAL_CALL ModuleImageManager::removeEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ModuleImageManager::removeEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ m_pImpl->removeEventListener(xListener); } // XInitialization -void SAL_CALL ModuleImageManager::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException ) +void SAL_CALL ModuleImageManager::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception ) { m_pImpl->initialize(aArguments); } // XImageManager void SAL_CALL ModuleImageManager::reset() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->reset(); } Sequence< OUString > SAL_CALL ModuleImageManager::getAllImageNames( ::sal_Int16 nImageType ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_pImpl->getAllImageNames( nImageType ); } ::sal_Bool SAL_CALL ModuleImageManager::hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) -throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { return m_pImpl->hasImage(nImageType,aCommandURL); } @@ -125,7 +125,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:: Sequence< uno::Reference< XGraphic > > SAL_CALL ModuleImageManager::getImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence ) -throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ) +throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) { SAL_INFO( "fwk", "framework: ModuleImageManager::getImages" ); return m_pImpl->getImages(nImageType,aCommandURLSequence); @@ -137,7 +137,7 @@ void SAL_CALL ModuleImageManager::replaceImages( const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->replaceImages(nImageType,aCommandURLSequence,aGraphicsSequence); } @@ -145,7 +145,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException, void SAL_CALL ModuleImageManager::removeImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->removeImages(nImageType,aCommandURLSequence); } @@ -154,20 +154,20 @@ void SAL_CALL ModuleImageManager::insertImages( ::sal_Int16 nImageType, const Se throw ( ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->insertImages(nImageType,aCommandURLSequence,aGraphicSequence); } // XUIConfiguration void SAL_CALL ModuleImageManager::addConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->addConfigurationListener(xListener); } void SAL_CALL ModuleImageManager::removeConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->removeConfigurationListener(xListener); } @@ -175,30 +175,30 @@ throw (::com::sun::star::uno::RuntimeException) // XUIConfigurationPersistence void SAL_CALL ModuleImageManager::reload() throw ( ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException ) + ::com::sun::star::uno::RuntimeException, std::exception ) { m_pImpl->reload(); } void SAL_CALL ModuleImageManager::store() -throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->store(); } void SAL_CALL ModuleImageManager::storeToStorage( const uno::Reference< XStorage >& Storage ) -throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->storeToStorage(Storage); } sal_Bool SAL_CALL ModuleImageManager::isModified() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_pImpl->isModified(); } -sal_Bool SAL_CALL ModuleImageManager::isReadOnly() throw (::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL ModuleImageManager::isReadOnly() throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_pImpl->isReadOnly(); } diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx index 66c3c82a2b92..c24ade507f90 100644 --- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx +++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx @@ -65,19 +65,19 @@ public: virtual ~ModuleUIConfigurationManagerSupplier(); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.ModuleUIConfigurationManagerSupplier"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.ui.ModuleUIConfigurationManagerSupplier"); @@ -86,7 +86,7 @@ public: // XModuleUIConfigurationManagerSupplier virtual css::uno::Reference< css::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager( const OUString& ModuleIdentifier ) - throw (css::container::NoSuchElementException, css::uno::RuntimeException); + throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception); private: virtual void SAL_CALL disposing() SAL_OVERRIDE; @@ -144,7 +144,7 @@ void SAL_CALL ModuleUIConfigurationManagerSupplier::disposing() // XModuleUIConfigurationManagerSupplier Reference< XUIConfigurationManager > SAL_CALL ModuleUIConfigurationManagerSupplier::getUIConfigurationManager( const OUString& sModuleIdentifier ) -throw ( NoSuchElementException, RuntimeException) +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 1bbcc39603be..02c15be672cb 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -79,19 +79,19 @@ public: virtual ~ModuleUIConfigurationManager(); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.ModuleUIConfigurationManager"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.ui.ModuleUIConfigurationManager"); @@ -99,37 +99,37 @@ public: } // XComponent - virtual void SAL_CALL dispose() throw (css::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException); + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception); // XUIConfiguration - virtual void SAL_CALL addConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException); - virtual void SAL_CALL removeConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException); + virtual void SAL_CALL addConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException, std::exception); // XUIConfigurationManager - virtual void SAL_CALL reset() throw (css::uno::RuntimeException); - virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getUIElementsInfo( sal_Int16 ElementType ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XIndexContainer > SAL_CALL createSettings( ) throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasSettings( const OUString& ResourceURL ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - 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); - 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); - virtual void SAL_CALL removeSettings( const OUString& ResourceURL ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException); - 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); - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getImageManager() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::ui::XAcceleratorConfiguration > SAL_CALL getShortCutManager() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getEventsManager() throw (css::uno::RuntimeException); + virtual void SAL_CALL reset() throw (css::uno::RuntimeException, std::exception); + 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); + virtual css::uno::Reference< css::container::XIndexContainer > SAL_CALL createSettings( ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasSettings( const OUString& ResourceURL ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + 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); + 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); + virtual void SAL_CALL removeSettings( const OUString& ResourceURL ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception); + 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); + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getImageManager() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::ui::XAcceleratorConfiguration > SAL_CALL getShortCutManager() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getEventsManager() throw (css::uno::RuntimeException, std::exception); // XModuleUIConfigurationManager - virtual sal_Bool SAL_CALL isDefaultSettings( const OUString& ResourceURL ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getDefaultSettings( const OUString& ResourceURL ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException); + virtual sal_Bool SAL_CALL isDefaultSettings( const OUString& ResourceURL ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + 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); // XUIConfigurationPersistence - virtual void SAL_CALL reload() throw (css::uno::Exception, css::uno::RuntimeException); - virtual void SAL_CALL store() throw (css::uno::Exception, css::uno::RuntimeException); - virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) throw (css::uno::Exception, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException); + virtual void SAL_CALL reload() throw (css::uno::Exception, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL store() throw (css::uno::Exception, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException, std::exception); private: // private data types @@ -931,7 +931,7 @@ ModuleUIConfigurationManager::~ModuleUIConfigurationManager() } // XComponent -void SAL_CALL ModuleUIConfigurationManager::dispose() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ModuleUIConfigurationManager::dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) { Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY ); @@ -967,7 +967,7 @@ void SAL_CALL ModuleUIConfigurationManager::dispose() throw (::com::sun::star::u } } -void SAL_CALL ModuleUIConfigurationManager::addEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ModuleUIConfigurationManager::addEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { { ResetableGuard aGuard( m_aLock ); @@ -980,14 +980,14 @@ void SAL_CALL ModuleUIConfigurationManager::addEventListener( const Reference< X m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener ); } -void SAL_CALL ModuleUIConfigurationManager::removeEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ModuleUIConfigurationManager::removeEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener ); } // XUIConfiguration -void SAL_CALL ModuleUIConfigurationManager::addConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ModuleUIConfigurationManager::addConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { { ResetableGuard aGuard( m_aLock ); @@ -1000,7 +1000,7 @@ void SAL_CALL ModuleUIConfigurationManager::addConfigurationListener( const Refe m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< ui::XUIConfigurationListener >* ) NULL ), xListener ); } -void SAL_CALL ModuleUIConfigurationManager::removeConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ModuleUIConfigurationManager::removeConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< ui::XUIConfigurationListener >* ) NULL ), xListener ); @@ -1008,7 +1008,7 @@ void SAL_CALL ModuleUIConfigurationManager::removeConfigurationListener( const R // XUIConfigurationManager -void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); @@ -1096,7 +1096,7 @@ void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno } Sequence< Sequence< PropertyValue > > SAL_CALL ModuleUIConfigurationManager::getUIElementsInfo( sal_Int16 ElementType ) -throw ( IllegalArgumentException, RuntimeException ) +throw ( IllegalArgumentException, RuntimeException, std::exception ) { if (( ElementType < 0 ) || ( ElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); @@ -1135,7 +1135,7 @@ throw ( IllegalArgumentException, RuntimeException ) return aElementInfoSeq; } -Reference< XIndexContainer > SAL_CALL ModuleUIConfigurationManager::createSettings() throw (::com::sun::star::uno::RuntimeException) +Reference< XIndexContainer > SAL_CALL ModuleUIConfigurationManager::createSettings() throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); @@ -1147,7 +1147,7 @@ Reference< XIndexContainer > SAL_CALL ModuleUIConfigurationManager::createSettin } sal_Bool SAL_CALL ModuleUIConfigurationManager::hasSettings( const OUString& ResourceURL ) -throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); @@ -1170,7 +1170,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:: } Reference< XIndexAccess > SAL_CALL ModuleUIConfigurationManager::getSettings( const OUString& ResourceURL, sal_Bool bWriteable ) -throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); @@ -1199,7 +1199,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la } void SAL_CALL ModuleUIConfigurationManager::replaceSettings( const OUString& ResourceURL, const Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) -throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException, std::exception) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); @@ -1306,7 +1306,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la } void SAL_CALL ModuleUIConfigurationManager::removeSettings( const OUString& ResourceURL ) -throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException, RuntimeException) +throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException, RuntimeException, std::exception) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); @@ -1384,7 +1384,7 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException } void SAL_CALL ModuleUIConfigurationManager::insertSettings( const OUString& NewResourceURL, const Reference< XIndexAccess >& aNewData ) -throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, RuntimeException ) +throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, RuntimeException, std::exception ) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( NewResourceURL ); @@ -1445,7 +1445,7 @@ throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, } } -Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getImageManager() throw (::com::sun::star::uno::RuntimeException) +Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getImageManager() throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); @@ -1476,7 +1476,7 @@ Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getImageManager() return Reference< XInterface >( m_xModuleImageManager, UNO_QUERY ); } -Reference< ui::XAcceleratorConfiguration > SAL_CALL ModuleUIConfigurationManager::getShortCutManager() throw (::com::sun::star::uno::RuntimeException) +Reference< ui::XAcceleratorConfiguration > SAL_CALL ModuleUIConfigurationManager::getShortCutManager() throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); @@ -1497,14 +1497,14 @@ Reference< ui::XAcceleratorConfiguration > SAL_CALL ModuleUIConfigurationManager return m_xModuleAcceleratorManager; } -Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getEventsManager() throw (::com::sun::star::uno::RuntimeException) +Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getEventsManager() throw (::com::sun::star::uno::RuntimeException, std::exception) { return Reference< XInterface >(); } // XModuleUIConfigurationManager sal_Bool SAL_CALL ModuleUIConfigurationManager::isDefaultSettings( const OUString& ResourceURL ) -throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); @@ -1527,7 +1527,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:: } Reference< XIndexAccess > SAL_CALL ModuleUIConfigurationManager::getDefaultSettings( const OUString& ResourceURL ) -throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); @@ -1560,7 +1560,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la } // XUIConfigurationPersistence -void SAL_CALL ModuleUIConfigurationManager::reload() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) +void SAL_CALL ModuleUIConfigurationManager::reload() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); @@ -1601,7 +1601,7 @@ void SAL_CALL ModuleUIConfigurationManager::reload() throw (::com::sun::star::un } } -void SAL_CALL ModuleUIConfigurationManager::store() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) +void SAL_CALL ModuleUIConfigurationManager::store() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); @@ -1634,7 +1634,7 @@ void SAL_CALL ModuleUIConfigurationManager::store() throw (::com::sun::star::uno } } -void SAL_CALL ModuleUIConfigurationManager::storeToStorage( const Reference< XStorage >& Storage ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) +void SAL_CALL ModuleUIConfigurationManager::storeToStorage( const Reference< XStorage >& Storage ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); @@ -1667,14 +1667,14 @@ void SAL_CALL ModuleUIConfigurationManager::storeToStorage( const Reference< XSt } } -sal_Bool SAL_CALL ModuleUIConfigurationManager::isModified() throw (::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL ModuleUIConfigurationManager::isModified() throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); return m_bModified; } -sal_Bool SAL_CALL ModuleUIConfigurationManager::isReadOnly() throw (::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL ModuleUIConfigurationManager::isReadOnly() throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx index 58023cb983b0..c3f6f2df3a05 100644 --- a/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/framework/source/uiconfiguration/uicategorydescription.cxx @@ -71,28 +71,28 @@ class ConfigurationAccess_UICategory : public ::cppu::WeakImplHelper2<XNameAcces // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) - throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // container.XContainerListener - virtual void SAL_CALL elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException); - virtual void SAL_CALL elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException); - virtual void SAL_CALL elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException); + virtual void SAL_CALL elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception); + virtual void SAL_CALL elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception); + virtual void SAL_CALL elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception); // lang.XEventListener - virtual void SAL_CALL disposing( const EventObject& aEvent ) throw(RuntimeException); + virtual void SAL_CALL disposing( const EventObject& aEvent ) throw(RuntimeException, std::exception); protected: Any getUINameFromID( const OUString& rId ); @@ -148,7 +148,7 @@ ConfigurationAccess_UICategory::~ConfigurationAccess_UICategory() // XNameAccess Any SAL_CALL ConfigurationAccess_UICategory::getByName( const OUString& rId ) -throw ( NoSuchElementException, WrappedTargetException, RuntimeException) +throw ( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { osl::MutexGuard g(aMutex); if ( !m_bConfigAccessInitialized ) @@ -168,26 +168,26 @@ throw ( NoSuchElementException, WrappedTargetException, RuntimeException) } Sequence< OUString > SAL_CALL ConfigurationAccess_UICategory::getElementNames() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { return getAllIds(); } sal_Bool SAL_CALL ConfigurationAccess_UICategory::hasByName( const OUString& rId ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { return getByName( rId ).hasValue(); } // XElementAccess Type SAL_CALL ConfigurationAccess_UICategory::getElementType() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { return( ::getCppuType( (const OUString*)NULL ) ); } sal_Bool SAL_CALL ConfigurationAccess_UICategory::hasElements() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { // There must be global categories! return sal_True; @@ -359,20 +359,20 @@ sal_Bool ConfigurationAccess_UICategory::initializeConfigAccess() } // container.XContainerListener -void SAL_CALL ConfigurationAccess_UICategory::elementInserted( const ContainerEvent& ) throw(RuntimeException) +void SAL_CALL ConfigurationAccess_UICategory::elementInserted( const ContainerEvent& ) throw(RuntimeException, std::exception) { } -void SAL_CALL ConfigurationAccess_UICategory::elementRemoved ( const ContainerEvent& ) throw(RuntimeException) +void SAL_CALL ConfigurationAccess_UICategory::elementRemoved ( const ContainerEvent& ) throw(RuntimeException, std::exception) { } -void SAL_CALL ConfigurationAccess_UICategory::elementReplaced( const ContainerEvent& ) throw(RuntimeException) +void SAL_CALL ConfigurationAccess_UICategory::elementReplaced( const ContainerEvent& ) throw(RuntimeException, std::exception) { } // lang.XEventListener -void SAL_CALL ConfigurationAccess_UICategory::disposing( const EventObject& aEvent ) throw(RuntimeException) +void SAL_CALL ConfigurationAccess_UICategory::disposing( const EventObject& aEvent ) throw(RuntimeException, std::exception) { // SAFE // remove our reference to the config access @@ -391,19 +391,19 @@ public: virtual ~UICategoryDescription(); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.UICategoryDescription"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.ui.UICategoryDescription"); diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index b3f30787ff5d..33a0845e4a0a 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -68,19 +68,19 @@ class UIConfigurationManager : private ThreadHelpBase, // Struct for right i { public: virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.UIConfigurationManager"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.ui.UIConfigurationManager"); @@ -91,37 +91,37 @@ public: virtual ~UIConfigurationManager(); // XComponent - virtual void SAL_CALL dispose() throw (css::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException); + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception); // XUIConfiguration - virtual void SAL_CALL addConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException); - virtual void SAL_CALL removeConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException); + virtual void SAL_CALL addConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException, std::exception); // XUIConfigurationManager - virtual void SAL_CALL reset() throw (css::uno::RuntimeException); - virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getUIElementsInfo( sal_Int16 ElementType ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XIndexContainer > SAL_CALL createSettings( ) throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasSettings( const OUString& ResourceURL ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - 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); - 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); - virtual void SAL_CALL removeSettings( const OUString& ResourceURL ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException); - 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); - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getImageManager() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::ui::XAcceleratorConfiguration > SAL_CALL getShortCutManager() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getEventsManager() throw (css::uno::RuntimeException); + virtual void SAL_CALL reset() throw (css::uno::RuntimeException, std::exception); + 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); + virtual css::uno::Reference< css::container::XIndexContainer > SAL_CALL createSettings( ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasSettings( const OUString& ResourceURL ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + 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); + 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); + virtual void SAL_CALL removeSettings( const OUString& ResourceURL ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception); + 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); + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getImageManager() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::ui::XAcceleratorConfiguration > SAL_CALL getShortCutManager() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getEventsManager() throw (css::uno::RuntimeException, std::exception); // XUIConfigurationPersistence - virtual void SAL_CALL reload() throw (css::uno::Exception, css::uno::RuntimeException); - virtual void SAL_CALL store() throw (css::uno::Exception, css::uno::RuntimeException); - virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) throw (css::uno::Exception, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException); + virtual void SAL_CALL reload() throw (css::uno::Exception, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL store() throw (css::uno::Exception, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException, std::exception); // XUIConfigurationStorage - virtual void SAL_CALL setStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasStorage() throw (css::uno::RuntimeException); + virtual void SAL_CALL setStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasStorage() throw (css::uno::RuntimeException, std::exception); private: // private data types @@ -709,7 +709,7 @@ UIConfigurationManager::~UIConfigurationManager() } // XComponent -void SAL_CALL UIConfigurationManager::dispose() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UIConfigurationManager::dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) { Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY ); @@ -736,7 +736,7 @@ void SAL_CALL UIConfigurationManager::dispose() throw (::com::sun::star::uno::Ru } } -void SAL_CALL UIConfigurationManager::addEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UIConfigurationManager::addEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { { ResetableGuard aGuard( m_aLock ); @@ -749,14 +749,14 @@ void SAL_CALL UIConfigurationManager::addEventListener( const Reference< XEventL m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener ); } -void SAL_CALL UIConfigurationManager::removeEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UIConfigurationManager::removeEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener ); } // XUIConfigurationManager -void SAL_CALL UIConfigurationManager::addConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UIConfigurationManager::addConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { { ResetableGuard aGuard( m_aLock ); @@ -769,14 +769,14 @@ void SAL_CALL UIConfigurationManager::addConfigurationListener( const Reference< m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< XUIConfigurationListener >* ) NULL ), xListener ); } -void SAL_CALL UIConfigurationManager::removeConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UIConfigurationManager::removeConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XUIConfigurationListener >* ) NULL ), xListener ); } -void SAL_CALL UIConfigurationManager::reset() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UIConfigurationManager::reset() throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); @@ -862,7 +862,7 @@ void SAL_CALL UIConfigurationManager::reset() throw (::com::sun::star::uno::Runt } Sequence< Sequence< PropertyValue > > SAL_CALL UIConfigurationManager::getUIElementsInfo( sal_Int16 ElementType ) -throw ( IllegalArgumentException, RuntimeException ) +throw ( IllegalArgumentException, RuntimeException, std::exception ) { if (( ElementType < 0 ) || ( ElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); @@ -901,7 +901,7 @@ throw ( IllegalArgumentException, RuntimeException ) return aElementInfoSeq; } -Reference< XIndexContainer > SAL_CALL UIConfigurationManager::createSettings() throw (::com::sun::star::uno::RuntimeException) +Reference< XIndexContainer > SAL_CALL UIConfigurationManager::createSettings() throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); @@ -913,7 +913,7 @@ Reference< XIndexContainer > SAL_CALL UIConfigurationManager::createSettings() t } sal_Bool SAL_CALL UIConfigurationManager::hasSettings( const OUString& ResourceURL ) -throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); @@ -931,7 +931,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:: } Reference< XIndexAccess > SAL_CALL UIConfigurationManager::getSettings( const OUString& ResourceURL, sal_Bool bWriteable ) -throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); @@ -960,7 +960,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la } void SAL_CALL UIConfigurationManager::replaceSettings( const OUString& ResourceURL, const Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) -throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException, std::exception) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); @@ -1018,7 +1018,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la } void SAL_CALL UIConfigurationManager::removeSettings( const OUString& ResourceURL ) -throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException, RuntimeException) +throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException, RuntimeException, std::exception) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); @@ -1075,7 +1075,7 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException } void SAL_CALL UIConfigurationManager::insertSettings( const OUString& NewResourceURL, const Reference< XIndexAccess >& aNewData ) -throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, RuntimeException ) +throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, RuntimeException, std::exception ) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( NewResourceURL ); @@ -1147,7 +1147,7 @@ throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, } } -Reference< XInterface > SAL_CALL UIConfigurationManager::getImageManager() throw (::com::sun::star::uno::RuntimeException) +Reference< XInterface > SAL_CALL UIConfigurationManager::getImageManager() throw (::com::sun::star::uno::RuntimeException, std::exception) { if ( m_bDisposed ) throw DisposedException(); @@ -1173,7 +1173,7 @@ Reference< XInterface > SAL_CALL UIConfigurationManager::getImageManager() throw return Reference< XInterface >( m_xImageManager, UNO_QUERY ); } -Reference< XAcceleratorConfiguration > SAL_CALL UIConfigurationManager::getShortCutManager() throw (::com::sun::star::uno::RuntimeException) +Reference< XAcceleratorConfiguration > SAL_CALL UIConfigurationManager::getShortCutManager() throw (::com::sun::star::uno::RuntimeException, std::exception) { // SAFE -> ResetableGuard aGuard( m_aLock ); @@ -1192,13 +1192,13 @@ Reference< XAcceleratorConfiguration > SAL_CALL UIConfigurationManager::getShort return m_xAccConfig; } -Reference< XInterface > SAL_CALL UIConfigurationManager::getEventsManager() throw (::com::sun::star::uno::RuntimeException) +Reference< XInterface > SAL_CALL UIConfigurationManager::getEventsManager() throw (::com::sun::star::uno::RuntimeException, std::exception) { return Reference< XInterface >(); } // XUIConfigurationStorage -void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& Storage ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& Storage ) throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); @@ -1258,7 +1258,7 @@ void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& S impl_Initialize(); } -sal_Bool SAL_CALL UIConfigurationManager::hasStorage() throw (::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL UIConfigurationManager::hasStorage() throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); @@ -1269,7 +1269,7 @@ sal_Bool SAL_CALL UIConfigurationManager::hasStorage() throw (::com::sun::star:: } // XUIConfigurationPersistence -void SAL_CALL UIConfigurationManager::reload() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) +void SAL_CALL UIConfigurationManager::reload() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); @@ -1308,7 +1308,7 @@ void SAL_CALL UIConfigurationManager::reload() throw (::com::sun::star::uno::Exc } } -void SAL_CALL UIConfigurationManager::store() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) +void SAL_CALL UIConfigurationManager::store() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); @@ -1341,7 +1341,7 @@ void SAL_CALL UIConfigurationManager::store() throw (::com::sun::star::uno::Exce } } -void SAL_CALL UIConfigurationManager::storeToStorage( const Reference< XStorage >& Storage ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) +void SAL_CALL UIConfigurationManager::storeToStorage( const Reference< XStorage >& Storage ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); @@ -1374,14 +1374,14 @@ void SAL_CALL UIConfigurationManager::storeToStorage( const Reference< XStorage } } -sal_Bool SAL_CALL UIConfigurationManager::isModified() throw (::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL UIConfigurationManager::isModified() throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); return m_bModified; } -sal_Bool SAL_CALL UIConfigurationManager::isReadOnly() throw (::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL UIConfigurationManager::isReadOnly() throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx index f825e9d16e68..a1d78b2c42d3 100644 --- a/framework/source/uiconfiguration/windowstateconfiguration.cxx +++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx @@ -110,39 +110,39 @@ class ConfigurationAccess_WindowState : public ::cppu::WeakImplHelper2< XNameCo // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) - throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XNameContainer virtual void SAL_CALL removeByName( const OUString& sName ) - throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException ); + throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ); 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 ); + throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ); // 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 ); + throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ); // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // container.XContainerListener - virtual void SAL_CALL elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException); - virtual void SAL_CALL elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException); - virtual void SAL_CALL elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException); + virtual void SAL_CALL elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception); + virtual void SAL_CALL elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception); + virtual void SAL_CALL elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception); // lang.XEventListener - virtual void SAL_CALL disposing( const EventObject& aEvent ) throw(RuntimeException); + virtual void SAL_CALL disposing( const EventObject& aEvent ) throw(RuntimeException, std::exception); protected: enum WindowStateMask @@ -253,7 +253,7 @@ ConfigurationAccess_WindowState::~ConfigurationAccess_WindowState() // XNameAccess Any SAL_CALL ConfigurationAccess_WindowState::getByName( const OUString& rResourceURL ) -throw ( NoSuchElementException, WrappedTargetException, RuntimeException) +throw ( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { // SAFE osl::MutexGuard g(m_aMutex); @@ -272,7 +272,7 @@ throw ( NoSuchElementException, WrappedTargetException, RuntimeException) } Sequence< OUString > SAL_CALL ConfigurationAccess_WindowState::getElementNames() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { // SAFE osl::MutexGuard g(m_aMutex); @@ -290,7 +290,7 @@ throw ( RuntimeException ) } sal_Bool SAL_CALL ConfigurationAccess_WindowState::hasByName( const OUString& rResourceURL ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { // SAFE osl::MutexGuard g(m_aMutex); @@ -310,13 +310,13 @@ throw (::com::sun::star::uno::RuntimeException) // XElementAccess Type SAL_CALL ConfigurationAccess_WindowState::getElementType() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { return( ::getCppuType( (const Sequence< PropertyValue >*)NULL ) ); } sal_Bool SAL_CALL ConfigurationAccess_WindowState::hasElements() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { // SAFE osl::MutexGuard g(m_aMutex); @@ -335,7 +335,7 @@ throw ( RuntimeException ) // XNameContainer void SAL_CALL ConfigurationAccess_WindowState::removeByName( const OUString& rResourceURL ) -throw( NoSuchElementException, WrappedTargetException, RuntimeException ) +throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) { // SAFE osl::ResettableMutexGuard g(m_aMutex); @@ -370,7 +370,7 @@ throw( NoSuchElementException, WrappedTargetException, RuntimeException ) } void SAL_CALL ConfigurationAccess_WindowState::insertByName( const OUString& rResourceURL, const css::uno::Any& aPropertySet ) -throw( IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException ) +throw( IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception ) { // SAFE osl::ResettableMutexGuard g(m_aMutex); @@ -435,7 +435,7 @@ throw( IllegalArgumentException, ElementExistException, WrappedTargetException, // XNameReplace void SAL_CALL ConfigurationAccess_WindowState::replaceByName( const OUString& rResourceURL, const css::uno::Any& aPropertySet ) -throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException ) +throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) { // SAFE osl::ResettableMutexGuard g(m_aMutex); @@ -506,21 +506,21 @@ throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, } // container.XContainerListener -void SAL_CALL ConfigurationAccess_WindowState::elementInserted( const ContainerEvent& ) throw(RuntimeException) +void SAL_CALL ConfigurationAccess_WindowState::elementInserted( const ContainerEvent& ) throw(RuntimeException, std::exception) { // 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) +void SAL_CALL ConfigurationAccess_WindowState::elementRemoved ( const ContainerEvent& ) throw(RuntimeException, std::exception) { } -void SAL_CALL ConfigurationAccess_WindowState::elementReplaced( const ContainerEvent& ) throw(RuntimeException) +void SAL_CALL ConfigurationAccess_WindowState::elementReplaced( const ContainerEvent& ) throw(RuntimeException, std::exception) { } // lang.XEventListener -void SAL_CALL ConfigurationAccess_WindowState::disposing( const EventObject& aEvent ) throw(RuntimeException) +void SAL_CALL ConfigurationAccess_WindowState::disposing( const EventObject& aEvent ) throw(RuntimeException, std::exception) { // SAFE // remove our reference to the config access @@ -1279,19 +1279,19 @@ public: virtual ~WindowStateConfiguration(); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.WindowStateConfiguration"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.ui.WindowStateConfiguration"); @@ -1300,19 +1300,19 @@ public: // XNameAccess virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) - throw ( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException); + throw ( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XElementAccess virtual css::uno::Type SAL_CALL getElementType() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasElements() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); typedef ::boost::unordered_map< OUString, OUString, @@ -1385,7 +1385,7 @@ WindowStateConfiguration::~WindowStateConfiguration() } Any SAL_CALL WindowStateConfiguration::getByName( const OUString& aModuleIdentifier ) -throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); @@ -1417,7 +1417,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la } Sequence< OUString > SAL_CALL WindowStateConfiguration::getElementNames() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); @@ -1435,7 +1435,7 @@ throw (::com::sun::star::uno::RuntimeException) } sal_Bool SAL_CALL WindowStateConfiguration::hasByName( const OUString& aName ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); @@ -1445,13 +1445,13 @@ throw (::com::sun::star::uno::RuntimeException) // XElementAccess Type SAL_CALL WindowStateConfiguration::getElementType() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { return( ::getCppuType( (const Reference< XNameAccess >*)NULL ) ); } sal_Bool SAL_CALL WindowStateConfiguration::hasElements() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { // We always have at least one module. So it is valid to return true! return sal_True; diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index aa6aaf01f867..1a95e500ae6b 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -139,7 +139,7 @@ static Image RetrieveImage( Reference< com::sun::star::frame::XFrame >& rFrame, } // XComponent -void SAL_CALL AddonsToolBarManager::dispose() throw( RuntimeException ) +void SAL_CALL AddonsToolBarManager::dispose() throw( RuntimeException, std::exception ) { Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY ); diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx index 2c6c04d1612f..e0aa84977032 100644 --- a/framework/source/uielement/addonstoolbarwrapper.cxx +++ b/framework/source/uielement/addonstoolbarwrapper.cxx @@ -64,7 +64,7 @@ AddonsToolBarWrapper::~AddonsToolBarWrapper() } // XComponent -void SAL_CALL AddonsToolBarWrapper::dispose() throw ( RuntimeException ) +void SAL_CALL AddonsToolBarWrapper::dispose() throw ( RuntimeException, std::exception ) { Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY ); @@ -81,7 +81,7 @@ void SAL_CALL AddonsToolBarWrapper::dispose() throw ( RuntimeException ) } // XInitialization -void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException ) +void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception ) { ResetableGuard aLock( m_aLock ); @@ -143,7 +143,7 @@ void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArgument } // XUIElement interface -Reference< XInterface > SAL_CALL AddonsToolBarWrapper::getRealInterface() throw (::com::sun::star::uno::RuntimeException) +Reference< XInterface > SAL_CALL AddonsToolBarWrapper::getRealInterface() throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aLock( m_aLock ); diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx index 09a70da6b292..d09fb90d693a 100644 --- a/framework/source/uielement/buttontoolbarcontroller.cxx +++ b/framework/source/uielement/buttontoolbarcontroller.cxx @@ -73,7 +73,7 @@ ButtonToolbarController::~ButtonToolbarController() // XInterface uno::Any SAL_CALL ButtonToolbarController::queryInterface( const uno::Type& rType ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { Any a = ::cppu::queryInterface( rType , @@ -102,7 +102,7 @@ void SAL_CALL ButtonToolbarController::release() throw () // XInitialization void SAL_CALL ButtonToolbarController::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) -throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) { bool bInitialized( true ); @@ -140,7 +140,7 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException } // XComponent -void SAL_CALL ButtonToolbarController::dispose() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ButtonToolbarController::dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) { Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY ); @@ -159,21 +159,21 @@ void SAL_CALL ButtonToolbarController::dispose() throw (::com::sun::star::uno::R void SAL_CALL ButtonToolbarController::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { // do nothing } void SAL_CALL ButtonToolbarController::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { // do nothing } // XUpdatable void SAL_CALL ButtonToolbarController::update() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarMutexGuard; if ( m_bDisposed ) @@ -183,7 +183,7 @@ throw (::com::sun::star::uno::RuntimeException) // XEventListener void SAL_CALL ButtonToolbarController::disposing( const com::sun::star::lang::EventObject& Source ) -throw ( ::com::sun::star::uno::RuntimeException ) +throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { uno::Reference< uno::XInterface > xSource( Source.Source ); @@ -198,7 +198,7 @@ throw ( ::com::sun::star::uno::RuntimeException ) } void SAL_CALL ButtonToolbarController::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& ) -throw ( ::com::sun::star::uno::RuntimeException ) +throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { // do nothing if ( m_bDisposed ) @@ -207,7 +207,7 @@ throw ( ::com::sun::star::uno::RuntimeException ) // XToolbarController void SAL_CALL ButtonToolbarController::execute( sal_Int16 KeyModifier ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { uno::Reference< frame::XDispatch > xDispatch; uno::Reference< frame::XFrame > xFrame; @@ -264,7 +264,7 @@ throw (::com::sun::star::uno::RuntimeException) } void SAL_CALL ButtonToolbarController::click() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarMutexGuard; @@ -276,7 +276,7 @@ throw (::com::sun::star::uno::RuntimeException) } void SAL_CALL ButtonToolbarController::doubleClick() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { // do nothing if ( m_bDisposed ) @@ -284,7 +284,7 @@ throw (::com::sun::star::uno::RuntimeException) } uno::Reference< awt::XWindow > SAL_CALL ButtonToolbarController::createPopupWindow() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { if ( m_bDisposed ) throw DisposedException(); @@ -294,7 +294,7 @@ throw (::com::sun::star::uno::RuntimeException) uno::Reference< awt::XWindow > SAL_CALL ButtonToolbarController::createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { if ( m_bDisposed ) throw DisposedException(); diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx index 0049f6f21ecd..eb80188c2c26 100644 --- a/framework/source/uielement/comboboxtoolbarcontroller.cxx +++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx @@ -168,7 +168,7 @@ ComboboxToolbarController::~ComboboxToolbarController() void SAL_CALL ComboboxToolbarController::dispose() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx index 386a20711b96..7ce3c45a1243 100644 --- a/framework/source/uielement/complextoolbarcontroller.cxx +++ b/framework/source/uielement/complextoolbarcontroller.cxx @@ -75,7 +75,7 @@ ComplexToolbarController::~ComplexToolbarController() void SAL_CALL ComplexToolbarController::dispose() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; @@ -99,7 +99,7 @@ Sequence<PropertyValue> ComplexToolbarController::getExecuteArgs(sal_Int16 KeyMo } void SAL_CALL ComplexToolbarController::execute( sal_Int16 KeyModifier ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { Reference< XDispatch > xDispatch; Reference< XURLTransformer > xURLTransformer; @@ -139,7 +139,7 @@ throw ( RuntimeException ) void ComplexToolbarController::statusChanged( const FeatureStateEvent& Event ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index c6bb47a9aae9..67b67d28715a 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -183,19 +183,19 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.ControlMenuController"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.frame.PopupMenuController"); @@ -204,19 +204,19 @@ public: // XPopupMenuController - virtual void SAL_CALL updatePopupMenu() throw (uno::RuntimeException); + virtual void SAL_CALL updatePopupMenu() throw (uno::RuntimeException, std::exception); // XInitialization - virtual void SAL_CALL initialize( const uno::Sequence< uno::Any >& aArguments ) throw (uno::Exception, uno::RuntimeException); + virtual void SAL_CALL initialize( const uno::Sequence< uno::Any >& aArguments ) throw (uno::Exception, uno::RuntimeException, std::exception); // XStatusListener - virtual void SAL_CALL statusChanged( const frame::FeatureStateEvent& Event ) throw ( uno::RuntimeException ); + virtual void SAL_CALL statusChanged( const frame::FeatureStateEvent& Event ) throw ( uno::RuntimeException, std::exception ); // XMenuListener - virtual void SAL_CALL itemActivated( const awt::MenuEvent& rEvent ) throw (uno::RuntimeException); + virtual void SAL_CALL itemActivated( const awt::MenuEvent& rEvent ) throw (uno::RuntimeException, std::exception); // XEventListener - virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw ( uno::RuntimeException ); + virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw ( uno::RuntimeException, std::exception ); private: virtual void impl_setPopupMenu(); @@ -295,7 +295,7 @@ void ControlMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rP } // XEventListener -void SAL_CALL ControlMenuController::disposing( const EventObject& ) throw ( RuntimeException ) +void SAL_CALL ControlMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception ) { Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY ); @@ -310,7 +310,7 @@ void SAL_CALL ControlMenuController::disposing( const EventObject& ) throw ( Run } // XStatusListener -void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException ) +void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception ) { osl::ResettableMutexGuard aLock( m_aMutex ); @@ -373,7 +373,7 @@ void ControlMenuController::impl_select(const Reference< XDispatch >& /*_xDispat } } -void SAL_CALL ControlMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException) +void SAL_CALL ControlMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException, std::exception) { osl::ResettableMutexGuard aLock( m_aMutex ); @@ -422,7 +422,7 @@ void ControlMenuController::impl_setPopupMenu() } // if ( m_pResPopupMenu == 0 ) } -void SAL_CALL ControlMenuController::updatePopupMenu() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ControlMenuController::updatePopupMenu() throw (::com::sun::star::uno::RuntimeException, std::exception) { osl::ResettableMutexGuard aLock( m_aMutex ); @@ -452,7 +452,7 @@ void SAL_CALL ControlMenuController::updatePopupMenu() throw (::com::sun::star:: } // XInitialization -void SAL_CALL ControlMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException ) +void SAL_CALL ControlMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception ) { osl::ResettableMutexGuard aLock( m_aMutex ); svt::PopupMenuControllerBase::initialize(aArguments); diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx index fef232b39d45..36d30ed28e2b 100644 --- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx +++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx @@ -152,7 +152,7 @@ DropdownToolbarController::~DropdownToolbarController() void SAL_CALL DropdownToolbarController::dispose() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx index 211de6c724df..6c62b6b69817 100644 --- a/framework/source/uielement/edittoolbarcontroller.cxx +++ b/framework/source/uielement/edittoolbarcontroller.cxx @@ -149,7 +149,7 @@ EditToolbarController::~EditToolbarController() void SAL_CALL EditToolbarController::dispose() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx index 1f243371660d..be85882478f6 100644 --- a/framework/source/uielement/fontmenucontroller.cxx +++ b/framework/source/uielement/fontmenucontroller.cxx @@ -116,7 +116,7 @@ void FontMenuController::fillPopupMenu( const Sequence< OUString >& rFontNameSeq } // XEventListener -void SAL_CALL FontMenuController::disposing( const EventObject& ) throw ( RuntimeException ) +void SAL_CALL FontMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception ) { Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY ); @@ -131,7 +131,7 @@ void SAL_CALL FontMenuController::disposing( const EventObject& ) throw ( Runtim } // XStatusListener -void SAL_CALL FontMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException ) +void SAL_CALL FontMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception ) { com::sun::star::awt::FontDescriptor aFontDescriptor; Sequence< OUString > aFontNameSeq; @@ -158,7 +158,7 @@ void FontMenuController::impl_select(const Reference< XDispatch >& _xDispatch,co _xDispatch->dispatch( aTargetURL, aArgs ); } -void SAL_CALL FontMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException) +void SAL_CALL FontMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException, std::exception) { osl::MutexGuard aLock( m_aMutex ); @@ -207,7 +207,7 @@ void FontMenuController::impl_setPopupMenu() m_xFontListDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); } -void SAL_CALL FontMenuController::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL FontMenuController::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { svt::PopupMenuControllerBase::updatePopupMenu(); diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx index 69625f061181..124c29212aa7 100644 --- a/framework/source/uielement/fontsizemenucontroller.cxx +++ b/framework/source/uielement/fontsizemenucontroller.cxx @@ -243,7 +243,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r } // XEventListener -void SAL_CALL FontSizeMenuController::disposing( const EventObject& ) throw ( RuntimeException ) +void SAL_CALL FontSizeMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception ) { Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY ); @@ -257,7 +257,7 @@ void SAL_CALL FontSizeMenuController::disposing( const EventObject& ) throw ( Ru } // XStatusListener -void SAL_CALL FontSizeMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException ) +void SAL_CALL FontSizeMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception ) { com::sun::star::awt::FontDescriptor aFontDescriptor; ::com::sun::star::frame::status::FontHeight aFontHeight; @@ -304,7 +304,7 @@ void FontSizeMenuController::impl_setPopupMenu() m_xCurrentFontDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); } -void SAL_CALL FontSizeMenuController::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL FontSizeMenuController::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { osl::ClearableMutexGuard aLock( m_aMutex ); diff --git a/framework/source/uielement/genericstatusbarcontroller.cxx b/framework/source/uielement/genericstatusbarcontroller.cxx index 62e19d00858a..2133045074c5 100644 --- a/framework/source/uielement/genericstatusbarcontroller.cxx +++ b/framework/source/uielement/genericstatusbarcontroller.cxx @@ -70,7 +70,7 @@ GenericStatusbarController::~GenericStatusbarController() } void SAL_CALL GenericStatusbarController::dispose() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { svt::StatusbarController::dispose(); @@ -83,7 +83,7 @@ throw ( RuntimeException ) void SAL_CALL GenericStatusbarController::statusChanged( const FeatureStateEvent& rEvent) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -124,7 +124,7 @@ void SAL_CALL GenericStatusbarController::paint( const Reference< awt::XGraphics >& xGraphics, const awt::Rectangle& rOutputRectangle, ::sal_Int32 /*nStyle*/ ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { OSL_TRACE("framework::GenericStatusbarController::paint"); SolarMutexGuard aGuard; diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index 61cfb09a96fd..f5fdc40b13ba 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -120,7 +120,7 @@ GenericToolbarController::~GenericToolbarController() } void SAL_CALL GenericToolbarController::dispose() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; @@ -131,7 +131,7 @@ throw ( RuntimeException ) } void SAL_CALL GenericToolbarController::execute( sal_Int16 KeyModifier ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { Reference< XDispatch > xDispatch; Reference< XURLTransformer > xURLTransformer; @@ -178,7 +178,7 @@ throw ( RuntimeException ) } void GenericToolbarController::statusChanged( const FeatureStateEvent& Event ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; @@ -338,13 +338,13 @@ Toolbarmenu::~Toolbarmenu() OSL_TRACE("**** destructing Toolbarmenu 0x%x", this ); } -void SAL_CALL MenuToolbarController::click() throw (RuntimeException) +void SAL_CALL MenuToolbarController::click() throw (RuntimeException, std::exception) { createPopupWindow(); } Reference< XWindow > SAL_CALL -MenuToolbarController::createPopupWindow() throw (::com::sun::star::uno::RuntimeException) +MenuToolbarController::createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception) { if ( !pMenu ) { diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx index f0656db07bd4..273956e6c68a 100644 --- a/framework/source/uielement/headermenucontroller.cxx +++ b/framework/source/uielement/headermenucontroller.cxx @@ -185,7 +185,7 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra } // XEventListener -void SAL_CALL HeaderMenuController::disposing( const EventObject& ) throw ( RuntimeException ) +void SAL_CALL HeaderMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception ) { Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY ); @@ -199,7 +199,7 @@ void SAL_CALL HeaderMenuController::disposing( const EventObject& ) throw ( Runt } // XStatusListener -void SAL_CALL HeaderMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException ) +void SAL_CALL HeaderMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception ) { Reference< com::sun::star::frame::XModel > xModel; @@ -221,7 +221,7 @@ void HeaderMenuController::impl_select(const Reference< XDispatch >& _xDispatch, _xDispatch->dispatch( aTargetURL, aArgs ); } -void SAL_CALL HeaderMenuController::updatePopupMenu() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL HeaderMenuController::updatePopupMenu() throw (::com::sun::star::uno::RuntimeException, std::exception) { osl::ResettableMutexGuard aLock( m_aMutex ); diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx index 3065fe785c8a..f86f59fcf697 100644 --- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx @@ -123,7 +123,7 @@ ImageButtonToolbarController::~ImageButtonToolbarController() void SAL_CALL ImageButtonToolbarController::dispose() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; ComplexToolbarController::dispose(); diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index e2c982cd902c..1d736eb8d633 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -86,7 +86,7 @@ LanguageSelectionMenuController::~LanguageSelectionMenuController() } // XEventListener -void SAL_CALL LanguageSelectionMenuController::disposing( const EventObject& ) throw ( RuntimeException ) +void SAL_CALL LanguageSelectionMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception ) { Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY ); @@ -101,7 +101,7 @@ void SAL_CALL LanguageSelectionMenuController::disposing( const EventObject& ) t } // XStatusListener -void SAL_CALL LanguageSelectionMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException ) +void SAL_CALL LanguageSelectionMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; @@ -278,7 +278,7 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup } -void SAL_CALL LanguageSelectionMenuController::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL LanguageSelectionMenuController::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { svt::PopupMenuControllerBase::updatePopupMenu(); @@ -313,7 +313,7 @@ void SAL_CALL LanguageSelectionMenuController::updatePopupMenu() throw ( ::com:: } // XInitialization -void SAL_CALL LanguageSelectionMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException ) +void SAL_CALL LanguageSelectionMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception ) { osl::MutexGuard aLock( m_aMutex ); diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index f06197afc9ab..af1ec30368e1 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -104,17 +104,17 @@ public: } // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException); + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception); // XStatusListener - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException ); + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ); // 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); - virtual void SAL_CALL click( const css::awt::Point& aPos ) throw (css::uno::RuntimeException); + const css::uno::Any& aData ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL click( const css::awt::Point& aPos ) throw (css::uno::RuntimeException, std::exception); private: virtual ~LangSelectionStatusbarController() {} @@ -141,7 +141,7 @@ 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) +throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarMutexGuard; @@ -293,7 +293,7 @@ void SAL_CALL LangSelectionStatusbarController::command( ::sal_Int32 nCommand, ::sal_Bool /*bMouseEvent*/, const css::uno::Any& /*aData*/ ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { if ( nCommand & ::awt::Command::CONTEXTMENU ) { @@ -303,14 +303,14 @@ throw (css::uno::RuntimeException) void SAL_CALL LangSelectionStatusbarController::click( const css::awt::Point& aPos ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { LangMenu( aPos ); } // XStatusListener void SAL_CALL LangSelectionStatusbarController::statusChanged( const FeatureStateEvent& Event ) -throw ( RuntimeException ) +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 99b3f570d9d6..5c0979180ac9 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -96,7 +96,7 @@ void MacrosMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPo } // XEventListener -void SAL_CALL MacrosMenuController::disposing( const EventObject& ) throw ( RuntimeException ) +void SAL_CALL MacrosMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception ) { Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY ); @@ -115,7 +115,7 @@ void SAL_CALL MacrosMenuController::disposing( const EventObject& ) throw ( Runt } // XStatusListener -void SAL_CALL MacrosMenuController::statusChanged( const FeatureStateEvent& ) throw ( RuntimeException ) +void SAL_CALL MacrosMenuController::statusChanged( const FeatureStateEvent& ) throw ( RuntimeException, std::exception ) { osl::MutexGuard aLock( m_aMutex ); if ( m_xPopupMenu.is() ) diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 05e914929041..228e7a3ff938 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -128,7 +128,7 @@ class StringLength : public ::cppu::WeakImplHelper1< ::com::sun::star::util::XSt // XStringWidth sal_Int32 SAL_CALL queryStringWidth( const OUString& aString ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return aString.getLength(); } @@ -226,7 +226,7 @@ MenuBarManager::MenuBarManager( Init(rFrame,pAddonPopupMenu,bDelete,bDeleteChildren,true); } -Any SAL_CALL MenuBarManager::queryInterface( const Type & rType ) throw ( RuntimeException ) +Any SAL_CALL MenuBarManager::queryInterface( const Type & rType ) throw ( RuntimeException, std::exception ) { Any a = ::cppu::queryInterface( rType , @@ -256,7 +256,7 @@ void SAL_CALL MenuBarManager::release() throw() } -Any SAL_CALL MenuBarManager::getMenuHandle( const Sequence< sal_Int8 >& /*ProcessId*/, sal_Int16 SystemType ) throw (RuntimeException) +Any SAL_CALL MenuBarManager::getMenuHandle( const Sequence< sal_Int8 >& /*ProcessId*/, sal_Int16 SystemType ) throw (RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); @@ -327,7 +327,7 @@ void MenuBarManager::Destroy() } // XComponent -void SAL_CALL MenuBarManager::dispose() throw( RuntimeException ) +void SAL_CALL MenuBarManager::dispose() throw( RuntimeException, std::exception ) { Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY ); @@ -377,7 +377,7 @@ void SAL_CALL MenuBarManager::dispose() throw( RuntimeException ) } } -void SAL_CALL MenuBarManager::addEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException ) +void SAL_CALL MenuBarManager::addEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -388,7 +388,7 @@ void SAL_CALL MenuBarManager::addEventListener( const Reference< XEventListener m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener ); } -void SAL_CALL MenuBarManager::removeEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException ) +void SAL_CALL MenuBarManager::removeEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); /* SAFE AREA ----------------------------------------------------------------------------------------------- */ @@ -396,7 +396,7 @@ void SAL_CALL MenuBarManager::removeEventListener( const Reference< XEventListen } void SAL_CALL MenuBarManager::elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); @@ -412,20 +412,20 @@ throw (RuntimeException) } void SAL_CALL MenuBarManager::elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { elementInserted(Event); } void SAL_CALL MenuBarManager::elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { elementInserted(Event); } // XFrameActionListener void SAL_CALL MenuBarManager::frameAction( const FrameActionEvent& Action ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -446,7 +446,7 @@ throw ( RuntimeException ) // XStatusListener void SAL_CALL MenuBarManager::statusChanged( const FeatureStateEvent& Event ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { OUString aFeatureURL = Event.FeatureURL.Complete; @@ -653,7 +653,7 @@ void MenuBarManager::RemoveListener() m_xFrame = 0; } -void SAL_CALL MenuBarManager::disposing( const EventObject& Source ) throw ( RuntimeException ) +void SAL_CALL MenuBarManager::disposing( const EventObject& Source ) throw ( RuntimeException, std::exception ) { MenuItemHandler* pMenuItemDisposing = NULL; @@ -775,7 +775,7 @@ private: virtual com::sun::star::uno::Any SAL_CALL getValueByName( OUString const & Name) - throw (com::sun::star::uno::RuntimeException) + throw (com::sun::star::uno::RuntimeException, std::exception) { 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 e822785c5c17..67ca57f3a945 100644 --- a/framework/source/uielement/menubarwrapper.cxx +++ b/framework/source/uielement/menubarwrapper.cxx @@ -94,7 +94,7 @@ MenuBarWrapper::~MenuBarWrapper() { } -void SAL_CALL MenuBarWrapper::dispose() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL MenuBarWrapper::dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) { Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY ); @@ -113,7 +113,7 @@ void SAL_CALL MenuBarWrapper::dispose() throw (::com::sun::star::uno::RuntimeExc } // XInitialization -void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException ) +void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception ) { ResetableGuard aLock( m_aLock ); @@ -203,7 +203,7 @@ void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) th } // XUIElementSettings -void SAL_CALL MenuBarWrapper::updateSettings() throw ( RuntimeException ) +void SAL_CALL MenuBarWrapper::updateSettings() throw ( RuntimeException, std::exception ) { ResetableGuard aLock( m_aLock ); @@ -256,13 +256,13 @@ void MenuBarWrapper::fillPopupControllerCache() // XElementAccess Type SAL_CALL MenuBarWrapper::getElementType() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { return ::getCppuType(( Reference< XDispatchProvider >*)0); } ::sal_Bool SAL_CALL MenuBarWrapper::hasElements() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aLock( m_aLock ); @@ -278,7 +278,7 @@ Any SAL_CALL MenuBarWrapper::getByName( const OUString& aName ) throw ( container::NoSuchElementException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { ResetableGuard aLock( m_aLock ); @@ -299,7 +299,7 @@ throw ( container::NoSuchElementException, } Sequence< OUString > SAL_CALL MenuBarWrapper::getElementNames() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aLock( m_aLock ); @@ -323,7 +323,7 @@ throw (::com::sun::star::uno::RuntimeException) ::sal_Bool SAL_CALL MenuBarWrapper::hasByName( const OUString& aName ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aLock( m_aLock ); @@ -340,7 +340,7 @@ throw (::com::sun::star::uno::RuntimeException) } // XUIElement -Reference< XInterface > SAL_CALL MenuBarWrapper::getRealInterface() throw ( RuntimeException ) +Reference< XInterface > SAL_CALL MenuBarWrapper::getRealInterface() throw ( RuntimeException, std::exception ) { if ( m_bDisposed ) throw DisposedException(); diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index 16da1544849d..73e5a2ac1d5e 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 ) +void SAL_CALL NewMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception ) { Reference< css::awt::XMenuListener > xHolder(( 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 ) +void SAL_CALL NewMenuController::statusChanged( const FeatureStateEvent& ) throw ( RuntimeException, std::exception ) { } // XMenuListener -void SAL_CALL NewMenuController::itemSelected( const css::awt::MenuEvent& rEvent ) throw (RuntimeException) +void SAL_CALL NewMenuController::itemSelected( const css::awt::MenuEvent& rEvent ) throw (RuntimeException, std::exception) { Reference< css::awt::XPopupMenu > xPopupMenu; Reference< XDispatch > xDispatch; @@ -443,7 +443,7 @@ void SAL_CALL NewMenuController::itemSelected( const css::awt::MenuEvent& rEvent } } -void SAL_CALL NewMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException) +void SAL_CALL NewMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarMutexGuard; if ( m_xFrame.is() && m_xPopupMenu.is() ) @@ -508,7 +508,7 @@ void NewMenuController::impl_setPopupMenu() } // XInitialization -void SAL_CALL NewMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException ) +void SAL_CALL NewMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception ) { osl::MutexGuard aLock( m_aMutex ); diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx index 618171c1e785..e270f3c287d0 100644 --- a/framework/source/uielement/objectmenucontroller.cxx +++ b/framework/source/uielement/objectmenucontroller.cxx @@ -62,19 +62,19 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.ObjectMenuController"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.frame.PopupMenuController"); @@ -82,10 +82,10 @@ public: } // XStatusListener - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException ); + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ); // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException ); + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception ); private: void fillPopupMenu( const css::uno::Sequence< css::embed::VerbDescriptor >& rVerbCommandSeq, css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu ); @@ -136,7 +136,7 @@ void ObjectMenuController::fillPopupMenu( const Sequence< com::sun::star::embed: } // XEventListener -void SAL_CALL ObjectMenuController::disposing( const EventObject& ) throw ( RuntimeException ) +void SAL_CALL ObjectMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception ) { Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY ); @@ -151,7 +151,7 @@ void SAL_CALL ObjectMenuController::disposing( const EventObject& ) throw ( Runt } // XStatusListener -void SAL_CALL ObjectMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException ) +void SAL_CALL ObjectMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception ) { Sequence < com::sun::star::embed::VerbDescriptor > aVerbCommandSeq; if ( Event.State >>= aVerbCommandSeq ) diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index f16bf43fc9e0..e0ce22aba52e 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -52,13 +52,13 @@ public: virtual ~PopupMenuToolbarController(); // XComponent - virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException ); + virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ); // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException); + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception); // XToolbarController - virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException); + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException, std::exception); // XStatusListener - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException ); + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ); protected: PopupMenuToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, @@ -92,7 +92,7 @@ PopupMenuToolbarController::~PopupMenuToolbarController() } void SAL_CALL PopupMenuToolbarController::dispose() -throw ( css::uno::RuntimeException ) +throw ( css::uno::RuntimeException, std::exception ) { svt::ToolboxController::dispose(); @@ -120,7 +120,7 @@ throw ( css::uno::RuntimeException ) void SAL_CALL PopupMenuToolbarController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) -throw ( css::uno::Exception, css::uno::RuntimeException ) +throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) { ToolboxController::initialize( aArguments ); @@ -157,7 +157,7 @@ throw ( css::uno::Exception, css::uno::RuntimeException ) } void SAL_CALL PopupMenuToolbarController::statusChanged( const css::frame::FeatureStateEvent& rEvent ) - throw ( css::uno::RuntimeException ) + throw ( css::uno::RuntimeException, std::exception ) { // TODO move to base class @@ -167,7 +167,7 @@ void SAL_CALL PopupMenuToolbarController::statusChanged( const css::frame::Featu css::uno::Reference< css::awt::XWindow > SAL_CALL PopupMenuToolbarController::createPopupWindow() - throw ( css::uno::RuntimeException ) + throw ( css::uno::RuntimeException, std::exception ) { css::uno::Reference< css::awt::XWindow > xRet; @@ -352,12 +352,12 @@ public: css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); - void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException); + void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception); private: void functionExecuted( const OUString &rCommand ); - void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException ); - void SAL_CALL execute( sal_Int16 KeyModifier ) throw (css::uno::RuntimeException); + void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ); + void SAL_CALL execute( sal_Int16 KeyModifier ) throw (css::uno::RuntimeException, std::exception); void setItemImage( const OUString &rCommand ); OUString m_aLastURL; @@ -391,7 +391,7 @@ css::uno::Sequence<OUString> NewToolbarController::getSupportedServiceNames() } void SAL_CALL NewToolbarController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) -throw ( css::uno::Exception, css::uno::RuntimeException ) +throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) { PopupMenuToolbarController::initialize( aArguments ); @@ -400,7 +400,7 @@ throw ( css::uno::Exception, css::uno::RuntimeException ) } void SAL_CALL NewToolbarController::statusChanged( const css::frame::FeatureStateEvent& rEvent ) - throw ( css::uno::RuntimeException ) + throw ( css::uno::RuntimeException, std::exception ) { if ( rEvent.IsEnabled ) { @@ -421,7 +421,7 @@ void SAL_CALL NewToolbarController::statusChanged( const css::frame::FeatureStat } void SAL_CALL NewToolbarController::execute( sal_Int16 /*KeyModifier*/ ) -throw ( css::uno::RuntimeException ) +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 9669cf7364ea..f00583735fb7 100644 --- a/framework/source/uielement/progressbarwrapper.cxx +++ b/framework/source/uielement/progressbarwrapper.cxx @@ -246,21 +246,21 @@ throw (uno::RuntimeException) // XInitialization void SAL_CALL ProgressBarWrapper::initialize( const uno::Sequence< uno::Any >& ) -throw (uno::Exception, uno::RuntimeException) +throw (uno::Exception, uno::RuntimeException, std::exception) { // dummy - do nothing } // XUpdatable void SAL_CALL ProgressBarWrapper::update() -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { // dummy - do nothing } // XComponent void SAL_CALL ProgressBarWrapper::dispose() -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { uno::Reference< lang::XComponent > xThis( static_cast< cppu::OWeakObject* >(this), @@ -298,7 +298,7 @@ throw (uno::RuntimeException) // XUIElement uno::Reference< uno::XInterface > SAL_CALL ProgressBarWrapper::getRealInterface() -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ // Ready for multithreading diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index 99cd85781e64..d181ac240fca 100644 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -64,19 +64,19 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.RecentFilesMenuController"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.frame.PopupMenuController"); @@ -84,20 +84,20 @@ public: } // XStatusListener - virtual void SAL_CALL statusChanged( const frame::FeatureStateEvent& Event ) throw ( uno::RuntimeException ); + virtual void SAL_CALL statusChanged( const frame::FeatureStateEvent& Event ) throw ( uno::RuntimeException, std::exception ); // XMenuListener - virtual void SAL_CALL itemSelected( const awt::MenuEvent& rEvent ) throw (uno::RuntimeException); - virtual void SAL_CALL itemActivated( const awt::MenuEvent& rEvent ) throw (uno::RuntimeException); + virtual void SAL_CALL itemSelected( const awt::MenuEvent& rEvent ) throw (uno::RuntimeException, std::exception); + virtual void SAL_CALL itemActivated( const awt::MenuEvent& rEvent ) throw (uno::RuntimeException, std::exception); // XDispatchProvider - virtual uno::Reference< frame::XDispatch > SAL_CALL queryDispatch( const util::URL& aURL, const OUString& sTarget, sal_Int32 nFlags ) throw( uno::RuntimeException ); + virtual uno::Reference< frame::XDispatch > SAL_CALL queryDispatch( const util::URL& aURL, const OUString& sTarget, sal_Int32 nFlags ) throw( uno::RuntimeException, std::exception ); // XDispatch - virtual void SAL_CALL dispatch( const util::URL& aURL, const uno::Sequence< beans::PropertyValue >& seqProperties ) throw( uno::RuntimeException ); + virtual void SAL_CALL dispatch( const util::URL& aURL, const uno::Sequence< beans::PropertyValue >& seqProperties ) throw( uno::RuntimeException, std::exception ); // XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( uno::RuntimeException ); + virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( uno::RuntimeException, std::exception ); DECL_STATIC_LINK( RecentFilesMenuController, ExecuteHdl_Impl, LoadRecentFile* ); @@ -290,7 +290,7 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex ) } // XEventListener -void SAL_CALL RecentFilesMenuController::disposing( const EventObject& ) throw ( RuntimeException ) +void SAL_CALL RecentFilesMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception ) { Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY ); @@ -304,13 +304,13 @@ void SAL_CALL RecentFilesMenuController::disposing( const EventObject& ) throw ( } // XStatusListener -void SAL_CALL RecentFilesMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException ) +void SAL_CALL RecentFilesMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception ) { osl::MutexGuard aLock( m_aMutex ); m_bDisabled = !Event.IsEnabled; } -void SAL_CALL RecentFilesMenuController::itemSelected( const css::awt::MenuEvent& rEvent ) throw (RuntimeException) +void SAL_CALL RecentFilesMenuController::itemSelected( const css::awt::MenuEvent& rEvent ) throw (RuntimeException, std::exception) { Reference< css::awt::XPopupMenu > xPopupMenu; @@ -336,7 +336,7 @@ void SAL_CALL RecentFilesMenuController::itemSelected( const css::awt::MenuEvent } } -void SAL_CALL RecentFilesMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException) +void SAL_CALL RecentFilesMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException, std::exception) { osl::MutexGuard aLock( m_aMutex ); impl_setPopupMenu(); @@ -354,7 +354,7 @@ Reference< XDispatch > SAL_CALL RecentFilesMenuController::queryDispatch( const URL& aURL, const OUString& /*sTarget*/, sal_Int32 /*nFlags*/ ) -throw( RuntimeException ) +throw( RuntimeException, std::exception ) { osl::MutexGuard aLock( m_aMutex ); @@ -370,7 +370,7 @@ throw( RuntimeException ) void SAL_CALL RecentFilesMenuController::dispatch( const URL& aURL, const Sequence< PropertyValue >& /*seqProperties*/ ) -throw( RuntimeException ) +throw( RuntimeException, std::exception ) { osl::MutexGuard aLock( m_aMutex ); diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx index b1c88f89fb31..100d7af2c31e 100644 --- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx +++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx @@ -210,7 +210,7 @@ SpinfieldToolbarController::~SpinfieldToolbarController() void SAL_CALL SpinfieldToolbarController::dispose() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; diff --git a/framework/source/uielement/statusbaritem.cxx b/framework/source/uielement/statusbaritem.cxx index 4a15b3a33495..a19e6f7f01fe 100644 --- a/framework/source/uielement/statusbaritem.cxx +++ b/framework/source/uielement/statusbaritem.cxx @@ -90,21 +90,21 @@ void SAL_CALL StatusbarItem::disposing() } OUString SAL_CALL StatusbarItem::getCommand() -throw (RuntimeException) +throw (RuntimeException, std::exception) { osl::MutexGuard aGuard( m_aMutex ); return m_aCommand; } ::sal_uInt16 SAL_CALL StatusbarItem::getItemId() -throw (RuntimeException) +throw (RuntimeException, std::exception) { osl::MutexGuard aGuard( m_aMutex ); return m_nId; } ::sal_uInt32 SAL_CALL StatusbarItem::getWidth() -throw (RuntimeException) +throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( m_pStatusBar ) @@ -114,14 +114,14 @@ throw (RuntimeException) } ::sal_uInt16 SAL_CALL StatusbarItem::getStyle() -throw (RuntimeException) +throw (RuntimeException, std::exception) { osl::MutexGuard aGuard( m_aMutex ); return m_nStyle; } ::sal_Int32 SAL_CALL StatusbarItem::getOffset() -throw (RuntimeException) +throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( m_pStatusBar ) @@ -131,7 +131,7 @@ throw (RuntimeException) } ::com::sun::star::awt::Rectangle SAL_CALL StatusbarItem::getItemRect() -throw (RuntimeException) +throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; ::com::sun::star::awt::Rectangle aAWTRect; @@ -148,7 +148,7 @@ throw (RuntimeException) } OUString SAL_CALL StatusbarItem::getText() -throw (RuntimeException) +throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( m_pStatusBar ) @@ -158,7 +158,7 @@ throw (RuntimeException) } void SAL_CALL StatusbarItem::setText( const OUString& rText ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( m_pStatusBar ) @@ -166,7 +166,7 @@ throw (RuntimeException) } OUString SAL_CALL StatusbarItem::getHelpText() -throw (RuntimeException) +throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( m_pStatusBar ) @@ -176,7 +176,7 @@ throw (RuntimeException) } void SAL_CALL StatusbarItem::setHelpText( const OUString& rHelpText ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( m_pStatusBar ) @@ -184,7 +184,7 @@ throw (RuntimeException) } OUString SAL_CALL StatusbarItem::getQuickHelpText() -throw (RuntimeException) +throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( m_pStatusBar ) @@ -194,7 +194,7 @@ throw (RuntimeException) } void SAL_CALL StatusbarItem::setQuickHelpText( const OUString& rQuickHelpText ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( m_pStatusBar ) @@ -202,7 +202,7 @@ throw (RuntimeException) } OUString SAL_CALL StatusbarItem::getAccessibleName() -throw (RuntimeException) +throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( m_pStatusBar ) @@ -212,7 +212,7 @@ throw (RuntimeException) } void SAL_CALL StatusbarItem::setAccessibleName( const OUString& rAccessibleName ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( m_pStatusBar ) @@ -220,7 +220,7 @@ throw (RuntimeException) } ::sal_Bool SAL_CALL StatusbarItem::getVisible() -throw (RuntimeException) +throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( m_pStatusBar ) @@ -230,7 +230,7 @@ throw (RuntimeException) } void SAL_CALL StatusbarItem::setVisible( ::sal_Bool bVisible ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( !m_pStatusBar ) @@ -246,7 +246,7 @@ throw (RuntimeException) } void SAL_CALL StatusbarItem::repaint( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( m_pStatusBar ) diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index 577ca6198bda..1decf935c86a 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -164,14 +164,14 @@ StatusBar* StatusBarManager::GetStatusBar() const } void StatusBarManager::frameAction( const frame::FrameActionEvent& Action ) -throw ( uno::RuntimeException ) +throw ( uno::RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); if ( Action.Action == frame::FrameAction_CONTEXT_CHANGED ) UpdateControllers(); } -void SAL_CALL StatusBarManager::disposing( const lang::EventObject& Source ) throw ( uno::RuntimeException ) +void SAL_CALL StatusBarManager::disposing( const lang::EventObject& Source ) throw ( uno::RuntimeException, std::exception ) { { ResetableGuard aGuard( m_aLock ); @@ -191,7 +191,7 @@ void SAL_CALL StatusBarManager::disposing( const lang::EventObject& Source ) thr } // XComponent -void SAL_CALL StatusBarManager::dispose() throw( uno::RuntimeException ) +void SAL_CALL StatusBarManager::dispose() throw( uno::RuntimeException, std::exception ) { uno::Reference< lang::XComponent > xThis( static_cast< OWeakObject* >(this), uno::UNO_QUERY ); @@ -238,7 +238,7 @@ void SAL_CALL StatusBarManager::dispose() throw( uno::RuntimeException ) } } -void SAL_CALL StatusBarManager::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) throw( uno::RuntimeException ) +void SAL_CALL StatusBarManager::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) throw( uno::RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -250,14 +250,14 @@ void SAL_CALL StatusBarManager::addEventListener( const uno::Reference< lang::XE ( const uno::Reference< lang::XEventListener >* ) NULL ), xListener ); } -void SAL_CALL StatusBarManager::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) throw( uno::RuntimeException ) +void SAL_CALL StatusBarManager::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) throw( uno::RuntimeException, std::exception ) { m_aListenerContainer.removeInterface( ::getCppuType( ( const uno::Reference< lang::XEventListener >* ) NULL ), xListener ); } // XUIConfigurationListener -void SAL_CALL StatusBarManager::elementInserted( const css::ui::ConfigurationEvent& ) throw ( uno::RuntimeException ) +void SAL_CALL StatusBarManager::elementInserted( const css::ui::ConfigurationEvent& ) throw ( uno::RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -265,7 +265,7 @@ void SAL_CALL StatusBarManager::elementInserted( const css::ui::ConfigurationEve return; } -void SAL_CALL StatusBarManager::elementRemoved( const css::ui::ConfigurationEvent& ) throw ( uno::RuntimeException ) +void SAL_CALL StatusBarManager::elementRemoved( const css::ui::ConfigurationEvent& ) throw ( uno::RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -273,7 +273,7 @@ void SAL_CALL StatusBarManager::elementRemoved( const css::ui::ConfigurationEven return; } -void SAL_CALL StatusBarManager::elementReplaced( const css::ui::ConfigurationEvent& ) throw ( uno::RuntimeException ) +void SAL_CALL StatusBarManager::elementReplaced( const css::ui::ConfigurationEvent& ) throw ( uno::RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx index ee451b27723a..6cc31b78ff98 100644 --- a/framework/source/uielement/statusbarwrapper.cxx +++ b/framework/source/uielement/statusbarwrapper.cxx @@ -64,7 +64,7 @@ StatusBarWrapper::~StatusBarWrapper() { } -void SAL_CALL StatusBarWrapper::dispose() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL StatusBarWrapper::dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) { Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY ); @@ -88,7 +88,7 @@ void SAL_CALL StatusBarWrapper::dispose() throw (::com::sun::star::uno::RuntimeE } // XInitialization -void SAL_CALL StatusBarWrapper::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException ) +void SAL_CALL StatusBarWrapper::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception ) { ResetableGuard aLock( m_aLock ); @@ -137,7 +137,7 @@ void SAL_CALL StatusBarWrapper::initialize( const Sequence< Any >& aArguments ) } // XUIElementSettings -void SAL_CALL StatusBarWrapper::updateSettings() throw ( RuntimeException ) +void SAL_CALL StatusBarWrapper::updateSettings() throw ( RuntimeException, std::exception ) { ResetableGuard aLock( m_aLock ); @@ -162,7 +162,7 @@ void SAL_CALL StatusBarWrapper::updateSettings() throw ( RuntimeException ) } } -Reference< XInterface > SAL_CALL StatusBarWrapper::getRealInterface() throw ( RuntimeException ) +Reference< XInterface > SAL_CALL StatusBarWrapper::getRealInterface() throw ( RuntimeException, std::exception ) { ResetableGuard aLock( m_aLock ); diff --git a/framework/source/uielement/statusindicatorinterfacewrapper.cxx b/framework/source/uielement/statusindicatorinterfacewrapper.cxx index 267f8c0a89af..5bd9e1ca806b 100644 --- a/framework/source/uielement/statusindicatorinterfacewrapper.cxx +++ b/framework/source/uielement/statusindicatorinterfacewrapper.cxx @@ -47,7 +47,7 @@ StatusIndicatorInterfaceWrapper::~StatusIndicatorInterfaceWrapper() void SAL_CALL StatusIndicatorInterfaceWrapper::start( const OUString& sText, sal_Int32 nRange ) -throw( ::com::sun::star::uno::RuntimeException ) +throw( ::com::sun::star::uno::RuntimeException, std::exception ) { Reference< XComponent > xComp( m_xStatusIndicatorImpl ); if ( xComp.is() ) @@ -59,7 +59,7 @@ throw( ::com::sun::star::uno::RuntimeException ) } void SAL_CALL StatusIndicatorInterfaceWrapper::end() -throw( ::com::sun::star::uno::RuntimeException ) +throw( ::com::sun::star::uno::RuntimeException, std::exception ) { Reference< XComponent > xComp( m_xStatusIndicatorImpl ); if ( xComp.is() ) @@ -71,7 +71,7 @@ throw( ::com::sun::star::uno::RuntimeException ) } void SAL_CALL StatusIndicatorInterfaceWrapper::reset() -throw( ::com::sun::star::uno::RuntimeException ) +throw( ::com::sun::star::uno::RuntimeException, std::exception ) { Reference< XComponent > xComp( m_xStatusIndicatorImpl ); if ( xComp.is() ) @@ -84,7 +84,7 @@ throw( ::com::sun::star::uno::RuntimeException ) void SAL_CALL StatusIndicatorInterfaceWrapper::setText( const OUString& sText ) -throw( ::com::sun::star::uno::RuntimeException ) +throw( ::com::sun::star::uno::RuntimeException, std::exception ) { Reference< XComponent > xComp( m_xStatusIndicatorImpl ); if ( xComp.is() ) @@ -97,7 +97,7 @@ throw( ::com::sun::star::uno::RuntimeException ) void SAL_CALL StatusIndicatorInterfaceWrapper::setValue( sal_Int32 nValue ) -throw( ::com::sun::star::uno::RuntimeException ) +throw( ::com::sun::star::uno::RuntimeException, std::exception ) { Reference< XComponent > xComp( m_xStatusIndicatorImpl ); if ( xComp.is() ) diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx index 5dbe7a306d8b..c5b35ed9c737 100644 --- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx @@ -81,7 +81,7 @@ ToggleButtonToolbarController::~ToggleButtonToolbarController() void SAL_CALL ToggleButtonToolbarController::dispose() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; ComplexToolbarController::dispose(); @@ -103,7 +103,7 @@ Sequence<PropertyValue> ToggleButtonToolbarController::getExecuteArgs(sal_Int16 uno::Reference< awt::XWindow > SAL_CALL ToggleButtonToolbarController::createPopupWindow() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { uno::Reference< awt::XWindow > xWindow; diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 4fbcf98536ca..caf157bef312 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -118,7 +118,7 @@ class ImageOrientationListener : public svt::FrameStatusListener const Reference< XFrame > rFrame ); virtual ~ImageOrientationListener(); - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); private: Reference< XStatusListener > m_xReceiver; @@ -138,7 +138,7 @@ ImageOrientationListener::~ImageOrientationListener() } void SAL_CALL ImageOrientationListener::statusChanged( const FeatureStateEvent& Event ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { if ( m_xReceiver.is() ) m_xReceiver->statusChanged( Event ); @@ -483,7 +483,7 @@ void ToolBarManager::UpdateController( ::com::sun::star::uno::Reference< ::com:: } void ToolBarManager::frameAction( const FrameActionEvent& Action ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); if ( Action.Action == FrameAction_CONTEXT_CHANGED ) @@ -491,7 +491,7 @@ throw ( RuntimeException ) } void SAL_CALL ToolBarManager::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) -throw ( ::com::sun::star::uno::RuntimeException ) +throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); if ( m_bDisposed ) @@ -508,7 +508,7 @@ throw ( ::com::sun::star::uno::RuntimeException ) } } -void SAL_CALL ToolBarManager::disposing( const EventObject& Source ) throw ( RuntimeException ) +void SAL_CALL ToolBarManager::disposing( const EventObject& Source ) throw ( RuntimeException, std::exception ) { { ResetableGuard aGuard( m_aLock ); @@ -565,7 +565,7 @@ void SAL_CALL ToolBarManager::disposing( const EventObject& Source ) throw ( Run } // XComponent -void SAL_CALL ToolBarManager::dispose() throw( RuntimeException ) +void SAL_CALL ToolBarManager::dispose() throw( RuntimeException, std::exception ) { Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY ); @@ -645,7 +645,7 @@ void SAL_CALL ToolBarManager::dispose() throw( RuntimeException ) } } -void SAL_CALL ToolBarManager::addEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException ) +void SAL_CALL ToolBarManager::addEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -656,18 +656,18 @@ void SAL_CALL ToolBarManager::addEventListener( const Reference< XEventListener m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener ); } -void SAL_CALL ToolBarManager::removeEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException ) +void SAL_CALL ToolBarManager::removeEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException, std::exception ) { m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener ); } // XUIConfigurationListener -void SAL_CALL ToolBarManager::elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ToolBarManager::elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) { impl_elementChanged(false,Event); } -void SAL_CALL ToolBarManager::elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ToolBarManager::elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) { impl_elementChanged(true,Event); } @@ -738,7 +738,7 @@ void ToolBarManager::setToolBarImage(const Image& _aImage,const CommandToInfoMap ::std::for_each(_rIDs.begin(),_rIDs.end(),::boost::bind(&ToolBox::SetItemImage,m_pToolBar,_1,_aImage)); } -void SAL_CALL ToolBarManager::elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ToolBarManager::elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) { impl_elementChanged(false,Event); } diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 45b576561d1c..3ad9a12bfe12 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -526,7 +526,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r } // XEventListener -void SAL_CALL ToolbarsMenuController::disposing( const EventObject& ) throw ( RuntimeException ) +void SAL_CALL ToolbarsMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception ) { Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY ); @@ -543,7 +543,7 @@ void SAL_CALL ToolbarsMenuController::disposing( const EventObject& ) throw ( Ru } // XStatusListener -void SAL_CALL ToolbarsMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException ) +void SAL_CALL ToolbarsMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception ) { OUString aFeatureURL( Event.FeatureURL.Complete ); @@ -592,7 +592,7 @@ void SAL_CALL ToolbarsMenuController::statusChanged( const FeatureStateEvent& Ev } // XMenuListener -void SAL_CALL ToolbarsMenuController::itemSelected( const css::awt::MenuEvent& rEvent ) throw (RuntimeException) +void SAL_CALL ToolbarsMenuController::itemSelected( const css::awt::MenuEvent& rEvent ) throw (RuntimeException, std::exception) { Reference< css::awt::XPopupMenu > xPopupMenu; Reference< XComponentContext > xContext; @@ -751,7 +751,7 @@ void SAL_CALL ToolbarsMenuController::itemSelected( const css::awt::MenuEvent& r } } -void SAL_CALL ToolbarsMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException) +void SAL_CALL ToolbarsMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException, std::exception) { std::vector< OUString > aCmdVector; Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY ); @@ -792,7 +792,7 @@ void SAL_CALL ToolbarsMenuController::itemActivated( const css::awt::MenuEvent& } // XPopupMenuController -void SAL_CALL ToolbarsMenuController::setPopupMenu( const Reference< css::awt::XPopupMenu >& xPopupMenu ) throw ( RuntimeException ) +void SAL_CALL ToolbarsMenuController::setPopupMenu( const Reference< css::awt::XPopupMenu >& xPopupMenu ) throw ( RuntimeException, std::exception ) { osl::MutexGuard aLock( m_aMutex ); @@ -810,7 +810,7 @@ void SAL_CALL ToolbarsMenuController::setPopupMenu( const Reference< css::awt::X } // XInitialization -void SAL_CALL ToolbarsMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException ) +void SAL_CALL ToolbarsMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception ) { osl::MutexGuard aLock( m_aMutex ); sal_Bool bInitalized( m_bInitialized ); diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx index efd7c8b3dec1..84f9706c9e0b 100644 --- a/framework/source/uielement/toolbarwrapper.cxx +++ b/framework/source/uielement/toolbarwrapper.cxx @@ -75,7 +75,7 @@ void SAL_CALL ToolBarWrapper::release() throw() } uno::Any SAL_CALL ToolBarWrapper::queryInterface( const uno::Type & rType ) -throw( ::com::sun::star::uno::RuntimeException ) +throw( ::com::sun::star::uno::RuntimeException, std::exception ) { Any a = ::cppu::queryInterface( rType , @@ -88,7 +88,7 @@ throw( ::com::sun::star::uno::RuntimeException ) } // XComponent -void SAL_CALL ToolBarWrapper::dispose() throw ( RuntimeException ) +void SAL_CALL ToolBarWrapper::dispose() throw ( RuntimeException, std::exception ) { Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY ); @@ -113,7 +113,7 @@ void SAL_CALL ToolBarWrapper::dispose() throw ( RuntimeException ) } // XInitialization -void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException ) +void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception ) { ResetableGuard aLock( m_aLock ); @@ -193,13 +193,13 @@ void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) th } // XEventListener -void SAL_CALL ToolBarWrapper::disposing( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ToolBarWrapper::disposing( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException, std::exception) { // nothing todo } // XUpdatable -void SAL_CALL ToolBarWrapper::update() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ToolBarWrapper::update() throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aLock( m_aLock ); @@ -212,7 +212,7 @@ void SAL_CALL ToolBarWrapper::update() throw (::com::sun::star::uno::RuntimeExce } // XUIElementSettings -void SAL_CALL ToolBarWrapper::updateSettings() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ToolBarWrapper::updateSettings() throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aLock( m_aLock ); @@ -251,7 +251,7 @@ void ToolBarWrapper::impl_fillNewData() } // XUIElement interface -Reference< XInterface > SAL_CALL ToolBarWrapper::getRealInterface( ) throw (::com::sun::star::uno::RuntimeException) +Reference< XInterface > SAL_CALL ToolBarWrapper::getRealInterface( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aLock( m_aLock ); @@ -272,7 +272,7 @@ Reference< XInterface > SAL_CALL ToolBarWrapper::getRealInterface( ) throw (::c void SAL_CALL ToolBarWrapper::functionExecute( const OUString& aUIElementName, const OUString& aCommand ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aLock( m_aLock ); @@ -284,7 +284,7 @@ throw (::com::sun::star::uno::RuntimeException) } } -void SAL_CALL ToolBarWrapper::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception ) +void SAL_CALL ToolBarWrapper::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception, std::exception ) { ResetableGuard aLock( m_aLock ); sal_Bool bNoClose( m_bNoClose ); diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx index 413aabc0204d..f7b5a357b491 100644 --- a/framework/source/uielement/uicommanddescription.cxx +++ b/framework/source/uielement/uicommanddescription.cxx @@ -92,28 +92,28 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) - throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // container.XContainerListener - virtual void SAL_CALL elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException); - virtual void SAL_CALL elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException); - virtual void SAL_CALL elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException); + virtual void SAL_CALL elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception); + virtual void SAL_CALL elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception); + virtual void SAL_CALL elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception); // lang.XEventListener - virtual void SAL_CALL disposing( const EventObject& aEvent ) throw(RuntimeException); + virtual void SAL_CALL disposing( const EventObject& aEvent ) throw(RuntimeException, std::exception); protected: virtual ::com::sun::star::uno::Any SAL_CALL getByNameImpl( const OUString& aName ); @@ -257,7 +257,7 @@ Any SAL_CALL ConfigurationAccess_UICommand::getByNameImpl( const OUString& rComm } Any SAL_CALL ConfigurationAccess_UICommand::getByName( const OUString& rCommandURL ) -throw ( NoSuchElementException, WrappedTargetException, RuntimeException) +throw ( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { Any aRet( getByNameImpl( rCommandURL ) ); if( !aRet.hasValue() ) @@ -267,26 +267,26 @@ throw ( NoSuchElementException, WrappedTargetException, RuntimeException) } Sequence< OUString > SAL_CALL ConfigurationAccess_UICommand::getElementNames() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { return getAllCommands(); } sal_Bool SAL_CALL ConfigurationAccess_UICommand::hasByName( const OUString& rCommandURL ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { return getByNameImpl( rCommandURL ).hasValue(); } // XElementAccess Type SAL_CALL ConfigurationAccess_UICommand::getElementType() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { return( ::getCppuType( (const Sequence< PropertyValue >*)NULL ) ); } sal_Bool SAL_CALL ConfigurationAccess_UICommand::hasElements() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { // There must are global commands! return sal_True; @@ -562,21 +562,21 @@ sal_Bool ConfigurationAccess_UICommand::initializeConfigAccess() } // container.XContainerListener -void SAL_CALL ConfigurationAccess_UICommand::elementInserted( const ContainerEvent& ) throw(RuntimeException) +void SAL_CALL ConfigurationAccess_UICommand::elementInserted( const ContainerEvent& ) throw(RuntimeException, std::exception) { osl::MutexGuard g(m_aMutex); m_bCacheFilled = sal_False; fillCache(); } -void SAL_CALL ConfigurationAccess_UICommand::elementRemoved( const ContainerEvent& ) throw(RuntimeException) +void SAL_CALL ConfigurationAccess_UICommand::elementRemoved( const ContainerEvent& ) throw(RuntimeException, std::exception) { osl::MutexGuard g(m_aMutex); m_bCacheFilled = sal_False; fillCache(); } -void SAL_CALL ConfigurationAccess_UICommand::elementReplaced( const ContainerEvent& ) throw(RuntimeException) +void SAL_CALL ConfigurationAccess_UICommand::elementReplaced( const ContainerEvent& ) throw(RuntimeException, std::exception) { osl::MutexGuard g(m_aMutex); m_bCacheFilled = sal_False; @@ -584,7 +584,7 @@ void SAL_CALL ConfigurationAccess_UICommand::elementReplaced( const ContainerEve } // lang.XEventListener -void SAL_CALL ConfigurationAccess_UICommand::disposing( const EventObject& aEvent ) throw(RuntimeException) +void SAL_CALL ConfigurationAccess_UICommand::disposing( const EventObject& aEvent ) throw(RuntimeException, std::exception) { // SAFE // remove our reference to the config access @@ -668,7 +668,7 @@ Reference< XNameAccess > UICommandDescription::impl_createConfigAccess(const OUS } Any SAL_CALL UICommandDescription::getByName( const OUString& aName ) -throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { Any a; @@ -709,7 +709,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la } Sequence< OUString > SAL_CALL UICommandDescription::getElementNames() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { osl::MutexGuard g(rBHelper.rMutex); @@ -727,7 +727,7 @@ throw (::com::sun::star::uno::RuntimeException) } sal_Bool SAL_CALL UICommandDescription::hasByName( const OUString& aName ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { osl::MutexGuard g(rBHelper.rMutex); @@ -737,13 +737,13 @@ throw (::com::sun::star::uno::RuntimeException) // XElementAccess Type SAL_CALL UICommandDescription::getElementType() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { return( ::getCppuType( (const Reference< XNameAccess >*)NULL ) ); } sal_Bool SAL_CALL UICommandDescription::hasElements() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { // generic UI commands are always available! return sal_True; diff --git a/framework/source/uifactory/addonstoolbarfactory.cxx b/framework/source/uifactory/addonstoolbarfactory.cxx index 2a89e5c86d39..87cdebc8f88a 100644 --- a/framework/source/uifactory/addonstoolbarfactory.cxx +++ b/framework/source/uifactory/addonstoolbarfactory.cxx @@ -61,19 +61,19 @@ public: virtual ~AddonsToolBarFactory(); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.AddonsToolBarFactory"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.ui.ToolBarFactory"); @@ -81,7 +81,7 @@ public: } // 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 ); + 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 ); sal_Bool hasButtonsInContext( const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& rPropSeq, const css::uno::Reference< css::frame::XFrame >& rFrame ); @@ -177,7 +177,7 @@ Reference< XUIElement > SAL_CALL AddonsToolBarFactory::createUIElement( const Sequence< PropertyValue >& Args ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException ) + ::com::sun::star::uno::RuntimeException, std::exception ) { // SAFE ResetableGuard aLock( m_aLock ); diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx index 35c55755171e..05a679afb15f 100644 --- a/framework/source/uifactory/factoryconfiguration.cxx +++ b/framework/source/uifactory/factoryconfiguration.cxx @@ -147,7 +147,7 @@ void ConfigurationAccess_ControllerFactory::removeServiceFromCommandModule( } // container.XContainerListener -void SAL_CALL ConfigurationAccess_ControllerFactory::elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException) +void SAL_CALL ConfigurationAccess_ControllerFactory::elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception) { OUString aCommand; OUString aModule; @@ -168,7 +168,7 @@ void SAL_CALL ConfigurationAccess_ControllerFactory::elementInserted( const Cont } } -void SAL_CALL ConfigurationAccess_ControllerFactory::elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException) +void SAL_CALL ConfigurationAccess_ControllerFactory::elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception) { OUString aCommand; OUString aModule; @@ -187,13 +187,13 @@ void SAL_CALL ConfigurationAccess_ControllerFactory::elementRemoved ( const Cont } } -void SAL_CALL ConfigurationAccess_ControllerFactory::elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException) +void SAL_CALL ConfigurationAccess_ControllerFactory::elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception) { elementInserted(aEvent); } // lang.XEventListener -void SAL_CALL ConfigurationAccess_ControllerFactory::disposing( const EventObject& ) throw(RuntimeException) +void SAL_CALL ConfigurationAccess_ControllerFactory::disposing( const EventObject& ) throw(RuntimeException, std::exception) { // SAFE // remove our reference to the config access diff --git a/framework/source/uifactory/menubarfactory.cxx b/framework/source/uifactory/menubarfactory.cxx index c5ffdfebc032..78dfb910d745 100644 --- a/framework/source/uifactory/menubarfactory.cxx +++ b/framework/source/uifactory/menubarfactory.cxx @@ -56,7 +56,7 @@ MenuBarFactory::~MenuBarFactory() Reference< XUIElement > SAL_CALL MenuBarFactory::createUIElement( const OUString& ResourceURL, const Sequence< PropertyValue >& Args ) -throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ) +throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) { Reference< ::com::sun::star::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 adf1673da789..8a6a07646387 100644 --- a/framework/source/uifactory/statusbarfactory.cxx +++ b/framework/source/uifactory/statusbarfactory.cxx @@ -43,19 +43,19 @@ public: StatusBarFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.StatusBarFactory"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.ui.StatusBarFactory"); @@ -63,7 +63,7 @@ public: } // 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 ); + 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 ); }; StatusBarFactory::StatusBarFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) : @@ -75,7 +75,7 @@ StatusBarFactory::StatusBarFactory( const ::com::sun::star::uno::Reference< ::co Reference< XUIElement > SAL_CALL StatusBarFactory::createUIElement( const OUString& ResourceURL, const Sequence< PropertyValue >& Args ) -throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ) +throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) { Reference< ::com::sun::star::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 2e104b528d56..5d9d23975012 100644 --- a/framework/source/uifactory/toolbarfactory.cxx +++ b/framework/source/uifactory/toolbarfactory.cxx @@ -41,19 +41,19 @@ public: ToolBarFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.ToolBarFactory"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.ui.ToolBarFactory"); @@ -63,7 +63,7 @@ public: // 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 ); + throw ( css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ); }; ToolBarFactory::ToolBarFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) : @@ -75,7 +75,7 @@ ToolBarFactory::ToolBarFactory( const ::com::sun::star::uno::Reference< ::com::s Reference< XUIElement > SAL_CALL ToolBarFactory::createUIElement( const OUString& ResourceURL, const Sequence< PropertyValue >& Args ) -throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ) +throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) { Reference< ::com::sun::star::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 7ffce356fc73..5fa49a03ebd0 100644 --- a/framework/source/uifactory/uicontrollerfactory.cxx +++ b/framework/source/uifactory/uicontrollerfactory.cxx @@ -48,19 +48,19 @@ public: virtual ~UIControllerFactory(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) = 0; - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (css::uno::RuntimeException) = 0; - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) = 0; + virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) = 0; + virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) = 0; + virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) = 0; // 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); - 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); - virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw (css::uno::RuntimeException); + 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); + 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); + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw (css::uno::RuntimeException, std::exception); // XUIControllerRegistration - virtual sal_Bool SAL_CALL hasController( const OUString& aCommandURL, const OUString& aModuleName ) throw (css::uno::RuntimeException); - virtual void SAL_CALL registerController( const OUString& aCommandURL, const OUString& aModuleName, const OUString& aControllerImplementationName ) throw (css::uno::RuntimeException); - virtual void SAL_CALL deregisterController( const OUString& aCommandURL, const OUString& aModuleName ) throw (css::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasController( const OUString& aCommandURL, const OUString& aModuleName ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL registerController( const OUString& aCommandURL, const OUString& aModuleName, const OUString& aControllerImplementationName ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL deregisterController( const OUString& aCommandURL, const OUString& aModuleName ) throw (css::uno::RuntimeException, std::exception); protected: UIControllerFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext, const rtl::OUString &rUINode ); @@ -105,7 +105,7 @@ void SAL_CALL UIControllerFactory::disposing() Reference< XInterface > SAL_CALL UIControllerFactory::createInstanceWithContext( const OUString& aServiceSpecifier, const Reference< XComponentContext >& ) -throw (Exception, RuntimeException) +throw (Exception, RuntimeException, std::exception) { // SAFE osl::MutexGuard g(rBHelper.rMutex); @@ -128,7 +128,7 @@ Reference< XInterface > SAL_CALL UIControllerFactory::createInstanceWithArgument const OUString& ServiceSpecifier, const Sequence< Any >& Arguments, const Reference< XComponentContext >& ) -throw (Exception, RuntimeException) +throw (Exception, RuntimeException, std::exception) { const OUString aPropModuleName( "ModuleIdentifier" ); const OUString aPropValueName( "Value" ); @@ -192,7 +192,7 @@ throw (Exception, RuntimeException) } Sequence< OUString > SAL_CALL UIControllerFactory::getAvailableServiceNames() -throw (RuntimeException) +throw (RuntimeException, std::exception) { return Sequence< OUString >(); } @@ -201,7 +201,7 @@ throw (RuntimeException) sal_Bool SAL_CALL UIControllerFactory::hasController( const OUString& aCommandURL, const OUString& aModuleName ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard g(rBHelper.rMutex); @@ -218,7 +218,7 @@ void SAL_CALL UIControllerFactory::registerController( const OUString& aCommandURL, const OUString& aModuleName, const OUString& aControllerImplementationName ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { // SAFE osl::MutexGuard g(rBHelper.rMutex); @@ -236,7 +236,7 @@ throw (RuntimeException) void SAL_CALL UIControllerFactory::deregisterController( const OUString& aCommandURL, const OUString& aModuleName ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { // SAFE osl::MutexGuard g(rBHelper.rMutex); @@ -257,19 +257,19 @@ public: PopupMenuControllerFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.PopupMenuControllerFactory"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.frame.PopupMenuControllerFactory"); @@ -309,19 +309,19 @@ public: ToolbarControllerFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.ToolBarControllerFactory"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.frame.ToolbarControllerFactory"); @@ -361,19 +361,19 @@ public: StatusbarControllerFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.StatusBarControllerFactory"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.frame.StatusbarControllerFactory"); diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx index 2282b0626895..248d322db878 100644 --- a/framework/source/uifactory/uielementfactorymanager.cxx +++ b/framework/source/uifactory/uielementfactorymanager.cxx @@ -194,7 +194,7 @@ Sequence< Sequence< PropertyValue > > ConfigurationAccess_FactoryManager::getFac } // container.XContainerListener -void SAL_CALL ConfigurationAccess_FactoryManager::elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException) +void SAL_CALL ConfigurationAccess_FactoryManager::elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception) { OUString aType; OUString aName; @@ -213,7 +213,7 @@ void SAL_CALL ConfigurationAccess_FactoryManager::elementInserted( const Contain } } -void SAL_CALL ConfigurationAccess_FactoryManager::elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException) +void SAL_CALL ConfigurationAccess_FactoryManager::elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception) { OUString aType; OUString aName; @@ -232,7 +232,7 @@ void SAL_CALL ConfigurationAccess_FactoryManager::elementRemoved ( const Contain } } -void SAL_CALL ConfigurationAccess_FactoryManager::elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException) +void SAL_CALL ConfigurationAccess_FactoryManager::elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception) { OUString aType; OUString aName; @@ -253,7 +253,7 @@ void SAL_CALL ConfigurationAccess_FactoryManager::elementReplaced( const Contain } // lang.XEventListener -void SAL_CALL ConfigurationAccess_FactoryManager::disposing( const EventObject& ) throw(RuntimeException) +void SAL_CALL ConfigurationAccess_FactoryManager::disposing( const EventObject& ) throw(RuntimeException, std::exception) { // SAFE // remove our reference to the config access @@ -361,19 +361,19 @@ public: virtual ~UIElementFactoryManager(); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.UIElementFactoryManager"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.ui.UIElementFactoryManager"); @@ -381,13 +381,13 @@ public: } // 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); + 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); // XUIElementFactoryRegistration - virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getRegisteredFactories( ) throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::ui::XUIElementFactory > SAL_CALL getFactory( const OUString& ResourceURL, const OUString& ModuleIdentifier ) throw (css::uno::RuntimeException); - virtual void SAL_CALL registerFactory( const OUString& aType, const OUString& aName, const OUString& aModuleIdentifier, const OUString& aFactoryImplementationName ) throw (css::container::ElementExistException, css::uno::RuntimeException); - virtual void SAL_CALL deregisterFactory( const OUString& aType, const OUString& aName, const OUString& aModuleIdentifier ) throw (css::container::NoSuchElementException, css::uno::RuntimeException); + virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getRegisteredFactories( ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::ui::XUIElementFactory > SAL_CALL getFactory( const OUString& ResourceURL, const OUString& ModuleIdentifier ) throw (css::uno::RuntimeException, std::exception); + 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); + virtual void SAL_CALL deregisterFactory( const OUString& aType, const OUString& aName, const OUString& aModuleIdentifier ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception); private: sal_Bool m_bConfigRead; @@ -425,7 +425,7 @@ void SAL_CALL UIElementFactoryManager::disposing() Reference< XUIElement > SAL_CALL UIElementFactoryManager::createUIElement( const OUString& ResourceURL, const Sequence< PropertyValue >& Args ) -throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ) +throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) { Reference< XFrame > xFrame; { // SAFE @@ -469,7 +469,7 @@ throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::l // XUIElementFactoryRegistration Sequence< Sequence< PropertyValue > > SAL_CALL UIElementFactoryManager::getRegisteredFactories() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { // SAFE osl::MutexGuard g(rBHelper.rMutex); @@ -484,7 +484,7 @@ throw ( RuntimeException ) } Reference< XUIElementFactory > SAL_CALL UIElementFactoryManager::getFactory( const OUString& aResourceURL, const OUString& aModuleId ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { OUString aServiceSpecifier; { // SAFE @@ -518,7 +518,7 @@ throw ( RuntimeException ) } void SAL_CALL UIElementFactoryManager::registerFactory( const OUString& aType, const OUString& aName, const OUString& aModuleId, const OUString& aFactoryImplementationName ) -throw ( ElementExistException, RuntimeException ) +throw ( ElementExistException, RuntimeException, std::exception ) { // SAFE osl::MutexGuard g(rBHelper.rMutex); @@ -534,7 +534,7 @@ throw ( ElementExistException, RuntimeException ) } void SAL_CALL UIElementFactoryManager::deregisterFactory( const OUString& aType, const OUString& aName, const OUString& aModuleId ) -throw ( NoSuchElementException, RuntimeException ) +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 6ffde73e514e..272b791b699e 100644 --- a/framework/source/uifactory/windowcontentfactorymanager.cxx +++ b/framework/source/uifactory/windowcontentfactorymanager.cxx @@ -51,19 +51,19 @@ public: virtual ~WindowContentFactoryManager(); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.WindowContentFactoryManager"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.ui.WindowContentFactoryManager"); @@ -71,8 +71,8 @@ public: } // 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); - 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); + 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); + 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); private: virtual void SAL_CALL disposing() SAL_OVERRIDE; @@ -112,7 +112,7 @@ 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) +throw (uno::Exception, uno::RuntimeException, std::exception) { uno::Reference< uno::XInterface > xWindow; return xWindow; @@ -120,7 +120,7 @@ throw (uno::Exception, uno::RuntimeException) 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) +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 342bb280e3df..54e87ea7d8c6 100644 --- a/framework/source/xml/acceleratorconfigurationreader.cxx +++ b/framework/source/xml/acceleratorconfigurationreader.cxx @@ -73,14 +73,14 @@ AcceleratorConfigurationReader::~AcceleratorConfigurationReader() void SAL_CALL AcceleratorConfigurationReader::startDocument() throw(css::xml::sax::SAXException, - css::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { } void SAL_CALL AcceleratorConfigurationReader::endDocument() throw(css::xml::sax::SAXException, - css::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { // The xml file seems to be corrupted. // Because we found no end-tags ... at least for @@ -98,7 +98,7 @@ 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 ) + css::uno::RuntimeException, std::exception ) { EXMLElement eElement = AcceleratorConfigurationReader::implst_classifyElement(sElement); @@ -189,7 +189,7 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const OUString& void SAL_CALL AcceleratorConfigurationReader::endElement(const OUString& sElement) throw(css::xml::sax::SAXException, - css::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { EXMLElement eElement = AcceleratorConfigurationReader::implst_classifyElement(sElement); @@ -213,14 +213,14 @@ void SAL_CALL AcceleratorConfigurationReader::endElement(const OUString& sElemen void SAL_CALL AcceleratorConfigurationReader::characters(const OUString&) throw(css::xml::sax::SAXException, - css::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { } void SAL_CALL AcceleratorConfigurationReader::ignorableWhitespace(const OUString&) throw(css::xml::sax::SAXException, - css::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { } @@ -228,14 +228,14 @@ void SAL_CALL AcceleratorConfigurationReader::ignorableWhitespace(const OUString void SAL_CALL AcceleratorConfigurationReader::processingInstruction(const OUString& /*sTarget*/, const OUString& /*sData*/ ) throw(css::xml::sax::SAXException, - css::uno::RuntimeException ) + 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 ) + css::uno::RuntimeException, std::exception ) { m_xLocator = xLocator; } diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx index 131e214c8513..84af2e1b0baf 100644 --- a/framework/source/xml/imagesdocumenthandler.cxx +++ b/framework/source/xml/imagesdocumenthandler.cxx @@ -145,12 +145,12 @@ OReadImagesDocumentHandler::~OReadImagesDocumentHandler() // XDocumentHandler void SAL_CALL OReadImagesDocumentHandler::startDocument(void) -throw ( SAXException, RuntimeException ) +throw ( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadImagesDocumentHandler::endDocument(void) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -560,24 +560,24 @@ void SAL_CALL OReadImagesDocumentHandler::endElement(const OUString& aName) } void SAL_CALL OReadImagesDocumentHandler::characters(const OUString&) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadImagesDocumentHandler::ignorableWhitespace(const OUString&) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadImagesDocumentHandler::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ ) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadImagesDocumentHandler::setDocumentLocator( const Reference< XLocator > &xLocator) -throw( SAXException, RuntimeException ) +throw( SAXException, RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); |