diff options
Diffstat (limited to 'scripting/source/provider')
| -rw-r--r-- | scripting/source/provider/ActiveMSPList.cxx | 1 | ||||
| -rw-r--r-- | scripting/source/provider/ActiveMSPList.hxx | 3 | ||||
| -rw-r--r-- | scripting/source/provider/BrowseNodeFactoryImpl.cxx | 74 | ||||
| -rw-r--r-- | scripting/source/provider/BrowseNodeFactoryImpl.hxx | 15 | ||||
| -rw-r--r-- | scripting/source/provider/MasterScriptProvider.cxx | 28 | ||||
| -rw-r--r-- | scripting/source/provider/MasterScriptProvider.hxx | 46 | ||||
| -rw-r--r-- | scripting/source/provider/MasterScriptProviderFactory.cxx | 5 | ||||
| -rw-r--r-- | scripting/source/provider/MasterScriptProviderFactory.hxx | 12 | ||||
| -rw-r--r-- | scripting/source/provider/ProviderCache.cxx | 12 | ||||
| -rw-r--r-- | scripting/source/provider/ProviderCache.hxx | 13 | ||||
| -rw-r--r-- | scripting/source/provider/URIHelper.cxx | 8 | ||||
| -rw-r--r-- | scripting/source/provider/URIHelper.hxx | 26 |
12 files changed, 79 insertions, 164 deletions
diff --git a/scripting/source/provider/ActiveMSPList.cxx b/scripting/source/provider/ActiveMSPList.cxx index 5859b4b6eef5..5ff52ea288d4 100644 --- a/scripting/source/provider/ActiveMSPList.cxx +++ b/scripting/source/provider/ActiveMSPList.cxx @@ -259,7 +259,6 @@ ActiveMSPList::addActiveMSP( const Reference< uno::XInterface >& xComponent, void SAL_CALL ActiveMSPList::disposing( const css::lang::EventObject& Source ) -throw ( css::uno::RuntimeException, std::exception ) { try diff --git a/scripting/source/provider/ActiveMSPList.hxx b/scripting/source/provider/ActiveMSPList.hxx index dffe00f4bb6b..0ce042baac07 100644 --- a/scripting/source/provider/ActiveMSPList.hxx +++ b/scripting/source/provider/ActiveMSPList.hxx @@ -72,8 +72,7 @@ public: //XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) - throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; private: void addActiveMSP( const css::uno::Reference< css::uno::XInterface >& xComponent, diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx index c6481a46d660..e74b9f90de99 100644 --- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx +++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx @@ -72,15 +72,13 @@ public: } virtual OUString - SAL_CALL getName() - throw ( RuntimeException, std::exception ) override + SAL_CALL getName() override { return m_Name; } virtual Sequence< Reference< browse::XBrowseNode > > SAL_CALL - getChildNodes() - throw ( RuntimeException, std::exception ) override + getChildNodes() override { std::vector< Sequence< Reference < browse::XBrowseNode > > > seqs; seqs.reserve( m_Nodes.size() ); @@ -119,8 +117,7 @@ public: } virtual sal_Bool SAL_CALL - hasChildNodes() - throw ( RuntimeException, std::exception ) override + hasChildNodes() override { if ( !m_Nodes.empty() ) { @@ -144,8 +141,7 @@ public: return false; } - virtual sal_Int16 SAL_CALL getType() - throw ( RuntimeException, std::exception ) override + virtual sal_Int16 SAL_CALL getType() override { return browse::BrowseNodeTypes::CONTAINER; } @@ -194,15 +190,13 @@ public: // XBrowseNode - virtual OUString SAL_CALL getName() - throw ( RuntimeException, std::exception ) override + virtual OUString SAL_CALL getName() override { return m_sNodeName; } virtual Sequence< Reference< browse::XBrowseNode > > SAL_CALL - getChildNodes() - throw ( RuntimeException, std::exception ) override + getChildNodes() override { if ( m_hBNA == nullptr ) { @@ -222,14 +216,12 @@ public: return children; } - virtual sal_Bool SAL_CALL hasChildNodes() - throw ( RuntimeException, std::exception ) override + virtual sal_Bool SAL_CALL hasChildNodes() override { return true; } - virtual sal_Int16 SAL_CALL getType() - throw ( RuntimeException, std::exception ) override + virtual sal_Int16 SAL_CALL getType() override { return browse::BrowseNodeTypes::CONTAINER; } @@ -418,8 +410,7 @@ public: } virtual Sequence< Reference< browse::XBrowseNode > > SAL_CALL - getChildNodes() - throw ( RuntimeException, std::exception ) override + getChildNodes() override { if ( hasChildNodes() ) { @@ -452,29 +443,25 @@ public: } } - virtual sal_Int16 SAL_CALL getType() - throw ( RuntimeException, std::exception ) override + virtual sal_Int16 SAL_CALL getType() override { return m_xWrappedBrowseNode->getType(); } virtual OUString - SAL_CALL getName() - throw ( RuntimeException, std::exception ) override + SAL_CALL getName() override { return m_xWrappedBrowseNode->getName(); } virtual sal_Bool SAL_CALL - hasChildNodes() - throw ( RuntimeException, std::exception ) override + hasChildNodes() override { return m_xWrappedBrowseNode->hasChildNodes(); } // XInterface - virtual Any SAL_CALL queryInterface( const Type& aType ) - throw ( css::uno::RuntimeException, std::exception ) override + virtual Any SAL_CALL queryInterface( const Type& aType ) override { Any aRet = t_BrowseNodeBase::queryInterface( aType ); if ( aRet.hasValue() ) @@ -493,13 +480,11 @@ public: // XTypeProvider (implemnented by base, but needs to be overridden for // delegating to aggregate) - virtual Sequence< Type > SAL_CALL getTypes() - throw ( css::uno::RuntimeException, std::exception ) override + virtual Sequence< Type > SAL_CALL getTypes() override { return m_xWrappedTypeProv->getTypes(); } - virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw ( css::uno::RuntimeException, std::exception ) override + virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() override { return css::uno::Sequence<sal_Int8>(); } @@ -527,8 +512,7 @@ public: } virtual Sequence< Reference< browse::XBrowseNode > > SAL_CALL - getChildNodes() - throw ( RuntimeException, std::exception ) override + getChildNodes() override { // no need to sort user, share, doc1...docN //::std::sort( m_vNodes.begin(), m_vNodes.end(), alphaSortForBNodes() ); @@ -541,22 +525,19 @@ public: return children; } - virtual sal_Int16 SAL_CALL getType() - throw ( RuntimeException, std::exception ) override + virtual sal_Int16 SAL_CALL getType() override { return browse::BrowseNodeTypes::ROOT; } virtual OUString - SAL_CALL getName() - throw ( RuntimeException, std::exception ) override + SAL_CALL getName() override { return m_Name; } virtual sal_Bool SAL_CALL - hasChildNodes() - throw ( RuntimeException, std::exception ) override + hasChildNodes() override { bool result = true; if ( m_vNodes.empty() ) @@ -580,15 +561,13 @@ public: { } - virtual OUString SAL_CALL getName() - throw ( RuntimeException, std::exception ) override + virtual OUString SAL_CALL getName() override { return OUString("Root"); } virtual Sequence< Reference< browse::XBrowseNode > > SAL_CALL - getChildNodes() - throw ( RuntimeException, std::exception ) override + getChildNodes() override { std::vector< Reference < browse::XBrowseNode > > locnBNs = getAllBrowseNodes( m_xComponentContext ); @@ -604,14 +583,12 @@ public: return children; } - virtual sal_Bool SAL_CALL hasChildNodes() - throw ( RuntimeException, std::exception ) override + virtual sal_Bool SAL_CALL hasChildNodes() override { return true; // will always be user and share } - virtual sal_Int16 SAL_CALL getType() - throw ( RuntimeException, std::exception ) override + virtual sal_Int16 SAL_CALL getType() override { return browse::BrowseNodeTypes::CONTAINER; } @@ -637,7 +614,6 @@ BrowseNodeFactoryImpl::~BrowseNodeFactoryImpl() */ Reference< browse::XBrowseNode > SAL_CALL BrowseNodeFactoryImpl::createView( sal_Int16 viewType ) - throw (RuntimeException, std::exception) { switch( viewType ) { @@ -652,7 +628,6 @@ BrowseNodeFactoryImpl::createView( sal_Int16 viewType ) Reference< browse::XBrowseNode > BrowseNodeFactoryImpl::getOrganizerHierarchy() - throw (RuntimeException) { Reference< browse::XBrowseNode > xRet = new DefaultRootBrowseNode( m_xComponentContext ); return xRet; @@ -693,20 +668,17 @@ bnf_create( Reference< XComponentContext > const & xComponentContext ) OUString SAL_CALL BrowseNodeFactoryImpl::getImplementationName() - throw (RuntimeException, std::exception) { return bnf_getImplementationName(); } Sequence< OUString > SAL_CALL BrowseNodeFactoryImpl::getSupportedServiceNames() - throw (RuntimeException, std::exception) { return bnf_getSupportedServiceNames(); } sal_Bool BrowseNodeFactoryImpl::supportsService(OUString const & serviceName ) - throw (RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.hxx b/scripting/source/provider/BrowseNodeFactoryImpl.hxx index db5f4a8ef233..45d0832f807c 100644 --- a/scripting/source/provider/BrowseNodeFactoryImpl.hxx +++ b/scripting/source/provider/BrowseNodeFactoryImpl.hxx @@ -51,26 +51,21 @@ public: css::uno::Reference< css::uno::XComponentContext > const & xComponentContext ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( OUString const & serviceName ) - throw ( css::uno::RuntimeException, std::exception ) override; + supportsService( OUString const & serviceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw ( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; // XBrowseNodeFactory virtual css::uno::Reference< css::script::browse::XBrowseNode > SAL_CALL - createView( sal_Int16 viewType ) - throw ( css::uno::RuntimeException, std::exception ) override; + createView( sal_Int16 viewType ) override; private: /// @throws css::uno::RuntimeException css::uno::Reference< css::script::browse::XBrowseNode > - getOrganizerHierarchy() - throw ( css::uno::RuntimeException ); + getOrganizerHierarchy(); }; diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx index c18d278bfc1e..9eaca17f0bc9 100644 --- a/scripting/source/provider/MasterScriptProvider.cxx +++ b/scripting/source/provider/MasterScriptProvider.cxx @@ -72,7 +72,7 @@ bool endsWith( const OUString& target, // XScriptProvider implementation -MasterScriptProvider::MasterScriptProvider( const Reference< XComponentContext > & xContext ) throw ( RuntimeException ): +MasterScriptProvider::MasterScriptProvider( const Reference< XComponentContext > & xContext ): m_xContext( xContext ), m_bIsValid( false ), m_bInitialised( false ), m_bIsPkgMSP( false ), m_pPCache( nullptr ) { @@ -94,7 +94,6 @@ MasterScriptProvider::~MasterScriptProvider() void SAL_CALL MasterScriptProvider::initialize( const Sequence < Any >& args ) -throw ( Exception, RuntimeException, std::exception ) { if ( m_bInitialised ) return; @@ -229,8 +228,6 @@ void MasterScriptProvider::createPkgProvider() Reference< provider::XScript > MasterScriptProvider::getScript( const OUString& scriptURI ) -throw ( provider::ScriptFrameworkErrorException, - RuntimeException, std::exception ) { if ( !m_bIsValid ) { @@ -384,7 +381,6 @@ MasterScriptProvider::providerCache() OUString SAL_CALL MasterScriptProvider::getName() - throw ( css::uno::RuntimeException, std::exception ) { if ( !m_bIsPkgMSP ) { @@ -414,7 +410,6 @@ MasterScriptProvider::getName() Sequence< Reference< browse::XBrowseNode > > SAL_CALL MasterScriptProvider::getChildNodes() - throw ( css::uno::RuntimeException, std::exception ) { if ( !providerCache() ) throw RuntimeException( "MasterScriptProvider::getAllProviders, cache not initialised" ); @@ -445,7 +440,6 @@ MasterScriptProvider::getChildNodes() sal_Bool SAL_CALL MasterScriptProvider::hasChildNodes() - throw ( css::uno::RuntimeException, std::exception ) { return true; } @@ -453,7 +447,6 @@ MasterScriptProvider::hasChildNodes() sal_Int16 SAL_CALL MasterScriptProvider::getType() - throw ( css::uno::RuntimeException, std::exception ) { return browse::BrowseNodeTypes::CONTAINER; } @@ -474,7 +467,7 @@ MasterScriptProvider::parseLocationName( const OUString& location ) // Register Package void SAL_CALL -MasterScriptProvider::insertByName( const OUString& aName, const Any& aElement ) throw ( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +MasterScriptProvider::insertByName( const OUString& aName, const Any& aElement ) { if ( !m_bIsPkgMSP ) { @@ -553,7 +546,7 @@ MasterScriptProvider::insertByName( const OUString& aName, const Any& aElement ) // Revoke Package void SAL_CALL -MasterScriptProvider::removeByName( const OUString& Name ) throw ( container::NoSuchElementException, lang::WrappedTargetException, RuntimeException, std::exception) +MasterScriptProvider::removeByName( const OUString& Name ) { if ( !m_bIsPkgMSP ) { @@ -624,7 +617,7 @@ MasterScriptProvider::removeByName( const OUString& Name ) throw ( container::No void SAL_CALL -MasterScriptProvider::replaceByName( const OUString& aName, const Any& aElement ) throw ( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, RuntimeException, std::exception) +MasterScriptProvider::replaceByName( const OUString& aName, const Any& aElement ) { (void)aName; (void)aElement; @@ -637,7 +630,7 @@ MasterScriptProvider::replaceByName( const OUString& aName, const Any& aElement } Any SAL_CALL -MasterScriptProvider::getByName( const OUString& aName ) throw ( container::NoSuchElementException, lang::WrappedTargetException, RuntimeException, std::exception) +MasterScriptProvider::getByName( const OUString& aName ) { (void)aName; @@ -651,7 +644,7 @@ MasterScriptProvider::getByName( const OUString& aName ) throw ( container::NoSu } sal_Bool SAL_CALL -MasterScriptProvider::hasByName( const OUString& aName ) throw (RuntimeException, std::exception) +MasterScriptProvider::hasByName( const OUString& aName ) { bool result = false; if ( !m_bIsPkgMSP ) @@ -721,7 +714,7 @@ MasterScriptProvider::hasByName( const OUString& aName ) throw (RuntimeException Sequence< OUString > SAL_CALL -MasterScriptProvider::getElementNames( ) throw ( RuntimeException, std::exception) +MasterScriptProvider::getElementNames( ) { // TODO needs implementing Sequence< OUString > names; @@ -733,14 +726,14 @@ MasterScriptProvider::getElementNames( ) throw ( RuntimeException, std::excepti } Type SAL_CALL -MasterScriptProvider::getElementType( ) throw ( RuntimeException, std::exception) +MasterScriptProvider::getElementType( ) { // TODO needs implementing Type t; return t; } -sal_Bool SAL_CALL MasterScriptProvider::hasElements( ) throw ( RuntimeException, std::exception) +sal_Bool SAL_CALL MasterScriptProvider::hasElements( ) { // TODO needs implementing if ( true ) @@ -752,20 +745,17 @@ sal_Bool SAL_CALL MasterScriptProvider::hasElements( ) throw ( RuntimeException OUString SAL_CALL MasterScriptProvider::getImplementationName( ) -throw( RuntimeException, std::exception ) { return OUString( "com.sun.star.script.provider.MasterScriptProvider" ); } sal_Bool SAL_CALL MasterScriptProvider::supportsService( const OUString& serviceName ) -throw( RuntimeException, std::exception ) { return cppu::supportsService(this, serviceName); } Sequence< OUString > SAL_CALL MasterScriptProvider::getSupportedServiceNames( ) -throw( RuntimeException, std::exception ) { OUString names[3]; diff --git a/scripting/source/provider/MasterScriptProvider.hxx b/scripting/source/provider/MasterScriptProvider.hxx index 47ba9689ac8d..a77642587dd9 100644 --- a/scripting/source/provider/MasterScriptProvider.hxx +++ b/scripting/source/provider/MasterScriptProvider.hxx @@ -52,46 +52,37 @@ public: /// @throws css::uno::RuntimeException explicit MasterScriptProvider( const css::uno::Reference< css::uno::XComponentContext > - & xContext ) throw( css::uno::RuntimeException ); + & xContext ); virtual ~MasterScriptProvider() override; // XServiceInfo implementation - virtual OUString SAL_CALL getImplementationName( ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName( ) override; // XBrowseNode implementation - virtual OUString SAL_CALL getName() - throw ( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Reference< css::script::browse::XBrowseNode > > SAL_CALL getChildNodes() - throw ( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasChildNodes() - throw ( css::uno::RuntimeException, std::exception ) override; - virtual sal_Int16 SAL_CALL getType() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getName() override; + virtual css::uno::Sequence< css::uno::Reference< css::script::browse::XBrowseNode > > SAL_CALL getChildNodes() override; + virtual sal_Bool SAL_CALL hasChildNodes() override; + virtual sal_Int16 SAL_CALL getType() override; // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw ( css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName( const OUString& Name ) throw ( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) override; + virtual void SAL_CALL removeByName( const OUString& Name ) override; // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw ( css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override; // XNameAccess - virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw ( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw ( css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) throw ( css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) 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 css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XScriptProvider implementation virtual css::uno::Reference < css::script::provider::XScript > SAL_CALL - getScript( const OUString& scriptURI ) - throw( css::script::provider::ScriptFrameworkErrorException, - css::uno::RuntimeException, std::exception ) override; + getScript( const OUString& scriptURI ) override; /** * XInitialise implementation @@ -99,8 +90,7 @@ public: * @param args expected to contain a single OUString * containing the URI */ - virtual void SAL_CALL initialize( const css::uno::Sequence < css::uno::Any > & args ) - throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence < css::uno::Any > & args ) override; // returns context string for this provider, eg const OUString& getContextString() { return m_sCtxString; } diff --git a/scripting/source/provider/MasterScriptProviderFactory.cxx b/scripting/source/provider/MasterScriptProviderFactory.cxx index d2d4493c0d35..a805015d0c3e 100644 --- a/scripting/source/provider/MasterScriptProviderFactory.cxx +++ b/scripting/source/provider/MasterScriptProviderFactory.cxx @@ -44,7 +44,7 @@ MasterScriptProviderFactory::~MasterScriptProviderFactory() } Reference< provider::XScriptProvider > SAL_CALL -MasterScriptProviderFactory::createScriptProvider( const Any& context ) throw ( lang::IllegalArgumentException, RuntimeException, std::exception) +MasterScriptProviderFactory::createScriptProvider( const Any& context ) { Reference< provider::XScriptProvider > xMsp( getActiveMSPList() ->getMSPFromAnyContext( context ), UNO_QUERY_THROW ); return xMsp; @@ -84,20 +84,17 @@ mspf_create( Reference< XComponentContext > const & xComponentContext ) } OUString SAL_CALL MasterScriptProviderFactory::getImplementationName() - throw (RuntimeException, std::exception) { return mspf_getImplementationName(); } Sequence< OUString > SAL_CALL MasterScriptProviderFactory::getSupportedServiceNames() - throw (RuntimeException, std::exception) { return mspf_getSupportedServiceNames(); } sal_Bool MasterScriptProviderFactory::supportsService( OUString const & serviceName ) - throw (RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } diff --git a/scripting/source/provider/MasterScriptProviderFactory.hxx b/scripting/source/provider/MasterScriptProviderFactory.hxx index 7a5245a30268..833e079e7f96 100644 --- a/scripting/source/provider/MasterScriptProviderFactory.hxx +++ b/scripting/source/provider/MasterScriptProviderFactory.hxx @@ -58,21 +58,17 @@ public: css::uno::Reference< css::uno::XComponentContext > const & xComponentContext ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( OUString const & serviceName ) - throw ( css::uno::RuntimeException, std::exception ) override; + supportsService( OUString const & serviceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw ( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; // XScriptProviderFactory virtual css::uno::Reference< css::script::provider::XScriptProvider > - SAL_CALL createScriptProvider( const css::uno::Any& context ) - throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + SAL_CALL createScriptProvider( const css::uno::Any& context ) override; }; diff --git a/scripting/source/provider/ProviderCache.cxx b/scripting/source/provider/ProviderCache.cxx index 57a2f924fbbe..65b4fa4f5f02 100644 --- a/scripting/source/provider/ProviderCache.cxx +++ b/scripting/source/provider/ProviderCache.cxx @@ -31,8 +31,7 @@ using namespace com::sun::star::script; namespace func_provider { -ProviderCache::ProviderCache( const Reference< XComponentContext >& xContext, const Sequence< Any >& scriptContext ) - throw ( RuntimeException ) : m_Sctx( scriptContext ), m_xContext( xContext ) +ProviderCache::ProviderCache( const Reference< XComponentContext >& xContext, const Sequence< Any >& scriptContext ) : m_Sctx( scriptContext ), m_xContext( xContext ) { // initialise m_hProviderDetailsCache with details of ScriptProviders // will use createContentEnumeration @@ -43,8 +42,7 @@ ProviderCache::ProviderCache( const Reference< XComponentContext >& xContext, co } -ProviderCache::ProviderCache( const Reference< XComponentContext >& xContext, const Sequence< Any >& scriptContext, const Sequence< OUString >& blackList ) - throw ( RuntimeException ) : m_sBlackList( blackList ), m_Sctx( scriptContext ), m_xContext( xContext ) +ProviderCache::ProviderCache( const Reference< XComponentContext >& xContext, const Sequence< Any >& scriptContext, const Sequence< OUString >& blackList ) : m_sBlackList( blackList ), m_Sctx( scriptContext ), m_xContext( xContext ) { // initialise m_hProviderDetailsCache with details of ScriptProviders @@ -81,7 +79,7 @@ ProviderCache::getProvider( const OUString& providerName ) } Sequence < Reference< provider::XScriptProvider > > -ProviderCache::getAllProviders() throw ( RuntimeException ) +ProviderCache::getAllProviders() { // need to create providers that haven't been created already // so check what providers exist and what ones don't @@ -131,7 +129,7 @@ ProviderCache::getAllProviders() throw ( RuntimeException ) } void -ProviderCache::populateCache() throw ( RuntimeException ) +ProviderCache::populateCache() { // wrong name in services.rdb OUString serviceName; @@ -179,7 +177,7 @@ ProviderCache::populateCache() throw ( RuntimeException ) } Reference< provider::XScriptProvider > -ProviderCache::createProvider( ProviderDetails& details ) throw ( RuntimeException ) +ProviderCache::createProvider( ProviderDetails& details ) { try { diff --git a/scripting/source/provider/ProviderCache.hxx b/scripting/source/provider/ProviderCache.hxx index 967f50cef269..7aacf487fb54 100644 --- a/scripting/source/provider/ProviderCache.hxx +++ b/scripting/source/provider/ProviderCache.hxx @@ -53,26 +53,23 @@ class ProviderCache public: /// @throws css::uno::RuntimeException - ProviderCache( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Sequence< css::uno::Any >& scriptContext ) - throw ( css::uno::RuntimeException ); + ProviderCache( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Sequence< css::uno::Any >& scriptContext ); /// @throws css::uno::RuntimeException ProviderCache( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Sequence< css::uno::Any >& scriptContext, - const css::uno::Sequence< OUString >& blackList ) - throw ( css::uno::RuntimeException ); + const css::uno::Sequence< OUString >& blackList ); ~ProviderCache(); css::uno::Reference< css::script::provider::XScriptProvider > getProvider( const OUString& providerName ); /// @throws css::uno::RuntimeException css::uno::Sequence < css::uno::Reference< css::script::provider::XScriptProvider > > - getAllProviders() throw ( css::uno::RuntimeException ); + getAllProviders(); private: /// @throws css::uno::RuntimeException - void populateCache() - throw ( css::uno::RuntimeException ); + void populateCache(); /// @throws css::uno::RuntimeException css::uno::Reference< css::script::provider::XScriptProvider > - createProvider( ProviderDetails& details ) throw ( css::uno::RuntimeException ); + createProvider( ProviderDetails& details ); bool isInBlackList( const OUString& serviceName ) { if ( m_sBlackList.getLength() > 0 ) diff --git a/scripting/source/provider/URIHelper.cxx b/scripting/source/provider/URIHelper.cxx index f205e6cb3582..233f0021ecab 100644 --- a/scripting/source/provider/URIHelper.cxx +++ b/scripting/source/provider/URIHelper.cxx @@ -47,7 +47,6 @@ static const char USER_URI[] = ScriptingFrameworkURIHelper::ScriptingFrameworkURIHelper( const uno::Reference< uno::XComponentContext >& xContext) - throw( uno::RuntimeException ) { try { @@ -76,7 +75,6 @@ ScriptingFrameworkURIHelper::~ScriptingFrameworkURIHelper() void SAL_CALL ScriptingFrameworkURIHelper::initialize( const uno::Sequence < uno::Any >& args ) -throw ( uno::Exception, uno::RuntimeException, std::exception ) { if ( args.getLength() != 2 || args[0].getValueType() != ::cppu::UnoType<OUString>::get() || @@ -194,7 +192,6 @@ ScriptingFrameworkURIHelper::getLanguagePath(const OUString& rLanguagePart) OUString SAL_CALL ScriptingFrameworkURIHelper::getScriptURI(const OUString& rStorageURI) - throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { OUStringBuffer buf(120); @@ -210,7 +207,6 @@ ScriptingFrameworkURIHelper::getScriptURI(const OUString& rStorageURI) OUString SAL_CALL ScriptingFrameworkURIHelper::getStorageURI(const OUString& rScriptURI) - throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { OUString sLanguagePart; try @@ -238,14 +234,12 @@ ScriptingFrameworkURIHelper::getStorageURI(const OUString& rScriptURI) OUString SAL_CALL ScriptingFrameworkURIHelper::getRootStorageURI() - throw( uno::RuntimeException, std::exception ) { return m_sBaseURI; } OUString SAL_CALL ScriptingFrameworkURIHelper::getImplementationName() - throw( uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.script.provider.ScriptURIHelper" ); @@ -253,14 +247,12 @@ ScriptingFrameworkURIHelper::getImplementationName() sal_Bool SAL_CALL ScriptingFrameworkURIHelper::supportsService( const OUString& serviceName ) - throw( uno::RuntimeException, std::exception ) { return cppu::supportsService( this, serviceName ); } uno::Sequence< OUString > SAL_CALL ScriptingFrameworkURIHelper::getSupportedServiceNames() - throw( uno::RuntimeException, std::exception ) { OUString serviceNameList[] = { OUString( diff --git a/scripting/source/provider/URIHelper.hxx b/scripting/source/provider/URIHelper.hxx index 5cd5a3c7e47d..b1d26b572cd8 100644 --- a/scripting/source/provider/URIHelper.hxx +++ b/scripting/source/provider/URIHelper.hxx @@ -58,40 +58,30 @@ private: public: /// @throws css::uno::RuntimeException explicit ScriptingFrameworkURIHelper( - const css::uno::Reference< css::uno::XComponentContext >& xContext ) - throw( css::uno::RuntimeException ); + const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~ScriptingFrameworkURIHelper() override; virtual void SAL_CALL - initialize( const css::uno::Sequence < css::uno::Any > & args ) - throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) override; + initialize( const css::uno::Sequence < css::uno::Any > & args ) override; virtual OUString SAL_CALL - getRootStorageURI() - throw ( css::uno::RuntimeException, std::exception ) override; + getRootStorageURI() override; virtual OUString SAL_CALL - getScriptURI( const OUString& rStorageURI ) - throw( css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception ) override; + getScriptURI( const OUString& rStorageURI ) override; virtual OUString SAL_CALL - getStorageURI( const OUString& rScriptURI ) - throw( css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception ) override; + getStorageURI( const OUString& rScriptURI ) override; virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; + supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; }; } // namespace func_provider |