summaryrefslogtreecommitdiff
path: root/configmgr
diff options
context:
space:
mode:
Diffstat (limited to 'configmgr')
-rw-r--r--configmgr/qa/unit/test.cxx8
-rw-r--r--configmgr/source/access.cxx100
-rw-r--r--configmgr/source/access.hxx223
-rw-r--r--configmgr/source/childaccess.cxx4
-rw-r--r--configmgr/source/childaccess.hxx14
-rw-r--r--configmgr/source/configurationprovider.cxx68
-rw-r--r--configmgr/source/configurationregistry.cxx271
-rw-r--r--configmgr/source/readonlyaccess.cxx19
-rw-r--r--configmgr/source/readwriteaccess.cxx40
-rw-r--r--configmgr/source/rootaccess.cxx10
-rw-r--r--configmgr/source/rootaccess.hxx24
-rw-r--r--configmgr/source/update.cxx19
12 files changed, 177 insertions, 623 deletions
diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index d0fc33260225..cd4614aa4f8f 100644
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
@@ -130,12 +130,10 @@ protected:
Test const & test_;
private:
- virtual void SAL_CALL disposing(css::lang::EventObject const &)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing(css::lang::EventObject const &) override;
virtual void SAL_CALL propertyChange(
- css::beans::PropertyChangeEvent const &)
- throw (css::uno::RuntimeException, std::exception) override;
+ css::beans::PropertyChangeEvent const &) override;
int count_;
bool * destroyed_;
@@ -167,14 +165,12 @@ RecursiveTest::~RecursiveTest()
}
void RecursiveTest::disposing(css::lang::EventObject const & Source)
- throw (css::uno::RuntimeException, std::exception)
{
CPPUNIT_ASSERT(properties_.is() && Source.Source == properties_);
properties_.clear();
}
void RecursiveTest::propertyChange(css::beans::PropertyChangeEvent const & evt)
- throw (css::uno::RuntimeException, std::exception)
{
CPPUNIT_ASSERT( evt.Source == properties_ && evt.PropertyName == "Label" );
if (count_ > 0) {
diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
index 486a826e50e4..63ec79f04157 100644
--- a/configmgr/source/access.cxx
+++ b/configmgr/source/access.cxx
@@ -173,7 +173,6 @@ void Access::initBroadcaster(
}
css::uno::Sequence< css::uno::Type > Access::getTypes()
- throw (css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
@@ -225,7 +224,6 @@ css::uno::Sequence< css::uno::Type > Access::getTypes()
}
css::uno::Sequence< sal_Int8 > Access::getImplementationId()
- throw (css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
@@ -233,7 +231,7 @@ css::uno::Sequence< sal_Int8 > Access::getImplementationId()
return css::uno::Sequence< sal_Int8 >();
}
-OUString Access::getImplementationName() throw (css::uno::RuntimeException, std::exception)
+OUString Access::getImplementationName()
{
assert(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
@@ -242,13 +240,11 @@ OUString Access::getImplementationName() throw (css::uno::RuntimeException, std:
}
sal_Bool Access::supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
css::uno::Sequence< OUString > Access::getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
@@ -279,7 +275,7 @@ css::uno::Sequence< OUString > Access::getSupportedServiceNames()
return comphelper::containerToSequence(services);
}
-void Access::dispose() throw (css::uno::RuntimeException, std::exception) {
+void Access::dispose() {
assert(thisIs(IS_ANY));
Broadcaster bc;
{
@@ -302,7 +298,6 @@ void Access::dispose() throw (css::uno::RuntimeException, std::exception) {
void Access::addEventListener(
css::uno::Reference< css::lang::XEventListener > const & xListener)
- throw (css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_ANY));
{
@@ -325,7 +320,6 @@ void Access::addEventListener(
void Access::removeEventListener(
css::uno::Reference< css::lang::XEventListener > const & aListener)
- throw (css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
@@ -336,7 +330,7 @@ void Access::removeEventListener(
}
}
-css::uno::Type Access::getElementType() throw (css::uno::RuntimeException, std::exception) {
+css::uno::Type Access::getElementType() {
assert(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
checkLocalizedPropertyAccess();
@@ -359,7 +353,7 @@ css::uno::Type Access::getElementType() throw (css::uno::RuntimeException, std::
}
}
-sal_Bool Access::hasElements() throw (css::uno::RuntimeException, std::exception) {
+sal_Bool Access::hasElements() {
assert(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
checkLocalizedPropertyAccess();
@@ -403,9 +397,6 @@ bool Access::getByNameFast(const OUString & name, css::uno::Any & value)
}
css::uno::Any Access::getByName(OUString const & aName)
- throw (
- css::container::NoSuchElementException,
- css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
@@ -418,7 +409,6 @@ css::uno::Any Access::getByName(OUString const & aName)
}
css::uno::Sequence< OUString > Access::getElementNames()
- throw (css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
@@ -435,7 +425,6 @@ css::uno::Sequence< OUString > Access::getElementNames()
}
sal_Bool Access::hasByName(OUString const & aName)
- throw (css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
@@ -444,7 +433,6 @@ sal_Bool Access::hasByName(OUString const & aName)
}
css::uno::Any Access::getByHierarchicalName(OUString const & aName)
- throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
@@ -458,7 +446,6 @@ css::uno::Any Access::getByHierarchicalName(OUString const & aName)
}
sal_Bool Access::hasByHierarchicalName(OUString const & aName)
- throw (css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
@@ -468,10 +455,6 @@ sal_Bool Access::hasByHierarchicalName(OUString const & aName)
void Access::replaceByHierarchicalName(
OUString const & aName, css::uno::Any const & aElement)
- throw (
- css::lang::IllegalArgumentException,
- css::container::NoSuchElementException,
- css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
//TODO: Actually support sets and combine with replaceByName:
assert(thisIs(IS_UPDATE));
@@ -514,7 +497,6 @@ void Access::replaceByHierarchicalName(
void Access::addContainerListener(
css::uno::Reference< css::container::XContainerListener > const & xListener)
- throw (css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_ANY));
{
@@ -537,7 +519,6 @@ void Access::addContainerListener(
void Access::removeContainerListener(
css::uno::Reference< css::container::XContainerListener > const & xListener)
- throw (css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
@@ -549,7 +530,6 @@ void Access::removeContainerListener(
}
OUString Access::getExactName(OUString const & aApproximateName)
- throw (css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
@@ -558,7 +538,6 @@ OUString Access::getExactName(OUString const & aApproximateName)
}
css::uno::Sequence< css::beans::Property > Access::getProperties()
- throw (css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_GROUP));
osl::MutexGuard g(*lock_);
@@ -574,7 +553,6 @@ css::uno::Sequence< css::beans::Property > Access::getProperties()
}
css::beans::Property Access::getPropertyByName(OUString const & aName)
- throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_GROUP));
osl::MutexGuard g(*lock_);
@@ -587,14 +565,13 @@ css::beans::Property Access::getPropertyByName(OUString const & aName)
}
sal_Bool Access::hasPropertyByName(OUString const & Name)
- 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, std::exception) {
+OUString Access::getHierarchicalName() {
assert(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
checkLocalizedPropertyAccess();
@@ -616,9 +593,6 @@ OUString Access::getHierarchicalName() throw (css::uno::RuntimeException, std::e
OUString Access::composeHierarchicalName(
OUString const & aRelativeName)
- throw (
- css::lang::IllegalArgumentException, css::lang::NoSupportException,
- css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
@@ -636,7 +610,7 @@ OUString Access::composeHierarchicalName(
return path.makeStringAndClear();
}
-OUString Access::getName() throw (css::uno::RuntimeException, std::exception) {
+OUString Access::getName() {
assert(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
checkLocalizedPropertyAccess();
@@ -644,7 +618,6 @@ OUString Access::getName() throw (css::uno::RuntimeException, std::exception) {
}
void Access::setName(OUString const & aName)
- throw (css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_ANY));
Broadcaster bc;
@@ -712,7 +685,7 @@ void Access::setName(OUString const & aName)
bc.send();
}
-css::beans::Property Access::getAsProperty() throw (css::uno::RuntimeException, std::exception)
+css::beans::Property Access::getAsProperty()
{
assert(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
@@ -721,7 +694,6 @@ css::beans::Property Access::getAsProperty() throw (css::uno::RuntimeException,
}
css::uno::Reference< css::beans::XPropertySetInfo > Access::getPropertySetInfo()
- throw (css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_GROUP));
return this;
@@ -729,10 +701,6 @@ css::uno::Reference< css::beans::XPropertySetInfo > Access::getPropertySetInfo()
void Access::setPropertyValue(
OUString const & aPropertyName, css::uno::Any const & aValue)
- throw (
- css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
- css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_GROUP));
Broadcaster bc;
@@ -754,9 +722,6 @@ void Access::setPropertyValue(
}
css::uno::Any Access::getPropertyValue(OUString const & PropertyName)
- throw (
- css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_GROUP));
osl::MutexGuard g(*lock_);
@@ -772,9 +737,6 @@ void Access::addPropertyChangeListener(
OUString const & aPropertyName,
css::uno::Reference< css::beans::XPropertyChangeListener > const &
xListener)
- throw (
- css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_GROUP));
{
@@ -799,9 +761,6 @@ void Access::removePropertyChangeListener(
OUString const & aPropertyName,
css::uno::Reference< css::beans::XPropertyChangeListener > const &
aListener)
- throw (
- css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_GROUP));
osl::MutexGuard g(*lock_);
@@ -823,9 +782,6 @@ void Access::addVetoableChangeListener(
OUString const & PropertyName,
css::uno::Reference< css::beans::XVetoableChangeListener > const &
aListener)
- throw (
- css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_GROUP));
{
@@ -851,9 +807,6 @@ void Access::removeVetoableChangeListener(
OUString const & PropertyName,
css::uno::Reference< css::beans::XVetoableChangeListener > const &
aListener)
- throw (
- css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_GROUP));
osl::MutexGuard g(*lock_);
@@ -874,9 +827,6 @@ void Access::removeVetoableChangeListener(
void Access::setPropertyValues(
css::uno::Sequence< OUString > const & aPropertyNames,
css::uno::Sequence< css::uno::Any > const & aValues)
- throw (
- css::beans::PropertyVetoException, css::lang::IllegalArgumentException,
- css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_GROUP));
Broadcaster bc;
@@ -908,7 +858,6 @@ void Access::setPropertyValues(
css::uno::Sequence< css::uno::Any > Access::getPropertyValues(
css::uno::Sequence< OUString > const & aPropertyNames)
- throw (css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_GROUP));
osl::MutexGuard g(*lock_);
@@ -929,7 +878,6 @@ void Access::addPropertiesChangeListener(
css::uno::Sequence< OUString > const &,
css::uno::Reference< css::beans::XPropertiesChangeListener > const &
xListener)
- throw (css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_GROUP));
{
@@ -952,7 +900,6 @@ void Access::addPropertiesChangeListener(
void Access::removePropertiesChangeListener(
css::uno::Reference< css::beans::XPropertiesChangeListener > const &
xListener)
- throw (css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_GROUP));
osl::MutexGuard g(*lock_);
@@ -967,7 +914,6 @@ void Access::firePropertiesChangeEvent(
css::uno::Sequence< OUString > const & aPropertyNames,
css::uno::Reference< css::beans::XPropertiesChangeListener > const &
xListener)
- throw (css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_GROUP));
css::uno::Sequence< css::beans::PropertyChangeEvent > events(
@@ -982,7 +928,7 @@ void Access::firePropertiesChangeEvent(
}
css::uno::Reference< css::beans::XHierarchicalPropertySetInfo >
-Access::getHierarchicalPropertySetInfo() throw (css::uno::RuntimeException, std::exception) {
+Access::getHierarchicalPropertySetInfo() {
assert(thisIs(IS_GROUP));
return this;
}
@@ -990,10 +936,6 @@ Access::getHierarchicalPropertySetInfo() throw (css::uno::RuntimeException, std:
void Access::setHierarchicalPropertyValue(
OUString const & aHierarchicalPropertyName,
css::uno::Any const & aValue)
- throw (
- css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
- css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_GROUP));
Broadcaster bc;
@@ -1021,10 +963,6 @@ void Access::setHierarchicalPropertyValue(
css::uno::Any Access::getHierarchicalPropertyValue(
OUString const & aHierarchicalPropertyName)
- throw (
- css::beans::UnknownPropertyException,
- css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_GROUP));
osl::MutexGuard g(*lock_);
@@ -1040,9 +978,6 @@ css::uno::Any Access::getHierarchicalPropertyValue(
void Access::setHierarchicalPropertyValues(
css::uno::Sequence< OUString > const & aHierarchicalPropertyNames,
css::uno::Sequence< css::uno::Any > const & Values)
- throw (
- css::beans::PropertyVetoException, css::lang::IllegalArgumentException,
- css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_GROUP));
Broadcaster bc;
@@ -1079,9 +1014,6 @@ void Access::setHierarchicalPropertyValues(
css::uno::Sequence< css::uno::Any > Access::getHierarchicalPropertyValues(
css::uno::Sequence< OUString > const & aHierarchicalPropertyNames)
- throw (
- css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_GROUP));
osl::MutexGuard g(*lock_);
@@ -1103,7 +1035,6 @@ css::uno::Sequence< css::uno::Any > Access::getHierarchicalPropertyValues(
css::beans::Property Access::getPropertyByHierarchicalName(
OUString const & aHierarchicalName)
- throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_GROUP));
osl::MutexGuard g(*lock_);
@@ -1117,7 +1048,6 @@ css::beans::Property Access::getPropertyByHierarchicalName(
sal_Bool Access::hasPropertyByHierarchicalName(
OUString const & aHierarchicalName)
- throw (css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_GROUP));
osl::MutexGuard g(*lock_);
@@ -1126,10 +1056,6 @@ sal_Bool Access::hasPropertyByHierarchicalName(
void Access::replaceByName(
OUString const & aName, css::uno::Any const & aElement)
- throw (
- css::lang::IllegalArgumentException,
- css::container::NoSuchElementException,
- css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_UPDATE));
Broadcaster bc;
@@ -1170,10 +1096,6 @@ void Access::replaceByName(
void Access::insertByName(
OUString const & aName, css::uno::Any const & aElement)
- throw (
- css::lang::IllegalArgumentException,
- css::container::ElementExistException,
- css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_EXTENSIBLE|IS_UPDATE));
Broadcaster bc;
@@ -1233,9 +1155,6 @@ void Access::insertByName(
}
void Access::removeByName(OUString const & aName)
- throw (
- css::container::NoSuchElementException,
- css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_EXTENSIBLE|IS_UPDATE));
Broadcaster bc;
@@ -1270,7 +1189,6 @@ void Access::removeByName(OUString const & aName)
}
css::uno::Reference< css::uno::XInterface > Access::createInstance()
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_SET|IS_UPDATE));
OUString tmplName(
@@ -1290,7 +1208,6 @@ 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, std::exception)
{
assert(thisIs(IS_SET|IS_UPDATE));
if (aArguments.getLength() != 0) {
@@ -1386,7 +1303,6 @@ void Access::clearListeners() throw() {
}
css::uno::Any Access::queryInterface(css::uno::Type const & aType)
- throw (css::uno::RuntimeException, std::exception)
{
css::uno::Any res(OWeakObject::queryInterface(aType));
if (res.hasValue()) {
diff --git a/configmgr/source/access.hxx b/configmgr/source/access.hxx
index 5bd3a74f89c3..5fc8d183f5be 100644
--- a/configmgr/source/access.hxx
+++ b/configmgr/source/access.hxx
@@ -134,295 +134,179 @@ public:
using OWeakObject::release;
virtual css::uno::Sequence< css::uno::Type > SAL_CALL
- getTypes() throw (css::uno::RuntimeException, std::exception) override;
+ getTypes() override;
virtual css::uno::Sequence< sal_Int8 > SAL_CALL
- getImplementationId() throw (css::uno::RuntimeException, std::exception) override;
+ getImplementationId() override;
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
virtual css::uno::Sequence< OUString > SAL_CALL
- getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+ getSupportedServiceNames() override;
- virtual void SAL_CALL dispose()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose() override;
virtual void SAL_CALL addEventListener(
css::uno::Reference< css::lang::XEventListener >
- const & xListener)
- throw (css::uno::RuntimeException, std::exception) override;
+ const & xListener) override;
virtual void SAL_CALL removeEventListener(
css::uno::Reference< css::lang::XEventListener >
- const & aListener)
- throw (css::uno::RuntimeException, std::exception) override;
+ const & aListener) override;
- virtual css::uno::Type SAL_CALL getElementType()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Type SAL_CALL getElementType() override;
- virtual sal_Bool SAL_CALL hasElements()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasElements() override;
virtual css::uno::Any SAL_CALL getByName(
- OUString const & aName)
- throw (
- css::container::NoSuchElementException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ OUString const & aName) override;
virtual css::uno::Sequence< OUString > SAL_CALL
- getElementNames() throw (css::uno::RuntimeException, std::exception) override;
+ getElementNames() override;
- virtual sal_Bool SAL_CALL hasByName(OUString const & aName)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasByName(OUString const & aName) override;
virtual css::uno::Any SAL_CALL getByHierarchicalName(
- OUString const & aName)
- throw (
- css::container::NoSuchElementException,
- css::uno::RuntimeException, std::exception) override;
+ OUString const & aName) override;
- virtual sal_Bool SAL_CALL hasByHierarchicalName(OUString const & aName)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasByHierarchicalName(OUString const & aName) override;
virtual void SAL_CALL replaceByHierarchicalName(
- OUString const & aName, css::uno::Any const & aElement)
- throw (
- css::lang::IllegalArgumentException,
- css::container::NoSuchElementException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ OUString const & aName, css::uno::Any const & aElement) override;
virtual void SAL_CALL addContainerListener(
css::uno::Reference<
- css::container::XContainerListener > const & xListener)
- throw (css::uno::RuntimeException, std::exception) override;
+ css::container::XContainerListener > const & xListener) override;
virtual void SAL_CALL removeContainerListener(
css::uno::Reference<
- css::container::XContainerListener > const & xListener)
- throw (css::uno::RuntimeException, std::exception) override;
+ css::container::XContainerListener > const & xListener) override;
virtual OUString SAL_CALL getExactName(
- OUString const & aApproximateName)
- throw (css::uno::RuntimeException, std::exception) override;
+ OUString const & aApproximateName) override;
virtual css::uno::Sequence< css::beans::Property >
- SAL_CALL getProperties() throw (css::uno::RuntimeException, std::exception) override;
+ SAL_CALL getProperties() override;
virtual css::beans::Property SAL_CALL getPropertyByName(
- OUString const & aName)
- throw (
- css::beans::UnknownPropertyException,
- css::uno::RuntimeException, std::exception) override;
+ OUString const & aName) override;
- virtual sal_Bool SAL_CALL hasPropertyByName(OUString const & Name)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasPropertyByName(OUString const & Name) override;
- virtual OUString SAL_CALL getHierarchicalName()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getHierarchicalName() override;
virtual OUString SAL_CALL composeHierarchicalName(
- OUString const & aRelativeName)
- throw (
- css::lang::IllegalArgumentException,
- css::lang::NoSupportException,
- css::uno::RuntimeException, std::exception) override;
+ OUString const & aRelativeName) override;
- virtual OUString SAL_CALL getName()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getName() override;
- virtual void SAL_CALL setName(OUString const & aName)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setName(OUString const & aName) override;
- virtual css::beans::Property SAL_CALL getAsProperty()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::beans::Property SAL_CALL getAsProperty() override;
virtual
css::uno::Reference< css::beans::XPropertySetInfo >
- SAL_CALL getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override;
+ SAL_CALL getPropertySetInfo() override;
virtual void SAL_CALL setPropertyValue(
OUString const & aPropertyName,
- css::uno::Any const & aValue)
- throw (
- css::beans::UnknownPropertyException,
- css::beans::PropertyVetoException,
- css::lang::IllegalArgumentException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ css::uno::Any const & aValue) override;
virtual css::uno::Any SAL_CALL getPropertyValue(
- OUString const & PropertyName)
- throw (
- css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ OUString const & PropertyName) override;
virtual void SAL_CALL addPropertyChangeListener(
OUString const & aPropertyName,
css::uno::Reference<
- css::beans::XPropertyChangeListener > const & xListener)
- throw (
- css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ css::beans::XPropertyChangeListener > const & xListener) override;
virtual void SAL_CALL removePropertyChangeListener(
OUString const & aPropertyName,
css::uno::Reference<
- css::beans::XPropertyChangeListener > const & aListener)
- throw (
- css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ css::beans::XPropertyChangeListener > const & aListener) override;
virtual void SAL_CALL addVetoableChangeListener(
OUString const & PropertyName,
css::uno::Reference<
- css::beans::XVetoableChangeListener > const & aListener)
- throw (
- css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ css::beans::XVetoableChangeListener > const & aListener) override;
virtual void SAL_CALL removeVetoableChangeListener(
OUString const & PropertyName,
css::uno::Reference<
- css::beans::XVetoableChangeListener > const & aListener)
- throw (
- css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ css::beans::XVetoableChangeListener > const & aListener) override;
virtual void SAL_CALL setPropertyValues(
css::uno::Sequence< OUString > const & aPropertyNames,
css::uno::Sequence< css::uno::Any > const &
- aValues)
- throw (
- css::beans::PropertyVetoException,
- css::lang::IllegalArgumentException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ aValues) override;
virtual css::uno::Sequence< css::uno::Any > SAL_CALL
getPropertyValues(
- css::uno::Sequence< OUString > const & aPropertyNames)
- throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Sequence< OUString > const & aPropertyNames) override;
virtual void SAL_CALL addPropertiesChangeListener(
css::uno::Sequence< OUString > const & aPropertyNames,
css::uno::Reference<
css::beans::XPropertiesChangeListener > const &
- xListener)
- throw (css::uno::RuntimeException, std::exception) override;
+ xListener) override;
virtual void SAL_CALL removePropertiesChangeListener(
css::uno::Reference<
css::beans::XPropertiesChangeListener > const &
- xListener)
- throw (css::uno::RuntimeException, std::exception) override;
+ xListener) override;
virtual void SAL_CALL firePropertiesChangeEvent(
css::uno::Sequence< OUString > const & aPropertyNames,
css::uno::Reference<
css::beans::XPropertiesChangeListener > const &
- xListener)
- throw (css::uno::RuntimeException, std::exception) override;
+ xListener) override;
virtual
css::uno::Reference<
css::beans::XHierarchicalPropertySetInfo > SAL_CALL
- getHierarchicalPropertySetInfo()
- throw (css::uno::RuntimeException, std::exception) override;
+ getHierarchicalPropertySetInfo() override;
virtual void SAL_CALL setHierarchicalPropertyValue(
OUString const & aHierarchicalPropertyName,
- css::uno::Any const & aValue)
- throw (
- css::beans::UnknownPropertyException,
- css::beans::PropertyVetoException,
- css::lang::IllegalArgumentException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ css::uno::Any const & aValue) override;
virtual css::uno::Any SAL_CALL getHierarchicalPropertyValue(
- OUString const & aHierarchicalPropertyName)
- throw (
- css::beans::UnknownPropertyException,
- css::lang::IllegalArgumentException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ OUString const & aHierarchicalPropertyName) override;
virtual void SAL_CALL setHierarchicalPropertyValues(
css::uno::Sequence< OUString > const &
aHierarchicalPropertyNames,
css::uno::Sequence< css::uno::Any > const &
- Values)
- throw (
- css::beans::PropertyVetoException,
- css::lang::IllegalArgumentException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ Values) override;
virtual css::uno::Sequence< css::uno::Any > SAL_CALL
getHierarchicalPropertyValues(
css::uno::Sequence< OUString > const &
- aHierarchicalPropertyNames)
- throw (
- css::lang::IllegalArgumentException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ aHierarchicalPropertyNames) override;
virtual css::beans::Property SAL_CALL
- getPropertyByHierarchicalName(OUString const & aHierarchicalName)
- throw (
- css::beans::UnknownPropertyException,
- css::uno::RuntimeException, std::exception) override;
+ getPropertyByHierarchicalName(OUString const & aHierarchicalName) override;
virtual sal_Bool SAL_CALL hasPropertyByHierarchicalName(
- OUString const & aHierarchicalName)
- throw (css::uno::RuntimeException, std::exception) override;
+ OUString const & aHierarchicalName) override;
virtual void SAL_CALL replaceByName(
- OUString const & aName, css::uno::Any const & aElement)
- throw (
- css::lang::IllegalArgumentException,
- css::container::NoSuchElementException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ OUString const & aName, css::uno::Any const & aElement) override;
virtual void SAL_CALL insertByName(
- OUString const & aName, css::uno::Any const & aElement)
- throw (
- css::lang::IllegalArgumentException,
- css::container::ElementExistException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
-
- virtual void SAL_CALL removeByName(OUString const & aName)
- throw (
- css::container::NoSuchElementException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ OUString const & aName, css::uno::Any const & aElement) override;
+
+ virtual void SAL_CALL removeByName(OUString const & aName) override;
virtual css::uno::Reference< css::uno::XInterface >
- SAL_CALL createInstance()
- throw (
- css::uno::Exception,
- css::uno::RuntimeException, std::exception) override;
+ SAL_CALL createInstance() override;
virtual css::uno::Reference< css::uno::XInterface >
SAL_CALL createInstanceWithArguments(
css::uno::Sequence< css::uno::Any > const &
- aArguments)
- throw (
- css::uno::Exception,
- css::uno::RuntimeException, std::exception) override;
+ aArguments) override;
protected:
explicit Access(Components & components);
@@ -443,8 +327,7 @@ protected:
virtual void clearListeners() throw ();
virtual css::uno::Any SAL_CALL queryInterface(
- css::uno::Type const & aType)
- throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Type const & aType) override;
Components & getComponents() const { return components_;}
diff --git a/configmgr/source/childaccess.cxx b/configmgr/source/childaccess.cxx
index 2cde81159b4a..c38e58a4cd43 100644
--- a/configmgr/source/childaccess.cxx
+++ b/configmgr/source/childaccess.cxx
@@ -151,7 +151,6 @@ void ChildAccess::release() throw () {
}
css::uno::Reference< css::uno::XInterface > ChildAccess::getParent()
- throw (css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
@@ -160,7 +159,6 @@ css::uno::Reference< css::uno::XInterface > ChildAccess::getParent()
}
void ChildAccess::setParent(css::uno::Reference< css::uno::XInterface > const &)
- throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
@@ -171,7 +169,6 @@ void ChildAccess::setParent(css::uno::Reference< css::uno::XInterface > const &)
sal_Int64 ChildAccess::getSomething(
css::uno::Sequence< sal_Int8 > const & aIdentifier)
- throw (css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
@@ -344,7 +341,6 @@ void ChildAccess::addSupportedServiceNames(
}
css::uno::Any ChildAccess::queryInterface(css::uno::Type const & aType)
- throw (css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
diff --git a/configmgr/source/childaccess.hxx b/configmgr/source/childaccess.hxx
index dd81b251bb8b..5a0ab480ec0d 100644
--- a/configmgr/source/childaccess.hxx
+++ b/configmgr/source/childaccess.hxx
@@ -82,18 +82,13 @@ public:
virtual void SAL_CALL release() throw () override;
virtual css::uno::Reference< css::uno::XInterface >
- SAL_CALL getParent()
- throw (css::uno::RuntimeException, std::exception) override;
+ SAL_CALL getParent() override;
virtual void SAL_CALL setParent(
- css::uno::Reference< css::uno::XInterface > const &)
- throw (
- css::lang::NoSupportException,
- css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference< css::uno::XInterface > const &) override;
virtual sal_Int64 SAL_CALL getSomething(
- css::uno::Sequence< sal_Int8 > const & aIdentifier)
- throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Sequence< sal_Int8 > const & aIdentifier) override;
void bind(
rtl::Reference< RootAccess > const & root,
@@ -127,8 +122,7 @@ private:
std::vector<OUString> * services) override;
virtual css::uno::Any SAL_CALL queryInterface(
- css::uno::Type const & aType)
- throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Type const & aType) override;
rtl::Reference< RootAccess > root_;
rtl::Reference< Access > parent_; // null if free node
diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx
index e4454a4c02a3..f093e9f684bc 100644
--- a/configmgr/source/configurationprovider.cxx
+++ b/configmgr/source/configurationprovider.cxx
@@ -117,20 +117,18 @@ private:
virtual void SAL_CALL disposing() override { flushModifications(); }
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return default_
? default_provider::getImplementationName()
: configuration_provider::getImplementationName();
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{ return cppu::supportsService(this, ServiceName); }
virtual css::uno::Sequence< OUString > SAL_CALL
- getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override
+ getSupportedServiceNames() override
{
return default_
? default_provider::getSupportedServiceNames()
@@ -138,43 +136,35 @@ private:
}
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(
- OUString const & aServiceSpecifier)
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ OUString const & aServiceSpecifier) override;
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, std::exception) override;
+ css::uno::Sequence< css::uno::Any > const & Arguments) override;
virtual css::uno::Sequence< OUString > SAL_CALL
- getAvailableServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+ getAvailableServiceNames() override;
- virtual void SAL_CALL refresh() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL refresh() override;
virtual void SAL_CALL addRefreshListener(
- css::uno::Reference< css::util::XRefreshListener > const & l)
- throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference< css::util::XRefreshListener > const & l) override;
virtual void SAL_CALL removeRefreshListener(
- css::uno::Reference< css::util::XRefreshListener > const & l)
- throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference< css::util::XRefreshListener > const & l) override;
- virtual void SAL_CALL flush() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL flush() override;
virtual void SAL_CALL addFlushListener(
- css::uno::Reference< css::util::XFlushListener > const & l)
- throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference< css::util::XFlushListener > const & l) override;
virtual void SAL_CALL removeFlushListener(
- css::uno::Reference< css::util::XFlushListener > const & l)
- throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference< css::util::XFlushListener > const & l) override;
- virtual void SAL_CALL setLocale(css::lang::Locale const & eLocale)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setLocale(css::lang::Locale const & eLocale) override;
- virtual css::lang::Locale SAL_CALL getLocale()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::lang::Locale SAL_CALL getLocale() override;
void flushModifications() const;
@@ -186,7 +176,6 @@ private:
css::uno::Reference< css::uno::XInterface > Service::createInstance(
OUString const & aServiceSpecifier)
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
{
return createInstanceWithArguments(
aServiceSpecifier, css::uno::Sequence< css::uno::Any >());
@@ -196,7 +185,6 @@ 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, std::exception)
{
OUString nodepath;
OUString locale;
@@ -284,7 +272,6 @@ Service::createInstanceWithArguments(
}
css::uno::Sequence< OUString > Service::getAvailableServiceNames()
- throw (css::uno::RuntimeException, std::exception)
{
css::uno::Sequence< OUString > names(2);
names[0] = accessServiceName;
@@ -292,7 +279,7 @@ css::uno::Sequence< OUString > Service::getAvailableServiceNames()
return names;
}
-void Service::refresh() throw (css::uno::RuntimeException, std::exception) {
+void Service::refresh() {
//TODO
cppu::OInterfaceContainerHelper * cont = rBHelper.getContainer(
cppu::UnoType< css::util::XRefreshListener >::get());
@@ -304,7 +291,6 @@ void Service::refresh() throw (css::uno::RuntimeException, std::exception) {
void Service::addRefreshListener(
css::uno::Reference< css::util::XRefreshListener > const & l)
- throw (css::uno::RuntimeException, std::exception)
{
rBHelper.addListener(
cppu::UnoType< css::util::XRefreshListener >::get(), l);
@@ -312,13 +298,12 @@ void Service::addRefreshListener(
void Service::removeRefreshListener(
css::uno::Reference< css::util::XRefreshListener > const & l)
- throw (css::uno::RuntimeException, std::exception)
{
rBHelper.removeListener(
cppu::UnoType< css::util::XRefreshListener >::get(), l);
}
-void Service::flush() throw (css::uno::RuntimeException, std::exception) {
+void Service::flush() {
flushModifications();
cppu::OInterfaceContainerHelper * cont = rBHelper.getContainer(
cppu::UnoType< css::util::XFlushListener >::get());
@@ -330,27 +315,24 @@ void Service::flush() throw (css::uno::RuntimeException, std::exception) {
void Service::addFlushListener(
css::uno::Reference< css::util::XFlushListener > const & l)
- 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, std::exception)
{
rBHelper.removeListener(
cppu::UnoType< css::util::XFlushListener >::get(), l);
}
void Service::setLocale(css::lang::Locale const & eLocale)
- throw (css::uno::RuntimeException, std::exception)
{
osl::MutexGuard guard(*lock_);
locale_ = LanguageTag::convertToBcp47( eLocale, false);
}
-css::lang::Locale Service::getLocale() throw (css::uno::RuntimeException, std::exception) {
+css::lang::Locale Service::getLocale() {
osl::MutexGuard guard(*lock_);
css::lang::Locale loc;
if (! locale_.isEmpty()) {
@@ -383,31 +365,26 @@ 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, std::exception) override;
+ css::uno::Reference< css::uno::XComponentContext > const & Context) override;
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, std::exception) override;
+ css::uno::Reference< css::uno::XComponentContext > const & Context) override;
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{ return configuration_provider::getImplementationName(); }
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{ return cppu::supportsService(this, ServiceName); }
virtual css::uno::Sequence< OUString > SAL_CALL
- getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override
+ getSupportedServiceNames() override
{ 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, std::exception)
{
return createInstanceWithArgumentsAndContext(
css::uno::Sequence< css::uno::Any >(), Context);
@@ -417,7 +394,6 @@ 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, std::exception)
{
if (Arguments.getLength() == 0) {
return css::configuration::theDefaultProvider::get(Context);
diff --git a/configmgr/source/configurationregistry.cxx b/configmgr/source/configurationregistry.cxx
index 5370f036cde5..2f23577ba2ba 100644
--- a/configmgr/source/configurationregistry.cxx
+++ b/configmgr/source/configurationregistry.cxx
@@ -80,60 +80,41 @@ private:
virtual ~Service() override {}
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{ return configuration_registry::getImplementationName(); }
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{ return cppu::supportsService(this, ServiceName); }
virtual css::uno::Sequence< OUString > SAL_CALL
- getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override
+ getSupportedServiceNames() override
{ return configuration_registry::getSupportedServiceNames(); }
- virtual OUString SAL_CALL getURL() throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getURL() override;
virtual void SAL_CALL open(
- OUString const & rURL, sal_Bool bReadOnly, sal_Bool)
- throw (
- css::registry::InvalidRegistryException,
- css::uno::RuntimeException, std::exception) override;
+ OUString const & rURL, sal_Bool bReadOnly, sal_Bool) override;
- virtual sal_Bool SAL_CALL isValid() throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isValid() override;
- virtual void SAL_CALL close()
- throw (
- css::registry::InvalidRegistryException,
- css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL close() override;
- virtual void SAL_CALL destroy()
- throw (
- css::registry::InvalidRegistryException,
- css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL destroy() override;
virtual css::uno::Reference< css::registry::XRegistryKey > SAL_CALL
- getRootKey()
- throw (
- css::registry::InvalidRegistryException,
- css::uno::RuntimeException, std::exception) override;
+ getRootKey() override;
- virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isReadOnly() override;
- virtual void SAL_CALL mergeKey(OUString const &, OUString const &)
- throw (
- css::registry::InvalidRegistryException,
- css::registry::MergeConflictException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL mergeKey(OUString const &, OUString const &) override;
- virtual void SAL_CALL flush() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL flush() override;
virtual void SAL_CALL addFlushListener(
- css::uno::Reference< css::util::XFlushListener > const &)
- throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference< css::util::XFlushListener > const &) override;
virtual void SAL_CALL removeFlushListener(
- css::uno::Reference< css::util::XFlushListener > const &)
- throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference< css::util::XFlushListener > const &) override;
void checkValid();
@@ -163,155 +144,73 @@ private:
virtual ~RegistryKey() override {}
- virtual OUString SAL_CALL getKeyName()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getKeyName() override;
- virtual sal_Bool SAL_CALL isReadOnly()
- throw (
- css::registry::InvalidRegistryException,
- css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isReadOnly() override;
- virtual sal_Bool SAL_CALL isValid() throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isValid() override;
virtual css::registry::RegistryKeyType SAL_CALL getKeyType(
- OUString const &)
- throw (
- css::registry::InvalidRegistryException,
- css::uno::RuntimeException, std::exception) override;
-
- virtual css::registry::RegistryValueType SAL_CALL getValueType()
- throw (
- css::registry::InvalidRegistryException,
- css::uno::RuntimeException, std::exception) override;
-
- virtual sal_Int32 SAL_CALL getLongValue()
- throw (
- css::registry::InvalidRegistryException,
- css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override;
-
- virtual void SAL_CALL setLongValue(sal_Int32)
- throw (
- css::registry::InvalidRegistryException,
- css::uno::RuntimeException, std::exception) override;
-
- virtual css::uno::Sequence< sal_Int32 > SAL_CALL getLongListValue()
- throw (
- css::registry::InvalidRegistryException,
- css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override;
+ OUString const &) override;
+
+ virtual css::registry::RegistryValueType SAL_CALL getValueType() override;
+
+ virtual sal_Int32 SAL_CALL getLongValue() override;
+
+ virtual void SAL_CALL setLongValue(sal_Int32) override;
+
+ virtual css::uno::Sequence< sal_Int32 > SAL_CALL getLongListValue() override;
virtual void SAL_CALL setLongListValue(
- css::uno::Sequence< sal_Int32 > const &)
- throw (
- css::registry::InvalidRegistryException,
- css::uno::RuntimeException, std::exception) override;
-
- virtual OUString SAL_CALL getAsciiValue()
- throw (
- css::registry::InvalidRegistryException,
- css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override;
-
- virtual void SAL_CALL setAsciiValue(OUString const &)
- throw (
- css::registry::InvalidRegistryException,
- css::uno::RuntimeException, std::exception) override;
-
- virtual css::uno::Sequence< OUString > SAL_CALL getAsciiListValue()
- throw (
- css::registry::InvalidRegistryException,
- css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override;
+ css::uno::Sequence< sal_Int32 > const &) override;
+
+ virtual OUString SAL_CALL getAsciiValue() override;
+
+ virtual void SAL_CALL setAsciiValue(OUString const &) override;
+
+ virtual css::uno::Sequence< OUString > SAL_CALL getAsciiListValue() override;
virtual void SAL_CALL setAsciiListValue(
- css::uno::Sequence< OUString > const &)
- throw (
- css::registry::InvalidRegistryException,
- css::uno::RuntimeException, std::exception) override;
-
- virtual OUString SAL_CALL getStringValue()
- throw (
- css::registry::InvalidRegistryException,
- css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override;
-
- virtual void SAL_CALL setStringValue(OUString const &)
- throw (
- css::registry::InvalidRegistryException,
- css::uno::RuntimeException, std::exception) override;
-
- virtual css::uno::Sequence< OUString > SAL_CALL getStringListValue()
- throw (
- css::registry::InvalidRegistryException,
- css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override;
+ css::uno::Sequence< OUString > const &) override;
+
+ virtual OUString SAL_CALL getStringValue() override;
+
+ virtual void SAL_CALL setStringValue(OUString const &) override;
+
+ virtual css::uno::Sequence< OUString > SAL_CALL getStringListValue() override;
virtual void SAL_CALL setStringListValue(
- css::uno::Sequence< OUString > const &)
- throw (
- css::registry::InvalidRegistryException,
- css::uno::RuntimeException, std::exception) override;
+ css::uno::Sequence< OUString > const &) override;
- virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBinaryValue()
- throw (
- css::registry::InvalidRegistryException,
- css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBinaryValue() override;
- virtual void SAL_CALL setBinaryValue(css::uno::Sequence< sal_Int8 > const &)
- throw (
- css::registry::InvalidRegistryException,
- css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setBinaryValue(css::uno::Sequence< sal_Int8 > const &) override;
virtual css::uno::Reference< css::registry::XRegistryKey > SAL_CALL openKey(
- OUString const & aKeyName)
- throw (
- css::registry::InvalidRegistryException,
- css::uno::RuntimeException, std::exception) override;
+ OUString const & aKeyName) override;
virtual css::uno::Reference< css::registry::XRegistryKey > SAL_CALL
- createKey(OUString const &)
- throw (
- css::registry::InvalidRegistryException,
- css::uno::RuntimeException, std::exception) override;
+ createKey(OUString const &) override;
- virtual void SAL_CALL closeKey()
- throw (
- css::registry::InvalidRegistryException,
- css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL closeKey() override;
- virtual void SAL_CALL deleteKey(OUString const &)
- throw (
- css::registry::InvalidRegistryException,
- css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL deleteKey(OUString const &) override;
virtual
css::uno::Sequence< css::uno::Reference< css::registry::XRegistryKey > >
- SAL_CALL openKeys()
- throw (
- css::registry::InvalidRegistryException,
- css::uno::RuntimeException, std::exception) override;
+ SAL_CALL openKeys() override;
- virtual css::uno::Sequence< OUString > SAL_CALL getKeyNames()
- throw (
- css::registry::InvalidRegistryException,
- css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getKeyNames() override;
virtual sal_Bool SAL_CALL createLink(
- OUString const &, OUString const &)
- throw (
- css::registry::InvalidRegistryException,
- css::uno::RuntimeException, std::exception) override;
+ OUString const &, OUString const &) override;
- virtual void SAL_CALL deleteLink(OUString const &)
- throw (
- css::registry::InvalidRegistryException,
- css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL deleteLink(OUString const &) override;
- virtual OUString SAL_CALL getLinkTarget(OUString const &)
- throw (
- css::registry::InvalidRegistryException,
- css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getLinkTarget(OUString const &) override;
virtual OUString SAL_CALL getResolvedName(
- OUString const & aKeyName)
- throw (
- css::registry::InvalidRegistryException,
- css::uno::RuntimeException, std::exception) override;
+ OUString const & aKeyName) override;
Service & service_;
css::uno::Any value_;
@@ -338,14 +237,13 @@ Service::Service(
}
}
-OUString Service::getURL() throw (css::uno::RuntimeException, std::exception) {
+OUString Service::getURL() {
osl::MutexGuard g(mutex_);
checkValid_RuntimeException();
return url_;
}
void Service::open(OUString const & rURL, sal_Bool bReadOnly, sal_Bool)
- throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
{
//TODO: bCreate
osl::MutexGuard g(mutex_);
@@ -373,13 +271,12 @@ void Service::open(OUString const & rURL, sal_Bool bReadOnly, sal_Bool)
readOnly_ = bReadOnly;
}
-sal_Bool Service::isValid() throw (css::uno::RuntimeException, std::exception) {
+sal_Bool Service::isValid() {
osl::MutexGuard g(mutex_);
return access_.is();
}
void Service::close()
- throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(mutex_);
checkValid();
@@ -387,7 +284,6 @@ void Service::close()
}
void Service::destroy()
- throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
{
throw css::uno::RuntimeException(
"com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -395,30 +291,26 @@ void Service::destroy()
}
css::uno::Reference< css::registry::XRegistryKey > Service::getRootKey()
- throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(mutex_);
checkValid();
return new RegistryKey(*this, css::uno::makeAny(access_));
}
-sal_Bool Service::isReadOnly() throw (css::uno::RuntimeException, std::exception) {
+sal_Bool Service::isReadOnly() {
osl::MutexGuard g(mutex_);
checkValid_RuntimeException();
return readOnly_;
}
void Service::mergeKey(OUString const &, OUString const &)
- throw (
- css::registry::InvalidRegistryException,
- css::registry::MergeConflictException, css::uno::RuntimeException, std::exception)
{
throw css::uno::RuntimeException(
"com.sun.star.configuration.ConfigurationRegistry: not implemented",
static_cast< cppu::OWeakObject * >(this));
}
-void Service::flush() throw (css::uno::RuntimeException, std::exception)
+void Service::flush()
{
throw css::uno::RuntimeException(
"com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -427,7 +319,6 @@ void Service::flush() throw (css::uno::RuntimeException, std::exception)
void Service::addFlushListener(
css::uno::Reference< css::util::XFlushListener > const &)
- throw (css::uno::RuntimeException, std::exception)
{
throw css::uno::RuntimeException(
"com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -436,7 +327,6 @@ void Service::addFlushListener(
void Service::removeFlushListener(
css::uno::Reference< css::util::XFlushListener > const &)
- throw (css::uno::RuntimeException, std::exception)
{
throw css::uno::RuntimeException(
"com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -463,7 +353,7 @@ void Service::doClose() {
access_.clear();
}
-OUString RegistryKey::getKeyName() throw (css::uno::RuntimeException, std::exception) {
+OUString RegistryKey::getKeyName() {
osl::MutexGuard g(service_.mutex_);
service_.checkValid_RuntimeException();
css::uno::Reference< css::container::XNamed > named;
@@ -476,19 +366,17 @@ OUString RegistryKey::getKeyName() throw (css::uno::RuntimeException, std::excep
}
sal_Bool RegistryKey::isReadOnly()
- throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(service_.mutex_);
service_.checkValid_RuntimeException();
return service_.readOnly_; //TODO: read-only sub-nodes in update access?
}
-sal_Bool RegistryKey::isValid() throw (css::uno::RuntimeException, std::exception) {
+sal_Bool RegistryKey::isValid() {
return service_.isValid();
}
css::registry::RegistryKeyType RegistryKey::getKeyType(OUString const &)
- throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(service_.mutex_);
service_.checkValid();
@@ -496,7 +384,6 @@ css::registry::RegistryKeyType RegistryKey::getKeyType(OUString const &)
}
css::registry::RegistryValueType RegistryKey::getValueType()
- throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(service_.mutex_);
service_.checkValid();
@@ -524,9 +411,6 @@ css::registry::RegistryValueType RegistryKey::getValueType()
}
sal_Int32 RegistryKey::getLongValue()
- throw (
- css::registry::InvalidRegistryException,
- css::registry::InvalidValueException, css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(service_.mutex_);
service_.checkValid();
@@ -540,7 +424,6 @@ sal_Int32 RegistryKey::getLongValue()
}
void RegistryKey::setLongValue(sal_Int32)
- throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
{
throw css::uno::RuntimeException(
"com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -548,9 +431,6 @@ void RegistryKey::setLongValue(sal_Int32)
}
css::uno::Sequence< sal_Int32 > RegistryKey::getLongListValue()
- throw (
- css::registry::InvalidRegistryException,
- css::registry::InvalidValueException, css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(service_.mutex_);
service_.checkValid();
@@ -564,7 +444,6 @@ css::uno::Sequence< sal_Int32 > RegistryKey::getLongListValue()
}
void RegistryKey::setLongListValue(css::uno::Sequence< sal_Int32 > const &)
- throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
{
throw css::uno::RuntimeException(
"com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -572,9 +451,6 @@ void RegistryKey::setLongListValue(css::uno::Sequence< sal_Int32 > const &)
}
OUString RegistryKey::getAsciiValue()
- throw (
- css::registry::InvalidRegistryException,
- css::registry::InvalidValueException, css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(service_.mutex_);
service_.checkValid();
@@ -588,7 +464,6 @@ OUString RegistryKey::getAsciiValue()
}
void RegistryKey::setAsciiValue(OUString const &)
- throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
{
throw css::uno::RuntimeException(
"com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -596,9 +471,6 @@ void RegistryKey::setAsciiValue(OUString const &)
}
css::uno::Sequence< OUString > RegistryKey::getAsciiListValue()
- throw (
- css::registry::InvalidRegistryException,
- css::registry::InvalidValueException, css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(service_.mutex_);
service_.checkValid();
@@ -612,7 +484,6 @@ css::uno::Sequence< OUString > RegistryKey::getAsciiListValue()
}
void RegistryKey::setAsciiListValue(css::uno::Sequence< OUString > const &)
- throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
{
throw css::uno::RuntimeException(
"com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -620,9 +491,6 @@ void RegistryKey::setAsciiListValue(css::uno::Sequence< OUString > const &)
}
OUString RegistryKey::getStringValue()
- throw (
- css::registry::InvalidRegistryException,
- css::registry::InvalidValueException, css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(service_.mutex_);
service_.checkValid();
@@ -636,7 +504,6 @@ OUString RegistryKey::getStringValue()
}
void RegistryKey::setStringValue(OUString const &)
- throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
{
throw css::uno::RuntimeException(
"com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -644,9 +511,6 @@ void RegistryKey::setStringValue(OUString const &)
}
css::uno::Sequence< OUString > RegistryKey::getStringListValue()
- throw (
- css::registry::InvalidRegistryException,
- css::registry::InvalidValueException, css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(service_.mutex_);
service_.checkValid();
@@ -661,7 +525,6 @@ css::uno::Sequence< OUString > RegistryKey::getStringListValue()
void RegistryKey::setStringListValue(
css::uno::Sequence< OUString > const &)
- throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
{
throw css::uno::RuntimeException(
"com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -669,9 +532,6 @@ void RegistryKey::setStringListValue(
}
css::uno::Sequence< sal_Int8 > RegistryKey::getBinaryValue()
- throw (
- css::registry::InvalidRegistryException,
- css::registry::InvalidValueException, css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(service_.mutex_);
service_.checkValid();
@@ -685,7 +545,6 @@ css::uno::Sequence< sal_Int8 > RegistryKey::getBinaryValue()
}
void RegistryKey::setBinaryValue(css::uno::Sequence< sal_Int8 > const &)
- throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
{
throw css::uno::RuntimeException(
"com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -694,7 +553,6 @@ void RegistryKey::setBinaryValue(css::uno::Sequence< sal_Int8 > const &)
css::uno::Reference< css::registry::XRegistryKey > RegistryKey::openKey(
OUString const & aKeyName)
- throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(service_.mutex_);
service_.checkValid_RuntimeException();
@@ -710,8 +568,6 @@ css::uno::Reference< css::registry::XRegistryKey > RegistryKey::openKey(
css::uno::Reference< css::registry::XRegistryKey > RegistryKey::createKey(
OUString const &)
- throw (
- css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
{
throw css::uno::RuntimeException(
"com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -719,15 +575,12 @@ css::uno::Reference< css::registry::XRegistryKey > RegistryKey::createKey(
}
void RegistryKey::closeKey()
- throw (
- css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(service_.mutex_);
service_.checkValid_RuntimeException();
}
void RegistryKey::deleteKey(OUString const &)
- throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
{
throw css::uno::RuntimeException(
"com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -736,7 +589,6 @@ void RegistryKey::deleteKey(OUString const &)
css::uno::Sequence< css::uno::Reference< css::registry::XRegistryKey > >
RegistryKey::openKeys()
- throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
{
throw css::uno::RuntimeException(
"com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -744,7 +596,6 @@ RegistryKey::openKeys()
}
css::uno::Sequence< OUString > RegistryKey::getKeyNames()
- throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
{
throw css::uno::RuntimeException(
"com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -752,7 +603,6 @@ css::uno::Sequence< OUString > RegistryKey::getKeyNames()
}
sal_Bool RegistryKey::createLink(OUString const &, OUString const &)
- throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(service_.mutex_);
service_.checkValid_RuntimeException();
@@ -760,14 +610,12 @@ sal_Bool RegistryKey::createLink(OUString const &, OUString const &)
}
void RegistryKey::deleteLink(OUString const &)
- throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(service_.mutex_);
service_.checkValid_RuntimeException();
}
OUString RegistryKey::getLinkTarget(OUString const &)
- throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(service_.mutex_);
service_.checkValid_RuntimeException();
@@ -775,7 +623,6 @@ OUString RegistryKey::getLinkTarget(OUString const &)
}
OUString RegistryKey::getResolvedName(OUString const & aKeyName)
- throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(service_.mutex_);
service_.checkValid_RuntimeException();
diff --git a/configmgr/source/readonlyaccess.cxx b/configmgr/source/readonlyaccess.cxx
index 9ff6c10acfa7..b14ad3dc59b8 100644
--- a/configmgr/source/readonlyaccess.cxx
+++ b/configmgr/source/readonlyaccess.cxx
@@ -56,30 +56,24 @@ private:
virtual ~Service() override {}
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{ return read_only_access::getImplementationName(); }
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{ return cppu::supportsService(this, ServiceName); }
virtual css::uno::Sequence< OUString > SAL_CALL
- getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override
+ getSupportedServiceNames() override
{ return read_only_access::getSupportedServiceNames(); }
virtual void SAL_CALL initialize(
- css::uno::Sequence< css::uno::Any > const & aArguments)
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ css::uno::Sequence< css::uno::Any > const & aArguments) override;
virtual css::uno::Any SAL_CALL getByHierarchicalName(
- OUString const & aName)
- throw (
- css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override
+ OUString const & aName) override
{ return getRoot()->getByHierarchicalName(aName); }
- virtual sal_Bool SAL_CALL hasByHierarchicalName(OUString const & aName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL hasByHierarchicalName(OUString const & aName) override
{ return getRoot()->hasByHierarchicalName(aName); }
rtl::Reference< RootAccess > getRoot();
@@ -91,7 +85,6 @@ private:
};
void Service::initialize(css::uno::Sequence< css::uno::Any > const & aArguments)
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
{
OUString locale;
if (aArguments.getLength() != 1 || !(aArguments[0] >>= locale)) {
diff --git a/configmgr/source/readwriteaccess.cxx b/configmgr/source/readwriteaccess.cxx
index 9ebf2f9dee65..422451c3e319 100644
--- a/configmgr/source/readwriteaccess.cxx
+++ b/configmgr/source/readwriteaccess.cxx
@@ -58,63 +58,46 @@ private:
virtual ~Service() override {}
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{ return read_write_access::getImplementationName(); }
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{ return cppu::supportsService(this, ServiceName); }
virtual css::uno::Sequence< OUString > SAL_CALL
- getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override
+ getSupportedServiceNames() override
{ return read_write_access::getSupportedServiceNames(); }
virtual void SAL_CALL initialize(
- css::uno::Sequence< css::uno::Any > const & aArguments)
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ css::uno::Sequence< css::uno::Any > const & aArguments) override;
virtual css::uno::Any SAL_CALL getByHierarchicalName(
- OUString const & aName)
- throw (
- css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override
+ OUString const & aName) override
{ return getRoot()->getByHierarchicalName(aName); }
- virtual sal_Bool SAL_CALL hasByHierarchicalName(OUString const & aName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL hasByHierarchicalName(OUString const & aName) override
{ return getRoot()->hasByHierarchicalName(aName); }
virtual void SAL_CALL replaceByHierarchicalName(
- OUString const & aName, css::uno::Any const & aElement)
- throw (
- css::lang::IllegalArgumentException,
- css::container::NoSuchElementException,
- css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+ OUString const & aName, css::uno::Any const & aElement) override
{ getRoot()->replaceByHierarchicalName(aName, aElement); }
- virtual void SAL_CALL commitChanges()
- throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL commitChanges() override
{ getRoot()->commitChanges(); }
- virtual sal_Bool SAL_CALL hasPendingChanges()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL hasPendingChanges() override
{ return getRoot()->hasPendingChanges(); }
- virtual css::util::ChangesSet SAL_CALL getPendingChanges()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::util::ChangesSet SAL_CALL getPendingChanges() override
{ return getRoot()->getPendingChanges(); }
css::beans::Property SAL_CALL getPropertyByHierarchicalName(
OUString const & aHierarchicalName)
- throw (
- css::beans::UnknownPropertyException, css::uno::RuntimeException,
- std::exception)
override
{ return getRoot()->getPropertyByHierarchicalName(aHierarchicalName); }
sal_Bool SAL_CALL hasPropertyByHierarchicalName(
- OUString const & aHierarchicalName)
- throw (css::uno::RuntimeException, std::exception) override
+ OUString const & aHierarchicalName) override
{ return getRoot()->hasPropertyByHierarchicalName(aHierarchicalName); }
rtl::Reference< RootAccess > getRoot();
@@ -126,7 +109,6 @@ private:
};
void Service::initialize(css::uno::Sequence< css::uno::Any > const & aArguments)
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
{
OUString locale;
if (aArguments.getLength() != 1 || !(aArguments[0] >>= locale)) {
diff --git a/configmgr/source/rootaccess.cxx b/configmgr/source/rootaccess.cxx
index 3d4bbd5b4345..ec47b20cb9b8 100644
--- a/configmgr/source/rootaccess.cxx
+++ b/configmgr/source/rootaccess.cxx
@@ -113,7 +113,6 @@ void RootAccess::setAlive(bool b) {
void RootAccess::addChangesListener(
css::uno::Reference< css::util::XChangesListener > const & aListener)
- throw (css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_ANY));
{
@@ -136,7 +135,6 @@ void RootAccess::addChangesListener(
void RootAccess::removeChangesListener(
css::uno::Reference< css::util::XChangesListener > const & aListener)
- throw (css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
@@ -148,9 +146,6 @@ void RootAccess::removeChangesListener(
}
void RootAccess::commitChanges()
- throw (css::lang::WrappedTargetException,
- css::uno::RuntimeException,
- std::exception)
{
assert(thisIs(IS_UPDATE));
if (!alive_)
@@ -176,7 +171,7 @@ void RootAccess::commitChanges()
bc.send();
}
-sal_Bool RootAccess::hasPendingChanges() throw (css::uno::RuntimeException, std::exception) {
+sal_Bool RootAccess::hasPendingChanges() {
assert(thisIs(IS_UPDATE));
osl::MutexGuard g(*lock_);
checkLocalizedPropertyAccess();
@@ -187,7 +182,6 @@ sal_Bool RootAccess::hasPendingChanges() throw (css::uno::RuntimeException, std:
}
css::util::ChangesSet RootAccess::getPendingChanges()
- throw (css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_UPDATE));
osl::MutexGuard g(*lock_);
@@ -289,7 +283,6 @@ void RootAccess::clearListeners() throw() {
}
css::uno::Any RootAccess::queryInterface(css::uno::Type const & aType)
- throw (css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
@@ -311,7 +304,6 @@ css::uno::Any RootAccess::queryInterface(css::uno::Type const & aType)
}
OUString RootAccess::getImplementationName()
- throw (css::uno::RuntimeException, std::exception)
{
assert(thisIs(IS_ANY));
osl::MutexGuard g(*lock_);
diff --git a/configmgr/source/rootaccess.hxx b/configmgr/source/rootaccess.hxx
index b0efeeeab842..1f4203ba9803 100644
--- a/configmgr/source/rootaccess.hxx
+++ b/configmgr/source/rootaccess.hxx
@@ -80,25 +80,17 @@ public:
virtual void SAL_CALL addChangesListener(
css::uno::Reference< css::util::XChangesListener >
- const & aListener)
- throw (css::uno::RuntimeException, std::exception) override;
+ const & aListener) override;
virtual void SAL_CALL removeChangesListener(
css::uno::Reference< css::util::XChangesListener >
- const & aListener)
- throw (css::uno::RuntimeException, std::exception) override;
+ const & aListener) override;
- virtual void SAL_CALL commitChanges()
- throw (
- css::lang::WrappedTargetException,
- css::uno::RuntimeException,
- std::exception) override;
+ virtual void SAL_CALL commitChanges() override;
- virtual sal_Bool SAL_CALL hasPendingChanges()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasPendingChanges() override;
- virtual css::util::ChangesSet SAL_CALL getPendingChanges()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::util::ChangesSet SAL_CALL getPendingChanges() override;
private:
virtual ~RootAccess() override;
@@ -128,11 +120,9 @@ private:
virtual void clearListeners() throw () override;
virtual css::uno::Any SAL_CALL queryInterface(
- css::uno::Type const & aType)
- throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Type const & aType) override;
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
typedef
std::multiset<
diff --git a/configmgr/source/update.cxx b/configmgr/source/update.cxx
index 43cc4dd40430..a830dd616f73 100644
--- a/configmgr/source/update.cxx
+++ b/configmgr/source/update.cxx
@@ -74,23 +74,17 @@ private:
virtual ~Service() override {}
virtual void SAL_CALL insertExtensionXcsFile(
- sal_Bool shared, OUString const & fileUri)
- throw (css::uno::RuntimeException, std::exception) override;
+ sal_Bool shared, OUString const & fileUri) override;
virtual void SAL_CALL insertExtensionXcuFile(
- sal_Bool shared, OUString const & fileUri)
- throw (css::uno::RuntimeException,
- std::exception) override;
+ sal_Bool shared, OUString const & fileUri) override;
- virtual void SAL_CALL removeExtensionXcuFile(OUString const & fileUri)
- throw (css::uno::RuntimeException,
- std::exception) override;
+ virtual void SAL_CALL removeExtensionXcuFile(OUString const & fileUri) override;
virtual void SAL_CALL insertModificationXcuFile(
OUString const & fileUri,
css::uno::Sequence< OUString > const & includedPaths,
- css::uno::Sequence< OUString > const & excludedPaths)
- throw (css::uno::RuntimeException, std::exception) override;
+ css::uno::Sequence< OUString > const & excludedPaths) override;
std::shared_ptr<osl::Mutex> lock_;
css::uno::Reference< css::uno::XComponentContext > context_;
@@ -98,7 +92,6 @@ private:
void Service::insertExtensionXcsFile(
sal_Bool shared, OUString const & fileUri)
- throw (css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(*lock_);
Components::getSingleton(context_).insertExtensionXcsFile(shared, fileUri);
@@ -106,8 +99,6 @@ void Service::insertExtensionXcsFile(
void Service::insertExtensionXcuFile(
sal_Bool shared, OUString const & fileUri)
- throw (css::uno::RuntimeException,
- std::exception)
{
Broadcaster bc;
{
@@ -122,7 +113,6 @@ void Service::insertExtensionXcuFile(
}
void Service::removeExtensionXcuFile(OUString const & fileUri)
- throw (css::uno::RuntimeException, std::exception)
{
Broadcaster bc;
{
@@ -140,7 +130,6 @@ void Service::insertModificationXcuFile(
OUString const & fileUri,
css::uno::Sequence< OUString > const & includedPaths,
css::uno::Sequence< OUString > const & excludedPaths)
- throw (css::uno::RuntimeException, std::exception)
{
Broadcaster bc;
{