diff options
| author | Noel Grandin <noel@peralex.com> | 2016-04-27 09:22:13 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-04-28 09:31:16 +0000 |
| commit | 43b4903db3e925c652e25c34362490f8adc9c5ec (patch) | |
| tree | af12777b72d42280467e8cc19b914b2c7f4f3816 /unoxml/source/xpath | |
| parent | 7d6308dad9f4a079d57719a6e3a9c4cebb47d051 (diff) | |
teach stylepolice plugin about ref-counted-pointer naming
Change-Id: I6e91d22fc1826038c05ddb6fc065563c6a250752
Reviewed-on: https://gerrit.libreoffice.org/24459
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'unoxml/source/xpath')
| -rw-r--r-- | unoxml/source/xpath/xpathapi.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/unoxml/source/xpath/xpathapi.cxx b/unoxml/source/xpath/xpathapi.cxx index 6452a42addfb..9e1eabd0677e 100644 --- a/unoxml/source/xpath/xpathapi.cxx +++ b/unoxml/source/xpath/xpathapi.cxx @@ -150,10 +150,10 @@ namespace XPath while (pNode != nullptr) { xmlNsPtr curDef = pNode->nsDef; while (curDef != nullptr) { - const xmlChar* xHref = curDef->href; - OUString aURI(reinterpret_cast<char const *>(xHref), strlen(reinterpret_cast<char const *>(xHref)), RTL_TEXTENCODING_UTF8); - const xmlChar* xPre = curDef->prefix; - OUString aPrefix(reinterpret_cast<char const *>(xPre), strlen(reinterpret_cast<char const *>(xPre)), RTL_TEXTENCODING_UTF8); + const xmlChar* pHref = curDef->href; + OUString aURI(reinterpret_cast<char const *>(pHref), strlen(reinterpret_cast<char const *>(pHref)), RTL_TEXTENCODING_UTF8); + const xmlChar* pPre = curDef->prefix; + OUString aPrefix(reinterpret_cast<char const *>(pPre), strlen(reinterpret_cast<char const *>(pPre)), RTL_TEXTENCODING_UTF8); // we could already have this prefix from a child node if (rNamespaces.find(aPrefix) == rNamespaces.end()) { @@ -372,9 +372,9 @@ namespace XPath /* run the query */ OString o1 = OUStringToOString(expr, RTL_TEXTENCODING_UTF8); - xmlChar const *xStr = reinterpret_cast<xmlChar const *>(o1.getStr()); + xmlChar const *pStr = reinterpret_cast<xmlChar const *>(o1.getStr()); std::shared_ptr<xmlXPathObject> const xpathObj( - xmlXPathEval(xStr, xpathCtx.get()), xmlXPathFreeObject); + xmlXPathEval(pStr, xpathCtx.get()), xmlXPathFreeObject); xmlSetGenericErrorFunc(nullptr, nullptr); if (nullptr == xpathObj) { // OSL_ENSURE(xpathCtx->lastError == NULL, xpathCtx->lastError->message); |