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>

14 files changed, 57 insertions, 57 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()
diff --git a/include/comphelper/componentmodule.hxx b/include/comphelper/componentmodule.hxx
index 277d0d483edf..cfffcb39b844 100644
--- a/include/comphelper/componentmodule.hxx
+++ b/include/comphelper/componentmodule.hxx
@@ -120,7 +120,7 @@ namespace comphelper
 
         /** version of getComponentFactory which directly takes the char argument you got in your component_getFactory call
         */
-        void* getComponentFactory( const sal_Char* _pImplementationName );
+        void* getComponentFactory( const char* _pImplementationName );
 
     private:
         OModule( const OModule& ) = delete;
diff --git a/include/comphelper/logging.hxx b/include/comphelper/logging.hxx
index 1fa7601519db..7719e86da201 100644
--- a/include/comphelper/logging.hxx
+++ b/include/comphelper/logging.hxx
@@ -45,7 +45,7 @@ namespace comphelper
             return _rValue;
         }
 
-        inline OUString convertLogArgToString( const sal_Char* _pAsciiValue )
+        inline OUString convertLogArgToString( const char* _pAsciiValue )
         {
             return OUString::createFromAscii( _pAsciiValue );
         }
@@ -106,7 +106,7 @@ namespace comphelper
         */
         EventLogger(
             const css::uno::Reference< css::uno::XComponentContext >& _rxContext,
-            const sal_Char* _pAsciiLoggerName
+            const char* _pAsciiLoggerName
         );
 
     public:
@@ -213,7 +213,7 @@ namespace comphelper
             is searched in the message string, and replaced with the argument string.
         */
         template< typename ARGTYPE1 >
-        void        log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1 ) const
+        void        log( const sal_Int32 _nLogLevel, const char* _pMessage, ARGTYPE1 _argument1 ) const
         {
             if ( isLoggable( _nLogLevel ) )
                 impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ),
@@ -222,7 +222,7 @@ namespace comphelper
 
         /// logs a given message, replacing 2 placeholders in the message with respective values
         template< typename ARGTYPE1, typename ARGTYPE2 >
