diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-10-22 13:04:56 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-10-22 13:04:56 +0000 |
| commit | 76159289d2e480558d571ad51117c9a1da25f730 (patch) | |
| tree | 158027992d65e1a276a69b01e77aece92082cf73 | |
| parent | 74bbffc8184f1a2de2b52304eca32f1a92d8c6ed (diff) | |
INTEGRATION: CWS scriptingf6 (1.17.14); FILE MERGED
2004/10/13 12:39:07 toconnor 1.17.14.4: #i25682# ensure that MasterScriptProvider can be created
2004/08/03 14:45:03 dfoster 1.17.14.3: #i32502#
2004/07/30 10:21:46 toconnor 1.17.14.2: RESYNC: (1.17-1.18); FILE MERGED
2004/07/23 11:33:36 dfoster 1.17.14.1: #i25821#
| -rw-r--r-- | scripting/source/protocolhandler/scripthandler.cxx | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx index bb27d6620e05..29952057161b 100644 --- a/scripting/source/protocolhandler/scripthandler.cxx +++ b/scripting/source/protocolhandler/scripthandler.cxx @@ -2,9 +2,9 @@ * * $RCSfile: scripthandler.cxx,v $ * -* $Revision: 1.18 $ +* $Revision: 1.19 $ * -* last change: $Author: hr $ $Date: 2004-07-23 14:08:49 $ +* last change: $Author: rt $ $Date: 2004-10-22 14:04:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -72,8 +72,8 @@ #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <drafts/com/sun/star/script/provider/XScriptProviderSupplier.hpp> -#include <drafts/com/sun/star/script/provider/XScriptProviderFactory.hpp> +#include <com/sun/star/script/provider/XScriptProviderSupplier.hpp> +#include <com/sun/star/script/provider/XScriptProviderFactory.hpp> #include <sfx2/objsh.hxx> #include <sfx2/frame.hxx> @@ -95,7 +95,8 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::util; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; -using namespace ::drafts::com::sun::star::script; +using namespace ::com::sun::star::script; +using namespace ::scripting_util; namespace scripting_protocolhandler { @@ -481,12 +482,13 @@ throw ( RuntimeException ) xProps->getPropertyValue( dc ), UNO_QUERY_THROW ); ::rtl::OUString tmspf = ::rtl::OUString::createFromAscii( - "/singletons/drafts.com.sun.star.script.provider.theMasterScriptProviderFactory"); + "/singletons/com.sun.star.script.provider.theMasterScriptProviderFactory"); Reference< provider::XScriptProviderFactory > xFac( xCtx->getValueByName( tmspf ), UNO_QUERY_THROW ); - Any aContext; + Any aContext = + makeAny( ::rtl::OUString::createFromAscii("share") ); m_xScriptProvider = Reference< provider::XScriptProvider > ( xFac->createScriptProvider( aContext ), UNO_QUERY_THROW ); |