jvmfwk/source/fwkbase.cxx | 12 ++++++------ sw/qa/python/set_expression.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-)
New commits: commit 0a57e51f410eda8e5d27a95a8d0ae5124fcc7496 Author: Julien Nabet <serval2...@yahoo.fr> Date: Sun Mar 19 17:35:07 2017 +0100 Fix typo for "expression" Change-Id: Iad0728fe53912d85ee40ef1b39d476a47aaad2d2 Reviewed-on: https://gerrit.libreoffice.org/35433 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Julien Nabet <serval2...@yahoo.fr> diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx index 6eacf33e4bcf..df2e41e4994f 100644 --- a/jvmfwk/source/fwkbase.cxx +++ b/jvmfwk/source/fwkbase.cxx @@ -124,13 +124,13 @@ VersionInfo VendorSettings::getVersionInformation(const OUString & sVendor) VersionInfo aVersionInfo; OString osVendor = OUStringToOString(sVendor, RTL_TEXTENCODING_UTF8); //Get minVersion - OString sExpresion = OString( + OString sExpression = OString( "/jf:javaSelection/jf:vendorInfos/jf:vendor[@name=\"") + osVendor + OString("\"]/jf:minVersion"); CXPathObjectPtr xPathObjectMin; xPathObjectMin = - xmlXPathEvalExpression(reinterpret_cast<xmlChar const *>(sExpresion.getStr()), + xmlXPathEvalExpression(reinterpret_cast<xmlChar const *>(sExpression.getStr()), m_xmlPathContextVendorSettings); if (xmlXPathNodeSetIsEmpty(xPathObjectMin->nodesetval)) { @@ -148,11 +148,11 @@ VersionInfo VendorSettings::getVersionInformation(const OUString & sVendor) } //Get maxVersion - sExpresion = OString("/jf:javaSelection/jf:vendorInfos/jf:vendor[@name=\"") + + sExpression = OString("/jf:javaSelection/jf:vendorInfos/jf:vendor[@name=\"") + osVendor + OString("\"]/jf:maxVersion"); CXPathObjectPtr xPathObjectMax; xPathObjectMax = xmlXPathEvalExpression( - reinterpret_cast<xmlChar const *>(sExpresion.getStr()), + reinterpret_cast<xmlChar const *>(sExpression.getStr()), m_xmlPathContextVendorSettings); if (xmlXPathNodeSetIsEmpty(xPathObjectMax->nodesetval)) { @@ -170,11 +170,11 @@ VersionInfo VendorSettings::getVersionInformation(const OUString & sVendor) } //Get excludeVersions - sExpresion = OString("/jf:javaSelection/jf:vendorInfos/jf:vendor[@name=\"") + + sExpression = OString("/jf:javaSelection/jf:vendorInfos/jf:vendor[@name=\"") + osVendor + OString("\"]/jf:excludeVersions/jf:version"); CXPathObjectPtr xPathObjectVersions; xPathObjectVersions = - xmlXPathEvalExpression(reinterpret_cast<xmlChar const *>(sExpresion.getStr()), + xmlXPathEvalExpression(reinterpret_cast<xmlChar const *>(sExpression.getStr()), m_xmlPathContextVendorSettings); if (!xmlXPathNodeSetIsEmpty(xPathObjectVersions->nodesetval)) { diff --git a/sw/qa/python/set_expression.py b/sw/qa/python/set_expression.py index 7bcc20d69880..220952536fea 100644 --- a/sw/qa/python/set_expression.py +++ b/sw/qa/python/set_expression.py @@ -12,7 +12,7 @@ from org.libreoffice.unotest import UnoInProcess # @unittest.skip("that seems to work") -class TestSetExpresion(unittest.TestCase): +class TestSetExpression(unittest.TestCase): @classmethod def setUpClass(cls): _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits