Bring up to date

5 files changed, 31 insertions, 24 deletions

diff --git a/configmgr/workben/apitest/cfgadmin.cxx b/configmgr/workben/apitest/cfgadmin.cxx
index d88db6c44557..32761133274a 100644
--- a/configmgr/workben/apitest/cfgadmin.cxx
+++ b/configmgr/workben/apitest/cfgadmin.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cfgadmin.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: lla $ $Date: 2000-11-29 13:59:55 $
+ *  last change: $Author: jb $ $Date: 2001-06-20 20:55:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -63,6 +63,7 @@
 #include <iostream>
 using namespace std;
 
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/Type.hxx>
 #include <com/sun/star/uno/TypeClass.hpp>
@@ -102,6 +103,7 @@ using namespace std;
 #include "createpropertyvalue.hxx"
 
 #include "typeconverter.hxx"
+#include <osl/time.h>
 
 // #include <com/sun/star/configuration/XConfigurationSync.hpp>
 
diff --git a/configmgr/workben/apitest/cfgapi.cxx b/configmgr/workben/apitest/cfgapi.cxx
index 79fe15c52456..9a6048bfcef8 100644
--- a/configmgr/workben/apitest/cfgapi.cxx
+++ b/configmgr/workben/apitest/cfgapi.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cfgapi.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: lla $ $Date: 2001-06-14 07:29:26 $
+ *  last change: $Author: jb $ $Date: 2001-06-20 20:55:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -215,8 +215,8 @@ static const sal_Char*      s_pPassword     =   "";
 #else
 static const sal_Char*      s_pSourcePath   =   "g:/src/configmgr/workben/local_io/share";
 static const sal_Char*      s_pUpdatePath   =   "g:/src/configmgr/workben/local_io/user";
-static const sal_Char*      s_pRootNode     =   "org.openoffice.test";
-static const sal_Char*      s_pServerType   =   "local";
+static const sal_Char*      s_pRootNode     =   "org.openoffice.Office.TypeDetection";
+static const sal_Char*      s_pServerType   =   "setup";
 static const sal_Char*      s_pLocale       =   "de-DE";
 static const sal_Char*      s_pServer       =   "lautrec-3108:19205";
 static const sal_Char*      s_pUser         =   "lars";
diff --git a/configmgr/workben/apitest/cfgapi_timetest.cxx b/configmgr/workben/apitest/cfgapi_timetest.cxx
index 3082da496069..41079b069ad6 100644
--- a/configmgr/workben/apitest/cfgapi_timetest.cxx
+++ b/configmgr/workben/apitest/cfgapi_timetest.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cfgapi_timetest.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: lla $ $Date: 2001-04-05 12:40:27 $
+ *  last change: $Author: jb $ $Date: 2001-06-20 20:55:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -247,10 +247,10 @@ static void loadDefaults()
 #else
         sExecutable += ::rtl::OUString::createFromAscii("cfgapi.ini");
 #endif
-        ::rtl::OUString sNormalized;
-        if (osl_File_E_None == osl_normalizePath(sExecutable.pData, &sNormalized.pData))
+        ::rtl::OUString sSystem;
+        if (osl_File_E_None == osl_getSystemPathFromFileURL(sExecutable.pData, &sSystem.pData))
         {
-            ::osl::Profile aProfile(sNormalized);
+            ::osl::Profile aProfile(sExecutable);
 
             static ::rtl::OString   sSection("defaults");
             static ::rtl::OString   sSourcePath("sourcepath");
@@ -475,7 +475,7 @@ int _cdecl main( int argc, char * argv[] )
 
         rtl::OUString sUser, sPasswd;
 
-        bool bLocal = sServerType.equalsIgnoreCase(ASCII("local")) || sServerType.equalsIgnoreCase(ASCII("setup"));
+        bool bLocal = sServerType.equalsIgnoreAsciiCase(ASCII("local")) || sServerType.equalsIgnoreAsciiCase(ASCII("setup"));
         if (!bLocal)
         {
             rtl::OUString sServer;
@@ -570,6 +570,7 @@ int _cdecl main( int argc, char * argv[] )
         cerr << "Caught exception: " << e.Message << endl;
         return 1;
     }
+    return 0;
 }
 
 // -----------------------------------------------------------------------------
