summaryrefslogtreecommitdiff
path: root/scripting
diff options
context:
space:
mode:
authorNoel Power <noel.power@suse.com>2013-07-30 17:29:42 +0100
committerNoel Power <noel.power@suse.com>2013-07-30 20:19:21 +0100
commit92500896a9d0ba873c06a4a2728eb5a1b9d8f68d (patch)
tree702c06fbfeca593ce68f6a540f24f58297574a44 /scripting
parent5226b42560e3965c23973ddaf157477f191fdbbb (diff)
fdo#67547 fix access to methods (getScript) of MasterScriptProvider from VB
access to libreoffice objects ( and methods/properties of those objects ) from VB all goes through the ole automation bridge. There has been a long standing issue where the bridge falls over trying to access methods of the scripting framework MasterScriptProvider object. Change-Id: I3b9391286e1030bef2a12d6e546a5c47a4f68edb
Diffstat (limited to 'scripting')
-rw-r--r--scripting/source/provider/MasterScriptProvider.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx
index a4733944c844..f7dca4dd6172 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -695,7 +695,9 @@ MasterScriptProvider::hasByName( const OUString& aName ) throw (RuntimeException
result = xCont->hasByName( aName );
}
- else
+ // If this is a document provider then we shouldn't
+ // have a PackageProvider
+ else if (!m_xModel.is())
{
throw RuntimeException( "PackageMasterScriptProvider is unitialised",
Reference< XInterface >() );