#80461# localsession splitted in share and user access

3 files changed, 32 insertions, 19 deletions

diff --git a/configmgr/workben/apitest/cfgadmin.cxx b/configmgr/workben/apitest/cfgadmin.cxx
index b3ba70098267..d88db6c44557 100644
--- a/configmgr/workben/apitest/cfgadmin.cxx
+++ b/configmgr/workben/apitest/cfgadmin.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cfgadmin.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: dg $ $Date: 2000-11-17 08:30:26 $
+ *  last change: $Author: lla $ $Date: 2000-11-29 13:59:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -475,7 +475,7 @@ int _cdecl main( int argc, char * argv[] )
             );
         if (!xORB.is())
         {
-            flush(cout);
+            ::flush(cout);
             cerr << "Could not create the service factory !\n\n";
             return 1;
         }
@@ -491,7 +491,7 @@ int _cdecl main( int argc, char * argv[] )
 
         if (!xCfgProvider.is())
         {
-            flush(cout);
+            ::flush(cout);
             cerr << "Could not create the configuration provider !\n\n";
             return 3;
         }
@@ -541,7 +541,7 @@ int _cdecl main( int argc, char * argv[] )
     }
     catch (Exception& e)
     {
-        flush(cout);
+        ::flush(cout);
         cerr << "Caught exception: " << e.Message << endl;
         return 1;
     }
diff --git a/configmgr/workben/apitest/cfgapi.cxx b/configmgr/workben/apitest/cfgapi.cxx
index fd3512b66544..fb371b7a8c2c 100644
--- a/configmgr/workben/apitest/cfgapi.cxx
+++ b/configmgr/workben/apitest/cfgapi.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cfgapi.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: lla $ $Date: 2000-11-23 14:45:39 $
+ *  last change: $Author: lla $ $Date: 2000-11-29 13:59:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -317,12 +317,12 @@ int _cdecl main( int argc, char * argv[] )
         cout << endl;
 
 
-        rtl::OUString sFilePath;
         rtl::OUString sUser;
 
         if (!sServerType.equalsIgnoreCase(ASCII("local")))
         {
-            sFilePath = enterValue("Enter Server: ", "lautrec-3108:19205",false);
+            rtl::OUString sServer;
+            sServer = enterValue("Enter Server: ", "lautrec-3108:19205",false);
             cout << endl;
 
             sUser =   enterValue("    Enter User: ", "lars", false);
@@ -334,7 +334,7 @@ int _cdecl main( int argc, char * argv[] )
             aCPArgs = createSequence(sUser, sPasswd);
 
             aCPArgs.realloc(aCPArgs.getLength() + 1);
-            aCPArgs[aCPArgs.getLength() - 1] <<= configmgr::createPropertyValue(ASCII("server"), sFilePath);
+            aCPArgs[aCPArgs.getLength() - 1] <<= configmgr::createPropertyValue(ASCII("server"), sServer);
 
             OUString sTimeout = ASCII("10000");
             aCPArgs.realloc(aCPArgs.getLength() + 1);
@@ -343,13 +343,19 @@ int _cdecl main( int argc, char * argv[] )
         }
         else
         {
-            sFilePath = enterValue("Enter Filepath: ", "f:/local/613/SRC613/configmgr/workben/local_io",false);
+            rtl::OUString sSharePath, sUserPath;
+            // sFilePath = enterValue("Enter Filepath: ", "f:/local/613/SRC613/configmgr/workben/local_io",false);
+            sSharePath = enterValue("Enter Share Path: ", "f:/local/613/SRC613/configmgr/workben/local_io/share",false);
+            cout << endl;
+            sUserPath = enterValue("Enter User Path: ", "f:/local/613/SRC613/configmgr/workben/local_io",false);
             // sFilePath = enterValue("Enter Filepath: ", "d:/local/609/SRC609/configmgr/workben/local_io",false);
             // sFilePath = enterValue("Enter Filepath: ", "f:/office60/user/config/registry", false);
             cout << endl;
 
             aCPArgs.realloc(aCPArgs.getLength() + 1);
-            aCPArgs[aCPArgs.getLength() - 1] <<= configmgr::createPropertyValue(ASCII("rootpath"), sFilePath);
+            aCPArgs[aCPArgs.getLength() - 1] <<= configmgr::createPropertyValue(ASCII("sharepath"), sSharePath);
+            aCPArgs.realloc(aCPArgs.getLength() + 1);
+            aCPArgs[aCPArgs.getLength() - 1] <<= configmgr::createPropertyValue(ASCII("userpath"), sUserPath);
         }
 
         aCPArgs.realloc(aCPArgs.getLength() + 1);
@@ -381,6 +387,8 @@ int _cdecl main( int argc, char * argv[] )
         cout << endl;
         OUString sLocale =   enterValue("Enter Locale: ", "de-DE", false);
         cout << endl;
+        OUString sSetup  =   enterValue("SetupMode: ", "true", false);
+        cout << endl;
 
         Sequence< Any > aArgs;
         aArgs = createSequence(sUser, ASCII(""));
@@ -389,6 +397,11 @@ int _cdecl main( int argc, char * argv[] )
         aArgs[aArgs.getLength() - 1] <<= configmgr::createPropertyValue(ASCII("nodepath"), sPath);
         aArgs.realloc(aArgs.getLength() + 1);
         aArgs[aArgs.getLength() - 1] <<= configmgr::createPropertyValue(ASCII("locale"), sLocale);
+        sal_Bool bSetupMode = false;
+        if (sSetup.equals(ASCII("true")))
+            bSetupMode = true;
+        aArgs.realloc(aArgs.getLength() + 1);
+        aArgs[aArgs.getLength() - 1] <<= configmgr::createPropertyValue(ASCII("setupmode"), bSetupMode);
 /*
 #else
         OUString aStr = ASCII("String");
diff --git a/configmgr/workben/apitest/cfgupdate.cxx b/configmgr/workben/apitest/cfgupdate.cxx
index cc03d616b3c9..6cfe0c9b6f9a 100644
--- a/configmgr/workben/apitest/cfgupdate.cxx
+++ b/configmgr/workben/apitest/cfgupdate.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cfgupdate.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: dg $ $Date: 2000-11-17 08:30:26 $
+ *  last change: $Author: lla $ $Date: 2000-11-29 13:59:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -359,7 +359,7 @@ void displayTree(Reference< XNameAccess > xIFace, sal_Int32 nLevel)
             cout << "<" << aNames[i] << "/>";
 
     }
-    flush(cout);
+    ::flush(cout);
 }
 
 // -----------------------------------------------------------------------------
@@ -395,7 +395,7 @@ int _cdecl main( int argc, char * argv[] )
             );
         if (!xORB.is())
         {
-            flush(cout);
+            ::flush(cout);
             cerr << "Could not create the service factory !\n\n";
             return 1;
         }
@@ -426,7 +426,7 @@ int _cdecl main( int argc, char * argv[] )
             UNO_QUERY);
         if (!xCfgProvider.is())
         {
-            flush(cout);
+            ::flush(cout);
             cerr << "Could not create the configuration provider !\n\n";
             return 3;
         }
@@ -459,13 +459,13 @@ int _cdecl main( int argc, char * argv[] )
     }
     catch (Exception& e)
     {
-        flush(cout);
+        ::flush(cout);
         cerr << "Caught exception: " << e.Message << endl;
     }
 /*
     catch (...)
     {
-        flush(cout);
+        ::flush(cout);
         cerr << "BUG: Caught UNKNOWN exception (?) " << endl;
     }
 */