[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - scripting/source

[Noel Power]

 scripting/source/provider/MasterScriptProvider.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 860dae597f24e519f78b0e74e0c371daea37a156
Author: Noel Power <noel.power at suse.com>
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

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 >() );