summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Power <noel.power@suse.com>2013-07-30 17:29:42 +0100
committerFridrich Strba <fridrich@documentfoundation.org>2013-07-31 15:38:00 +0000
commit6a3c26a46c28ca1bcc26f4cc546b9facafe7030a (patch)
treef63acfac3f5a2adbb841e0423cf3b8e37c94455f
parentb23a866a93e42467ef42c2d46735e1ffcf6f1c78 (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 (cherry picked from commit 92500896a9d0ba873c06a4a2728eb5a1b9d8f68d) Reviewed-on: https://gerrit.libreoffice.org/5206 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
-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 32c89b4abfed..afe595706b10 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -696,7 +696,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 >() );