summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--basic/source/classes/sbunoobj.cxx18
-rw-r--r--basic/source/runtime/iosys.cxx10
-rw-r--r--basic/source/runtime/methods.cxx10
-rw-r--r--basic/util/makefile.mk8
4 files changed, 25 insertions, 21 deletions
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index e9763f5eeb1d..234fbd11e412 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: sbunoobj.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: ab $ $Date: 2000-10-27 11:25:31 $
+ * last change: $Author: fs $ $Date: 2000-11-02 11:58:25 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -81,8 +81,8 @@
#include <cppuhelper/typeprovider.hxx>
#include <cppuhelper/extract.hxx>
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_
-#include <unotools/processfactory.hxx>
+#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+#include <comphelper/processfactory.hxx>
#endif
#include <rtl/ustrbuf.hxx>
@@ -150,7 +150,7 @@ Reference< XIdlReflection > getCoreReflection_Impl( void )
// Haben wir schon CoreReflection, sonst besorgen
if( !xCoreReflection.is() )
{
- Reference< XMultiServiceFactory > xFactory = utl::getProcessServiceFactory();
+ Reference< XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory();
if ( xFactory.is() )
{
Reference< XInterface > xI = xFactory->createInstance( rtl::OUString::createFromAscii("com.sun.star.reflection.CoreReflection") );
@@ -1411,7 +1411,7 @@ void SbUnoObject::doIntrospection( void )
if( !xIntrospection.is() )
{
// Introspection-Service holen
- Reference< XMultiServiceFactory > xFactory( utl::getProcessServiceFactory() );
+ Reference< XMultiServiceFactory > xFactory( comphelper::getProcessServiceFactory() );
if ( xFactory.is() )
{
Reference< XInterface > xI = xFactory->createInstance( rtl::OUString::createFromAscii("com.sun.star.beans.Introspection") );
@@ -1864,7 +1864,7 @@ void RTL_Impl_CreateUnoService( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
String aServiceName = rPar.Get(1)->GetString();
// Service suchen und instanzieren
- Reference< XMultiServiceFactory > xFactory( utl::getProcessServiceFactory() );
+ Reference< XMultiServiceFactory > xFactory( comphelper::getProcessServiceFactory() );
Reference< XInterface > xInterface;
if ( xFactory.is() )
{
@@ -1911,7 +1911,7 @@ void RTL_Impl_GetProcessServiceManager( StarBASIC* pBasic, SbxArray& rPar, BOOL
SbxVariableRef refVar = rPar.Get(0);
// Globalen Service-Manager holen
- Reference< XMultiServiceFactory > xFactory( utl::getProcessServiceFactory() );
+ Reference< XMultiServiceFactory > xFactory( comphelper::getProcessServiceFactory() );
if( xFactory.is() )
{
Any aAny;
@@ -2462,7 +2462,7 @@ void SbRtl_CreateUnoListener( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
return;
// AllListenerAdapterService holen
- Reference< XMultiServiceFactory > xFactory( utl::getProcessServiceFactory() );
+ Reference< XMultiServiceFactory > xFactory( comphelper::getProcessServiceFactory() );
if( !xFactory.is() )
return;
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 7662c5ec6f8f..83daefa20f9d 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: iosys.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: ab $ $Date: 2000-10-19 08:36:50 $
+ * last change: $Author: fs $ $Date: 2000-11-02 12:01:22 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -108,7 +108,9 @@
#endif
// encoding -->
-#include <unotools/processfactory.hxx>
+#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+#include <comphelper/processfactory.hxx>
+#endif
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -120,7 +122,7 @@
#include <com/sun/star/bridge/XBridge.hpp>
#include <com/sun/star/bridge/XBridgeFactory.hpp>
-using namespace utl;
+using namespace comphelper;
using namespace osl;
using namespace rtl;
using namespace com::sun::star::uno;
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index fb1cfb71a4fb..6ef2df32132b 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: methods.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: ab $ $Date: 2000-10-24 09:26:51 $
+ * last change: $Author: fs $ $Date: 2000-11-02 12:01:22 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -123,7 +123,9 @@
#endif
#ifdef _USE_UNO
-#include <unotools/processfactory.hxx>
+#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+#include <comphelper/processfactory.hxx>
+#endif
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/util/DateTime.hpp>
@@ -135,7 +137,7 @@
#include <com/sun/star/io/XStream.hpp>
#include <com/sun/star/io/XSeekable.hpp>
-using namespace utl;
+using namespace comphelper;
using namespace rtl;
using namespace osl;
using namespace com::sun::star::uno;
diff --git a/basic/util/makefile.mk b/basic/util/makefile.mk
index 33d23435464a..619e983cccae 100644
--- a/basic/util/makefile.mk
+++ b/basic/util/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.1.1.1 $
+# $Revision: 1.2 $
#
-# last change: $Author: hr $ $Date: 2000-09-18 16:12:12 $
+# last change: $Author: fs $ $Date: 2000-11-02 12:03:49 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -111,7 +111,7 @@ SHL1STDLIBS= \
$(VOSLIB) \
$(SALLIB) \
$(SVMEMLIB) \
- $(UNOTOOLSLIB)
+ $(COMPHELPERLIB)
.IF "$(GUI)"=="WNT"
SHL1STDLIBS+=$(LIBCIMT)
@@ -151,7 +151,7 @@ APP1STDLIBS= \
$(SVLLIB) \
$(SVLIB) \
$(SO2LIB) \
- $(UNOTOOLSLIB) \
+ $(COMPHELPERLIB) \
$(UCBHELPERLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
generated by cgit (git 2.34.1) at 2024-06-30 08:13:47 +0000