From bd76e4945aa41f118efc3a72c67e6df8a16b1a79 Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Tue, 18 Mar 2008 11:22:17 +0000
Subject: INTEGRATION: CWS sb83 (1.10.32); FILE MERGED 2008/01/07 15:26:30 sb
 1.10.32.1: #i84985# support multiple URLs in UNO_JAVA_JFW_USER|SHARED_DATA,
 ignoring all but the first

---
 jvmfwk/source/fwkbase.cxx | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'jvmfwk')

diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx
index 77ec7906a8c0..1071996a6923 100644
--- a/jvmfwk/source/fwkbase.cxx
+++ b/jvmfwk/source/fwkbase.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: fwkbase.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: obo $ $Date: 2007-06-13 07:57:54 $
+ *  last change: $Author: vg $ $Date: 2008-03-18 12:22:17 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -104,6 +104,15 @@ rtl::OUString getParam(const char * name)
     return retVal;
 }
 
+rtl::OUString getParamFirstUrl(const char * name)
+{
+    // Some parameters can consist of multiple URLs (separated by space
+    // characters, although trim() harmlessly also removes other white-space),
+    // of which only the first is used:
+    sal_Int32 i = 0;
+    return getParam(name).trim().getToken(0, ' ', i);
+}
+
 }//blind namespace
 
 
@@ -362,12 +371,12 @@ OUString VendorSettings::getPluginLibrary(const OUString& sVendor)
 
 rtl::OUString BootParams::getUserData()
 {
-    return getParam(UNO_JAVA_JFW_USER_DATA);
+    return getParamFirstUrl(UNO_JAVA_JFW_USER_DATA);
 }
 
 rtl::OUString BootParams::getSharedData()
 {
-    return getParam(UNO_JAVA_JFW_SHARED_DATA);
+    return getParamFirstUrl(UNO_JAVA_JFW_SHARED_DATA);
 }
 
 rtl::OUString BootParams::getInstallData()
-- 
cgit