diff options
Diffstat (limited to 'scripting')
4 files changed, 5 insertions, 39 deletions
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx index 73011f9adca2..6b8d128b2f36 100644 --- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx +++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx @@ -655,7 +655,7 @@ BrowseNodeFactoryImpl::createView( sal_Int16 viewType ) switch( viewType ) { case browse::BrowseNodeFactoryViewTypes::MACROSELECTOR: - return getSelectorHierarchy(); + return new SelectorBrowseNode( m_xComponentContext ); case browse::BrowseNodeFactoryViewTypes::MACROORGANIZER: return getOrganizerHierarchy(); default: @@ -664,17 +664,6 @@ BrowseNodeFactoryImpl::createView( sal_Int16 viewType ) } Reference< browse::XBrowseNode > -BrowseNodeFactoryImpl::getSelectorHierarchy() - throw (RuntimeException) -{ - /*if ( !m_xSelectorBrowseNode.is() ) - { - m_xSelectorBrowseNode = new SelectorBrowseNode( m_xComponentContext ); - }*/ - return new SelectorBrowseNode( m_xComponentContext ); -} - -Reference< browse::XBrowseNode > BrowseNodeFactoryImpl::getOrganizerHierarchy() throw (RuntimeException) { diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.hxx b/scripting/source/provider/BrowseNodeFactoryImpl.hxx index ef54adbe51a9..3a87e2d3dee7 100644 --- a/scripting/source/provider/BrowseNodeFactoryImpl.hxx +++ b/scripting/source/provider/BrowseNodeFactoryImpl.hxx @@ -66,11 +66,7 @@ public: virtual css::uno::Reference< css::script::browse::XBrowseNode > SAL_CALL createView( sal_Int16 viewType ) throw ( css::uno::RuntimeException, std::exception ) override; - private: - css::uno::Reference< css::script::browse::XBrowseNode > - getSelectorHierarchy() - throw ( css::uno::RuntimeException ); - +private: css::uno::Reference< css::script::browse::XBrowseNode > getOrganizerHierarchy() throw ( css::uno::RuntimeException ); diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx index 83a559358932..888b7f9800b1 100644 --- a/scripting/source/provider/MasterScriptProvider.cxx +++ b/scripting/source/provider/MasterScriptProvider.cxx @@ -419,7 +419,9 @@ Sequence< Reference< browse::XBrowseNode > > SAL_CALL MasterScriptProvider::getChildNodes() throw ( css::uno::RuntimeException, std::exception ) { - Sequence< Reference< provider::XScriptProvider > > providers = getAllProviders(); + if ( !providerCache() ) + throw RuntimeException( "MasterScriptProvider::getAllProviders, cache not initialised" ); + Sequence< Reference< provider::XScriptProvider > > providers = providerCache()->getAllProviders(); sal_Int32 size = providers.getLength(); bool hasPkgs = m_xMSPPkg.is(); @@ -752,22 +754,6 @@ sal_Bool SAL_CALL MasterScriptProvider::hasElements( ) throw ( RuntimeException } -Sequence< Reference< provider::XScriptProvider > > SAL_CALL -MasterScriptProvider::getAllProviders() throw ( css::uno::RuntimeException ) -{ - if ( providerCache() ) - { - return providerCache()->getAllProviders(); - } - else - { - OUString errorMsg( - "MasterScriptProvider::getAllProviders, cache not initialised"); - throw RuntimeException( errorMsg.concat( errorMsg ) ); - } -} - - OUString SAL_CALL MasterScriptProvider::getImplementationName( ) throw( RuntimeException, std::exception ) { diff --git a/scripting/source/provider/MasterScriptProvider.hxx b/scripting/source/provider/MasterScriptProvider.hxx index 964a1a13d451..989441a8403c 100644 --- a/scripting/source/provider/MasterScriptProvider.hxx +++ b/scripting/source/provider/MasterScriptProvider.hxx @@ -101,11 +101,6 @@ public: virtual void SAL_CALL initialize( const css::uno::Sequence < css::uno::Any > & args ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) override; - // Public method to return all Language Providers in this MasterScriptProviders - // context. - css::uno::Sequence< css::uno::Reference< css::script::provider::XScriptProvider > > SAL_CALL - getAllProviders() throw ( css::uno::RuntimeException ); - // returns context string for this provider, eg const OUString& getContextString() { return m_sCtxString; } |