summaryrefslogtreecommitdiff
path: root/framework/source/uiconfiguration/uiconfigurationmanager.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'framework/source/uiconfiguration/uiconfigurationmanager.cxx')
-rw-r--r--framework/source/uiconfiguration/uiconfigurationmanager.cxx95
1 files changed, 43 insertions, 52 deletions
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index fa0ee57bdfd0..cf746c77faa5 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -65,20 +65,17 @@ class UIConfigurationManager : public ::cppu::WeakImplHelper<
css::ui::XUIConfigurationManager2 >
{
public:
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.framework.UIConfigurationManager");
}
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{
return cppu::supportsService(this, ServiceName);
}
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
return {"com.sun.star.ui.UIConfigurationManager"};
}
@@ -86,37 +83,37 @@ public:
explicit UIConfigurationManager( const css::uno::Reference< css::uno::XComponentContext > & rxContext );
// XComponent
- virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose() override;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
// XUIConfiguration
- virtual void SAL_CALL addConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) override;
+ virtual void SAL_CALL removeConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) override;
// XUIConfigurationManager
- virtual void SAL_CALL reset() throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getUIElementsInfo( sal_Int16 ElementType ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::container::XIndexContainer > SAL_CALL createSettings( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL hasSettings( const OUString& ResourceURL ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getSettings( const OUString& ResourceURL, sal_Bool bWriteable ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL replaceSettings( const OUString& ResourceURL, const css::uno::Reference< css::container::XIndexAccess >& aNewData ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeSettings( const OUString& ResourceURL ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL insertSettings( const OUString& NewResourceURL, const css::uno::Reference< css::container::XIndexAccess >& aNewData ) throw (css::container::ElementExistException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getImageManager() throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::ui::XAcceleratorConfiguration > SAL_CALL getShortCutManager() throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getEventsManager() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL reset() override;
+ virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getUIElementsInfo( sal_Int16 ElementType ) override;
+ virtual css::uno::Reference< css::container::XIndexContainer > SAL_CALL createSettings( ) override;
+ virtual sal_Bool SAL_CALL hasSettings( const OUString& ResourceURL ) override;
+ virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getSettings( const OUString& ResourceURL, sal_Bool bWriteable ) override;
+ virtual void SAL_CALL replaceSettings( const OUString& ResourceURL, const css::uno::Reference< css::container::XIndexAccess >& aNewData ) override;
+ virtual void SAL_CALL removeSettings( const OUString& ResourceURL ) override;
+ virtual void SAL_CALL insertSettings( const OUString& NewResourceURL, const css::uno::Reference< css::container::XIndexAccess >& aNewData ) override;
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getImageManager() override;
+ virtual css::uno::Reference< css::ui::XAcceleratorConfiguration > SAL_CALL getShortCutManager() override;
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getEventsManager() override;
// XUIConfigurationPersistence
- virtual void SAL_CALL reload() throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL store() throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL reload() override;
+ virtual void SAL_CALL store() override;
+ virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) override;
+ virtual sal_Bool SAL_CALL isModified() override;
+ virtual sal_Bool SAL_CALL isReadOnly() override;
// XUIConfigurationStorage
- virtual void SAL_CALL setStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL hasStorage() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) override;
+ virtual sal_Bool SAL_CALL hasStorage() override;
private:
// private data types
@@ -693,7 +690,7 @@ UIConfigurationManager::UIConfigurationManager( const css::uno::Reference< css::
}
// XComponent
-void SAL_CALL UIConfigurationManager::dispose() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigurationManager::dispose()
{
Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
@@ -719,7 +716,7 @@ void SAL_CALL UIConfigurationManager::dispose() throw (css::uno::RuntimeExceptio
}
}
-void SAL_CALL UIConfigurationManager::addEventListener( const Reference< XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigurationManager::addEventListener( const Reference< XEventListener >& xListener )
{
{
SolarMutexGuard g;
@@ -732,14 +729,14 @@ void SAL_CALL UIConfigurationManager::addEventListener( const Reference< XEventL
m_aListenerContainer.addInterface( cppu::UnoType<XEventListener>::get(), xListener );
}
-void SAL_CALL UIConfigurationManager::removeEventListener( const Reference< XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigurationManager::removeEventListener( const Reference< XEventListener >& xListener )
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
m_aListenerContainer.removeInterface( cppu::UnoType<XEventListener>::get(), xListener );
}
// XUIConfigurationManager
-void SAL_CALL UIConfigurationManager::addConfigurationListener( const Reference< css::ui::XUIConfigurationListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigurationManager::addConfigurationListener( const Reference< css::ui::XUIConfigurationListener >& xListener )
{
{
SolarMutexGuard g;
@@ -752,13 +749,13 @@ void SAL_CALL UIConfigurationManager::addConfigurationListener( const Reference<
m_aListenerContainer.addInterface( cppu::UnoType<XUIConfigurationListener>::get(), xListener );
}
-void SAL_CALL UIConfigurationManager::removeConfigurationListener( const Reference< css::ui::XUIConfigurationListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigurationManager::removeConfigurationListener( const Reference< css::ui::XUIConfigurationListener >& xListener )
{
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
m_aListenerContainer.removeInterface( cppu::UnoType<XUIConfigurationListener>::get(), xListener );
}
-void SAL_CALL UIConfigurationManager::reset() throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigurationManager::reset()
{
SolarMutexClearableGuard aGuard;
@@ -844,7 +841,6 @@ void SAL_CALL UIConfigurationManager::reset() throw (css::uno::RuntimeException,
}
Sequence< Sequence< PropertyValue > > SAL_CALL UIConfigurationManager::getUIElementsInfo( sal_Int16 ElementType )
-throw ( IllegalArgumentException, RuntimeException, std::exception )
{
if (( ElementType < 0 ) || ( ElementType >= css::ui::UIElementType::COUNT ))
throw IllegalArgumentException();
@@ -883,7 +879,7 @@ throw ( IllegalArgumentException, RuntimeException, std::exception )
return comphelper::containerToSequence(aElementInfoSeq);
}
-Reference< XIndexContainer > SAL_CALL UIConfigurationManager::createSettings() throw (css::uno::RuntimeException, std::exception)
+Reference< XIndexContainer > SAL_CALL UIConfigurationManager::createSettings()
{
SolarMutexGuard g;
@@ -895,7 +891,6 @@ Reference< XIndexContainer > SAL_CALL UIConfigurationManager::createSettings() t
}
sal_Bool SAL_CALL UIConfigurationManager::hasSettings( const OUString& ResourceURL )
-throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
{
sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
@@ -913,7 +908,6 @@ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exc
}
Reference< XIndexAccess > SAL_CALL UIConfigurationManager::getSettings( const OUString& ResourceURL, sal_Bool bWriteable )
-throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
{
sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
@@ -942,7 +936,6 @@ throw (css::container::NoSuchElementException, css::lang::IllegalArgumentExcepti
}
void SAL_CALL UIConfigurationManager::replaceSettings( const OUString& ResourceURL, const Reference< css::container::XIndexAccess >& aNewData )
-throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception)
{
sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
@@ -1001,7 +994,6 @@ throw (css::container::NoSuchElementException, css::lang::IllegalArgumentExcepti
}
void SAL_CALL UIConfigurationManager::removeSettings( const OUString& ResourceURL )
-throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException, RuntimeException, std::exception)
{
sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL );
@@ -1059,7 +1051,6 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException
}
void SAL_CALL UIConfigurationManager::insertSettings( const OUString& NewResourceURL, const Reference< XIndexAccess >& aNewData )
-throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, RuntimeException, std::exception )
{
sal_Int16 nElementType = RetrieveTypeFromResourceURL( NewResourceURL );
@@ -1132,7 +1123,7 @@ throw ( ElementExistException, IllegalArgumentException, IllegalAccessException,
}
}
-Reference< XInterface > SAL_CALL UIConfigurationManager::getImageManager() throw (css::uno::RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL UIConfigurationManager::getImageManager()
{
if ( m_bDisposed )
throw DisposedException();
@@ -1158,7 +1149,7 @@ Reference< XInterface > SAL_CALL UIConfigurationManager::getImageManager() throw
return Reference< XInterface >( m_xImageManager, UNO_QUERY );
}
-Reference< XAcceleratorConfiguration > SAL_CALL UIConfigurationManager::getShortCutManager() throw (css::uno::RuntimeException, std::exception)
+Reference< XAcceleratorConfiguration > SAL_CALL UIConfigurationManager::getShortCutManager()
{
// SAFE ->
SolarMutexGuard g;
@@ -1177,13 +1168,13 @@ Reference< XAcceleratorConfiguration > SAL_CALL UIConfigurationManager::getShort
return m_xAccConfig;
}
-Reference< XInterface > SAL_CALL UIConfigurationManager::getEventsManager() throw (css::uno::RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL UIConfigurationManager::getEventsManager()
{
return Reference< XInterface >();
}
// XUIConfigurationStorage
-void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& Storage ) throw (css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& Storage )
{
SolarMutexGuard g;
@@ -1243,7 +1234,7 @@ void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& S
impl_Initialize();
}
-sal_Bool SAL_CALL UIConfigurationManager::hasStorage() throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL UIConfigurationManager::hasStorage()
{
SolarMutexGuard g;
@@ -1254,7 +1245,7 @@ sal_Bool SAL_CALL UIConfigurationManager::hasStorage() throw (css::uno::RuntimeE
}
// XUIConfigurationPersistence
-void SAL_CALL UIConfigurationManager::reload() throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigurationManager::reload()
{
SolarMutexClearableGuard aGuard;
@@ -1293,7 +1284,7 @@ void SAL_CALL UIConfigurationManager::reload() throw (css::uno::Exception, css::
}
}
-void SAL_CALL UIConfigurationManager::store() throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigurationManager::store()
{
SolarMutexGuard g;
@@ -1326,7 +1317,7 @@ void SAL_CALL UIConfigurationManager::store() throw (css::uno::Exception, css::u
}
}
-void SAL_CALL UIConfigurationManager::storeToStorage( const Reference< XStorage >& Storage ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
+void SAL_CALL UIConfigurationManager::storeToStorage( const Reference< XStorage >& Storage )
{
SolarMutexGuard g;
@@ -1359,14 +1350,14 @@ void SAL_CALL UIConfigurationManager::storeToStorage( const Reference< XStorage
}
}
-sal_Bool SAL_CALL UIConfigurationManager::isModified() throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL UIConfigurationManager::isModified()
{
SolarMutexGuard g;
return m_bModified;
}
-sal_Bool SAL_CALL UIConfigurationManager::isReadOnly() throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL UIConfigurationManager::isReadOnly()
{
SolarMutexGuard g;