@@ -916,17 +917,17 @@ bool ask(Reference< XInterface >& xIface, const Reference< XMultiServiceFactory
                                     sal_Bool bValue = false;
 
                                     Any aValueAny;
-                                    if (aInput.equalsIgnoreCase(ASCII("true")))
+                                    if (aInput.equalsIgnoreAsciiCase(ASCII("true")))
                                     {
                                         bValue = true;
                                         aValueAny <<= bValue;
                                     }
-                                    else if (aInput.equalsIgnoreCase(ASCII("false")))
+                                    else if (aInput.equalsIgnoreAsciiCase(ASCII("false")))
                                     {
                                         bValue = false;
                                         aValueAny <<= bValue;
                                     }
-                                    else if (aInput.equalsIgnoreCase(ASCII("null")))
+                                    else if (aInput.equalsIgnoreAsciiCase(ASCII("null")))
                                     {
                                     }
 
diff --git a/configmgr/workben/apitest/cfgupdate.cxx b/configmgr/workben/apitest/cfgupdate.cxx
index 6cfe0c9b6f9a..daa2d42ec8e6 100644
--- a/configmgr/workben/apitest/cfgupdate.cxx
+++ b/configmgr/workben/apitest/cfgupdate.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cfgupdate.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: lla $ $Date: 2000-11-29 13:59:55 $
+ *  last change: $Author: jb $ $Date: 2001-06-20 20:55:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -63,6 +63,7 @@
 #include <iostream>
 using namespace std;
 
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/Type.hxx>
 #include <com/sun/star/uno/TypeClass.hpp>
@@ -85,6 +86,7 @@ using namespace std;
 
 #include <rtl/ustring.hxx>
 #include <rtl/string.hxx>
+#include <osl/time.h>
 
 #ifndef _CPPUHELPER_SERVICEFACTORY_HXX_
 #include <cppuhelper/servicefactory.hxx>
diff --git a/configmgr/workben/apitest/makefile.mk b/configmgr/workben/apitest/makefile.mk
index 33a201918849..85c76bf34424 100644
--- a/configmgr/workben/apitest/makefile.mk
+++ b/configmgr/workben/apitest/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.6 $
+#   $Revision: 1.7 $
 #
-#   last change: $Author: lla $ $Date: 2001-06-14 07:29:26 $
+#   last change: $Author: jb $ $Date: 2001-06-20 20:55:05 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -120,7 +120,9 @@ APP6TARGET= $(TARGET6)
 APP6OBJS=	\
     $(SLO)$/cfgapi_timetest.obj	\
     $(SLO)$/strimpl.obj \
-    $(SLO)$/typeconverter.obj
+    $(SLO)$/typeconverter.obj \
+    $(SLO)$/simpletypehelper.obj \
+
 # ... cfgreg ..............................
 APP2STDLIBS = $(APPSTDLIBS)
 
@@ -160,8 +162,8 @@ APP4TARGET= $(TARGET4)
 APP4OBJS=	\
     $(SLO)$/cfgadmin.obj	\
     $(SLO)$/strimpl.obj \
-    $(SLO)$/typeconverter.obj
-
+    $(SLO)$/typeconverter.obj \
+    $(SLO)$/simpletypehelper.obj \
 
 # ... cfgupdate ..............................
 APP5STDLIBS = $(APPSTDLIBS)
@@ -176,8 +178,8 @@ APP5TARGET= $(TARGET5)
 APP5OBJS=	\
     $(SLO)$/cfgupdate.obj	\
     $(SLO)$/strimpl.obj \
-    $(SLO)$/typeconverter.obj
-
+    $(SLO)$/typeconverter.obj \
+    $(SLO)$/simpletypehelper.obj \
 
 .INCLUDE :  target.mk