unotools -> comphelper

8 files changed, 45 insertions, 33 deletions

diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx
index 6d36fdd6b567..b86b4f22c1c1 100644
--- a/toolkit/source/controls/stdtabcontroller.cxx
+++ b/toolkit/source/controls/stdtabcontroller.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: stdtabcontroller.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:02:09 $
+ *  last change: $Author: fs $ $Date: 2000-11-02 11:07:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,7 +77,9 @@
 #include <tools/debug.hxx>
 #include <vcl/window.hxx>
 
-#include <unotools/sequence.hxx>
+#ifndef _COMPHELPER_SEQUENCE_HXX_
+#include <comphelper/sequence.hxx>
+#endif
 
 //  ----------------------------------------------------
 //  class StdTabController
@@ -137,7 +139,7 @@ StdTabController::~StdTabController()
         if ( (::com::sun::star::awt::XControlModel*)xModel.get() == (::com::sun::star::awt::XControlModel*)rxCtrlModel.get() )
         {
             ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >  xCtrl( pCtrls[n] );
-            ::utl::removeElementAt( rCtrls, n );
+            ::comphelper::removeElementAt( rCtrls, n );
             return xCtrl;
         }
     }
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index 86041d144d19..db26e9e9f97c 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unocontrolcontainer.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:02:09 $
+ *  last change: $Author: fs $ $Date: 2000-11-02 11:07:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,7 +72,9 @@
 #include <toolkit/helper/property.hxx>
 #include <toolkit/helper/servicenames.hxx>
 
-#include <unotools/sequence.hxx>
+#ifndef _COMPHELPER_SEQUENCE_HXX_
+#include <comphelper/sequence.hxx>
+#endif
 
 #include <tools/debug.hxx>
 #include <tools/list.hxx>
@@ -366,7 +368,7 @@ void UnoControlContainer::removeTabController( const ::com::sun::star::uno::Refe
     {
         if( maTabControllers.getConstArray()[n] == TabController )
         {
-            ::utl::removeElementAt( maTabControllers, n );
+            ::comphelper::removeElementAt( maTabControllers, n );
             break;
         }
     }
diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx
index 8bb60c559193..750d8003e422 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unocontrolmodel.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fs $ $Date: 2000-09-19 15:09:44 $
+ *  last change: $Author: fs $ $Date: 2000-11-02 11:07:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -100,7 +100,9 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <toolkit/helper/emptyfontdescriptor.hxx>
 
-#include <unotools/sequence.hxx>
+#ifndef _COMPHELPER_SEQUENCE_HXX_
+#include <comphelper/sequence.hxx>
+#endif
 
 #include <vcl/svapp.hxx>
 #include <tools/intn.hxx>
@@ -871,8 +873,8 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun::
         {
             if ( !aProps.getConstArray()[n].len() )
             {
-                ::utl::removeElementAt( aProps, n );
-                ::utl::removeElementAt( aValues, n );
+                ::comphelper::removeElementAt( aProps, n );
+                ::comphelper::removeElementAt( aValues, n );
                 n--;
             }
         }
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index 561b1b77a0f0..4be6b901a6de 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unocontrols.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:02:09 $
+ *  last change: $Author: fs $ $Date: 2000-11-02 11:07:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,7 +79,9 @@
 
 #include <cppuhelper/typeprovider.hxx>
 
-#include <unotools/processfactory.hxx>
+#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+#include <comphelper/processfactory.hxx>
+#endif
 
 #include <vcl/wrkwin.hxx>
 #include <vcl/svapp.hxx>
@@ -811,7 +813,7 @@ UnoImageControlControl::UnoImageControlControl()
     maComponentInfos.nWidth = 100;
     maComponentInfos.nHeight = 100;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMSF = ::utl::getProcessServiceFactory();
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
     ::com::sun::star::uno::Reference < ::com::sun::star::uno::XInterface > xI = xMSF->createInstance( ::rtl::OUString::createFromAscii( szServiceName_ImageProducer ) );
     if ( xI.is() )
         mxImageProducer = ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageProducer >( xI, ::com::sun::star::uno::UNO_QUERY );
diff --git a/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx
index 613ba62f3ea3..11655fc9f5cc 100644
--- a/toolkit/source/helper/property.cxx
+++ b/toolkit/source/helper/property.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: property.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:02:09 $
+ *  last change: $Author: fs $ $Date: 2000-11-02 11:08:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -106,7 +106,9 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #endif
 
-#include <unotools/types.hxx>
+#ifndef _COMPHELPER_TYPES_HXX_
+#include <comphelper/types.hxx>
+#endif
 
 #include <toolkit/helper/property.hxx>
 
@@ -338,7 +340,7 @@ sal_Bool DoesDependOnOthers( sal_uInt16 nPropertyId )
 
 sal_Bool CompareProperties( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 )
 {
-    return ::utl::compare( r1, r2 );
+    return ::comphelper::compare( r1, r2 );
 }
 
 
diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx
index de1edb563922..90feb1c3077c 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unowrapper.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:02:09 $
+ *  last change: $Author: fs $ $Date: 2000-11-02 11:08:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,8 +75,8 @@
 #include <com/sun/star/awt/MouseButton.hpp>
 #endif
 
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_
-#include <unotools/processfactory.hxx>
+#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+#include <comphelper/processfactory.hxx>
 #endif
 
 #include <toolkit/helper/unowrapper.hxx>
@@ -564,7 +564,7 @@ void UnoWrapper::WindowEvent_Normalize( Window* pWindow )
 
 ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >  UnoWrapper::getNewUnoServiceManager()
 {
-    return ::utl::getProcessServiceFactory();
+    return ::comphelper::getProcessServiceFactory();
 }
 
 
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx
index 9e9108918be1..03be2245e14c 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: vclunohelper.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:02:09 $
+ *  last change: $Author: fs $ $Date: 2000-11-02 11:08:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -119,7 +119,9 @@
 #include <toolkit/controls/unocontrolcontainer.hxx>
 #include <toolkit/controls/unocontrolcontainermodel.hxx>
 
-#include <unotools/processfactory.hxx>
+#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+#include <comphelper/processfactory.hxx>
+#endif
 
 //  ----------------------------------------------------
 //  class VCLUnoHelper
@@ -127,7 +129,7 @@
 
 ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit> VCLUnoHelper::CreateToolkit()
 {
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMSF = ::utl::getProcessServiceFactory();
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
     ::com::sun::star::uno::Reference < ::com::sun::star::uno::XInterface > xI = xMSF->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.awt.ExtToolkit" ) );
     if ( !xI.is() )
         xI = xMSF->createInstance( ::rtl::OUString::createFromAscii( szServiceName2_Toolkit ) );
diff --git a/toolkit/util/makefile.mk b/toolkit/util/makefile.mk
index 652409af0725..5f7f509a7325 100644
--- a/toolkit/util/makefile.mk
+++ b/toolkit/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 17:02:09 $
+#   last change: $Author: fs $ $Date: 2000-11-02 11:08:58 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -92,7 +92,7 @@ SHL1STDLIBS=\
         $(TOOLSLIB)			\
         $(SOTLIB)			\
         $(VOSLIB)			\
-        $(UNOTOOLSLIB)		\
+        $(COMPHELPERLIB)	\
         $(VCLLIB)			\
         $(CPPUHELPERLIB)	\
         $(CPPULIB)			\