[Libreoffice-commits] core.git: include/unotools unodevtools/inc unodevtools/source unotools/source unoxml/inc unoxml/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Tue Dec 24 16:29:50 UTC 2019
include/unotools/confignode.hxx | 6 +++---
include/unotools/configvaluecontainer.hxx | 4 ++--
include/unotools/resmgr.hxx | 2 +-
unodevtools/inc/options.hxx | 4 ++--
unodevtools/source/unodevtools/options.cxx | 4 ++--
unotools/source/config/configvaluecontainer.cxx | 4 ++--
unotools/source/config/lingucfg.cxx | 2 +-
unotools/source/config/saveopt.cxx | 2 +-
unotools/source/i18n/resmgr.cxx | 2 +-
unotools/source/misc/syslocale.cxx | 2 +-
unotools/source/misc/unotoolsservices.cxx | 2 +-
unoxml/inc/node.hxx | 4 ++--
unoxml/source/dom/characterdata.cxx | 8 ++++----
unoxml/source/dom/element.cxx | 12 ++++++------
unoxml/source/dom/node.cxx | 8 ++++----
unoxml/source/dom/processinginstruction.cxx | 4 ++--
unoxml/source/rdf/librdf_repository.cxx | 8 ++++----
unoxml/source/service/services.cxx | 2 +-
unoxml/source/xpath/xpathobject.cxx | 2 +-
19 files changed, 41 insertions(+), 41 deletions(-)
New commits:
commit 56063d30628ee2497a7c559d7de42d26e9cfc8ae
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Dec 24 10:36:27 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Dec 24 17:28:50 2019 +0100
sal_Char->char in unoxml
Change-Id: Ie14ea8349e5dc698a11b3447429b3ca7cbab9bb3
Reviewed-on: https://gerrit.libreoffice.org/85774
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/unotools/confignode.hxx b/include/unotools/confignode.hxx
index 156c5a05381b..9e3d57ee8b9a 100644
--- a/include/unotools/confignode.hxx
+++ b/include/unotools/confignode.hxx
@@ -81,7 +81,7 @@ namespace utl
*/
OConfigurationNode openNode(const OUString& _rPath) const throw();
- OConfigurationNode openNode( const sal_Char* _pAsciiPath ) const
+ OConfigurationNode openNode( const char* _pAsciiPath ) const
{
return openNode( OUString::createFromAscii( _pAsciiPath ) );
}
@@ -112,7 +112,7 @@ namespace utl
*/
css::uno::Any getNodeValue(const OUString& _rPath) const throw();
- css::uno::Any getNodeValue( const sal_Char* _pAsciiPath ) const
+ css::uno::Any getNodeValue( const char* _pAsciiPath ) const
{
return getNodeValue( OUString::createFromAscii( _pAsciiPath ) );
}
@@ -125,7 +125,7 @@ namespace utl
*/
bool setNodeValue(const OUString& _rPath, const css::uno::Any& _rValue) const throw();
- bool setNodeValue( const sal_Char* _pAsciiPath, const css::uno::Any& _rValue ) const
+ bool setNodeValue( const char* _pAsciiPath, const css::uno::Any& _rValue ) const
{
return setNodeValue( OUString::createFromAscii( _pAsciiPath ), _rValue );
}
diff --git a/include/unotools/configvaluecontainer.hxx b/include/unotools/configvaluecontainer.hxx
index 5d51b1e7dcaa..4190f76b5829 100644
--- a/include/unotools/configvaluecontainer.hxx
+++ b/include/unotools/configvaluecontainer.hxx
@@ -82,7 +82,7 @@ namespace utl
OConfigurationValueContainer(
const css::uno::Reference< css::uno::XComponentContext >& _rxORB,
::osl::Mutex& _rAccessSafety,
- const sal_Char* _pConfigLocation,
+ const char* _pConfigLocation,
const sal_Int32 _nLevels
);
@@ -104,7 +104,7 @@ namespace utl
is the type of your accessor. This type must be supported by the configuration.
*/
void registerExchangeLocation(
- const sal_Char* _pRelativePathAscii,
+ const char* _pRelativePathAscii,
void* _pContainer,
const css::uno::Type& _rValueType
);
diff --git a/include/unotools/resmgr.hxx b/include/unotools/resmgr.hxx
index 400f3a74f389..d1c64e399ffe 100644
--- a/include/unotools/resmgr.hxx
+++ b/include/unotools/resmgr.hxx
@@ -29,7 +29,7 @@ typedef OUString (*ResHookProc)(const OUString& rStr);
namespace Translate
{
- UNOTOOLS_DLLPUBLIC std::locale Create(const sal_Char* pPrefixName, const LanguageTag& rLocale = SvtSysLocale().GetUILanguageTag());
+ UNOTOOLS_DLLPUBLIC std::locale Create(const char* pPrefixName, const LanguageTag& rLocale = SvtSysLocale().GetUILanguageTag());
UNOTOOLS_DLLPUBLIC OUString get(const char* pId, const std::locale &loc);
UNOTOOLS_DLLPUBLIC OUString nget(const char* pId, int n, const std::locale &loc);
UNOTOOLS_DLLPUBLIC void SetReadStringHook( ResHookProc pProc );
diff --git a/unodevtools/inc/options.hxx b/unodevtools/inc/options.hxx
index f459009e190b..882d5c6488bf 100644
--- a/unodevtools/inc/options.hxx
+++ b/unodevtools/inc/options.hxx
@@ -27,12 +27,12 @@
namespace unodevtools {
-bool readOption( OUString * pValue, const sal_Char * pOpt,
+bool readOption( OUString * pValue, const char * pOpt,
sal_uInt32 * pnIndex, const OUString & aArg);
// throws CannotDumpException
-bool readOption( const sal_Char * pOpt,
+bool readOption( const char * pOpt,
sal_uInt32 * pnIndex, const OUString & aArg);
} // end of namespace unodevtools
diff --git a/unodevtools/source/unodevtools/options.cxx b/unodevtools/source/unodevtools/options.cxx
index 664cdceca99d..43948067359e 100644
--- a/unodevtools/source/unodevtools/options.cxx
+++ b/unodevtools/source/unodevtools/options.cxx
@@ -28,7 +28,7 @@
namespace unodevtools {
-bool readOption( OUString * pValue, const sal_Char * pOpt,
+bool readOption( OUString * pValue, const char * pOpt,
sal_uInt32 * pnIndex, const OUString & aArg)
{
const OUString dash = "-";
@@ -65,7 +65,7 @@ bool readOption( OUString * pValue, const sal_Char * pOpt,
}
-bool readOption( const sal_Char * pOpt,
+bool readOption( const char * pOpt,
sal_uInt32 * pnIndex, const OUString & aArg)
{
OUString aOpt = OUString::createFromAscii(pOpt);
diff --git a/unotools/source/config/configvaluecontainer.cxx b/unotools/source/config/configvaluecontainer.cxx
index 01a974bcecf2..9d4f711938d3 100644
--- a/unotools/source/config/configvaluecontainer.cxx
+++ b/unotools/source/config/configvaluecontainer.cxx
@@ -204,7 +204,7 @@ namespace utl
OConfigurationValueContainer::OConfigurationValueContainer(
const Reference< XComponentContext >& _rxORB, ::osl::Mutex& _rAccessSafety,
- const sal_Char* _pConfigLocation, const sal_Int32 _nLevels )
+ const char* _pConfigLocation, const sal_Int32 _nLevels )
:m_pImpl( new OConfigurationValueContainerImpl( _rxORB, _rAccessSafety ) )
{
implConstruct( OUString::createFromAscii( _pConfigLocation ), _nLevels );
@@ -229,7 +229,7 @@ namespace utl
"Could not access the configuration node located at " << _rConfigLocation);
}
- void OConfigurationValueContainer::registerExchangeLocation( const sal_Char* _pRelativePath,
+ void OConfigurationValueContainer::registerExchangeLocation( const char* _pRelativePath,
void* _pContainer, const Type& _rValueType )
{
// checks...
diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx
index 0bbd036b6255..21ac370ba7ab 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -273,7 +273,7 @@ uno::Sequence< OUString > SvtLinguConfigItem::GetPropertyNames()
sal_Int32 nIdx = 0;
for (sal_Int32 i = 0; i < nMax; ++i)
{
- const sal_Char *pFullPropName = aNamesToHdl[i].pFullPropName;
+ const char *pFullPropName = aNamesToHdl[i].pFullPropName;
if (pFullPropName)
pNames[ nIdx++ ] = OUString::createFromAscii( pFullPropName );
}
diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx
index 82f63887932d..650ec5586b8d 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -714,7 +714,7 @@ public:
}
-const sal_Char cUserDefinedSettings[] = "UserDefinedSettings";
+const char cUserDefinedSettings[] = "UserDefinedSettings";
SvtLoadOptions_Impl::SvtLoadOptions_Impl()
: ConfigItem( "Office.Common/Load" )
diff --git a/unotools/source/i18n/resmgr.cxx b/unotools/source/i18n/resmgr.cxx
index 47069489aa41..4e899aa9ea26 100644
--- a/unotools/source/i18n/resmgr.cxx
+++ b/unotools/source/i18n/resmgr.cxx
@@ -112,7 +112,7 @@ static int IgnoringCrtReportHook(int reportType, wchar_t *message, int * /* retu
namespace Translate
{
- std::locale Create(const sal_Char* pPrefixName, const LanguageTag& rLocale)
+ std::locale Create(const char* pPrefixName, const LanguageTag& rLocale)
{
static std::unordered_map<OString, std::locale> aCache;
OString sIdentifier = rLocale.getGlibcLocaleString(".UTF-8").toUtf8();
diff --git a/unotools/source/misc/syslocale.cxx b/unotools/source/misc/syslocale.cxx
index cad884f71d1f..b80a89aff396 100644
--- a/unotools/source/misc/syslocale.cxx
+++ b/unotools/source/misc/syslocale.cxx
@@ -187,7 +187,7 @@ const LanguageTag& SvtSysLocale::GetUILanguageTag() const
// static
rtl_TextEncoding SvtSysLocale::GetBestMimeEncoding()
{
- const sal_Char* pCharSet = rtl_getBestMimeCharsetFromTextEncoding(
+ const char* pCharSet = rtl_getBestMimeCharsetFromTextEncoding(
osl_getThreadTextEncoding() );
if ( !pCharSet )
{
diff --git a/unotools/source/misc/unotoolsservices.cxx b/unotools/source/misc/unotoolsservices.cxx
index 4804e9ab5042..4d1d897f15e5 100644
--- a/unotools/source/misc/unotoolsservices.cxx
+++ b/unotools/source/misc/unotoolsservices.cxx
@@ -14,7 +14,7 @@
namespace sdecl = ::comphelper::service_decl;
extern "C" SAL_DLLPUBLIC_EXPORT void* utl_component_getFactory(
- sal_Char const* pImplName, void*, void*)
+ char const* pImplName, void*, void*)
{
return sdecl::component_getFactoryHelper( pImplName,
{&OTempFileServiceDecl, &ServiceDocumenterDecl});
diff --git a/unoxml/inc/node.hxx b/unoxml/inc/node.hxx
index e35ab3aafda5..3637c47cd004 100644
--- a/unoxml/inc/node.hxx
+++ b/unoxml/inc/node.hxx
@@ -83,8 +83,8 @@ namespace DOM
void pushContext(Context& io_rContext);
void popContext(Context& io_rContext);
- sal_Int32 getTokenWithPrefix( const Context& rContext, const sal_Char* xPrefix, const sal_Char* xName );
- sal_Int32 getToken( const Context& rContext, const sal_Char* xName );
+ sal_Int32 getTokenWithPrefix( const Context& rContext, const char* xPrefix, const char* xName );
+ sal_Int32 getToken( const Context& rContext, const char* xName );
/// add namespaces on this node to context
void addNamespaces(Context& io_rContext, xmlNodePtr pNode);
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;
}
diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx
index 46bcdfa05dba..b06901436df1 100644
--- a/unoxml/source/rdf/librdf_repository.cxx
+++ b/unoxml/source/rdf/librdf_repository.cxx
@@ -2353,7 +2353,7 @@ librdf_TypeConverter::convertToXURI(librdf_uri* i_pURI) const
"librdf_uri_as_string failed", m_rRep);
}
OUString uriU( OStringToOUString(
- OString(reinterpret_cast<const sal_Char*>(uri)),
+ OString(reinterpret_cast<const char*>(uri)),
RTL_TEXTENCODING_UTF8) );
try {
return rdf::URI::create(m_xContext, uriU);
@@ -2395,7 +2395,7 @@ librdf_TypeConverter::convertToXResource(librdf_node* i_pNode) const
"blank node has no label", m_rRep);
}
OUString labelU( OStringToOUString(
- OString(reinterpret_cast<const sal_Char*>(label)),
+ OString(reinterpret_cast<const char*>(label)),
RTL_TEXTENCODING_UTF8) );
try {
return rdf::BlankNode::create(m_xContext, labelU);
@@ -2428,11 +2428,11 @@ librdf_TypeConverter::convertToXNode(librdf_node* i_pNode) const
librdf_node_get_literal_value_datatype_uri(i_pNode) );
OSL_ENSURE(!lang || !pType, "convertToXNode: invalid literal");
const OUString valueU( OStringToOUString(
- OString(reinterpret_cast<const sal_Char*>(value)),
+ OString(reinterpret_cast<const char*>(value)),
RTL_TEXTENCODING_UTF8) );
if (lang) {
const OUString langU( OStringToOUString(
- OString(reinterpret_cast<const sal_Char*>(lang)),
+ OString(reinterpret_cast<const char*>(lang)),
RTL_TEXTENCODING_UTF8) );
return rdf::Literal::createWithLanguage(m_xContext, valueU, langU);
} else if (pType) {
diff --git a/unoxml/source/service/services.cxx b/unoxml/source/service/services.cxx
index cf029fb3d01b..55e58b769965 100644
--- a/unoxml/source/service/services.cxx
+++ b/unoxml/source/service/services.cxx
@@ -41,7 +41,7 @@ using namespace css::registry;
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void* unoxml_component_getFactory(const sal_Char *pImplementationName, void *pServiceManager, void * /*pRegistryKey*/)
+SAL_DLLPUBLIC_EXPORT void* unoxml_component_getFactory(const char *pImplementationName, void *pServiceManager, void * /*pRegistryKey*/)
{
void* pReturn = nullptr ;
if ( pImplementationName && pServiceManager )
diff --git a/unoxml/source/xpath/xpathobject.cxx b/unoxml/source/xpath/xpathobject.cxx
index 2a055f10cdc4..b71f8b80d5cf 100644
--- a/unoxml/source/xpath/xpathobject.cxx
+++ b/unoxml/source/xpath/xpathobject.cxx
@@ -170,7 +170,7 @@ namespace XPath
std::shared_ptr<xmlChar const> str(
xmlXPathCastToString(m_pXPathObj.get()), xmlFree);
- sal_Char const*const pS(reinterpret_cast<sal_Char const*>(str.get()));
+ char const*const pS(reinterpret_cast<char const*>(str.get()));
return OUString(pS, strlen(pS), RTL_TEXTENCODING_UTF8);
}
More information about the Libreoffice-commits
mailing list