diff options
Diffstat (limited to 'ucb/source/ucp/hierarchy/hierarchydatasource.cxx')
-rw-r--r-- | ucb/source/ucp/hierarchy/hierarchydatasource.cxx | 132 |
1 files changed, 26 insertions, 106 deletions
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx index 4337e17761c9..b9ba11f2eaa5 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx @@ -91,117 +91,81 @@ public: bool bReadOnly ); // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XComponent virtual void SAL_CALL - dispose() - throw ( uno::RuntimeException, std::exception ) override; + dispose() override; virtual void SAL_CALL - addEventListener( const uno::Reference< lang::XEventListener > & xListener ) - throw ( uno::RuntimeException, std::exception ) override; + addEventListener( const uno::Reference< lang::XEventListener > & xListener ) override; virtual void SAL_CALL removeEventListener( const uno::Reference< - lang::XEventListener > & aListener ) - throw ( uno::RuntimeException, std::exception ) override; + lang::XEventListener > & aListener ) override; // XSingleServiceFactory virtual uno::Reference< uno::XInterface > SAL_CALL - createInstance() - throw ( uno::Exception, uno::RuntimeException, std::exception ) override; + createInstance() override; virtual uno::Reference< uno::XInterface > SAL_CALL - createInstanceWithArguments( const uno::Sequence< uno::Any > & aArguments ) - throw ( uno::Exception, uno::RuntimeException, std::exception ) override; + createInstanceWithArguments( const uno::Sequence< uno::Any > & aArguments ) override; // XHierarchicalNameAccess virtual uno::Any SAL_CALL - getByHierarchicalName( const OUString & aName ) - throw ( container::NoSuchElementException, uno::RuntimeException, std::exception ) override; + getByHierarchicalName( const OUString & aName ) override; virtual sal_Bool SAL_CALL - hasByHierarchicalName( const OUString & aName ) - throw ( uno::RuntimeException, std::exception ) override; + hasByHierarchicalName( const OUString & aName ) override; // XNameContainer virtual void SAL_CALL - insertByName( const OUString & aName, const uno::Any & aElement ) - throw ( lang::IllegalArgumentException, - container::ElementExistException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) override; + insertByName( const OUString & aName, const uno::Any & aElement ) override; virtual void SAL_CALL - removeByName( const OUString & Name ) - throw ( container::NoSuchElementException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) override; + removeByName( const OUString & Name ) override; // XNameReplace ( base of XNameContainer ) virtual void SAL_CALL - replaceByName( const OUString & aName, const uno::Any & aElement ) - throw ( lang::IllegalArgumentException, - container::NoSuchElementException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) override; + replaceByName( const OUString & aName, const uno::Any & aElement ) override; // XNameAccess ( base of XNameReplace ) virtual uno::Any SAL_CALL - getByName( const OUString & aName ) - throw ( container::NoSuchElementException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) override; + getByName( const OUString & aName ) override; virtual uno::Sequence< OUString > SAL_CALL - getElementNames() - throw ( uno::RuntimeException, std::exception ) override; + getElementNames() override; virtual sal_Bool SAL_CALL - hasByName( const OUString & aName ) - throw ( uno::RuntimeException, std::exception ) override; + hasByName( const OUString & aName ) override; // XElementAccess ( base of XNameAccess ) virtual uno::Type SAL_CALL - getElementType() - throw ( uno::RuntimeException, std::exception ) override; + getElementType() override; virtual sal_Bool SAL_CALL - hasElements() - throw ( uno::RuntimeException, std::exception ) override; + hasElements() override; // XChangesNotifier virtual void SAL_CALL addChangesListener( const uno::Reference< - util::XChangesListener > & aListener ) - throw ( uno::RuntimeException, std::exception ) override; + util::XChangesListener > & aListener ) override; virtual void SAL_CALL removeChangesListener( const uno::Reference< - util::XChangesListener > & aListener ) - throw ( uno::RuntimeException, std::exception ) override; + util::XChangesListener > & aListener ) override; // XChangesBatch virtual void SAL_CALL - commitChanges() - throw ( lang::WrappedTargetException, uno::RuntimeException, std::exception ) override; + commitChanges() override; virtual sal_Bool SAL_CALL - hasPendingChanges() - throw ( uno::RuntimeException, std::exception ) override; + hasPendingChanges() override; virtual uno::Sequence< util::ElementChange > SAL_CALL - getPendingChanges() - throw ( uno::RuntimeException, std::exception ) override; + getPendingChanges() override; }; } // namespace hcp_impl @@ -240,7 +204,6 @@ void SAL_CALL HierarchyDataSource::release() } css::uno::Any SAL_CALL HierarchyDataSource::queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) { css::uno::Any aRet = cppu::queryInterface( rType, (static_cast< lang::XTypeProvider* >(this)), @@ -268,7 +231,6 @@ XSERVICEINFO_COMMOM_IMPL( HierarchyDataSource, /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > SAL_CALL HierarchyDataSource_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) - throw( css::uno::Exception ) { css::lang::XServiceInfo* pX = static_cast<css::lang::XServiceInfo*>(new HierarchyDataSource( ucbhelper::getComponentContext(rSMgr) )); @@ -292,7 +254,6 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( HierarchyDataSource ); // virtual void SAL_CALL HierarchyDataSource::dispose() - throw( uno::RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -308,7 +269,6 @@ void SAL_CALL HierarchyDataSource::dispose() // virtual void SAL_CALL HierarchyDataSource::addEventListener( const uno::Reference< lang::XEventListener > & Listener ) - throw( uno::RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -323,7 +283,6 @@ void SAL_CALL HierarchyDataSource::addEventListener( // virtual void SAL_CALL HierarchyDataSource::removeEventListener( const uno::Reference< lang::XEventListener > & Listener ) - throw( uno::RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -338,7 +297,6 @@ void SAL_CALL HierarchyDataSource::removeEventListener( // virtual uno::Reference< uno::XInterface > SAL_CALL HierarchyDataSource::createInstance( const OUString & aServiceSpecifier ) - throw ( uno::Exception, uno::RuntimeException, std::exception ) { // Create view to root node. @@ -358,7 +316,6 @@ uno::Reference< uno::XInterface > SAL_CALL HierarchyDataSource::createInstanceWithArguments( const OUString & ServiceSpecifier, const uno::Sequence< uno::Any > & Arguments ) - throw ( uno::Exception, uno::RuntimeException, std::exception ) { return createInstanceWithArguments( ServiceSpecifier, Arguments, true ); } @@ -367,7 +324,6 @@ HierarchyDataSource::createInstanceWithArguments( // virtual uno::Sequence< OUString > SAL_CALL HierarchyDataSource::getAvailableServiceNames() - throw ( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aNames( 2 ); aNames[ 0 ] = READ_SERVICE_NAME; @@ -384,7 +340,6 @@ HierarchyDataSource::createInstanceWithArguments( const OUString & ServiceSpecifier, const uno::Sequence< uno::Any > & Arguments, bool bCheckArgs ) - throw ( uno::Exception, uno::RuntimeException ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -618,7 +573,6 @@ void SAL_CALL HierarchyDataAccess::release() // virtual uno::Any SAL_CALL HierarchyDataAccess::queryInterface( const uno::Type & aType ) - throw ( uno::RuntimeException, std::exception ) { // Interfaces supported in read-only and read-write mode. uno::Any aRet = cppu::queryInterface( aType, @@ -652,7 +606,6 @@ XTYPEPROVIDER_COMMON_IMPL( HierarchyDataAccess ); // virtual uno::Sequence< uno::Type > SAL_CALL HierarchyDataAccess::getTypes() - throw( uno::RuntimeException, std::exception ) { cppu::OTypeCollection * pCollection = nullptr; @@ -722,19 +675,16 @@ uno::Sequence< uno::Type > SAL_CALL HierarchyDataAccess::getTypes() // XServiceInfo methods. OUString SAL_CALL HierarchyDataAccess::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.ucb.HierarchyDataAccess"); } sal_Bool SAL_CALL HierarchyDataAccess::supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService( this, ServiceName ); } css::uno::Sequence< OUString > SAL_CALL HierarchyDataAccess::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { READ_SERVICE_NAME, READWRITE_SERVICE_NAME }; } @@ -745,7 +695,6 @@ css::uno::Sequence< OUString > SAL_CALL HierarchyDataAccess::getSupportedService // virtual void SAL_CALL HierarchyDataAccess::dispose() - throw ( uno::RuntimeException, std::exception ) { uno::Reference< lang::XComponent > xOrig = ENSURE_ORIG_INTERFACE( lang::XComponent, C ); @@ -759,7 +708,6 @@ void SAL_CALL HierarchyDataAccess::dispose() // virtual void SAL_CALL HierarchyDataAccess::addEventListener( const uno::Reference< lang::XEventListener > & xListener ) - throw ( uno::RuntimeException, std::exception ) { uno::Reference< lang::XComponent > xOrig = ENSURE_ORIG_INTERFACE( lang::XComponent, C ); @@ -773,7 +721,6 @@ void SAL_CALL HierarchyDataAccess::addEventListener( // virtual void SAL_CALL HierarchyDataAccess::removeEventListener( const uno::Reference< lang::XEventListener > & aListener ) - throw ( uno::RuntimeException, std::exception ) { uno::Reference< lang::XComponent > xOrig = ENSURE_ORIG_INTERFACE( lang::XComponent, C ); @@ -790,7 +737,6 @@ void SAL_CALL HierarchyDataAccess::removeEventListener( // virtual uno::Any SAL_CALL HierarchyDataAccess::getByHierarchicalName( const OUString & aName ) - throw ( container::NoSuchElementException, uno::RuntimeException, std::exception ) { uno::Reference< container::XHierarchicalNameAccess > xOrig = ENSURE_ORIG_INTERFACE( container::XHierarchicalNameAccess, HNA ); @@ -805,7 +751,6 @@ uno::Any SAL_CALL HierarchyDataAccess::getByHierarchicalName( // virtual sal_Bool SAL_CALL HierarchyDataAccess::hasByHierarchicalName( const OUString & aName ) - throw ( uno::RuntimeException, std::exception ) { uno::Reference< container::XHierarchicalNameAccess > xOrig = ENSURE_ORIG_INTERFACE( container::XHierarchicalNameAccess, HNA ); @@ -822,9 +767,6 @@ sal_Bool SAL_CALL HierarchyDataAccess::hasByHierarchicalName( // virtual uno::Any SAL_CALL HierarchyDataAccess::getByName( const OUString & aName ) - throw ( container::NoSuchElementException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { uno::Reference< container::XNameAccess > xOrig = ENSURE_ORIG_INTERFACE( container::XNameAccess, NA ); @@ -837,7 +779,6 @@ uno::Any SAL_CALL HierarchyDataAccess::getByName( const OUString & aName ) // virtual uno::Sequence< OUString > SAL_CALL HierarchyDataAccess::getElementNames() - throw ( uno::RuntimeException, std::exception ) { uno::Reference< container::XNameAccess > xOrig = ENSURE_ORIG_INTERFACE( container::XNameAccess, NA ); @@ -850,7 +791,6 @@ uno::Sequence< OUString > SAL_CALL HierarchyDataAccess::getElementNames() // virtual sal_Bool SAL_CALL HierarchyDataAccess::hasByName( const OUString & aName ) - throw ( uno::RuntimeException, std::exception ) { uno::Reference< container::XNameAccess > xOrig = ENSURE_ORIG_INTERFACE( container::XNameAccess, NA ); @@ -866,7 +806,6 @@ sal_Bool SAL_CALL HierarchyDataAccess::hasByName( const OUString & aName ) // virtual uno::Type SAL_CALL HierarchyDataAccess::getElementType() - throw ( uno::RuntimeException, std::exception ) { uno::Reference< container::XElementAccess > xOrig = ENSURE_ORIG_INTERFACE( container::XElementAccess, EA ); @@ -879,7 +818,6 @@ uno::Type SAL_CALL HierarchyDataAccess::getElementType() // virtual sal_Bool SAL_CALL HierarchyDataAccess::hasElements() - throw ( uno::RuntimeException, std::exception ) { uno::Reference< container::XElementAccess > xOrig = ENSURE_ORIG_INTERFACE( container::XElementAccess, EA ); @@ -896,7 +834,6 @@ sal_Bool SAL_CALL HierarchyDataAccess::hasElements() // virtual void SAL_CALL HierarchyDataAccess::addChangesListener( const uno::Reference< util::XChangesListener > & aListener ) - throw ( uno::RuntimeException, std::exception ) { uno::Reference< util::XChangesNotifier > xOrig = ENSURE_ORIG_INTERFACE( util::XChangesNotifier, CN ); @@ -910,7 +847,6 @@ void SAL_CALL HierarchyDataAccess::addChangesListener( // virtual void SAL_CALL HierarchyDataAccess::removeChangesListener( const uno::Reference< util::XChangesListener > & aListener ) - throw ( uno::RuntimeException, std::exception ) { uno::Reference< util::XChangesNotifier > xOrig = ENSURE_ORIG_INTERFACE( util::XChangesNotifier, CN ); @@ -926,7 +862,6 @@ void SAL_CALL HierarchyDataAccess::removeChangesListener( // virtual uno::Reference< uno::XInterface > SAL_CALL HierarchyDataAccess::createInstance() - throw ( uno::Exception, uno::RuntimeException, std::exception ) { uno::Reference< lang::XSingleServiceFactory > xOrig = ENSURE_ORIG_INTERFACE( lang::XSingleServiceFactory, SSF ); @@ -941,7 +876,6 @@ uno::Reference< uno::XInterface > SAL_CALL HierarchyDataAccess::createInstance() uno::Reference< uno::XInterface > SAL_CALL HierarchyDataAccess::createInstanceWithArguments( const uno::Sequence< uno::Any > & aArguments ) - throw ( uno::Exception, uno::RuntimeException, std::exception ) { uno::Reference< lang::XSingleServiceFactory > xOrig = ENSURE_ORIG_INTERFACE( lang::XSingleServiceFactory, SSF ); @@ -959,10 +893,6 @@ HierarchyDataAccess::createInstanceWithArguments( void SAL_CALL HierarchyDataAccess::insertByName( const OUString & aName, const uno::Any & aElement ) - throw ( lang::IllegalArgumentException, - container::ElementExistException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { uno::Reference< container::XNameContainer > xOrig = ENSURE_ORIG_INTERFACE( container::XNameContainer, NC ); @@ -976,9 +906,6 @@ HierarchyDataAccess::insertByName( const OUString & aName, // virtual void SAL_CALL HierarchyDataAccess::removeByName( const OUString & Name ) - throw ( container::NoSuchElementException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { uno::Reference< container::XNameContainer > xOrig = ENSURE_ORIG_INTERFACE( container::XNameContainer, NC ); @@ -995,10 +922,6 @@ HierarchyDataAccess::removeByName( const OUString & Name ) // virtual void SAL_CALL HierarchyDataAccess::replaceByName( const OUString & aName, const uno::Any & aElement ) - throw ( lang::IllegalArgumentException, - container::NoSuchElementException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { uno::Reference< container::XNameReplace > xOrig = ENSURE_ORIG_INTERFACE( container::XNameReplace, NR ); @@ -1014,7 +937,6 @@ void SAL_CALL HierarchyDataAccess::replaceByName( const OUString & aName, // virtual void SAL_CALL HierarchyDataAccess::commitChanges() - throw ( lang::WrappedTargetException, uno::RuntimeException, std::exception ) { uno::Reference< util::XChangesBatch > xOrig = ENSURE_ORIG_INTERFACE( util::XChangesBatch, CB ); @@ -1027,7 +949,6 @@ void SAL_CALL HierarchyDataAccess::commitChanges() // virtual sal_Bool SAL_CALL HierarchyDataAccess::hasPendingChanges() - throw ( uno::RuntimeException, std::exception ) { uno::Reference< util::XChangesBatch > xOrig = ENSURE_ORIG_INTERFACE( util::XChangesBatch, CB ); @@ -1041,7 +962,6 @@ sal_Bool SAL_CALL HierarchyDataAccess::hasPendingChanges() // virtual uno::Sequence< util::ElementChange > SAL_CALL HierarchyDataAccess::getPendingChanges() - throw ( uno::RuntimeException, std::exception ) { uno::Reference< util::XChangesBatch > xOrig = ENSURE_ORIG_INTERFACE( util::XChangesBatch, CB ); |