diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2017-03-19 17:35:07 +0100 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2017-03-19 17:25:49 +0000 |
| commit | 0a57e51f410eda8e5d27a95a8d0ae5124fcc7496 (patch) | |
| tree | 55d5c806566de0f237e21c2fea7d0d606977ce23 | |
| parent | fa7e3d389f64e051bd3a1f4cde4f938bd324051f (diff) | |
Fix typo for "expression"
Change-Id: Iad0728fe53912d85ee40ef1b39d476a47aaad2d2
Reviewed-on: https://gerrit.libreoffice.org/35433
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
| -rw-r--r-- | jvmfwk/source/fwkbase.cxx | 12 | ||||
| -rw-r--r-- | sw/qa/python/set_expression.py | 2 |
2 files changed, 7 insertions, 7 deletions
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): |