mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:expandablemethods in scaddins..scripting

Browse Source 
Change-Id: I6a39184e526c9a41155565e798a7f1f2542985f2
Reviewed-on: https://gerrit.libreoffice.org/30331
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2016-10-27 14:57:17 +02:00
parent c0b3531919
commit 24360897c0
10 changed files with 9 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scripting/source/provider/BrowseNodeFactoryImpl.cxx
View File

@@ -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:
@@ -663,17 +663,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)

6
scripting/source/provider/BrowseNodeFactoryImpl.hxx
View File

@@ -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 );

20
scripting/source/provider/MasterScriptProvider.cxx
View File

@@ -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 )
{

5
scripting/source/provider/MasterScriptProvider.hxx
View File

@@ -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; }