diff options
Diffstat (limited to 'framework/source/uiconfiguration')
9 files changed, 210 insertions, 210 deletions
diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx index 7f5f090c43e6..bd6257e04bb7 100644 --- a/framework/source/uiconfiguration/globalsettings.cxx +++ b/framework/source/uiconfiguration/globalsettings.cxx @@ -69,12 +69,12 @@ class GlobalSettings_Access : private ThreadHelpBase , virtual ~GlobalSettings_Access(); // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); // settings access sal_Bool HasStatesInfo( GlobalSettings::UIElementType eElementType ); @@ -116,7 +116,7 @@ GlobalSettings_Access::~GlobalSettings_Access() // XComponent void SAL_CALL GlobalSettings_Access::dispose() -throw ( css::uno::RuntimeException ) +throw ( css::uno::RuntimeException, std::exception ) { // SAFE ResetableGuard aLock( m_aLock ); @@ -126,18 +126,18 @@ throw ( css::uno::RuntimeException ) } void SAL_CALL GlobalSettings_Access::addEventListener( const css::uno::Reference< css::lang::XEventListener >& ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { } void SAL_CALL GlobalSettings_Access::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { } // XEventListener void SAL_CALL GlobalSettings_Access::disposing( const css::lang::EventObject& ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { // SAFE ResetableGuard aLock( m_aLock ); diff --git a/framework/source/uiconfiguration/graphicnameaccess.cxx b/framework/source/uiconfiguration/graphicnameaccess.cxx index 33b7b6ced705..e127152624be 100644 --- a/framework/source/uiconfiguration/graphicnameaccess.cxx +++ b/framework/source/uiconfiguration/graphicnameaccess.cxx @@ -43,7 +43,7 @@ void GraphicNameAccess::addElement( const OUString& rName, const uno::Reference< uno::Any SAL_CALL GraphicNameAccess::getByName( const OUString& aName ) throw( container::NoSuchElementException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { NameGraphicHashMap::const_iterator pIter = m_aNameToElementMap.find( aName ); if ( pIter != m_aNameToElementMap.end() ) @@ -53,7 +53,7 @@ throw( container::NoSuchElementException, } uno::Sequence< OUString > SAL_CALL GraphicNameAccess::getElementNames() -throw(::com::sun::star::uno::RuntimeException) +throw(::com::sun::star::uno::RuntimeException, std::exception) { if ( m_aSeq.getLength() == 0 ) { @@ -72,7 +72,7 @@ throw(::com::sun::star::uno::RuntimeException) } sal_Bool SAL_CALL GraphicNameAccess::hasByName( const OUString& aName ) -throw(::com::sun::star::uno::RuntimeException) +throw(::com::sun::star::uno::RuntimeException, std::exception) { NameGraphicHashMap::const_iterator pIter = m_aNameToElementMap.find( aName ); return ( pIter != m_aNameToElementMap.end() ); @@ -80,13 +80,13 @@ throw(::com::sun::star::uno::RuntimeException) // XElementAccess sal_Bool SAL_CALL GraphicNameAccess::hasElements() -throw( uno::RuntimeException ) +throw( uno::RuntimeException, std::exception ) { return ( !m_aNameToElementMap.empty() ); } uno::Type SAL_CALL GraphicNameAccess::getElementType() -throw( uno::RuntimeException ) +throw( uno::RuntimeException, std::exception ) { return ::getCppuType( (const uno::Reference< graphic::XGraphic > *)NULL ); } diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx index 8540e2400945..b42a0b5319f1 100644 --- a/framework/source/uiconfiguration/imagemanager.cxx +++ b/framework/source/uiconfiguration/imagemanager.cxx @@ -71,17 +71,17 @@ ImageManager::~ImageManager() } // XComponent -void SAL_CALL ImageManager::dispose() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ImageManager::dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->dispose(); } -void SAL_CALL ImageManager::addEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ImageManager::addEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->addEventListener(xListener); } -void SAL_CALL ImageManager::removeEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ImageManager::removeEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ m_pImpl->removeEventListener(xListener); @@ -98,14 +98,14 @@ throw (::com::sun::star::uno::RuntimeException) } // XInitialization -void SAL_CALL ImageManager::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException ) +void SAL_CALL ImageManager::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception ) { m_pImpl->initialize(aArguments); } // XImageManager void SAL_CALL ImageManager::reset() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ @@ -113,13 +113,13 @@ throw (::com::sun::star::uno::RuntimeException) } Sequence< OUString > SAL_CALL ImageManager::getAllImageNames( ::sal_Int16 nImageType ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_pImpl->getAllImageNames( nImageType ); } ::sal_Bool SAL_CALL ImageManager::hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) -throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { return m_pImpl->hasImage(nImageType,aCommandURL); } @@ -127,7 +127,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:: Sequence< uno::Reference< XGraphic > > SAL_CALL ImageManager::getImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence ) -throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ) +throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) { return m_pImpl->getImages(nImageType,aCommandURLSequence); } @@ -138,7 +138,7 @@ void SAL_CALL ImageManager::replaceImages( const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->replaceImages(nImageType,aCommandURLSequence,aGraphicsSequence); } @@ -146,7 +146,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException, void SAL_CALL ImageManager::removeImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->removeImages(nImageType,aCommandURLSequence); } @@ -155,20 +155,20 @@ void SAL_CALL ImageManager::insertImages( ::sal_Int16 nImageType, const Sequence throw ( ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->insertImages(nImageType,aCommandURLSequence,aGraphicSequence); } // XUIConfiguration void SAL_CALL ImageManager::addConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->addConfigurationListener(xListener); } void SAL_CALL ImageManager::removeConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ m_pImpl->removeConfigurationListener(xListener); @@ -177,30 +177,30 @@ throw (::com::sun::star::uno::RuntimeException) // XUIConfigurationPersistence void SAL_CALL ImageManager::reload() throw ( ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException ) + ::com::sun::star::uno::RuntimeException, std::exception ) { m_pImpl->reload(); } void SAL_CALL ImageManager::store() -throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->store(); } void SAL_CALL ImageManager::storeToStorage( const uno::Reference< XStorage >& Storage ) -throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->storeToStorage(Storage); } sal_Bool SAL_CALL ImageManager::isModified() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_pImpl->isModified(); } -sal_Bool SAL_CALL ImageManager::isReadOnly() throw (::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL ImageManager::isReadOnly() throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_pImpl->isReadOnly(); } diff --git a/framework/source/uiconfiguration/moduleimagemanager.cxx b/framework/source/uiconfiguration/moduleimagemanager.cxx index ee8cbe638638..8405d23b5fc2 100644 --- a/framework/source/uiconfiguration/moduleimagemanager.cxx +++ b/framework/source/uiconfiguration/moduleimagemanager.cxx @@ -81,43 +81,43 @@ ModuleImageManager::~ModuleImageManager() } // XComponent -void SAL_CALL ModuleImageManager::dispose() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ModuleImageManager::dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->dispose(); } -void SAL_CALL ModuleImageManager::addEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ModuleImageManager::addEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->addEventListener(xListener); } -void SAL_CALL ModuleImageManager::removeEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ModuleImageManager::removeEventListener( const uno::Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ m_pImpl->removeEventListener(xListener); } // XInitialization -void SAL_CALL ModuleImageManager::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException ) +void SAL_CALL ModuleImageManager::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception ) { m_pImpl->initialize(aArguments); } // XImageManager void SAL_CALL ModuleImageManager::reset() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->reset(); } Sequence< OUString > SAL_CALL ModuleImageManager::getAllImageNames( ::sal_Int16 nImageType ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_pImpl->getAllImageNames( nImageType ); } ::sal_Bool SAL_CALL ModuleImageManager::hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) -throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { return m_pImpl->hasImage(nImageType,aCommandURL); } @@ -125,7 +125,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:: Sequence< uno::Reference< XGraphic > > SAL_CALL ModuleImageManager::getImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence ) -throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ) +throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) { SAL_INFO( "fwk", "framework: ModuleImageManager::getImages" ); return m_pImpl->getImages(nImageType,aCommandURLSequence); @@ -137,7 +137,7 @@ void SAL_CALL ModuleImageManager::replaceImages( const Sequence< uno::Reference< XGraphic > >& aGraphicsSequence ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->replaceImages(nImageType,aCommandURLSequence,aGraphicsSequence); } @@ -145,7 +145,7 @@ throw ( ::com::sun::star::lang::IllegalArgumentException, void SAL_CALL ModuleImageManager::removeImages( ::sal_Int16 nImageType, const Sequence< OUString >& aCommandURLSequence ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->removeImages(nImageType,aCommandURLSequence); } @@ -154,20 +154,20 @@ void SAL_CALL ModuleImageManager::insertImages( ::sal_Int16 nImageType, const Se throw ( ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->insertImages(nImageType,aCommandURLSequence,aGraphicSequence); } // XUIConfiguration void SAL_CALL ModuleImageManager::addConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->addConfigurationListener(xListener); } void SAL_CALL ModuleImageManager::removeConfigurationListener( const uno::Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->removeConfigurationListener(xListener); } @@ -175,30 +175,30 @@ throw (::com::sun::star::uno::RuntimeException) // XUIConfigurationPersistence void SAL_CALL ModuleImageManager::reload() throw ( ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException ) + ::com::sun::star::uno::RuntimeException, std::exception ) { m_pImpl->reload(); } void SAL_CALL ModuleImageManager::store() -throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->store(); } void SAL_CALL ModuleImageManager::storeToStorage( const uno::Reference< XStorage >& Storage ) -throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) { m_pImpl->storeToStorage(Storage); } sal_Bool SAL_CALL ModuleImageManager::isModified() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_pImpl->isModified(); } -sal_Bool SAL_CALL ModuleImageManager::isReadOnly() throw (::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL ModuleImageManager::isReadOnly() throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_pImpl->isReadOnly(); } diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx index 66c3c82a2b92..c24ade507f90 100644 --- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx +++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx @@ -65,19 +65,19 @@ public: virtual ~ModuleUIConfigurationManagerSupplier(); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.ModuleUIConfigurationManagerSupplier"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.ui.ModuleUIConfigurationManagerSupplier"); @@ -86,7 +86,7 @@ public: // XModuleUIConfigurationManagerSupplier virtual css::uno::Reference< css::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager( const OUString& ModuleIdentifier ) - throw (css::container::NoSuchElementException, css::uno::RuntimeException); + throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception); private: virtual void SAL_CALL disposing() SAL_OVERRIDE; @@ -144,7 +144,7 @@ void SAL_CALL ModuleUIConfigurationManagerSupplier::disposing() // XModuleUIConfigurationManagerSupplier Reference< XUIConfigurationManager > SAL_CALL ModuleUIConfigurationManagerSupplier::getUIConfigurationManager( const OUString& sModuleIdentifier ) -throw ( NoSuchElementException, RuntimeException) +throw ( NoSuchElementException, RuntimeException, std::exception) { osl::MutexGuard g(rBHelper.rMutex); /* SAFE AREA ----------------------------------------------------------------------------------------------- */ diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index 1bbcc39603be..02c15be672cb 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -79,19 +79,19 @@ public: virtual ~ModuleUIConfigurationManager(); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.ModuleUIConfigurationManager"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.ui.ModuleUIConfigurationManager"); @@ -99,37 +99,37 @@ public: } // XComponent - virtual void SAL_CALL dispose() throw (css::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException); + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception); // XUIConfiguration - virtual void SAL_CALL addConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException); - virtual void SAL_CALL removeConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException); + virtual void SAL_CALL addConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException, std::exception); // XUIConfigurationManager - virtual void SAL_CALL reset() throw (css::uno::RuntimeException); - virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getUIElementsInfo( sal_Int16 ElementType ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XIndexContainer > SAL_CALL createSettings( ) throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasSettings( const OUString& ResourceURL ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getSettings( const OUString& ResourceURL, sal_Bool bWriteable ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException); - virtual void SAL_CALL replaceSettings( const OUString& ResourceURL, const css::uno::Reference< css::container::XIndexAccess >& aNewData ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException); - virtual void SAL_CALL removeSettings( const OUString& ResourceURL ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException); - virtual void SAL_CALL insertSettings( const OUString& NewResourceURL, const css::uno::Reference< css::container::XIndexAccess >& aNewData ) throw (css::container::ElementExistException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException); - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getImageManager() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::ui::XAcceleratorConfiguration > SAL_CALL getShortCutManager() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getEventsManager() throw (css::uno::RuntimeException); + virtual void SAL_CALL reset() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getUIElementsInfo( sal_Int16 ElementType ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::container::XIndexContainer > SAL_CALL createSettings( ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasSettings( const OUString& ResourceURL ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getSettings( const OUString& ResourceURL, sal_Bool bWriteable ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL replaceSettings( const OUString& ResourceURL, const css::uno::Reference< css::container::XIndexAccess >& aNewData ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeSettings( const OUString& ResourceURL ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL insertSettings( const OUString& NewResourceURL, const css::uno::Reference< css::container::XIndexAccess >& aNewData ) throw (css::container::ElementExistException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getImageManager() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::ui::XAcceleratorConfiguration > SAL_CALL getShortCutManager() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getEventsManager() throw (css::uno::RuntimeException, std::exception); // XModuleUIConfigurationManager - virtual sal_Bool SAL_CALL isDefaultSettings( const OUString& ResourceURL ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getDefaultSettings( const OUString& ResourceURL ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException); + virtual sal_Bool SAL_CALL isDefaultSettings( const OUString& ResourceURL ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getDefaultSettings( const OUString& ResourceURL ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); // XUIConfigurationPersistence - virtual void SAL_CALL reload() throw (css::uno::Exception, css::uno::RuntimeException); - virtual void SAL_CALL store() throw (css::uno::Exception, css::uno::RuntimeException); - virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) throw (css::uno::Exception, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException); + virtual void SAL_CALL reload() throw (css::uno::Exception, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL store() throw (css::uno::Exception, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException, std::exception); private: // private data types @@ -931,7 +931,7 @@ ModuleUIConfigurationManager::~ModuleUIConfigurationManager() } // XComponent -void SAL_CALL ModuleUIConfigurationManager::dispose() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ModuleUIConfigurationManager::dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) { Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY ); @@ -967,7 +967,7 @@ void SAL_CALL ModuleUIConfigurationManager::dispose() throw (::com::sun::star::u } } -void SAL_CALL ModuleUIConfigurationManager::addEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ModuleUIConfigurationManager::addEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { { ResetableGuard aGuard( m_aLock ); @@ -980,14 +980,14 @@ void SAL_CALL ModuleUIConfigurationManager::addEventListener( const Reference< X m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener ); } -void SAL_CALL ModuleUIConfigurationManager::removeEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ModuleUIConfigurationManager::removeEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener ); } // XUIConfiguration -void SAL_CALL ModuleUIConfigurationManager::addConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ModuleUIConfigurationManager::addConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { { ResetableGuard aGuard( m_aLock ); @@ -1000,7 +1000,7 @@ void SAL_CALL ModuleUIConfigurationManager::addConfigurationListener( const Refe m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< ui::XUIConfigurationListener >* ) NULL ), xListener ); } -void SAL_CALL ModuleUIConfigurationManager::removeConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ModuleUIConfigurationManager::removeConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< ui::XUIConfigurationListener >* ) NULL ), xListener ); @@ -1008,7 +1008,7 @@ void SAL_CALL ModuleUIConfigurationManager::removeConfigurationListener( const R // XUIConfigurationManager -void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); @@ -1096,7 +1096,7 @@ void SAL_CALL ModuleUIConfigurationManager::reset() throw (::com::sun::star::uno } Sequence< Sequence< PropertyValue > > SAL_CALL ModuleUIConfigurationManager::getUIElementsInfo( sal_Int16 ElementType ) -throw ( IllegalArgumentException, RuntimeException ) +throw ( IllegalArgumentException, RuntimeException, std::exception ) { if (( ElementType < 0 ) || ( ElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); @@ -1135,7 +1135,7 @@ throw ( IllegalArgumentException, RuntimeException ) return aElementInfoSeq; } -Reference< XIndexContainer > SAL_CALL ModuleUIConfigurationManager::createSettings() throw (::com::sun::star::uno::RuntimeException) +Reference< XIndexContainer > SAL_CALL ModuleUIConfigurationManager::createSettings() throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); @@ -1147,7 +1147,7 @@ Reference< XIndexContainer > SAL_CALL ModuleUIConfigurationManager::createSettin } sal_Bool SAL_CALL ModuleUIConfigurationManager::hasSettings( const OUString& ResourceURL ) -throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); @@ -1170,7 +1170,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:: } Reference< XIndexAccess > SAL_CALL ModuleUIConfigurationManager::getSettings( const OUString& ResourceURL, sal_Bool bWriteable ) -throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); @@ -1199,7 +1199,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la } void SAL_CALL ModuleUIConfigurationManager::replaceSettings( const OUString& ResourceURL, const Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) -throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException, std::exception) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); @@ -1306,7 +1306,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la } void SAL_CALL ModuleUIConfigurationManager::removeSettings( const OUString& ResourceURL ) -throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException, RuntimeException) +throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException, RuntimeException, std::exception) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); @@ -1384,7 +1384,7 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException } void SAL_CALL ModuleUIConfigurationManager::insertSettings( const OUString& NewResourceURL, const Reference< XIndexAccess >& aNewData ) -throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, RuntimeException ) +throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, RuntimeException, std::exception ) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( NewResourceURL ); @@ -1445,7 +1445,7 @@ throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, } } -Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getImageManager() throw (::com::sun::star::uno::RuntimeException) +Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getImageManager() throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); @@ -1476,7 +1476,7 @@ Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getImageManager() return Reference< XInterface >( m_xModuleImageManager, UNO_QUERY ); } -Reference< ui::XAcceleratorConfiguration > SAL_CALL ModuleUIConfigurationManager::getShortCutManager() throw (::com::sun::star::uno::RuntimeException) +Reference< ui::XAcceleratorConfiguration > SAL_CALL ModuleUIConfigurationManager::getShortCutManager() throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); @@ -1497,14 +1497,14 @@ Reference< ui::XAcceleratorConfiguration > SAL_CALL ModuleUIConfigurationManager return m_xModuleAcceleratorManager; } -Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getEventsManager() throw (::com::sun::star::uno::RuntimeException) +Reference< XInterface > SAL_CALL ModuleUIConfigurationManager::getEventsManager() throw (::com::sun::star::uno::RuntimeException, std::exception) { return Reference< XInterface >(); } // XModuleUIConfigurationManager sal_Bool SAL_CALL ModuleUIConfigurationManager::isDefaultSettings( const OUString& ResourceURL ) -throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); @@ -1527,7 +1527,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:: } Reference< XIndexAccess > SAL_CALL ModuleUIConfigurationManager::getDefaultSettings( const OUString& ResourceURL ) -throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); @@ -1560,7 +1560,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la } // XUIConfigurationPersistence -void SAL_CALL ModuleUIConfigurationManager::reload() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) +void SAL_CALL ModuleUIConfigurationManager::reload() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); @@ -1601,7 +1601,7 @@ void SAL_CALL ModuleUIConfigurationManager::reload() throw (::com::sun::star::un } } -void SAL_CALL ModuleUIConfigurationManager::store() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) +void SAL_CALL ModuleUIConfigurationManager::store() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); @@ -1634,7 +1634,7 @@ void SAL_CALL ModuleUIConfigurationManager::store() throw (::com::sun::star::uno } } -void SAL_CALL ModuleUIConfigurationManager::storeToStorage( const Reference< XStorage >& Storage ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) +void SAL_CALL ModuleUIConfigurationManager::storeToStorage( const Reference< XStorage >& Storage ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); @@ -1667,14 +1667,14 @@ void SAL_CALL ModuleUIConfigurationManager::storeToStorage( const Reference< XSt } } -sal_Bool SAL_CALL ModuleUIConfigurationManager::isModified() throw (::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL ModuleUIConfigurationManager::isModified() throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); return m_bModified; } -sal_Bool SAL_CALL ModuleUIConfigurationManager::isReadOnly() throw (::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL ModuleUIConfigurationManager::isReadOnly() throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx index 58023cb983b0..c3f6f2df3a05 100644 --- a/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/framework/source/uiconfiguration/uicategorydescription.cxx @@ -71,28 +71,28 @@ class ConfigurationAccess_UICategory : public ::cppu::WeakImplHelper2<XNameAcces // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) - throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // container.XContainerListener - virtual void SAL_CALL elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException); - virtual void SAL_CALL elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException); - virtual void SAL_CALL elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException); + virtual void SAL_CALL elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception); + virtual void SAL_CALL elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception); + virtual void SAL_CALL elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception); // lang.XEventListener - virtual void SAL_CALL disposing( const EventObject& aEvent ) throw(RuntimeException); + virtual void SAL_CALL disposing( const EventObject& aEvent ) throw(RuntimeException, std::exception); protected: Any getUINameFromID( const OUString& rId ); @@ -148,7 +148,7 @@ ConfigurationAccess_UICategory::~ConfigurationAccess_UICategory() // XNameAccess Any SAL_CALL ConfigurationAccess_UICategory::getByName( const OUString& rId ) -throw ( NoSuchElementException, WrappedTargetException, RuntimeException) +throw ( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { osl::MutexGuard g(aMutex); if ( !m_bConfigAccessInitialized ) @@ -168,26 +168,26 @@ throw ( NoSuchElementException, WrappedTargetException, RuntimeException) } Sequence< OUString > SAL_CALL ConfigurationAccess_UICategory::getElementNames() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { return getAllIds(); } sal_Bool SAL_CALL ConfigurationAccess_UICategory::hasByName( const OUString& rId ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { return getByName( rId ).hasValue(); } // XElementAccess Type SAL_CALL ConfigurationAccess_UICategory::getElementType() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { return( ::getCppuType( (const OUString*)NULL ) ); } sal_Bool SAL_CALL ConfigurationAccess_UICategory::hasElements() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { // There must be global categories! return sal_True; @@ -359,20 +359,20 @@ sal_Bool ConfigurationAccess_UICategory::initializeConfigAccess() } // container.XContainerListener -void SAL_CALL ConfigurationAccess_UICategory::elementInserted( const ContainerEvent& ) throw(RuntimeException) +void SAL_CALL ConfigurationAccess_UICategory::elementInserted( const ContainerEvent& ) throw(RuntimeException, std::exception) { } -void SAL_CALL ConfigurationAccess_UICategory::elementRemoved ( const ContainerEvent& ) throw(RuntimeException) +void SAL_CALL ConfigurationAccess_UICategory::elementRemoved ( const ContainerEvent& ) throw(RuntimeException, std::exception) { } -void SAL_CALL ConfigurationAccess_UICategory::elementReplaced( const ContainerEvent& ) throw(RuntimeException) +void SAL_CALL ConfigurationAccess_UICategory::elementReplaced( const ContainerEvent& ) throw(RuntimeException, std::exception) { } // lang.XEventListener -void SAL_CALL ConfigurationAccess_UICategory::disposing( const EventObject& aEvent ) throw(RuntimeException) +void SAL_CALL ConfigurationAccess_UICategory::disposing( const EventObject& aEvent ) throw(RuntimeException, std::exception) { // SAFE // remove our reference to the config access @@ -391,19 +391,19 @@ public: virtual ~UICategoryDescription(); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.UICategoryDescription"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.ui.UICategoryDescription"); diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index b3f30787ff5d..33a0845e4a0a 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -68,19 +68,19 @@ class UIConfigurationManager : private ThreadHelpBase, // Struct for right i { public: virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.UIConfigurationManager"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.ui.UIConfigurationManager"); @@ -91,37 +91,37 @@ public: virtual ~UIConfigurationManager(); // XComponent - virtual void SAL_CALL dispose() throw (css::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException); + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception); // XUIConfiguration - virtual void SAL_CALL addConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException); - virtual void SAL_CALL removeConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException); + virtual void SAL_CALL addConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeConfigurationListener( const css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw (css::uno::RuntimeException, std::exception); // XUIConfigurationManager - virtual void SAL_CALL reset() throw (css::uno::RuntimeException); - virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getUIElementsInfo( sal_Int16 ElementType ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XIndexContainer > SAL_CALL createSettings( ) throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasSettings( const OUString& ResourceURL ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getSettings( const OUString& ResourceURL, sal_Bool bWriteable ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException); - virtual void SAL_CALL replaceSettings( const OUString& ResourceURL, const css::uno::Reference< css::container::XIndexAccess >& aNewData ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException); - virtual void SAL_CALL removeSettings( const OUString& ResourceURL ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException); - virtual void SAL_CALL insertSettings( const OUString& NewResourceURL, const css::uno::Reference< css::container::XIndexAccess >& aNewData ) throw (css::container::ElementExistException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException); - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getImageManager() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::ui::XAcceleratorConfiguration > SAL_CALL getShortCutManager() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getEventsManager() throw (css::uno::RuntimeException); + virtual void SAL_CALL reset() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getUIElementsInfo( sal_Int16 ElementType ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::container::XIndexContainer > SAL_CALL createSettings( ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasSettings( const OUString& ResourceURL ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getSettings( const OUString& ResourceURL, sal_Bool bWriteable ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL replaceSettings( const OUString& ResourceURL, const css::uno::Reference< css::container::XIndexAccess >& aNewData ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeSettings( const OUString& ResourceURL ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL insertSettings( const OUString& NewResourceURL, const css::uno::Reference< css::container::XIndexAccess >& aNewData ) throw (css::container::ElementExistException, css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getImageManager() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::ui::XAcceleratorConfiguration > SAL_CALL getShortCutManager() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getEventsManager() throw (css::uno::RuntimeException, std::exception); // XUIConfigurationPersistence - virtual void SAL_CALL reload() throw (css::uno::Exception, css::uno::RuntimeException); - virtual void SAL_CALL store() throw (css::uno::Exception, css::uno::RuntimeException); - virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) throw (css::uno::Exception, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException); + virtual void SAL_CALL reload() throw (css::uno::Exception, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL store() throw (css::uno::Exception, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException, std::exception); // XUIConfigurationStorage - virtual void SAL_CALL setStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasStorage() throw (css::uno::RuntimeException); + virtual void SAL_CALL setStorage( const css::uno::Reference< css::embed::XStorage >& Storage ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasStorage() throw (css::uno::RuntimeException, std::exception); private: // private data types @@ -709,7 +709,7 @@ UIConfigurationManager::~UIConfigurationManager() } // XComponent -void SAL_CALL UIConfigurationManager::dispose() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UIConfigurationManager::dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) { Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY ); @@ -736,7 +736,7 @@ void SAL_CALL UIConfigurationManager::dispose() throw (::com::sun::star::uno::Ru } } -void SAL_CALL UIConfigurationManager::addEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UIConfigurationManager::addEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { { ResetableGuard aGuard( m_aLock ); @@ -749,14 +749,14 @@ void SAL_CALL UIConfigurationManager::addEventListener( const Reference< XEventL m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener ); } -void SAL_CALL UIConfigurationManager::removeEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UIConfigurationManager::removeEventListener( const Reference< XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener ); } // XUIConfigurationManager -void SAL_CALL UIConfigurationManager::addConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UIConfigurationManager::addConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { { ResetableGuard aGuard( m_aLock ); @@ -769,14 +769,14 @@ void SAL_CALL UIConfigurationManager::addConfigurationListener( const Reference< m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< XUIConfigurationListener >* ) NULL ), xListener ); } -void SAL_CALL UIConfigurationManager::removeConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UIConfigurationManager::removeConfigurationListener( const Reference< ::com::sun::star::ui::XUIConfigurationListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XUIConfigurationListener >* ) NULL ), xListener ); } -void SAL_CALL UIConfigurationManager::reset() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UIConfigurationManager::reset() throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); @@ -862,7 +862,7 @@ void SAL_CALL UIConfigurationManager::reset() throw (::com::sun::star::uno::Runt } Sequence< Sequence< PropertyValue > > SAL_CALL UIConfigurationManager::getUIElementsInfo( sal_Int16 ElementType ) -throw ( IllegalArgumentException, RuntimeException ) +throw ( IllegalArgumentException, RuntimeException, std::exception ) { if (( ElementType < 0 ) || ( ElementType >= ::com::sun::star::ui::UIElementType::COUNT )) throw IllegalArgumentException(); @@ -901,7 +901,7 @@ throw ( IllegalArgumentException, RuntimeException ) return aElementInfoSeq; } -Reference< XIndexContainer > SAL_CALL UIConfigurationManager::createSettings() throw (::com::sun::star::uno::RuntimeException) +Reference< XIndexContainer > SAL_CALL UIConfigurationManager::createSettings() throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); @@ -913,7 +913,7 @@ Reference< XIndexContainer > SAL_CALL UIConfigurationManager::createSettings() t } sal_Bool SAL_CALL UIConfigurationManager::hasSettings( const OUString& ResourceURL ) -throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); @@ -931,7 +931,7 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno:: } Reference< XIndexAccess > SAL_CALL UIConfigurationManager::getSettings( const OUString& ResourceURL, sal_Bool bWriteable ) -throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); @@ -960,7 +960,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la } void SAL_CALL UIConfigurationManager::replaceSettings( const OUString& ResourceURL, const Reference< ::com::sun::star::container::XIndexAccess >& aNewData ) -throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException, std::exception) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); @@ -1018,7 +1018,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la } void SAL_CALL UIConfigurationManager::removeSettings( const OUString& ResourceURL ) -throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException, RuntimeException) +throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException, RuntimeException, std::exception) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( ResourceURL ); @@ -1075,7 +1075,7 @@ throw ( NoSuchElementException, IllegalArgumentException, IllegalAccessException } void SAL_CALL UIConfigurationManager::insertSettings( const OUString& NewResourceURL, const Reference< XIndexAccess >& aNewData ) -throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, RuntimeException ) +throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, RuntimeException, std::exception ) { sal_Int16 nElementType = RetrieveTypeFromResourceURL( NewResourceURL ); @@ -1147,7 +1147,7 @@ throw ( ElementExistException, IllegalArgumentException, IllegalAccessException, } } -Reference< XInterface > SAL_CALL UIConfigurationManager::getImageManager() throw (::com::sun::star::uno::RuntimeException) +Reference< XInterface > SAL_CALL UIConfigurationManager::getImageManager() throw (::com::sun::star::uno::RuntimeException, std::exception) { if ( m_bDisposed ) throw DisposedException(); @@ -1173,7 +1173,7 @@ Reference< XInterface > SAL_CALL UIConfigurationManager::getImageManager() throw return Reference< XInterface >( m_xImageManager, UNO_QUERY ); } -Reference< XAcceleratorConfiguration > SAL_CALL UIConfigurationManager::getShortCutManager() throw (::com::sun::star::uno::RuntimeException) +Reference< XAcceleratorConfiguration > SAL_CALL UIConfigurationManager::getShortCutManager() throw (::com::sun::star::uno::RuntimeException, std::exception) { // SAFE -> ResetableGuard aGuard( m_aLock ); @@ -1192,13 +1192,13 @@ Reference< XAcceleratorConfiguration > SAL_CALL UIConfigurationManager::getShort return m_xAccConfig; } -Reference< XInterface > SAL_CALL UIConfigurationManager::getEventsManager() throw (::com::sun::star::uno::RuntimeException) +Reference< XInterface > SAL_CALL UIConfigurationManager::getEventsManager() throw (::com::sun::star::uno::RuntimeException, std::exception) { return Reference< XInterface >(); } // XUIConfigurationStorage -void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& Storage ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& Storage ) throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); @@ -1258,7 +1258,7 @@ void SAL_CALL UIConfigurationManager::setStorage( const Reference< XStorage >& S impl_Initialize(); } -sal_Bool SAL_CALL UIConfigurationManager::hasStorage() throw (::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL UIConfigurationManager::hasStorage() throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); @@ -1269,7 +1269,7 @@ sal_Bool SAL_CALL UIConfigurationManager::hasStorage() throw (::com::sun::star:: } // XUIConfigurationPersistence -void SAL_CALL UIConfigurationManager::reload() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) +void SAL_CALL UIConfigurationManager::reload() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); @@ -1308,7 +1308,7 @@ void SAL_CALL UIConfigurationManager::reload() throw (::com::sun::star::uno::Exc } } -void SAL_CALL UIConfigurationManager::store() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) +void SAL_CALL UIConfigurationManager::store() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); @@ -1341,7 +1341,7 @@ void SAL_CALL UIConfigurationManager::store() throw (::com::sun::star::uno::Exce } } -void SAL_CALL UIConfigurationManager::storeToStorage( const Reference< XStorage >& Storage ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) +void SAL_CALL UIConfigurationManager::storeToStorage( const Reference< XStorage >& Storage ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); @@ -1374,14 +1374,14 @@ void SAL_CALL UIConfigurationManager::storeToStorage( const Reference< XStorage } } -sal_Bool SAL_CALL UIConfigurationManager::isModified() throw (::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL UIConfigurationManager::isModified() throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); return m_bModified; } -sal_Bool SAL_CALL UIConfigurationManager::isReadOnly() throw (::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL UIConfigurationManager::isReadOnly() throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx index f825e9d16e68..a1d78b2c42d3 100644 --- a/framework/source/uiconfiguration/windowstateconfiguration.cxx +++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx @@ -110,39 +110,39 @@ class ConfigurationAccess_WindowState : public ::cppu::WeakImplHelper2< XNameCo // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) - throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XNameContainer virtual void SAL_CALL removeByName( const OUString& sName ) - throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException ); + throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ); virtual void SAL_CALL insertByName( const OUString& sName, const css::uno::Any& aPropertySet ) - throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException ); + throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ); // XNameReplace virtual void SAL_CALL replaceByName( const OUString& sName, const css::uno::Any& aPropertySet ) - throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException ); + throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ); // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // container.XContainerListener - virtual void SAL_CALL elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException); - virtual void SAL_CALL elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException); - virtual void SAL_CALL elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException); + virtual void SAL_CALL elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception); + virtual void SAL_CALL elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception); + virtual void SAL_CALL elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception); // lang.XEventListener - virtual void SAL_CALL disposing( const EventObject& aEvent ) throw(RuntimeException); + virtual void SAL_CALL disposing( const EventObject& aEvent ) throw(RuntimeException, std::exception); protected: enum WindowStateMask @@ -253,7 +253,7 @@ ConfigurationAccess_WindowState::~ConfigurationAccess_WindowState() // XNameAccess Any SAL_CALL ConfigurationAccess_WindowState::getByName( const OUString& rResourceURL ) -throw ( NoSuchElementException, WrappedTargetException, RuntimeException) +throw ( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { // SAFE osl::MutexGuard g(m_aMutex); @@ -272,7 +272,7 @@ throw ( NoSuchElementException, WrappedTargetException, RuntimeException) } Sequence< OUString > SAL_CALL ConfigurationAccess_WindowState::getElementNames() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { // SAFE osl::MutexGuard g(m_aMutex); @@ -290,7 +290,7 @@ throw ( RuntimeException ) } sal_Bool SAL_CALL ConfigurationAccess_WindowState::hasByName( const OUString& rResourceURL ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { // SAFE osl::MutexGuard g(m_aMutex); @@ -310,13 +310,13 @@ throw (::com::sun::star::uno::RuntimeException) // XElementAccess Type SAL_CALL ConfigurationAccess_WindowState::getElementType() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { return( ::getCppuType( (const Sequence< PropertyValue >*)NULL ) ); } sal_Bool SAL_CALL ConfigurationAccess_WindowState::hasElements() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { // SAFE osl::MutexGuard g(m_aMutex); @@ -335,7 +335,7 @@ throw ( RuntimeException ) // XNameContainer void SAL_CALL ConfigurationAccess_WindowState::removeByName( const OUString& rResourceURL ) -throw( NoSuchElementException, WrappedTargetException, RuntimeException ) +throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) { // SAFE osl::ResettableMutexGuard g(m_aMutex); @@ -370,7 +370,7 @@ throw( NoSuchElementException, WrappedTargetException, RuntimeException ) } void SAL_CALL ConfigurationAccess_WindowState::insertByName( const OUString& rResourceURL, const css::uno::Any& aPropertySet ) -throw( IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException ) +throw( IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception ) { // SAFE osl::ResettableMutexGuard g(m_aMutex); @@ -435,7 +435,7 @@ throw( IllegalArgumentException, ElementExistException, WrappedTargetException, // XNameReplace void SAL_CALL ConfigurationAccess_WindowState::replaceByName( const OUString& rResourceURL, const css::uno::Any& aPropertySet ) -throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException ) +throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) { // SAFE osl::ResettableMutexGuard g(m_aMutex); @@ -506,21 +506,21 @@ throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, } // container.XContainerListener -void SAL_CALL ConfigurationAccess_WindowState::elementInserted( const ContainerEvent& ) throw(RuntimeException) +void SAL_CALL ConfigurationAccess_WindowState::elementInserted( const ContainerEvent& ) throw(RuntimeException, std::exception) { // do nothing - next time someone wants to retrieve this node we will find it in the configuration } -void SAL_CALL ConfigurationAccess_WindowState::elementRemoved ( const ContainerEvent& ) throw(RuntimeException) +void SAL_CALL ConfigurationAccess_WindowState::elementRemoved ( const ContainerEvent& ) throw(RuntimeException, std::exception) { } -void SAL_CALL ConfigurationAccess_WindowState::elementReplaced( const ContainerEvent& ) throw(RuntimeException) +void SAL_CALL ConfigurationAccess_WindowState::elementReplaced( const ContainerEvent& ) throw(RuntimeException, std::exception) { } // lang.XEventListener -void SAL_CALL ConfigurationAccess_WindowState::disposing( const EventObject& aEvent ) throw(RuntimeException) +void SAL_CALL ConfigurationAccess_WindowState::disposing( const EventObject& aEvent ) throw(RuntimeException, std::exception) { // SAFE // remove our reference to the config access @@ -1279,19 +1279,19 @@ public: virtual ~WindowStateConfiguration(); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.WindowStateConfiguration"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.ui.WindowStateConfiguration"); @@ -1300,19 +1300,19 @@ public: // XNameAccess virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) - throw ( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException); + throw ( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XElementAccess virtual css::uno::Type SAL_CALL getElementType() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasElements() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); typedef ::boost::unordered_map< OUString, OUString, @@ -1385,7 +1385,7 @@ WindowStateConfiguration::~WindowStateConfiguration() } Any SAL_CALL WindowStateConfiguration::getByName( const OUString& aModuleIdentifier ) -throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); @@ -1417,7 +1417,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la } Sequence< OUString > SAL_CALL WindowStateConfiguration::getElementNames() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); @@ -1435,7 +1435,7 @@ throw (::com::sun::star::uno::RuntimeException) } sal_Bool SAL_CALL WindowStateConfiguration::hasByName( const OUString& aName ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); @@ -1445,13 +1445,13 @@ throw (::com::sun::star::uno::RuntimeException) // XElementAccess Type SAL_CALL WindowStateConfiguration::getElementType() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { return( ::getCppuType( (const Reference< XNameAccess >*)NULL ) ); } sal_Bool SAL_CALL WindowStateConfiguration::hasElements() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { // We always have at least one module. So it is valid to return true! return sal_True; |