INTEGRATION: CWS scriptingf6 (1.11.2); FILE MERGED

2004/10/11 10:07:39 toconnor 1.11.2.3: RESYNC: (1.11-1.12); FILE MERGED
2004/09/30 09:34:23 dfoster 1.11.2.2: #i33478#
Add BrowseNode service.
2004/08/03 14:45:00 dfoster 1.11.2.1: #i32502#
This commit is contained in:
Rüdiger Timm
2004-10-22 13:02:27 +00:00
parent 290623540f
commit 7b10f16e58

View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: basprov.cxx,v $ * $RCSfile: basprov.cxx,v $
* *
* $Revision: 1.12 $ * $Revision: 1.13 $
* *
* last change: $Author: obo $ $Date: 2004-08-12 13:17:46 $ * last change: $Author: rt $ $Date: 2004-10-22 14:02:27 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -73,11 +73,11 @@
#ifndef _COM_SUN_STAR_FRAME_XMODEL_HPP_ #ifndef _COM_SUN_STAR_FRAME_XMODEL_HPP_
#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XModel.hpp>
#endif #endif
#ifndef _DRAFTS_COM_SUN_STAR_SCRIPT_BROWSE_BROWSENODETYPES_HPP_ #ifndef _COM_SUN_STAR_SCRIPT_BROWSE_BROWSENODETYPES_HPP_
#include <drafts/com/sun/star/script/browse/BrowseNodeTypes.hpp> #include <com/sun/star/script/browse/BrowseNodeTypes.hpp>
#endif #endif
#ifndef _DRAFTS_COM_SUN_STAR_SCRIPT_PROVIDER_SCRIPTFRAMEWORKERRORTYPE_HPP_ #ifndef _COM_SUN_STAR_SCRIPT_PROVIDER_SCRIPTFRAMEWORKERRORTYPE_HPP_
#include <drafts/com/sun/star/script/provider/ScriptFrameworkErrorType.hpp> #include <com/sun/star/script/provider/ScriptFrameworkErrorType.hpp>
#endif #endif
#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_ #ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
@@ -128,7 +128,7 @@
using namespace ::com::sun::star; using namespace ::com::sun::star;
using namespace ::com::sun::star::lang; using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
using namespace ::drafts::com::sun::star::script; using namespace ::com::sun::star::script;
using namespace ::sf_misc; using namespace ::sf_misc;
//......................................................................... //.........................................................................
@@ -165,10 +165,11 @@ namespace basprov
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if ( !pNames ) if ( !pNames )
{ {
static Sequence< ::rtl::OUString > aNames(3); static Sequence< ::rtl::OUString > aNames(4);
aNames.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "drafts.com.sun.star.script.provider.ScriptProviderForBasic" ) ); aNames.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.provider.ScriptProviderForBasic" ) );
aNames.getArray()[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "drafts.com.sun.star.script.provider.LanguageScriptProvider" ) ); aNames.getArray()[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.provider.LanguageScriptProvider" ) );
aNames.getArray()[2] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "drafts.com.sun.star.script.provider.ScriptProvider" ) ); aNames.getArray()[2] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.provider.ScriptProvider" ) );
aNames.getArray()[3] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.browse.BrowseNode" ) );
pNames = &aNames; pNames = &aNames;
} }
} }