sal_Char->char in comphelper

Change-Id: I63488463f2255a013cb80a9318d22207cb0ed532
Reviewed-on: https://gerrit.libreoffice.org/85395
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

9 files changed, 20 insertions, 20 deletions

diff --git a/comphelper/source/misc/backupfilehelper.cxx b/comphelper/source/misc/backupfilehelper.cxx
index 464fbeb89048..39040a560e7e 100644
--- a/comphelper/source/misc/backupfilehelper.cxx
+++ b/comphelper/source/misc/backupfilehelper.cxx
@@ -166,7 +166,7 @@ namespace
         if (nLength > nRemainingSize)
             return false;
 
-        std::vector<sal_Char> aTarget(nLength);
+        std::vector<char> aTarget(nLength);
         sal_uInt64 nBaseRead(0);
 
         // read rTarget
diff --git a/comphelper/source/misc/base64.cxx b/comphelper/source/misc/base64.cxx
index 3748f2f1e56b..75274f5a73cb 100644
--- a/comphelper/source/misc/base64.cxx
+++ b/comphelper/source/misc/base64.cxx
@@ -28,7 +28,7 @@ using namespace com::sun::star;
 namespace comphelper {
 
 const
-  sal_Char aBase64EncodeTable[] =
+  char aBase64EncodeTable[] =
     { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
       'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
       'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
@@ -56,7 +56,7 @@ const
 //    p   q   r   s   t   u   v   w   x   y   z
 
 
-static void ThreeByteToFourByte(const sal_Int8* pBuffer, const sal_Int32 nStart, const sal_Int32 nFullLen, sal_Char* aCharBuffer)
+static void ThreeByteToFourByte(const sal_Int8* pBuffer, const sal_Int32 nStart, const sal_Int32 nFullLen, char* aCharBuffer)
 {
     sal_Int32 nLen(nFullLen - nStart);
     if (nLen > 3)
@@ -115,7 +115,7 @@ void Base64::encode(OStringBuffer& aStrBuffer, const uno::Sequence<sal_Int8>& aP
     const sal_Int8* pBuffer = aPass.getConstArray();
     while (i < nBufferLength)
     {
-        sal_Char aCharBuffer[4];
+        char aCharBuffer[4];
         ThreeByteToFourByte(pBuffer, i, nBufferLength, aCharBuffer);
         aStrBuffer.append(aCharBuffer, SAL_N_ELEMENTS(aCharBuffer));
         i += 3;
@@ -129,7 +129,7 @@ void Base64::encode(OUStringBuffer& aStrBuffer, const uno::Sequence<sal_Int8>& a
     const sal_Int8* pBuffer = aPass.getConstArray();
     while (i < nBufferLength)
     {
-        sal_Char aCharBuffer[4];
+        char aCharBuffer[4];
         ThreeByteToFourByte(pBuffer, i, nBufferLength, aCharBuffer);
         aStrBuffer.appendAscii(aCharBuffer, SAL_N_ELEMENTS(aCharBuffer));
         i += 3;
diff --git a/comphelper/source/misc/comphelper_services.cxx b/comphelper/source/misc/comphelper_services.cxx
index 6d267d2f8287..5ab04afeadff 100644
--- a/comphelper/source/misc/comphelper_services.cxx
+++ b/comphelper/source/misc/comphelper_services.cxx
@@ -52,7 +52,7 @@ namespace comphelper { namespace module
 
 
 extern "C" SAL_DLLPUBLIC_EXPORT void* comphelp_component_getFactory(
-    const sal_Char* pImplementationName, SAL_UNUSED_PARAMETER void*,
+    const char* pImplementationName, SAL_UNUSED_PARAMETER void*,
     SAL_UNUSED_PARAMETER void* )
 {
     ::comphelper::module::initializeModule();
diff --git a/comphelper/source/misc/componentmodule.cxx b/comphelper/source/misc/componentmodule.cxx
index f2645f3c4260..33c4a3118a7d 100644
--- a/comphelper/source/misc/componentmodule.cxx
+++ b/comphelper/source/misc/componentmodule.cxx
@@ -71,7 +71,7 @@ namespace comphelper
         registerImplementation( aComponent );
     }
 
-    void* OModule::getComponentFactory( const sal_Char* _pImplementationName )
+    void* OModule::getComponentFactory( const char* _pImplementationName )
     {
         Reference< XInterface > xFactory( getComponentFactory(
             OUString::createFromAscii( _pImplementationName ) ) );
diff --git a/comphelper/source/misc/logging.cxx b/comphelper/source/misc/logging.cxx
index 22ff36c288bc..4054222c855d 100644
--- a/comphelper/source/misc/logging.cxx
+++ b/comphelper/source/misc/logging.cxx
@@ -64,7 +64,7 @@ namespace comphelper
         }
     }
 
-    EventLogger::EventLogger( const Reference< XComponentContext >& _rxContext, const sal_Char* _pAsciiLoggerName )
+    EventLogger::EventLogger( const Reference< XComponentContext >& _rxContext, const char* _pAsciiLoggerName )
         :m_pImpl( new EventLogger_Impl( _rxContext, OUString::createFromAscii( _pAsciiLoggerName ) ) )
     {
     }
@@ -107,7 +107,7 @@ namespace comphelper
 
 
     void EventLogger::impl_log( const sal_Int32 _nLogLevel,
-        const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage,
+        const char* _pSourceClass, const char* _pSourceMethod, const OUString& _rMessage,
         const OptionalString& _rArgument1, const OptionalString& _rArgument2,
         const OptionalString& _rArgument3, const OptionalString& _rArgument4,
         const OptionalString& _rArgument5, const OptionalString& _rArgument6 ) const
diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx
index 21126c4867ec..d0858a89d578 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.cxx
@@ -68,7 +68,7 @@ OUString MimeConfigurationHelper::GetStringClassIDRepresentation( const uno::Seq
 }
 
 
-static sal_uInt8 GetDigit_Impl( sal_Char aChar )
+static sal_uInt8 GetDigit_Impl( char aChar )
 {
     if ( aChar >= '0' && aChar <= '9' )
         return aChar - '0';
diff --git a/comphelper/source/misc/servicedecl.cxx b/comphelper/source/misc/servicedecl.cxx
index f37f783b902f..410ef472ee26 100644
--- a/comphelper/source/misc/servicedecl.cxx
+++ b/comphelper/source/misc/servicedecl.cxx
@@ -99,7 +99,7 @@ ServiceDecl::Factory::createInstanceWithArgumentsAndContext(
         m_rServiceDecl, args, xContext );
 }
 
-void * ServiceDecl::getFactory( sal_Char const* pImplName ) const
+void * ServiceDecl::getFactory( char const* pImplName ) const
 {
     if (rtl_str_compare(m_pImplName, pImplName) == 0) {
         lang::XSingleComponentFactory * const pFac( new Factory(*this) );
@@ -143,7 +143,7 @@ OUString ServiceDecl::getImplementationName() const
     return OUString::createFromAscii(m_pImplName);
 }
 
-void* component_getFactoryHelper( const sal_Char* pImplName,
+void* component_getFactoryHelper( const char* pImplName,
                                   std::initializer_list<ServiceDecl const *> args )
 {
     for (auto const i: args) {
diff --git a/comphelper/source/misc/string.cxx b/comphelper/source/misc/string.cxx
index 31c8c750e8d8..296c9ac016d3 100644
--- a/comphelper/source/misc/string.cxx
+++ b/comphelper/source/misc/string.cxx
@@ -63,9 +63,9 @@ namespace
     }
 }
 
-OString stripStart(const OString &rIn, sal_Char c)
+OString stripStart(const OString &rIn, char c)
 {
-    return tmpl_stripStart<OString, sal_Char>(rIn, c);
+    return tmpl_stripStart<OString, char>(rIn, c);
 }
 
 OUString stripStart(const OUString &rIn, sal_Unicode c)
@@ -94,9 +94,9 @@ namespace
     }
 }
 
-OString stripEnd(const OString &rIn, sal_Char c)
+OString stripEnd(const OString &rIn, char c)
 {
-    return tmpl_stripEnd<OString, sal_Char>(rIn, c);
+    return tmpl_stripEnd<OString, char>(rIn, c);
 }
 
 OUString stripEnd(const OUString &rIn, sal_Unicode c)
@@ -104,7 +104,7 @@ OUString stripEnd(const OUString &rIn, sal_Unicode c)
     return tmpl_stripEnd<OUString, sal_Unicode>(rIn, c);
 }
 
-OString strip(const OString &rIn, sal_Char c)
+OString strip(const OString &rIn, char c)
 {
     return stripEnd(stripStart(rIn, c), c);
 }
@@ -133,9 +133,9 @@ namespace
     }
 }
 
-sal_Int32 getTokenCount(const OString &rIn, sal_Char cTok)
+sal_Int32 getTokenCount(const OString &rIn, char cTok)
 {
-    return tmpl_getTokenCount<OString, sal_Char>(rIn, cTok);
+    return tmpl_getTokenCount<OString, char>(rIn, cTok);
 }
 
 sal_Int32 getTokenCount(const OUString &rIn, sal_Unicode cTok)
diff --git a/comphelper/source/xml/xmltools.cxx b/comphelper/source/xml/xmltools.cxx
index 948ed64e370e..14809221d0e5 100644
--- a/comphelper/source/xml/xmltools.cxx
+++ b/comphelper/source/xml/xmltools.cxx
@@ -89,7 +89,7 @@ namespace comphelper
 
             encodeChaff(aChaff);
 
-            return OString(reinterpret_cast<const sal_Char*>(aChaff.data()), nLength);
+            return OString(reinterpret_cast<const char*>(aChaff.data()), nLength);
         }
 
         OString generateGUIDString()