-        void        log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
+        void        log( const sal_Int32 _nLogLevel, const char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
         {
             if ( isLoggable( _nLogLevel ) )
                 impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ),
@@ -232,7 +232,7 @@ namespace comphelper
 
         /// logs a given message, replacing 3 placeholders in the message with respective values
         template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3 >
-        void        log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
+        void        log( const sal_Int32 _nLogLevel, const char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
         {
             if ( isLoggable( _nLogLevel ) )
                 impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ),
@@ -243,7 +243,7 @@ namespace comphelper
 
         /// logs a given message, replacing 4 placeholders in the message with respective values
         template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4 >
-        void        log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
+        void        log( const sal_Int32 _nLogLevel, const char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
         {
             if ( isLoggable( _nLogLevel ) )
                 impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ),
@@ -255,7 +255,7 @@ namespace comphelper
 
         /// logs a given message, replacing 5 placeholders in the message with respective values
         template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5 >
-        void        log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
+        void        log( const sal_Int32 _nLogLevel, const char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
         {
             if ( isLoggable( _nLogLevel ) )
                 impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ),
@@ -268,7 +268,7 @@ namespace comphelper
 
         /// logs a given message, replacing 6 placeholders in the message with respective values
         template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5, typename ARGTYPE6 >
-        void        log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const
+        void        log( const sal_Int32 _nLogLevel, const char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const
         {
             if ( isLoggable( _nLogLevel ) )
                 impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ),
@@ -292,7 +292,7 @@ namespace comphelper
             is searched in the message string, and replaced with the argument string.
         */
         template< typename ARGTYPE1 >
-        void        logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1 ) const
+        void        logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1 ) const
         {
             if ( isLoggable( _nLogLevel ) )
                 impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
@@ -301,7 +301,7 @@ namespace comphelper
 
         /// logs a given message, replacing 2 placeholders in the message with respective values
         template< typename ARGTYPE1, typename ARGTYPE2 >
-        void        logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
+        void        logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
         {
             if ( isLoggable( _nLogLevel ) )
                 impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
@@ -311,7 +311,7 @@ namespace comphelper
 
         /// logs a given message, replacing 3 placeholders in the message with respective values
         template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3 >
-        void        logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
+        void        logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
         {
             if ( isLoggable( _nLogLevel ) )
                 impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
@@ -322,7 +322,7 @@ namespace comphelper
 
         /// logs a given message, replacing 4 placeholders in the message with respective values
         template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4 >
-        void        logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
+        void        logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
         {
             if ( isLoggable( _nLogLevel ) )
                 impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
@@ -334,7 +334,7 @@ namespace comphelper
 
         /// logs a given message, replacing 5 placeholders in the message with respective values
         template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5 >
-        void        logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
+        void        logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
         {
             if ( isLoggable( _nLogLevel ) )
                 impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
@@ -347,7 +347,7 @@ namespace comphelper
 
         /// logs a given message, replacing 6 placeholders in the message with respective values
         template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5, typename ARGTYPE6 >
-        void        logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const
+        void        logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const
         {
             if ( isLoggable( _nLogLevel ) )
                 impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
@@ -371,7 +371,7 @@ namespace comphelper
             is searched in the message string, and replaced with the argument string.
         */
         template< typename ARGTYPE1 >
-        void        logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1 ) const
+        void        logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const char* _pAsciiMessage, ARGTYPE1 _argument1 ) const
         {
             if ( isLoggable( _nLogLevel ) )
                 impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
@@ -380,7 +380,7 @@ namespace comphelper
 
         /// logs a given ASCII message, replacing 2 placeholders in the message with respective values
         template< typename ARGTYPE1, typename ARGTYPE2 >
-        void        logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
+        void        logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
         {
             if ( isLoggable( _nLogLevel ) )
                 impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
@@ -390,7 +390,7 @@ namespace comphelper
 
         /// logs a given ASCII message, replacing 3 placeholders in the message with respective values
         template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3 >
-        void        logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
+        void        logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
         {
             if ( isLoggable( _nLogLevel ) )
                 impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
@@ -401,7 +401,7 @@ namespace comphelper
 
         /// logs a given ASCII message, replacing 4 placeholders in the message with respective values
         template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4 >
-        void        logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
+        void        logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
         {
             if ( isLoggable( _nLogLevel ) )
                 impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
@@ -413,7 +413,7 @@ namespace comphelper
 
         /// logs a given ASCII message, replacing 5 placeholders in the message with respective values
         template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5 >
-        void        logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
+        void        logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
         {
             if ( isLoggable( _nLogLevel ) )
                 impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
@@ -426,7 +426,7 @@ namespace comphelper
 
         /// logs a given ASCII message, replacing 6 placeholders in the message with respective values
         template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5, typename ARGTYPE6 >
-        void        logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const
+        void        logp( const sal_Int32 _nLogLevel, const char* _pSourceClass, const char* _pSourceMethod, const char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const
         {
             if ( isLoggable( _nLogLevel ) )
                 impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
@@ -441,8 +441,8 @@ namespace comphelper
     protected:
         void        impl_log(
                         const sal_Int32 _nLogLevel,
-                        const sal_Char* _pSourceClass,
-                        const sal_Char* _pSourceMethod,
+                        const char* _pSourceClass,
+                        const char* _pSourceMethod,
                         const OUString& _rMessage,
                         const OptionalString& _rArgument1 = OptionalString(),
                         const OptionalString& _rArgument2 = OptionalString(),
diff --git a/include/comphelper/namedvaluecollection.hxx b/include/comphelper/namedvaluecollection.hxx
index b6986b13033b..3fc2ed301b6c 100644
--- a/include/comphelper/namedvaluecollection.hxx
+++ b/include/comphelper/namedvaluecollection.hxx
@@ -146,7 +146,7 @@ namespace comphelper
                 _out_rValue.
         */
         template < typename VALUE_TYPE >
-        bool get_ensureType( const sal_Char* _pAsciiValueName, VALUE_TYPE& _out_rValue ) const
+        bool get_ensureType( const char* _pAsciiValueName, VALUE_TYPE& _out_rValue ) const
         {
             return get_ensureType( OUString::createFromAscii( _pAsciiValueName ), &_out_rValue, ::cppu::UnoType< VALUE_TYPE >::get() );
         }
@@ -161,7 +161,7 @@ namespace comphelper
             in the collection
         */
         template < typename VALUE_TYPE >
-        VALUE_TYPE  getOrDefault( const sal_Char* _pAsciiValueName, const VALUE_TYPE& _rDefault ) const
+        VALUE_TYPE  getOrDefault( const char* _pAsciiValueName, const VALUE_TYPE& _rDefault ) const
         {
             return getOrDefault( OUString::createFromAscii( _pAsciiValueName ), _rDefault );
         }
@@ -179,7 +179,7 @@ namespace comphelper
             If the collection does not contain a value with the given name, an empty
             Any is returned.
         */
-        const css::uno::Any& get( const sal_Char* _pAsciiValueName ) const
+        const css::uno::Any& get( const char* _pAsciiValueName ) const
         {
             return get( OUString::createFromAscii( _pAsciiValueName ) );
         }
@@ -195,7 +195,7 @@ namespace comphelper
         }
 
         /// determines whether a value with a given name is present in the collection
-        bool has( const sal_Char* _pAsciiValueName ) const
+        bool has( const char* _pAsciiValueName ) const
         {
             return impl_has( OUString::createFromAscii( _pAsciiValueName ) );
         }
@@ -212,7 +212,7 @@ namespace comphelper
                 which case it has been overwritten.
         */
         template < typename VALUE_TYPE >
-        bool put( const sal_Char* _pAsciiValueName, const VALUE_TYPE& _rValue )
+        bool put( const char* _pAsciiValueName, const VALUE_TYPE& _rValue )
         {
             return impl_put( OUString::createFromAscii( _pAsciiValueName ), css::uno::makeAny( _rValue ) );
         }
@@ -228,7 +228,7 @@ namespace comphelper
             return impl_put( _rValueName, css::uno::makeAny( _rValue ) );
         }
 
-        bool put( const sal_Char* _pAsciiValueName, const css::uno::Any& _rValue )
+        bool put( const char* _pAsciiValueName, const css::uno::Any& _rValue )
         {
             return impl_put( OUString::createFromAscii( _pAsciiValueName ), _rValue );
         }
@@ -242,7 +242,7 @@ namespace comphelper
 
             @return true if and only if a value with the given name existed in the collection.
         */
-        bool remove( const sal_Char* _pAsciiValueName )
+        bool remove( const char* _pAsciiValueName )
         {
             return impl_remove( OUString::createFromAscii( _pAsciiValueName ) );
         }
diff --git a/include/comphelper/servicedecl.hxx b/include/comphelper/servicedecl.hxx
index 01c4d29c8992..8175b2f96ea0 100644
--- a/include/comphelper/servicedecl.hxx
+++ b/include/comphelper/servicedecl.hxx
@@ -114,7 +114,7 @@ public:
           m_pServiceNames(pSupportedServiceNames) {}
 
     /// @internal gets called by component_getFactoryHelper()
-    void * getFactory( sal_Char const* pImplName ) const;
+    void * getFactory( char const* pImplName ) const;
 
     /// @return supported service names
     css::uno::Sequence< OUString> getSupportedServiceNames() const;
@@ -325,7 +325,7 @@ struct inheritingClass_ : public serviceimpl_base< detail::InheritingServiceImpl
 };
 
 COMPHELPER_DLLPUBLIC
-void* component_getFactoryHelper( const sal_Char* pImplName,
+void* component_getFactoryHelper( const char* pImplName,
                                   std::initializer_list<ServiceDecl const *> args );
 
 } // namespace service_decl
diff --git a/include/comphelper/string.hxx b/include/comphelper/string.hxx
index 9f5738e5ba48..3f7ebf958512 100644
--- a/include/comphelper/string.hxx
+++ b/include/comphelper/string.hxx
@@ -81,7 +81,7 @@ inline OUStringBuffer& remove(OUStringBuffer &rIn,
     @return         The resulting OString
  */
 COMPHELPER_DLLPUBLIC OString stripStart(const OString &rIn,
-    sal_Char c);
+    char c);
 
 /** Strips occurrences of a character from the start of the source string
 
@@ -101,7 +101,7 @@ COMPHELPER_DLLPUBLIC OUString stripStart(const OUString &rIn,
     @return         The resulting OString
  */
 COMPHELPER_DLLPUBLIC OString stripEnd(const OString &rIn,
-    sal_Char c);
+    char c);
 
 /** Strips occurrences of a character from the end of the source string
 
@@ -121,7 +121,7 @@ COMPHELPER_DLLPUBLIC OUString stripEnd(const OUString &rIn,
     @return         The resulting OString
  */
 COMPHELPER_DLLPUBLIC OString strip(const OString &rIn,
-    sal_Char c);
+    char c);
 
 /** Strips occurrences of a character from the start and end of the source string
 
@@ -139,7 +139,7 @@ COMPHELPER_DLLPUBLIC OUString strip(const OUString &rIn,
   @param    cTok    the character which separate the tokens.
   @return   the number of tokens
 */
-COMPHELPER_DLLPUBLIC sal_Int32 getTokenCount(const OString &rIn, sal_Char cTok);
+COMPHELPER_DLLPUBLIC sal_Int32 getTokenCount(const OString &rIn, char cTok);
 
 /** Returns number of tokens in an OUString
 
@@ -223,7 +223,7 @@ namespace detail
  */
 inline OStringBuffer& padToLength(
     OStringBuffer& rBuffer, sal_Int32 nLength,
-    sal_Char cFill = '\0')
+    char cFill = '\0')
 {
     return detail::padToLength(rBuffer, nLength, cFill);
 }