scripting/source/provider/MasterScriptProvider.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
New commits: commit 6a3c26a46c28ca1bcc26f4cc546b9facafe7030a Author: Noel Power <[email protected]> Date: Tue Jul 30 17:29:42 2013 +0100 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 <[email protected]> Tested-by: Fridrich Strba <[email protected]> diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx index 32c89b4..afe5957 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 >() ); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
