From 1b15d686bf0fc076061c4ecff17d94ddf8c7b000 Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Thu, 6 Mar 2008 15:29:42 +0000 Subject: INTEGRATION: CWS odbmacros2 (1.9.54); FILE MERGED 2007/12/17 12:43:37 fs 1.9.54.2: #i49133# allow to create script providers for documents which do not support embedded scripts themselves (i.e. don't have the XEmbeddedScripts interface), but are able to point to such a do cument (via XScriptInvocationContext) whose scripts they can execute 2007/12/10 11:08:56 fs 1.9.54.1: #i49133# don't use an SfxObjectShell, there's UNO equivalents nowadays, which also includes non-SFX documents then --- scripting/source/provider/MasterScriptProviderFactory.cxx | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'scripting/source/provider') diff --git a/scripting/source/provider/MasterScriptProviderFactory.cxx b/scripting/source/provider/MasterScriptProviderFactory.cxx index 90fa749e3360..b9db12962af5 100644 --- a/scripting/source/provider/MasterScriptProviderFactory.cxx +++ b/scripting/source/provider/MasterScriptProviderFactory.cxx @@ -4,9 +4,9 @@ * * $RCSfile: MasterScriptProviderFactory.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: obo $ $Date: 2006-09-16 12:28:29 $ + * last change: $Author: kz $ $Date: 2008-03-06 16:29:42 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -41,12 +41,6 @@ #include #include -#include -#include -#include -#include -#include - #include #include "MasterScriptProviderFactory.hxx" @@ -77,7 +71,7 @@ MasterScriptProviderFactory::~MasterScriptProviderFactory() Reference< provider::XScriptProvider > SAL_CALL MasterScriptProviderFactory::createScriptProvider( const Any& context ) throw ( lang::IllegalArgumentException, RuntimeException) { - Reference< provider::XScriptProvider > xMsp( getActiveMSPList()->createMSP( context ), UNO_QUERY_THROW ); + Reference< provider::XScriptProvider > xMsp( getActiveMSPList() ->getMSPFromAnyContext( context ), UNO_QUERY_THROW ); return xMsp; } -- cgit