diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-03-09 09:55:35 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-03-09 09:55:35 +0000 |
| commit | a8b7bd9d348f27d6755432197d1a4478acc38a70 (patch) | |
| tree | dca281649383cfe6133086c0060ee50702618554 /jvmfwk/source | |
| parent | f540acea0e3fd9b8925ba5753cf6f760edf85b69 (diff) | |
INTEGRATION: CWS jl31 (1.6.22); FILE MERGED
2006/02/09 10:28:47 jl 1.6.22.2: #130857# Prevent trailing : in classpath
2006/02/09 10:07:23 jl 1.6.22.1: #130857# Prevent trailing : in classpath
Diffstat (limited to 'jvmfwk/source')
| -rw-r--r-- | jvmfwk/source/fwkbase.cxx | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx index 5983cb039f7e..319f680435cb 100644 --- a/jvmfwk/source/fwkbase.cxx +++ b/jvmfwk/source/fwkbase.cxx @@ -4,9 +4,9 @@ * * $RCSfile: fwkbase.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rt $ $Date: 2005-09-07 19:34:57 $ + * last change: $Author: rt $ $Date: 2006-03-09 10:55:35 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -609,12 +609,16 @@ rtl::OString makeClassPathOption(CNodeJava & javaSettings) // append all user selected jars to the class path rtl::OUString sUser = javaSettings.getUserClassPath(); if (sUser.getLength() > 0) - { sBufCP.append(sUser); - sBufCP.appendAscii(szSep); - } + //append all jar libraries and components to the class path - sBufCP.append(getApplicationClassPath()); + OUString sAppCP = getApplicationClassPath(); + if (sAppCP.getLength()) + { + if (sUser.getLength()) + sBufCP.appendAscii(szSep); + sBufCP.append(sAppCP); + } sPaths = rtl::OUStringToOString( sBufCP.makeStringAndClear(), osl_getThreadTextEncoding()); |