summaryrefslogtreecommitdiff
path: root/unoxml/source/dom
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-12-24 10:36:27 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-12-24 17:28:50 +0100
commit56063d30628ee2497a7c559d7de42d26e9cfc8ae (patch)
tree2a48a93cfee5c6d1e7e942361b5d040ac04ce663 /unoxml/source/dom
parent122598af564082786f01b4eafdb9f09f0cffdf5f (diff)
sal_Char->char in unoxml
Change-Id: Ie14ea8349e5dc698a11b3447429b3ca7cbab9bb3 Reviewed-on: https://gerrit.libreoffice.org/85774 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'unoxml/source/dom')
-rw-r--r--unoxml/source/dom/characterdata.cxx8
-rw-r--r--unoxml/source/dom/element.cxx12
-rw-r--r--unoxml/source/dom/node.cxx8
-rw-r--r--unoxml/source/dom/processinginstruction.cxx4
4 files changed, 16 insertions, 16 deletions
diff --git a/unoxml/source/dom/characterdata.cxx b/unoxml/source/dom/characterdata.cxx
index f9fa0cce650f..46d7a4d7b898 100644
--- a/unoxml/source/dom/characterdata.cxx
+++ b/unoxml/source/dom/characterdata.cxx
@@ -88,7 +88,7 @@ namespace DOM
// get current data
std::shared_ptr<xmlChar const> const pContent(
xmlNodeGetContent(m_aNodePtr), xmlFree);
- OString aData(reinterpret_cast<sal_Char const*>(pContent.get()));
+ OString aData(reinterpret_cast<char const*>(pContent.get()));
OUString tmp(OStringToOUString(aData, RTL_TEXTENCODING_UTF8));
if (offset > tmp.getLength() || offset < 0 || count < 0) {
DOMException e;
@@ -158,7 +158,7 @@ namespace DOM
// get current data
std::shared_ptr<xmlChar const> const pContent(
xmlNodeGetContent(m_aNodePtr), xmlFree);
- OString aData(reinterpret_cast<sal_Char const*>(pContent.get()));
+ OString aData(reinterpret_cast<char const*>(pContent.get()));
OUString tmp(OStringToOUString(aData, RTL_TEXTENCODING_UTF8));
if (offset > tmp.getLength() || offset < 0) {
DOMException e;
@@ -193,7 +193,7 @@ namespace DOM
// get current data
std::shared_ptr<xmlChar const> const pContent(
xmlNodeGetContent(m_aNodePtr), xmlFree);
- OString aData(reinterpret_cast<sal_Char const*>(pContent.get()));
+ OString aData(reinterpret_cast<char const*>(pContent.get()));
OUString tmp(OStringToOUString(aData, RTL_TEXTENCODING_UTF8));
if (offset > tmp.getLength() || offset < 0 || count < 0){
DOMException e;
@@ -246,7 +246,7 @@ namespace DOM
// get current data
std::shared_ptr<xmlChar const> const pContent(
xmlNodeGetContent(m_aNodePtr), xmlFree);
- OString aData(reinterpret_cast<sal_Char const*>(pContent.get()));
+ OString aData(reinterpret_cast<char const*>(pContent.get()));
OUString tmp(OStringToOUString(aData, RTL_TEXTENCODING_UTF8));
if (offset > tmp.getLength() || offset < 0 || count < 0) {
DOMException e;
diff --git a/unoxml/source/dom/element.cxx b/unoxml/source/dom/element.cxx
index e5e82b2613cd..f154cbc2e2dc 100644
--- a/unoxml/source/dom/element.cxx
+++ b/unoxml/source/dom/element.cxx
@@ -62,13 +62,13 @@ namespace DOM
// add namespace definitions to attributes
for (xmlNsPtr pNs = m_aNodePtr->nsDef; pNs != nullptr; pNs = pNs->next) {
const xmlChar *pPrefix = pNs->prefix ? pNs->prefix : reinterpret_cast<const xmlChar*>("");
- OUString prefix(reinterpret_cast<const sal_Char*>(pPrefix),
+ OUString prefix(reinterpret_cast<const char*>(pPrefix),
strlen(reinterpret_cast<const char*>(pPrefix)),
RTL_TEXTENCODING_UTF8);
OUString name = (prefix.isEmpty())
? OUString( "xmlns" ) : "xmlns:" + prefix;
const xmlChar *pHref = pNs->href;
- OUString val(reinterpret_cast<const sal_Char*>(pHref),
+ OUString val(reinterpret_cast<const char*>(pHref),
strlen(reinterpret_cast<const char*>(pHref)),
RTL_TEXTENCODING_UTF8);
pAttrs->AddAttribute(name, type, val);
@@ -243,7 +243,7 @@ namespace DOM
std::shared_ptr<xmlChar const> const pValue(
xmlGetProp(m_aNodePtr, reinterpret_cast<xmlChar const *>(o1.getStr())), xmlFree);
OUString const ret( pValue
- ? OUString(reinterpret_cast<sal_Char const*>(pValue.get()),
+ ? OUString(reinterpret_cast<char const*>(pValue.get()),
strlen(reinterpret_cast<char const*>(pValue.get())),
RTL_TEXTENCODING_UTF8)
: OUString() );
@@ -326,7 +326,7 @@ namespace DOM
if (nullptr == pValue) {
return OUString();
}
- OUString const ret(reinterpret_cast<sal_Char const*>(pValue.get()),
+ OUString const ret(reinterpret_cast<char const*>(pValue.get()),
strlen(reinterpret_cast<char const*>(pValue.get())),
RTL_TEXTENCODING_UTF8);
return ret;
@@ -620,7 +620,7 @@ namespace DOM
aChangeType = AttrChangeType_ADDITION;
xmlNewProp(m_aNodePtr, pName, pValue);
} else {
- oldValue = OUString(reinterpret_cast<sal_Char const*>(pOld.get()),
+ oldValue = OUString(reinterpret_cast<char const*>(pOld.get()),
strlen(reinterpret_cast<char const*>(pOld.get())),
RTL_TEXTENCODING_UTF8);
xmlSetProp(m_aNodePtr, pName, pValue);
@@ -702,7 +702,7 @@ namespace DOM
aChangeType = AttrChangeType_ADDITION;
xmlNewNsProp(m_aNodePtr, pNs, pLName, pValue);
} else {
- oldValue = OUString(reinterpret_cast<sal_Char const*>(pOld.get()),
+ oldValue = OUString(reinterpret_cast<char const*>(pOld.get()),
strlen(reinterpret_cast<char const*>(pOld.get())),
RTL_TEXTENCODING_UTF8);
xmlSetNsProp(m_aNodePtr, pNs, pLName, pValue);
diff --git a/unoxml/source/dom/node.cxx b/unoxml/source/dom/node.cxx
index cdeab8e2d419..d85038c7e48d 100644
--- a/unoxml/source/dom/node.cxx
+++ b/unoxml/source/dom/node.cxx
@@ -76,10 +76,10 @@ namespace DOM
for (xmlNsPtr pNs = pNode->nsDef; pNs != nullptr; pNs = pNs->next) {
const xmlChar *pPrefix = pNs->prefix;
// prefix can be NULL when xmlns attribute is empty (xmlns="")
- OString prefix(reinterpret_cast<const sal_Char*>(pPrefix),
+ OString prefix(reinterpret_cast<const char*>(pPrefix),
pPrefix ? strlen(reinterpret_cast<const char*>(pPrefix)) : 0);
const xmlChar *pHref = pNs->href;
- OUString val(reinterpret_cast<const sal_Char*>(pHref),
+ OUString val(reinterpret_cast<const char*>(pHref),
strlen(reinterpret_cast<const char*>(pHref)),
RTL_TEXTENCODING_UTF8);
@@ -98,13 +98,13 @@ namespace DOM
}
}
- sal_Int32 getToken( const Context& rContext, const sal_Char* pToken )
+ sal_Int32 getToken( const Context& rContext, const char* pToken )
{
const Sequence<sal_Int8> aSeq( reinterpret_cast<sal_Int8 const *>(pToken), strlen( pToken ) );
return rContext.mxTokenHandler->getTokenFromUTF8( aSeq );
}
- sal_Int32 getTokenWithPrefix( const Context& rContext, const sal_Char* pPrefix, const sal_Char* pName )
+ sal_Int32 getTokenWithPrefix( const Context& rContext, const char* pPrefix, const char* pName )
{
sal_Int32 nNamespaceToken = FastToken::DONTKNOW;
OString prefix(pPrefix,
diff --git a/unoxml/source/dom/processinginstruction.cxx b/unoxml/source/dom/processinginstruction.cxx
index 275441249feb..9eda0b90461d 100644
--- a/unoxml/source/dom/processinginstruction.cxx
+++ b/unoxml/source/dom/processinginstruction.cxx
@@ -116,8 +116,8 @@ namespace DOM
return OUString();
}
- sal_Char const*const pName =
- reinterpret_cast<sal_Char const*>(m_aNodePtr->name);
+ char const*const pName =
+ reinterpret_cast<char const*>(m_aNodePtr->name);
OUString const ret(pName, strlen(pName), RTL_TEXTENCODING_UTF8);
return ret;
}