From 92500896a9d0ba873c06a4a2728eb5a1b9d8f68d Mon Sep 17 00:00:00 2001 From: Noel Power Date: Tue, 30 Jul 2013 17:29:42 +0100 Subject: 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 --- scripting/source/provider/MasterScriptProvider.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'scripting') 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 >() ); -- cgit