sal_Char->char in xmloff..xmlsecurity

Change-Id: I292d699ce1de10ca9341525161f5da2592102ff7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85778
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

6 files changed, 11 insertions, 11 deletions

diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 0c02bdf1c466..975e338bf5c2 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -327,7 +327,7 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const OUStrin
         {
             sal_uInt32 pos = 0;
             sal_uInt64 nRead;
-            sal_Char buffer[2048];
+            char buffer[2048];
             sal_Unicode lineBuffer[1028];
             OUStringBuffer fileContent;
 
@@ -600,7 +600,7 @@ void KeywordInfo::KeywordElement::init( Databases const *pDatabases,helpdatafile
         listAnchor[i] = anchor[i];
 
         helpdatafileproxy::HDFData aHDFData;
-        const sal_Char* pData = nullptr;
+        const char* pData = nullptr;
 
         if( pHdf )
         {
@@ -1020,7 +1020,7 @@ void Databases::setActiveText( const OUString& Module,
     helpdatafileproxy::HDFData aHDFData;
 
     int nSize = 0;
-    const sal_Char* pData = nullptr;
+    const char* pData = nullptr;
 
     bool bSuccess = false;
     if( !bFoundAsEmpty )
diff --git a/xmlhelp/source/cxxhelp/provider/db.cxx b/xmlhelp/source/cxxhelp/provider/db.cxx
index bf8da3ce7f04..f8a38ecd8199 100644
--- a/xmlhelp/source/cxxhelp/provider/db.cxx
+++ b/xmlhelp/source/cxxhelp/provider/db.cxx
@@ -166,7 +166,7 @@ bool Hdf::getValueForKey( const OString& rKey, HDFData& rValue )
                     sal_Int32 nRead = xIn->readBytes( aData, nValueLen );
                     if( nRead == nValueLen )
                     {
-                        const char* pData = reinterpret_cast<const sal_Char*>(aData.getConstArray());
+                        const char* pData = reinterpret_cast<const char*>(aData.getConstArray());
                         rValue.copyToBuffer( pData, nValueLen );
                         bSuccess = true;
                     }
diff --git a/xmlhelp/source/cxxhelp/provider/services.cxx b/xmlhelp/source/cxxhelp/provider/services.cxx
index 5778a27ce6e5..f1541d5c4b87 100644
--- a/xmlhelp/source/cxxhelp/provider/services.cxx
+++ b/xmlhelp/source/cxxhelp/provider/services.cxx
@@ -26,7 +26,7 @@
 using namespace com::sun::star;
 
 extern "C" SAL_DLLPUBLIC_EXPORT void * ucpchelp_component_getFactory(
-    const sal_Char * pImplName,
+    const char * pImplName,
     void * pServiceManager,
     SAL_UNUSED_PARAMETER void * /*pRegistryKey*/ )
 {
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index 6dbe5bd9a09b..2ec811373c76 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -240,7 +240,7 @@ void URLParameter::readHelpDataFile()
     DataBaseIterator aDbIt( *m_pDatabases, aModule, aLanguage, false );
     bool bSuccess = false;
 
-    const sal_Char* pData = nullptr;
+    const char* pData = nullptr;
 
     helpdatafileproxy::HDFData aHDFData;
     OUString aExtensionPath;
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
index a4c33513d5ff..11269c4d04a2 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
@@ -35,7 +35,7 @@ namespace chelp {
     {
     public:
 
-        explicit DbtToStringConverter( const sal_Char* ptr )
+        explicit DbtToStringConverter( const char* ptr )
             : m_ptr( ptr )
         {
         }
@@ -86,11 +86,11 @@ namespace chelp {
 
             //fdo#82025 - use strlen instead of stored length byte to determine string len
             //There is a one byte length field at m_ptr[2 + m_ptr[0] +  m_ptr[1
-            //+ m_ptr[0]]] but by default sal_Char is signed so anything larger
+            //+ m_ptr[0]]] but by default char is signed so anything larger
             //than 127 defaults to a negative value, casting it would allow up
             //to 255 but instead make use of the null termination to avoid
             //running into a later problem with strings >= 255
-            const sal_Char* pTitle = m_ptr + 3 + m_ptr[0] +  static_cast<sal_Int32>(m_ptr[ 1+ static_cast<sal_Int32>(m_ptr[0]) ]);
+            const char* pTitle = m_ptr + 3 + m_ptr[0] +  static_cast<sal_Int32>(m_ptr[ 1+ static_cast<sal_Int32>(m_ptr[0]) ]);
 
             return OUString(pTitle, rtl_str_getLength(pTitle), RTL_TEXTENCODING_UTF8);
         }
@@ -98,7 +98,7 @@ namespace chelp {
 
     private:
 
-        const sal_Char* m_ptr;
+        const char* m_ptr;
 
     };
 
diff --git a/xmlhelp/source/cxxhelp/test/searchdemo.cxx b/xmlhelp/source/cxxhelp/test/searchdemo.cxx
index aa1c3cbe2c74..cfe1a51ee369 100644
--- a/xmlhelp/source/cxxhelp/test/searchdemo.cxx
+++ b/xmlhelp/source/cxxhelp/test/searchdemo.cxx
@@ -43,7 +43,7 @@ void print_rtl_OUString( const OUString bla )
 {
     OString bluber = OString( bla.getStr(),bla.getLength(),RTL_TEXTENCODING_UTF8 );
     char* bluberChr = new char[ 1+bluber.getLength() ];
-    const sal_Char* jux = bluber.getStr();
+    const char* jux = bluber.getStr();
 
     for( int i = 0; i < bluber.getLength(); ++i )
         bluberChr[i] = jux[i];