diff options
Diffstat (limited to 'ucb/source/ucp/hierarchy')
-rw-r--r-- | ucb/source/ucp/hierarchy/hierarchycontent.cxx | 20 | ||||
-rw-r--r-- | ucb/source/ucp/hierarchy/hierarchycontent.hxx | 16 | ||||
-rw-r--r-- | ucb/source/ucp/hierarchy/hierarchydatasource.cxx | 96 | ||||
-rw-r--r-- | ucb/source/ucp/hierarchy/hierarchydatasource.hxx | 12 | ||||
-rw-r--r-- | ucb/source/ucp/hierarchy/hierarchyprovider.cxx | 4 | ||||
-rw-r--r-- | ucb/source/ucp/hierarchy/hierarchyprovider.hxx | 4 |
6 files changed, 76 insertions, 76 deletions
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx index 31f9dbd785b3..0704bc24180f 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx @@ -174,7 +174,7 @@ void SAL_CALL HierarchyContent::release() // virtual uno::Any SAL_CALL HierarchyContent::queryInterface( const uno::Type & rType ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Any aRet = ContentImplHelper::queryInterface( rType ); @@ -205,7 +205,7 @@ XTYPEPROVIDER_COMMON_IMPL( HierarchyContent ); // virtual uno::Sequence< uno::Type > SAL_CALL HierarchyContent::getTypes() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { cppu::OTypeCollection * pCollection = 0; @@ -286,7 +286,7 @@ uno::Sequence< uno::Type > SAL_CALL HierarchyContent::getTypes() // virtual OUString SAL_CALL HierarchyContent::getImplementationName() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.ucb.HierarchyContent" ); } @@ -295,7 +295,7 @@ OUString SAL_CALL HierarchyContent::getImplementationName() // virtual uno::Sequence< OUString > SAL_CALL HierarchyContent::getSupportedServiceNames() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aSNS( 1 ); @@ -317,7 +317,7 @@ HierarchyContent::getSupportedServiceNames() // virtual OUString SAL_CALL HierarchyContent::getContentType() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return m_aProps.getContentType(); } @@ -326,7 +326,7 @@ OUString SAL_CALL HierarchyContent::getContentType() // virtual uno::Reference< ucb::XContentIdentifier > SAL_CALL HierarchyContent::getIdentifier() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { // Transient? if ( m_eState == TRANSIENT ) @@ -351,7 +351,7 @@ uno::Any SAL_CALL HierarchyContent::execute( const uno::Reference< ucb::XCommandEnvironment >& Environment ) throw( uno::Exception, ucb::CommandAbortedException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { uno::Any aRet; @@ -566,7 +566,7 @@ uno::Any SAL_CALL HierarchyContent::execute( // virtual void SAL_CALL HierarchyContent::abort( sal_Int32 /*CommandId*/ ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { // @@@ Generally, no action takes much time... } @@ -580,7 +580,7 @@ void SAL_CALL HierarchyContent::abort( sal_Int32 /*CommandId*/ ) // virtual uno::Sequence< ucb::ContentInfo > SAL_CALL HierarchyContent::queryCreatableContentsInfo() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return m_aProps.getCreatableContentsInfo(); } @@ -589,7 +589,7 @@ HierarchyContent::queryCreatableContentsInfo() // virtual uno::Reference< ucb::XContent > SAL_CALL HierarchyContent::createNewContent( const ucb::ContentInfo& Info ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if ( isFolder() ) { diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.hxx b/ucb/source/ucp/hierarchy/hierarchycontent.hxx index a91b9f59566a..69d0f1052dd5 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.hxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.hxx @@ -243,19 +243,19 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XContent virtual OUString SAL_CALL getContentType() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL getIdentifier() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XCommandProcessor virtual com::sun::star::uno::Any SAL_CALL @@ -265,10 +265,10 @@ public: com::sun::star::ucb::XCommandEnvironment >& Environment ) throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // Additional interfaces @@ -278,11 +278,11 @@ public: virtual com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > SAL_CALL queryCreatableContentsInfo() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL createNewContent( const com::sun::star::ucb::ContentInfo& Info ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // Non-interface methods. diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx index 856c826f1210..f57e0ada7856 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx @@ -111,30 +111,30 @@ public: // XComponent virtual void SAL_CALL dispose() - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); virtual void SAL_CALL addEventListener( const uno::Reference< lang::XEventListener > & xListener ) - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); virtual void SAL_CALL removeEventListener( const uno::Reference< lang::XEventListener > & aListener ) - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); // XSingleServiceFactory virtual uno::Reference< uno::XInterface > SAL_CALL createInstance() - throw ( uno::Exception, uno::RuntimeException ); + throw ( uno::Exception, uno::RuntimeException, std::exception ); virtual uno::Reference< uno::XInterface > SAL_CALL createInstanceWithArguments( const uno::Sequence< uno::Any > & aArguments ) - throw ( uno::Exception, uno::RuntimeException ); + throw ( uno::Exception, uno::RuntimeException, std::exception ); // XHierarchicalNameAccess virtual uno::Any SAL_CALL getByHierarchicalName( const OUString & aName ) - throw ( container::NoSuchElementException, uno::RuntimeException ); + throw ( container::NoSuchElementException, uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL hasByHierarchicalName( const OUString & aName ) - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); // XNameContainer virtual void SAL_CALL @@ -142,12 +142,12 @@ public: throw ( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, - uno::RuntimeException ); + uno::RuntimeException, std::exception ); virtual void SAL_CALL removeByName( const OUString & Name ) throw ( container::NoSuchElementException, lang::WrappedTargetException, - uno::RuntimeException ); + uno::RuntimeException, std::exception ); // XNameReplace ( base of XNameContainer ) virtual void SAL_CALL @@ -155,49 +155,49 @@ public: throw ( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, - uno::RuntimeException ); + uno::RuntimeException, std::exception ); // XNameAccess ( base of XNameReplace ) virtual uno::Any SAL_CALL getByName( const OUString & aName ) throw ( container::NoSuchElementException, lang::WrappedTargetException, - uno::RuntimeException ); + uno::RuntimeException, std::exception ); virtual uno::Sequence< OUString > SAL_CALL getElementNames() - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL hasByName( const OUString & aName ) - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); // XElementAccess ( base of XNameAccess ) virtual uno::Type SAL_CALL getElementType() - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL hasElements() - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); // XChangesNotifier virtual void SAL_CALL addChangesListener( const uno::Reference< util::XChangesListener > & aListener ) - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); virtual void SAL_CALL removeChangesListener( const uno::Reference< util::XChangesListener > & aListener ) - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); // XChangesBatch virtual void SAL_CALL commitChanges() - throw ( lang::WrappedTargetException, uno::RuntimeException ); + throw ( lang::WrappedTargetException, uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL hasPendingChanges() - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); virtual uno::Sequence< util::ElementChange > SAL_CALL getPendingChanges() - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); }; } // namespace hcp_impl @@ -275,7 +275,7 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( HierarchyDataSource ); // virtual void SAL_CALL HierarchyDataSource::dispose() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -291,7 +291,7 @@ void SAL_CALL HierarchyDataSource::dispose() // virtual void SAL_CALL HierarchyDataSource::addEventListener( const uno::Reference< lang::XEventListener > & Listener ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -306,7 +306,7 @@ void SAL_CALL HierarchyDataSource::addEventListener( // virtual void SAL_CALL HierarchyDataSource::removeEventListener( const uno::Reference< lang::XEventListener > & Listener ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -323,7 +323,7 @@ void SAL_CALL HierarchyDataSource::removeEventListener( // virtual uno::Reference< uno::XInterface > SAL_CALL HierarchyDataSource::createInstance( const OUString & aServiceSpecifier ) - throw ( uno::Exception, uno::RuntimeException ) + throw ( uno::Exception, uno::RuntimeException, std::exception ) { // Create view to root node. @@ -343,7 +343,7 @@ uno::Reference< uno::XInterface > SAL_CALL HierarchyDataSource::createInstanceWithArguments( const OUString & ServiceSpecifier, const uno::Sequence< uno::Any > & Arguments ) - throw ( uno::Exception, uno::RuntimeException ) + throw ( uno::Exception, uno::RuntimeException, std::exception ) { return createInstanceWithArguments( ServiceSpecifier, Arguments, true ); } @@ -352,7 +352,7 @@ HierarchyDataSource::createInstanceWithArguments( // virtual uno::Sequence< OUString > SAL_CALL HierarchyDataSource::getAvailableServiceNames() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aNames( 2 ); aNames[ 0 ] = READ_SERVICE_NAME; @@ -613,7 +613,7 @@ XINTERFACE_COMMON_IMPL( HierarchyDataAccess ); // virtual uno::Any SAL_CALL HierarchyDataAccess::queryInterface( const uno::Type & aType ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { // Interfaces supported in read-only and read-write mode. uno::Any aRet = cppu::queryInterface( aType, @@ -649,7 +649,7 @@ XTYPEPROVIDER_COMMON_IMPL( HierarchyDataAccess ); // virtual uno::Sequence< uno::Type > SAL_CALL HierarchyDataAccess::getTypes() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { cppu::OTypeCollection * pCollection = 0; @@ -739,7 +739,7 @@ XSERVICEINFO_NOFACTORY_IMPL_0( // virtual void SAL_CALL HierarchyDataAccess::dispose() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Reference< lang::XComponent > xOrig = ENSURE_ORIG_INTERFACE( lang::XComponent, C ); @@ -753,7 +753,7 @@ void SAL_CALL HierarchyDataAccess::dispose() // virtual void SAL_CALL HierarchyDataAccess::addEventListener( const uno::Reference< lang::XEventListener > & xListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Reference< lang::XComponent > xOrig = ENSURE_ORIG_INTERFACE( lang::XComponent, C ); @@ -767,7 +767,7 @@ void SAL_CALL HierarchyDataAccess::addEventListener( // virtual void SAL_CALL HierarchyDataAccess::removeEventListener( const uno::Reference< lang::XEventListener > & aListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Reference< lang::XComponent > xOrig = ENSURE_ORIG_INTERFACE( lang::XComponent, C ); @@ -786,7 +786,7 @@ void SAL_CALL HierarchyDataAccess::removeEventListener( // virtual uno::Any SAL_CALL HierarchyDataAccess::getByHierarchicalName( const OUString & aName ) - throw ( container::NoSuchElementException, uno::RuntimeException ) + throw ( container::NoSuchElementException, uno::RuntimeException, std::exception ) { uno::Reference< container::XHierarchicalNameAccess > xOrig = ENSURE_ORIG_INTERFACE( container::XHierarchicalNameAccess, HNA ); @@ -801,7 +801,7 @@ uno::Any SAL_CALL HierarchyDataAccess::getByHierarchicalName( // virtual sal_Bool SAL_CALL HierarchyDataAccess::hasByHierarchicalName( const OUString & aName ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Reference< container::XHierarchicalNameAccess > xOrig = ENSURE_ORIG_INTERFACE( container::XHierarchicalNameAccess, HNA ); @@ -822,7 +822,7 @@ sal_Bool SAL_CALL HierarchyDataAccess::hasByHierarchicalName( uno::Any SAL_CALL HierarchyDataAccess::getByName( const OUString & aName ) throw ( container::NoSuchElementException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { uno::Reference< container::XNameAccess > xOrig = ENSURE_ORIG_INTERFACE( container::XNameAccess, NA ); @@ -835,7 +835,7 @@ uno::Any SAL_CALL HierarchyDataAccess::getByName( const OUString & aName ) // virtual uno::Sequence< OUString > SAL_CALL HierarchyDataAccess::getElementNames() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Reference< container::XNameAccess > xOrig = ENSURE_ORIG_INTERFACE( container::XNameAccess, NA ); @@ -848,7 +848,7 @@ uno::Sequence< OUString > SAL_CALL HierarchyDataAccess::getElementNames() // virtual sal_Bool SAL_CALL HierarchyDataAccess::hasByName( const OUString & aName ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Reference< container::XNameAccess > xOrig = ENSURE_ORIG_INTERFACE( container::XNameAccess, NA ); @@ -866,7 +866,7 @@ sal_Bool SAL_CALL HierarchyDataAccess::hasByName( const OUString & aName ) // virtual uno::Type SAL_CALL HierarchyDataAccess::getElementType() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Reference< container::XElementAccess > xOrig = ENSURE_ORIG_INTERFACE( container::XElementAccess, EA ); @@ -879,7 +879,7 @@ uno::Type SAL_CALL HierarchyDataAccess::getElementType() // virtual sal_Bool SAL_CALL HierarchyDataAccess::hasElements() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Reference< container::XElementAccess > xOrig = ENSURE_ORIG_INTERFACE( container::XElementAccess, EA ); @@ -898,7 +898,7 @@ sal_Bool SAL_CALL HierarchyDataAccess::hasElements() // virtual void SAL_CALL HierarchyDataAccess::addChangesListener( const uno::Reference< util::XChangesListener > & aListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Reference< util::XChangesNotifier > xOrig = ENSURE_ORIG_INTERFACE( util::XChangesNotifier, CN ); @@ -912,7 +912,7 @@ void SAL_CALL HierarchyDataAccess::addChangesListener( // virtual void SAL_CALL HierarchyDataAccess::removeChangesListener( const uno::Reference< util::XChangesListener > & aListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Reference< util::XChangesNotifier > xOrig = ENSURE_ORIG_INTERFACE( util::XChangesNotifier, CN ); @@ -930,7 +930,7 @@ void SAL_CALL HierarchyDataAccess::removeChangesListener( // virtual uno::Reference< uno::XInterface > SAL_CALL HierarchyDataAccess::createInstance() - throw ( uno::Exception, uno::RuntimeException ) + throw ( uno::Exception, uno::RuntimeException, std::exception ) { uno::Reference< lang::XSingleServiceFactory > xOrig = ENSURE_ORIG_INTERFACE( lang::XSingleServiceFactory, SSF ); @@ -945,7 +945,7 @@ 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 ) + throw ( uno::Exception, uno::RuntimeException, std::exception ) { uno::Reference< lang::XSingleServiceFactory > xOrig = ENSURE_ORIG_INTERFACE( lang::XSingleServiceFactory, SSF ); @@ -968,7 +968,7 @@ HierarchyDataAccess::insertByName( const OUString & aName, throw ( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { uno::Reference< container::XNameContainer > xOrig = ENSURE_ORIG_INTERFACE( container::XNameContainer, NC ); @@ -984,7 +984,7 @@ void SAL_CALL HierarchyDataAccess::removeByName( const OUString & Name ) throw ( container::NoSuchElementException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { uno::Reference< container::XNameContainer > xOrig = ENSURE_ORIG_INTERFACE( container::XNameContainer, NC ); @@ -1006,7 +1006,7 @@ void SAL_CALL HierarchyDataAccess::replaceByName( const OUString & aName, throw ( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { uno::Reference< container::XNameReplace > xOrig = ENSURE_ORIG_INTERFACE( container::XNameReplace, NR ); @@ -1024,7 +1024,7 @@ void SAL_CALL HierarchyDataAccess::replaceByName( const OUString & aName, // virtual void SAL_CALL HierarchyDataAccess::commitChanges() - throw ( lang::WrappedTargetException, uno::RuntimeException ) + throw ( lang::WrappedTargetException, uno::RuntimeException, std::exception ) { uno::Reference< util::XChangesBatch > xOrig = ENSURE_ORIG_INTERFACE( util::XChangesBatch, CB ); @@ -1037,7 +1037,7 @@ void SAL_CALL HierarchyDataAccess::commitChanges() // virtual sal_Bool SAL_CALL HierarchyDataAccess::hasPendingChanges() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Reference< util::XChangesBatch > xOrig = ENSURE_ORIG_INTERFACE( util::XChangesBatch, CB ); @@ -1051,7 +1051,7 @@ sal_Bool SAL_CALL HierarchyDataAccess::hasPendingChanges() // virtual uno::Sequence< util::ElementChange > SAL_CALL HierarchyDataAccess::getPendingChanges() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Reference< util::XChangesBatch > xOrig = ENSURE_ORIG_INTERFACE( util::XChangesBatch, CB ); diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx index deafa70c063c..38489e05ee94 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx @@ -66,32 +66,32 @@ public: // XComponent virtual void SAL_CALL dispose() - throw ( com::sun::star::uno::RuntimeException ); + 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 ); + 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 ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); // XMultiServiceFactory virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString & aServiceSpecifier ) throw ( com::sun::star::uno::Exception, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString & ServiceSpecifier, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > & Arguments ) throw ( com::sun::star::uno::Exception, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); // Non-Interface methods diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx index a16aff7b03c2..e5e981a68fe0 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx @@ -112,7 +112,7 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( HierarchyContentProvider ); uno::Reference< ucb::XContent > SAL_CALL HierarchyContentProvider::queryContent( const uno::Reference< ucb::XContentIdentifier >& Identifier ) - throw( ucb::IllegalIdentifierException, uno::RuntimeException ) + throw( ucb::IllegalIdentifierException, uno::RuntimeException, std::exception ) { HierarchyUri aUri( Identifier->getContentIdentifier() ); if ( !aUri.isValid() ) @@ -148,7 +148,7 @@ HierarchyContentProvider::queryContent( // virtual void SAL_CALL HierarchyContentProvider::initialize( const uno::Sequence< uno::Any >& aArguments ) - throw( uno::Exception, uno::RuntimeException ) + throw( uno::Exception, uno::RuntimeException, std::exception ) { if ( aArguments.getLength() > 0 ) OSL_FAIL( "HierarchyContentProvider::initialize : not supported!" ); diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx index 76206a2f062e..dff3aa942733 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx @@ -119,14 +119,14 @@ public: queryContent( const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Identifier ) throw( com::sun::star::ucb::IllegalIdentifierException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw( ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); // Non-Interface methods com::sun::star::uno::Reference< |