diff options
Diffstat (limited to 'jvmfwk/source/fwkbase.cxx')
| -rw-r--r-- | jvmfwk/source/fwkbase.cxx | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx index aab2201ee07d..ecc60eb2190e 100644 --- a/jvmfwk/source/fwkbase.cxx +++ b/jvmfwk/source/fwkbase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -131,7 +131,7 @@ VendorSettings::VendorSettings(): JFW_E_ERROR, OString("[Java framework] Error while parsing file: ") + sSettingsPath + OString(".")); - + m_xmlPathContextVendorSettings = xmlXPathNewContext(m_xmlDocVendorSettings); int res = xmlXPathRegisterNs( m_xmlPathContextVendorSettings, (xmlChar*) "jf", @@ -145,7 +145,7 @@ std::vector<PluginLibrary> VendorSettings::getPluginData() { OString sExcMsg("[Java framework] Error in function VendorSettings::getVendorPluginURLs " "(fwkbase.cxx)."); - std::vector<PluginLibrary> vecPlugins; + std::vector<PluginLibrary> vecPlugins; CXPathObjectPtr result(xmlXPathEvalExpression( (xmlChar*)"/jf:javaSelection/jf:plugins/jf:library", m_xmlPathContextVendorSettings)); @@ -180,7 +180,7 @@ std::vector<PluginLibrary> VendorSettings::getPluginData() "[Java framework] The file: " + sPlugin + " does not exist."); } plugin.sPath = sUrl; - + vecPlugins.push_back(plugin); } cur = cur->next; @@ -195,11 +195,11 @@ VersionInfo VendorSettings::getVersionInformation(const rtl::OUString & sVendor) OString osVendor = OUStringToOString(sVendor, RTL_TEXTENCODING_UTF8); //Get minVersion OString sExpresion = OString( - "/jf:javaSelection/jf:vendorInfos/jf:vendor[@name=\"") + + "/jf:javaSelection/jf:vendorInfos/jf:vendor[@name=\"") + osVendor + OString("\"]/jf:minVersion"); - + CXPathObjectPtr xPathObjectMin; - xPathObjectMin = + xPathObjectMin = xmlXPathEvalExpression((xmlChar*) sExpresion.getStr(), m_xmlPathContextVendorSettings); if (xmlXPathNodeSetIsEmpty(xPathObjectMin->nodesetval)) @@ -218,7 +218,7 @@ VersionInfo VendorSettings::getVersionInformation(const rtl::OUString & sVendor) } //Get maxVersion - sExpresion = OString("/jf:javaSelection/jf:vendorInfos/jf:vendor[@name=\"") + + sExpresion = OString("/jf:javaSelection/jf:vendorInfos/jf:vendor[@name=\"") + osVendor + OString("\"]/jf:maxVersion"); CXPathObjectPtr xPathObjectMax; xPathObjectMax = xmlXPathEvalExpression( @@ -240,7 +240,7 @@ VersionInfo VendorSettings::getVersionInformation(const rtl::OUString & sVendor) } //Get excludeVersions - sExpresion = OString("/jf:javaSelection/jf:vendorInfos/jf:vendor[@name=\"") + + sExpresion = OString("/jf:javaSelection/jf:vendorInfos/jf:vendor[@name=\"") + osVendor + OString("\"]/jf:excludeVersions/jf:version"); CXPathObjectPtr xPathObjectVersions; xPathObjectVersions = @@ -282,7 +282,7 @@ std::vector<OUString> VendorSettings::getSupportedVendors() throw FrameworkException( JFW_E_ERROR, rtl::OString("[Java framework] Error in function getSupportedVendors (fwkutil.cxx).")); - + //get the values of the library elements + vendor attribute xmlNode* cur = result->nodesetval->nodeTab[0]; while (cur != NULL) @@ -394,7 +394,7 @@ rtl::OString BootParams::getClasspath() UNO_JAVA_JFW_CLASSPATH " = %s.\n", sClassPath.getStr()); #endif } - + rtl::OUString sEnvCP; if (Bootstrap::get()->getFrom( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_ENV_CLASSPATH)), @@ -513,7 +513,7 @@ rtl::OUString BootParams::getJREHome() fprintf(stderr,"[Java framework] Using bootstrap parameter " UNO_JAVA_JFW_JREHOME" = %s.\n", sValue.getStr()); } -#endif +#endif return sJRE; } @@ -604,7 +604,7 @@ JFW_MODE getMode() g_mode = JFW_MODE_APPLICATION; g_bMode = true; } - + return g_mode; } @@ -647,11 +647,11 @@ rtl::OString makeClassPathOption(OUString const & sUserClassPath) rtl::OString sPaths; rtl::OUStringBuffer sBufCP(4096); char szSep[] = {SAL_PATHSEPARATOR,0}; - + // append all user selected jars to the class path if (sUserClassPath.getLength() > 0) sBufCP.append(sUserClassPath); - + //append all jar libraries and components to the class path OUString sAppCP = getApplicationClassPath(); if (sAppCP.getLength()) @@ -660,10 +660,10 @@ rtl::OString makeClassPathOption(OUString const & sUserClassPath) sBufCP.appendAscii(szSep); sBufCP.append(sAppCP); } - + sPaths = rtl::OUStringToOString( sBufCP.makeStringAndClear(), osl_getThreadTextEncoding()); - + rtl::OString sOptionClassPath("-Djava.class.path="); sOptionClassPath += sPaths; return sOptionClassPath; |