mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify string handling

Browse Source 
Change-Id: I1b79bfd7e7e92fc8f4937e6b9ae9ec9468839ea6
This commit is contained in:
Stephan Bergmann
2014-02-11 16:45:52 +01:00
parent 972d71dafd
commit ba826a22c6
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
View File

@@ -646,7 +646,6 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
options[n].optionString= (char *) "abort"; options[n].optionString= (char *) "abort";
options[n].extraInfo= (void* )(sal_IntPtr)abort_handler; options[n].extraInfo= (void* )(sal_IntPtr)abort_handler;
++n; ++n;
OString sClassPathProp("-Djava.class.path=");
OString sClassPathOption; OString sClassPathOption;
for (int i = 0; i < cOptions; i++) for (int i = 0; i < cOptions; i++)
{ {
@@ -654,12 +653,12 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
// Until java 1.5 we need to put a plugin.jar or javaplugin.jar (<1.4.2) // Until java 1.5 we need to put a plugin.jar or javaplugin.jar (<1.4.2)
// in the class path in order to have applet support. // in the class path in order to have applet support.
OString sClassPath = arOptions[i].optionString; OString sClassPath = arOptions[i].optionString;
if (sClassPath.match(sClassPathProp, 0)) if (sClassPath.startsWith("-Djava.class.path="))
{ {
char sep[] = {SAL_PATHSEPARATOR, 0};
OString sAddPath = getPluginJarPath(pInfo->sVendor, pInfo->sLocation,pInfo->sVersion); OString sAddPath = getPluginJarPath(pInfo->sVendor, pInfo->sLocation,pInfo->sVersion);
if (!sAddPath.isEmpty()) if (!sAddPath.isEmpty())
sClassPathOption = sClassPath + OString(sep) + sAddPath; sClassPathOption = sClassPath + OString(SAL_PATHSEPARATOR)
+ sAddPath;
else else
sClassPathOption = sClassPath; sClassPathOption = sClassPath;
options[n].optionString = (char *) sClassPathOption.getStr(); options[n].optionString = (char *) sClassPathOption.getStr();