summaryrefslogtreecommitdiff
path: root/scripting/source/provider
diff options
context:
space:
mode:
Diffstat (limited to 'scripting/source/provider')
-rw-r--r--scripting/source/provider/MasterScriptProvider.cxx9
-rw-r--r--scripting/source/provider/MasterScriptProvider.hxx3
2 files changed, 4 insertions, 8 deletions
diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx
index 7c6157d4d7b4..83a559358932 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -235,7 +235,7 @@ MasterScriptProvider::getScript( const OUString& scriptURI )
throw ( provider::ScriptFrameworkErrorException,
RuntimeException, std::exception )
{
- if ( !isValid() )
+ if ( !m_bIsValid )
{
throw provider::ScriptFrameworkErrorException(
"MasterScriptProvider not initialised", Reference< XInterface >(),
@@ -389,7 +389,7 @@ OUString SAL_CALL
MasterScriptProvider::getName()
throw ( css::uno::RuntimeException, std::exception )
{
- if ( !isPkgProvider() )
+ if ( !m_bIsPkgMSP )
{
OUString sCtx = getContextString();
if ( sCtx.startsWith( "vnd.sun.star.tdoc" ) )
@@ -421,9 +421,8 @@ MasterScriptProvider::getChildNodes()
{
Sequence< Reference< provider::XScriptProvider > > providers = getAllProviders();
- Reference< provider::XScriptProvider > pkgProv = getPkgProvider();
sal_Int32 size = providers.getLength();
- bool hasPkgs = pkgProv.is();
+ bool hasPkgs = m_xMSPPkg.is();
if ( hasPkgs )
{
size++;
@@ -437,7 +436,7 @@ MasterScriptProvider::getChildNodes()
if ( hasPkgs )
{
- children[ provIndex ].set( pkgProv, UNO_QUERY );
+ children[ provIndex ].set( m_xMSPPkg, UNO_QUERY );
}
diff --git a/scripting/source/provider/MasterScriptProvider.hxx b/scripting/source/provider/MasterScriptProvider.hxx
index 38f6c1fed02f..964a1a13d451 100644
--- a/scripting/source/provider/MasterScriptProvider.hxx
+++ b/scripting/source/provider/MasterScriptProvider.hxx
@@ -106,15 +106,12 @@ public:
css::uno::Sequence< css::uno::Reference< css::script::provider::XScriptProvider > > SAL_CALL
getAllProviders() throw ( css::uno::RuntimeException );
- bool isPkgProvider() { return m_bIsPkgMSP; }
- const css::uno::Reference< css::script::provider::XScriptProvider >& getPkgProvider() { return m_xMSPPkg; }
// returns context string for this provider, eg
const OUString& getContextString() { return m_sCtxString; }
private:
static OUString parseLocationName( const OUString& location );
void createPkgProvider();
- bool isValid() { return m_bIsValid;}
ProviderCache* providerCache();
/* to obtain other services if needed */