diff options
Diffstat (limited to 'configmgr/source/configurationprovider.cxx')
-rw-r--r-- | configmgr/source/configurationprovider.cxx | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx index 8a76390c84b4..40d580b5d5ca 100644 --- a/configmgr/source/configurationprovider.cxx +++ b/configmgr/source/configurationprovider.cxx @@ -115,7 +115,7 @@ private: virtual void SAL_CALL disposing() { flushModifications(); } virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return default_ ? default_provider::getImplementationName() @@ -123,11 +123,11 @@ private: } 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) + getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) { return default_ ? default_provider::getSupportedServiceNames() @@ -136,42 +136,42 @@ private: virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( OUString const & aServiceSpecifier) - throw (css::uno::Exception, css::uno::RuntimeException); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( OUString const & ServiceSpecifier, css::uno::Sequence< css::uno::Any > const & Arguments) - throw (css::uno::Exception, css::uno::RuntimeException); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< OUString > SAL_CALL - getAvailableServiceNames() throw (css::uno::RuntimeException); + getAvailableServiceNames() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL refresh() throw (css::uno::RuntimeException); + virtual void SAL_CALL refresh() throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL addRefreshListener( css::uno::Reference< css::util::XRefreshListener > const & l) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeRefreshListener( css::uno::Reference< css::util::XRefreshListener > const & l) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL flush() throw (css::uno::RuntimeException); + virtual void SAL_CALL flush() throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL addFlushListener( css::uno::Reference< css::util::XFlushListener > const & l) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeFlushListener( css::uno::Reference< css::util::XFlushListener > const & l) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setLocale(css::lang::Locale const & eLocale) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::lang::Locale SAL_CALL getLocale() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); void flushModifications() const; @@ -183,7 +183,7 @@ private: css::uno::Reference< css::uno::XInterface > Service::createInstance( OUString const & aServiceSpecifier) - throw (css::uno::Exception, css::uno::RuntimeException) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { return createInstanceWithArguments( aServiceSpecifier, css::uno::Sequence< css::uno::Any >()); @@ -193,7 +193,7 @@ css::uno::Reference< css::uno::XInterface > Service::createInstanceWithArguments( OUString const & ServiceSpecifier, css::uno::Sequence< css::uno::Any > const & Arguments) - throw (css::uno::Exception, css::uno::RuntimeException) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { OUString nodepath; OUString locale; @@ -281,7 +281,7 @@ Service::createInstanceWithArguments( } css::uno::Sequence< OUString > Service::getAvailableServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > names(2); names[0] = accessServiceName; @@ -289,7 +289,7 @@ css::uno::Sequence< OUString > Service::getAvailableServiceNames() return names; } -void Service::refresh() throw (css::uno::RuntimeException) { +void Service::refresh() throw (css::uno::RuntimeException, std::exception) { //TODO cppu::OInterfaceContainerHelper * cont = rBHelper.getContainer( cppu::UnoType< css::util::XRefreshListener >::get()); @@ -301,7 +301,7 @@ void Service::refresh() throw (css::uno::RuntimeException) { void Service::addRefreshListener( css::uno::Reference< css::util::XRefreshListener > const & l) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { rBHelper.addListener( cppu::UnoType< css::util::XRefreshListener >::get(), l); @@ -309,13 +309,13 @@ void Service::addRefreshListener( void Service::removeRefreshListener( css::uno::Reference< css::util::XRefreshListener > const & l) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { rBHelper.removeListener( cppu::UnoType< css::util::XRefreshListener >::get(), l); } -void Service::flush() throw (css::uno::RuntimeException) { +void Service::flush() throw (css::uno::RuntimeException, std::exception) { flushModifications(); cppu::OInterfaceContainerHelper * cont = rBHelper.getContainer( cppu::UnoType< css::util::XFlushListener >::get()); @@ -327,27 +327,27 @@ void Service::flush() throw (css::uno::RuntimeException) { void Service::addFlushListener( css::uno::Reference< css::util::XFlushListener > const & l) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { rBHelper.addListener(cppu::UnoType< css::util::XFlushListener >::get(), l); } void Service::removeFlushListener( css::uno::Reference< css::util::XFlushListener > const & l) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { rBHelper.removeListener( cppu::UnoType< css::util::XFlushListener >::get(), l); } void Service::setLocale(css::lang::Locale const & eLocale) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard guard(*lock_); locale_ = LanguageTag::convertToBcp47( eLocale, false); } -css::lang::Locale Service::getLocale() throw (css::uno::RuntimeException) { +css::lang::Locale Service::getLocale() throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard guard(*lock_); css::lang::Locale loc; if (! locale_.isEmpty()) { @@ -379,30 +379,30 @@ private: virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext( css::uno::Reference< css::uno::XComponentContext > const & Context) - throw (css::uno::Exception, css::uno::RuntimeException); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( css::uno::Sequence< css::uno::Any > const & Arguments, css::uno::Reference< css::uno::XComponentContext > const & Context) - throw (css::uno::Exception, css::uno::RuntimeException); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return configuration_provider::getImplementationName(); } 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) + getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) { return configuration_provider::getSupportedServiceNames(); } }; css::uno::Reference< css::uno::XInterface > Factory::createInstanceWithContext( css::uno::Reference< css::uno::XComponentContext > const & Context) - throw (css::uno::Exception, css::uno::RuntimeException) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { return createInstanceWithArgumentsAndContext( css::uno::Sequence< css::uno::Any >(), Context); @@ -412,7 +412,7 @@ css::uno::Reference< css::uno::XInterface > Factory::createInstanceWithArgumentsAndContext( css::uno::Sequence< css::uno::Any > const & Arguments, css::uno::Reference< css::uno::XComponentContext > const & Context) - throw (css::uno::Exception, css::uno::RuntimeException) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { if (Arguments.getLength() == 0) { return css::configuration::theDefaultProvider::get(Context); |