From 5e21a413c788f839a66d9e4c14e745ed18058db8 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 25 Feb 2014 21:31:58 +0100 Subject: cppuhelper: retrofit std::exception into overriding exception specs Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3 --- configmgr/source/access.cxx | 104 ++++++++++++++++++++++---------------------- 1 file changed, 52 insertions(+), 52 deletions(-) (limited to 'configmgr/source/access.cxx') diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx index 8e4bd8256de1..571a1e6eed74 100644 --- a/configmgr/source/access.cxx +++ b/configmgr/source/access.cxx @@ -151,7 +151,7 @@ void Access::initBroadcaster( } css::uno::Sequence< css::uno::Type > Access::getTypes() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -203,7 +203,7 @@ css::uno::Sequence< css::uno::Type > Access::getTypes() } css::uno::Sequence< sal_Int8 > Access::getImplementationId() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -211,7 +211,7 @@ css::uno::Sequence< sal_Int8 > Access::getImplementationId() return css::uno::Sequence< sal_Int8 >(); } -OUString Access::getImplementationName() throw (css::uno::RuntimeException) +OUString Access::getImplementationName() throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -220,13 +220,13 @@ OUString Access::getImplementationName() throw (css::uno::RuntimeException) } sal_Bool Access::supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence< OUString > Access::getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -257,7 +257,7 @@ css::uno::Sequence< OUString > Access::getSupportedServiceNames() return services.getAsConstList(); } -void Access::dispose() throw (css::uno::RuntimeException) { +void Access::dispose() throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); Broadcaster bc; { @@ -280,7 +280,7 @@ void Access::dispose() throw (css::uno::RuntimeException) { void Access::addEventListener( css::uno::Reference< css::lang::XEventListener > const & xListener) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); { @@ -303,7 +303,7 @@ void Access::addEventListener( void Access::removeEventListener( css::uno::Reference< css::lang::XEventListener > const & aListener) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -314,7 +314,7 @@ void Access::removeEventListener( } } -css::uno::Type Access::getElementType() throw (css::uno::RuntimeException) { +css::uno::Type Access::getElementType() throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); checkLocalizedPropertyAccess(); @@ -337,7 +337,7 @@ css::uno::Type Access::getElementType() throw (css::uno::RuntimeException) { } } -sal_Bool Access::hasElements() throw (css::uno::RuntimeException) { +sal_Bool Access::hasElements() throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); checkLocalizedPropertyAccess(); @@ -347,7 +347,7 @@ sal_Bool Access::hasElements() throw (css::uno::RuntimeException) { css::uno::Any Access::getByName(OUString const & aName) throw ( css::container::NoSuchElementException, - css::lang::WrappedTargetException, css::uno::RuntimeException) + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -361,7 +361,7 @@ css::uno::Any Access::getByName(OUString const & aName) } css::uno::Sequence< OUString > Access::getElementNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -378,7 +378,7 @@ css::uno::Sequence< OUString > Access::getElementNames() } sal_Bool Access::hasByName(OUString const & aName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -387,7 +387,7 @@ sal_Bool Access::hasByName(OUString const & aName) } css::uno::Any Access::getByHierarchicalName(OUString const & aName) - throw (css::container::NoSuchElementException, css::uno::RuntimeException) + throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -401,7 +401,7 @@ css::uno::Any Access::getByHierarchicalName(OUString const & aName) } sal_Bool Access::hasByHierarchicalName(OUString const & aName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -414,7 +414,7 @@ void Access::replaceByHierarchicalName( throw ( css::lang::IllegalArgumentException, css::container::NoSuchElementException, - css::lang::WrappedTargetException, css::uno::RuntimeException) + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { //TODO: Actually support sets and combine with replaceByName: assert(thisIs(IS_UPDATE)); @@ -457,7 +457,7 @@ void Access::replaceByHierarchicalName( void Access::addContainerListener( css::uno::Reference< css::container::XContainerListener > const & xListener) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); { @@ -480,7 +480,7 @@ void Access::addContainerListener( void Access::removeContainerListener( css::uno::Reference< css::container::XContainerListener > const & xListener) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -492,7 +492,7 @@ void Access::removeContainerListener( } OUString Access::getExactName(OUString const & aApproximateName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -501,7 +501,7 @@ OUString Access::getExactName(OUString const & aApproximateName) } css::uno::Sequence< css::beans::Property > Access::getProperties() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); osl::MutexGuard g(*lock_); @@ -517,7 +517,7 @@ css::uno::Sequence< css::beans::Property > Access::getProperties() } css::beans::Property Access::getPropertyByName(OUString const & aName) - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) + throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); osl::MutexGuard g(*lock_); @@ -530,14 +530,14 @@ css::beans::Property Access::getPropertyByName(OUString const & aName) } sal_Bool Access::hasPropertyByName(OUString const & Name) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); osl::MutexGuard g(*lock_); return getChild(Name).is(); } -OUString Access::getHierarchicalName() throw (css::uno::RuntimeException) { +OUString Access::getHierarchicalName() throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); checkLocalizedPropertyAccess(); @@ -561,7 +561,7 @@ OUString Access::composeHierarchicalName( OUString const & aRelativeName) throw ( css::lang::IllegalArgumentException, css::lang::NoSupportException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -579,7 +579,7 @@ OUString Access::composeHierarchicalName( return path.makeStringAndClear(); } -OUString Access::getName() throw (css::uno::RuntimeException) { +OUString Access::getName() throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); checkLocalizedPropertyAccess(); @@ -587,7 +587,7 @@ OUString Access::getName() throw (css::uno::RuntimeException) { } void Access::setName(OUString const & aName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); Broadcaster bc; @@ -651,7 +651,7 @@ void Access::setName(OUString const & aName) bc.send(); } -css::beans::Property Access::getAsProperty() throw (css::uno::RuntimeException) +css::beans::Property Access::getAsProperty() throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -660,7 +660,7 @@ css::beans::Property Access::getAsProperty() throw (css::uno::RuntimeException) } css::uno::Reference< css::beans::XPropertySetInfo > Access::getPropertySetInfo() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); return this; @@ -671,7 +671,7 @@ void Access::setPropertyValue( throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); Broadcaster bc; @@ -695,7 +695,7 @@ void Access::setPropertyValue( css::uno::Any Access::getPropertyValue(OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); osl::MutexGuard g(*lock_); @@ -713,7 +713,7 @@ void Access::addPropertyChangeListener( xListener) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); { @@ -740,7 +740,7 @@ void Access::removePropertyChangeListener( aListener) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); osl::MutexGuard g(*lock_); @@ -764,7 +764,7 @@ void Access::addVetoableChangeListener( aListener) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); { @@ -792,7 +792,7 @@ void Access::removeVetoableChangeListener( aListener) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); osl::MutexGuard g(*lock_); @@ -815,7 +815,7 @@ void Access::setPropertyValues( css::uno::Sequence< css::uno::Any > const & aValues) throw ( css::beans::PropertyVetoException, css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, css::uno::RuntimeException) + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); Broadcaster bc; @@ -847,7 +847,7 @@ void Access::setPropertyValues( css::uno::Sequence< css::uno::Any > Access::getPropertyValues( css::uno::Sequence< OUString > const & aPropertyNames) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); osl::MutexGuard g(*lock_); @@ -868,7 +868,7 @@ void Access::addPropertiesChangeListener( css::uno::Sequence< OUString > const &, css::uno::Reference< css::beans::XPropertiesChangeListener > const & xListener) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); { @@ -891,7 +891,7 @@ void Access::addPropertiesChangeListener( void Access::removePropertiesChangeListener( css::uno::Reference< css::beans::XPropertiesChangeListener > const & xListener) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); osl::MutexGuard g(*lock_); @@ -906,7 +906,7 @@ void Access::firePropertiesChangeEvent( css::uno::Sequence< OUString > const & aPropertyNames, css::uno::Reference< css::beans::XPropertiesChangeListener > const & xListener) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); css::uno::Sequence< css::beans::PropertyChangeEvent > events( @@ -921,7 +921,7 @@ void Access::firePropertiesChangeEvent( } css::uno::Reference< css::beans::XHierarchicalPropertySetInfo > -Access::getHierarchicalPropertySetInfo() throw (css::uno::RuntimeException) { +Access::getHierarchicalPropertySetInfo() throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); return this; } @@ -932,7 +932,7 @@ void Access::setHierarchicalPropertyValue( throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); Broadcaster bc; @@ -963,7 +963,7 @@ css::uno::Any Access::getHierarchicalPropertyValue( throw ( css::beans::UnknownPropertyException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); osl::MutexGuard g(*lock_); @@ -981,7 +981,7 @@ void Access::setHierarchicalPropertyValues( css::uno::Sequence< css::uno::Any > const & Values) throw ( css::beans::PropertyVetoException, css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, css::uno::RuntimeException) + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); Broadcaster bc; @@ -1020,7 +1020,7 @@ css::uno::Sequence< css::uno::Any > Access::getHierarchicalPropertyValues( css::uno::Sequence< OUString > const & aHierarchicalPropertyNames) throw ( css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); osl::MutexGuard g(*lock_); @@ -1042,7 +1042,7 @@ css::uno::Sequence< css::uno::Any > Access::getHierarchicalPropertyValues( css::beans::Property Access::getPropertyByHierarchicalName( OUString const & aHierarchicalName) - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) + throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); osl::MutexGuard g(*lock_); @@ -1056,7 +1056,7 @@ css::beans::Property Access::getPropertyByHierarchicalName( sal_Bool Access::hasPropertyByHierarchicalName( OUString const & aHierarchicalName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); osl::MutexGuard g(*lock_); @@ -1068,7 +1068,7 @@ void Access::replaceByName( throw ( css::lang::IllegalArgumentException, css::container::NoSuchElementException, - css::lang::WrappedTargetException, css::uno::RuntimeException) + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { assert(thisIs(IS_UPDATE)); Broadcaster bc; @@ -1112,7 +1112,7 @@ void Access::insertByName( throw ( css::lang::IllegalArgumentException, css::container::ElementExistException, - css::lang::WrappedTargetException, css::uno::RuntimeException) + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { assert(thisIs(IS_EXTENSIBLE|IS_UPDATE)); Broadcaster bc; @@ -1162,7 +1162,7 @@ void Access::insertByName( void Access::removeByName(OUString const & aName) throw ( css::container::NoSuchElementException, - css::lang::WrappedTargetException, css::uno::RuntimeException) + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { assert(thisIs(IS_EXTENSIBLE|IS_UPDATE)); Broadcaster bc; @@ -1197,7 +1197,7 @@ void Access::removeByName(OUString const & aName) } css::uno::Reference< css::uno::XInterface > Access::createInstance() - throw (css::uno::Exception, css::uno::RuntimeException) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { assert(thisIs(IS_SET|IS_UPDATE)); OUString tmplName( @@ -1217,7 +1217,7 @@ css::uno::Reference< css::uno::XInterface > Access::createInstance() css::uno::Reference< css::uno::XInterface > Access::createInstanceWithArguments( css::uno::Sequence< css::uno::Any > const & aArguments) - throw (css::uno::Exception, css::uno::RuntimeException) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { assert(thisIs(IS_SET|IS_UPDATE)); if (aArguments.getLength() != 0) { @@ -1314,7 +1314,7 @@ void Access::clearListeners() throw() { } css::uno::Any Access::queryInterface(css::uno::Type const & aType) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Any res(OWeakObject::queryInterface(aType)); if (res.hasValue()) { -- cgit