mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS scriptingf6 (1.5.14); FILE MERGED

Browse Source 
2004/08/27 15:35:15 npower 1.5.14.5: #i33479# Reverse sense of check in createMSP check now sees if the incomming any does not contain a string, if it dosn't it tries to convert the Any to a XModel. Previously it checked if the Any contained type XModel and if not then assumed it was a string. This causes problems when used from a scripting language when the type of the object implementation XModel may be transported in the Any as a nother implemented type e.g. XInterface or XComponent or some other interface supported by that object.
2004/08/03 14:45:04 dfoster 1.5.14.4: #i32502#
2004/07/30 16:13:00 toconnor 1.5.14.3: #i25821# fix build problem after merging files
2004/07/30 10:24:37 toconnor 1.5.14.2: RESYNC: (1.5-1.6); FILE MERGED
2004/07/23 11:33:36 dfoster 1.5.14.1: #i25821#
This commit is contained in:
Rüdiger Timm
2004-10-22 13:05:33 +00:00
parent 492bd01b94
commit cb453fcaa7
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scripting/source/provider/ActiveMSPList.cxx
View File

@@ -2,9 +2,9 @@
*
* $RCSfile: ActiveMSPList.cxx,v $
*
* $Revision: 1.6 $
* $Revision: 1.7 $
*
* last change: $Author: hr $ $Date: 2004-07-23 14:09:03 $
* last change: $Author: rt $ $Date: 2004-10-22 14:05:33 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -69,7 +69,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/util/XMacroExpander.hpp>
#include <drafts/com/sun/star/script/browse/BrowseNodeTypes.hpp>
#include <com/sun/star/script/browse/BrowseNodeTypes.hpp>
#include <com/sun/star/document/XDocumentInfoSupplier.hpp>
#include "MasterScriptProvider.hxx"
@@ -77,8 +77,9 @@
using namespace com::sun::star;
using namespace com::sun::star::uno;
using namespace drafts::com::sun::star::script;
using namespace sf_misc;
using namespace com::sun::star::script;
using namespace ::scripting_util;
using namespace ::sf_misc;
namespace func_provider
{
@@ -100,7 +101,7 @@ ActiveMSPList::createNewMSP( const ::rtl::OUString& context ) throw( RuntimeExce
{
OSL_TRACE("ActiveMSPList::createNewMSP() context [%s]",
::rtl::OUStringToOString( context , RTL_TEXTENCODING_ASCII_US ).pData->buffer );
::rtl::OUString serviceName = ::rtl::OUString::createFromAscii("drafts.com.sun.star.script.provider.MasterScriptProvider");
::rtl::OUString serviceName = ::rtl::OUString::createFromAscii("com.sun.star.script.provider.MasterScriptProvider");
Sequence< Any > args(1);
args[ 0 ] <<= context;
@@ -143,8 +144,7 @@ ActiveMSPList::createMSP( const Any& aContext )
throw ( RuntimeException )
{
Reference< provider::XScriptProvider > msp;
if ( aContext.getValueType() == ::getCppuType((const Reference< frame::XModel >* ) NULL ) )
if ( ! ( aContext.getValueType() == ::getCppuType((const ::rtl::OUString* ) NULL ) ) )
{
OSL_TRACE("ActiveMSPList::createMSP() for model");
Reference< frame::XModel> xModel( aContext, UNO_QUERY );
@@ -344,7 +344,7 @@ ActiveMSPList::createNonDocMSPs()
return;
}
// do creation of user and share MSPs here
::rtl::OUString serviceName = ::rtl::OUString::createFromAscii("drafts.com.sun.star.script.provider.MasterScriptProvider");
::rtl::OUString serviceName = ::rtl::OUString::createFromAscii("com.sun.star.script.provider.MasterScriptProvider");
Sequence< Any > args(1);
args[ 0 ] <<= userDirString;