sal_Char->char in tools

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

8 files changed, 81 insertions, 81 deletions

diff --git a/tools/qa/cppunit/test_reversemap.cxx b/tools/qa/cppunit/test_reversemap.cxx
index 04ed1741d211..be70ade79585 100644
--- a/tools/qa/cppunit/test_reversemap.cxx
+++ b/tools/qa/cppunit/test_reversemap.cxx
@@ -55,9 +55,9 @@ namespace
     void Test::testEncoding(rtl_TextEncoding eEncoding)
     {
         //Taking the single byte legacy encodings, fill in all possible values
-        std::vector<sal_Char> aAllChars(255);
+        std::vector<char> aAllChars(255);
         for (int i = 1; i <= 255; ++i)
-            aAllChars[i-1] = static_cast<sal_Char>(i);
+            aAllChars[i-1] = static_cast<char>(i);
 
         //Some slots are unused, so don't map to private, just set them to 'X'
         sal_uInt32 const convertFlags = OSTRING_TO_OUSTRING_CVTFLAGS ^ RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_MAPTOPRIVATE;
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index e07cfd04035e..be9dadeb8043 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -289,8 +289,8 @@ int INetURLObject::SubString::compare(SubString const & rOther,
 
 struct INetURLObject::SchemeInfo
 {
-    sal_Char const * m_pScheme;
-    sal_Char const * m_pPrefix;
+    char const * m_pScheme;
+    char const * m_pPrefix;
     bool const m_bAuthority;
     bool const m_bUser;
     bool const m_bAuth;
@@ -305,8 +305,8 @@ struct INetURLObject::PrefixInfo
 {
     enum class Kind { Official, Internal, External }; // order is important!
 
-    sal_Char const * m_pPrefix;
-    sal_Char const * m_pTranslatedPrefix;
+    char const * m_pPrefix;
+    char const * m_pTranslatedPrefix;
     INetProtocol const m_eScheme;
     Kind const m_eKind;
 };
@@ -2181,7 +2181,7 @@ INetURLObject::PrefixInfo const * INetURLObject::getPrefix(sal_Unicode const *&
     }
     if (pFirst == pLast)
     {
-        sal_Char const * q = pFirst->m_pPrefix + i;
+        char const * q = pFirst->m_pPrefix + i;
         while (p < pEnd && *q != '\0'
                && rtl::toAsciiLowerCase(*p) == static_cast<unsigned char>(*q))
         {
diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index b96e463154e4..cc9d0c1e94fc 100644
--- a/tools/source/inet/inetmime.cxx
+++ b/tools/source/inet/inetmime.cxx
@@ -32,8 +32,8 @@
 
 namespace {
 
-rtl_TextEncoding getCharsetEncoding(const sal_Char * pBegin,
-                                           const sal_Char * pEnd);
+rtl_TextEncoding getCharsetEncoding(const char * pBegin,
+                                           const char * pEnd);
 
 /** Check for US-ASCII white space character.
 
@@ -92,8 +92,8 @@ bool isMIMECharsetEncoding(rtl_TextEncoding eEncoding)
     return rtl_isOctetTextEncoding(eEncoding);
 }
 
-std::unique_ptr<sal_Unicode[]> convertToUnicode(const sal_Char * pBegin,
-                                         const sal_Char * pEnd,
+std::unique_ptr<sal_Unicode[]> convertToUnicode(const char * pBegin,
+                                         const char * pEnd,
                                          rtl_TextEncoding eEncoding,
                                          sal_Size & rSize)
 {
@@ -161,36 +161,36 @@ void writeUTF8(OStringBuffer & rSink, sal_uInt32 nChar)
     DBG_ASSERT(nChar < 0x80000000, "writeUTF8(): Bad char");
 
     if (nChar < 0x80)
-        rSink.append(sal_Char(nChar));
+        rSink.append(char(nChar));
     else if (nChar < 0x800)
-        rSink.append(sal_Char(nChar >> 6 | 0xC0))
-             .append(sal_Char((nChar & 0x3F) | 0x80));
+        rSink.append(char(nChar >> 6 | 0xC0))
+             .append(char((nChar & 0x3F) | 0x80));
     else if (nChar < 0x10000)
-        rSink.append(sal_Char(nChar >> 12 | 0xE0))
-             .append(sal_Char((nChar >> 6 & 0x3F) | 0x80))
-             .append(sal_Char((nChar & 0x3F) | 0x80));
+        rSink.append(char(nChar >> 12 | 0xE0))
+             .append(char((nChar >> 6 & 0x3F) | 0x80))
+             .append(char((nChar & 0x3F) | 0x80));
     else if (nChar < 0x200000)
-        rSink.append(sal_Char(nChar >> 18 | 0xF0))
-             .append(sal_Char((nChar >> 12 & 0x3F) | 0x80))
-             .append(sal_Char((nChar >> 6 & 0x3F) | 0x80))
-             .append(sal_Char((nChar & 0x3F) | 0x80));
+        rSink.append(char(nChar >> 18 | 0xF0))
+             .append(char((nChar >> 12 & 0x3F) | 0x80))
+             .append(char((nChar >> 6 & 0x3F) | 0x80))
+             .append(char((nChar & 0x3F) | 0x80));
     else if (nChar < 0x4000000)
-        rSink.append(sal_Char(nChar >> 24 | 0xF8))
-             .append(sal_Char((nChar >> 18 & 0x3F) | 0x80))
-             .append(sal_Char((nChar >> 12 & 0x3F) | 0x80))
-             .append(sal_Char((nChar >> 6 & 0x3F) | 0x80))
-             .append(sal_Char((nChar & 0x3F) | 0x80));
+        rSink.append(char(nChar >> 24 | 0xF8))
+             .append(char((nChar >> 18 & 0x3F) | 0x80))
+             .append(char((nChar >> 12 & 0x3F) | 0x80))
+             .append(char((nChar >> 6 & 0x3F) | 0x80))
+             .append(char((nChar & 0x3F) | 0x80));
     else
-        rSink.append(sal_Char(nChar >> 30 | 0xFC))
-             .append(sal_Char((nChar >> 24 & 0x3F) | 0x80))
-             .append(sal_Char((nChar >> 18 & 0x3F) | 0x80))
-             .append(sal_Char((nChar >> 12 & 0x3F) | 0x80))
-             .append(sal_Char((nChar >> 6 & 0x3F) | 0x80))
-             .append(sal_Char((nChar & 0x3F) | 0x80));
+        rSink.append(char(nChar >> 30 | 0xFC))
+             .append(char((nChar >> 24 & 0x3F) | 0x80))
+             .append(char((nChar >> 18 & 0x3F) | 0x80))
+             .append(char((nChar >> 12 & 0x3F) | 0x80))
+             .append(char((nChar >> 6 & 0x3F) | 0x80))
+             .append(char((nChar & 0x3F) | 0x80));
 }
 
-bool translateUTF8Char(const sal_Char *& rBegin,
-                                 const sal_Char * pEnd,
+bool translateUTF8Char(const char *& rBegin,
+                                 const char * pEnd,
                                  sal_uInt32 & rCharacter)
 {
     if (rBegin == pEnd || static_cast< unsigned char >(*rBegin) < 0x80
@@ -200,7 +200,7 @@ bool translateUTF8Char(const sal_Char *& rBegin,
     int nCount;
     sal_uInt32 nMin;
     sal_uInt32 nUCS4;
-    const sal_Char * p = rBegin;
+    const char * p = rBegin;
     if (static_cast< unsigned char >(*p) < 0xE0)
     {
         nCount = 1;
@@ -247,8 +247,8 @@ bool translateUTF8Char(const sal_Char *& rBegin,
     return true;
 }
 
-void appendISO88591(OUStringBuffer & rText, sal_Char const * pBegin,
-                    sal_Char const * pEnd);
+void appendISO88591(OUStringBuffer & rText, char const * pBegin,
+                    char const * pEnd);
 
 struct Parameter
 {
@@ -281,8 +281,8 @@ bool parseParameters(ParameterList const & rInput,
 
 //  appendISO88591
 
-void appendISO88591(OUStringBuffer & rText, sal_Char const * pBegin,
-                    sal_Char const * pEnd)
+void appendISO88591(OUStringBuffer & rText, char const * pBegin,
+                    char const * pEnd)
 {
     sal_Int32 nLength = pEnd - pBegin;
     std::unique_ptr<sal_Unicode[]> pBuffer(new sal_Unicode[nLength]);
@@ -644,7 +644,7 @@ sal_Unicode const * scanParameters(sal_Unicode const * pBegin,
                         int nWeight2 = INetMIME::getHexWeight(p[1]);
                         if (nWeight1 >= 0 && nWeight2 >= 0)
                         {
-                            aSink.append(sal_Char(nWeight1 << 4 | nWeight2));
+                            aSink.append(char(nWeight1 << 4 | nWeight2));
                             p += 2;
                             continue;
                         }
@@ -722,9 +722,9 @@ sal_Unicode const * scanParameters(sal_Unicode const * pBegin,
     return parseParameters(aList, pParameters) ? pParameterBegin : pBegin;
 }
 
-bool equalIgnoreCase(const sal_Char * pBegin1,
-                               const sal_Char * pEnd1,
-                               const sal_Char * pString2)
+bool equalIgnoreCase(const char * pBegin1,
+                               const char * pEnd1,
+                               const char * pString2)
 {
     DBG_ASSERT(pBegin1 && pBegin1 <= pEnd1 && pString2,
                "equalIgnoreCase(): Bad sequences");
@@ -740,7 +740,7 @@ bool equalIgnoreCase(const sal_Char * pBegin1,
 
 struct EncodingEntry
 {
-    sal_Char const * m_aName;
+    char const * m_aName;
     rtl_TextEncoding const m_eEncoding;
 };
 
@@ -924,8 +924,8 @@ static EncodingEntry const aEncodingMap[]
         { "ISO-10646-UCS-2", RTL_TEXTENCODING_UCS2 },
         { "CSUNICODE", RTL_TEXTENCODING_UCS2 } };
 
-rtl_TextEncoding getCharsetEncoding(sal_Char const * pBegin,
-                                              sal_Char const * pEnd)
+rtl_TextEncoding getCharsetEncoding(char const * pBegin,
+                                              char const * pEnd)
 {
     for (const EncodingEntry& i : aEncodingMap)
         if (equalIgnoreCase(pBegin, pEnd, i.m_aName))
@@ -988,7 +988,7 @@ bool INetMIME::isIMAPAtomChar(sal_uInt32 nChar)
 // static
 bool INetMIME::equalIgnoreCase(const sal_Unicode * pBegin1,
                                const sal_Unicode * pEnd1,
-                               const sal_Char * pString2)
+                               const char * pString2)
 {
     DBG_ASSERT(pBegin1 && pBegin1 <= pEnd1 && pString2,
                "INetMIME::equalIgnoreCase(): Bad sequences");
@@ -1092,28 +1092,28 @@ OUString INetMIME::decodeHeaderFieldBody(const OString& rBody)
 
     // base64 = ALPHA / DIGIT / "+" / "/"
 
-    const sal_Char * pBegin = rBody.getStr();
-    const sal_Char * pEnd = pBegin + rBody.getLength();
+    const char * pBegin = rBody.getStr();
+    const char * pEnd = pBegin + rBody.getLength();
 
     OUStringBuffer sDecoded;
-    const sal_Char * pCopyBegin = pBegin;
+    const char * pCopyBegin = pBegin;
 
     /* bool bStartEncodedWord = true; */
-    const sal_Char * pWSPBegin = pBegin;
+    const char * pWSPBegin = pBegin;
 
-    for (const sal_Char * p = pBegin; p != pEnd;)
+    for (const char * p = pBegin; p != pEnd;)
     {
         OUString sEncodedText;
         if (*p == '=' /* && bStartEncodedWord */)
         {
-            const sal_Char * q = p + 1;
+            const char * q = p + 1;
             bool bEncodedWord = q != pEnd && *q++ == '?';
 
             rtl_TextEncoding eCharsetEncoding = RTL_TEXTENCODING_DONTKNOW;
             if (bEncodedWord)
             {
-                const sal_Char * pCharsetBegin = q;
-                const sal_Char * pLanguageBegin = nullptr;
+                const char * pCharsetBegin = q;
+                const char * pLanguageBegin = nullptr;
                 int nAlphaCount = 0;
                 for (bool bDone = false; !bDone;)
                     if (q == pEnd)
@@ -1123,7 +1123,7 @@ OUString INetMIME::decodeHeaderFieldBody(const OString& rBody)
                     }
                     else
                     {
-                        sal_Char cChar = *q++;
+                        char cChar = *q++;
                         switch (cChar)
                         {
                             case '*':
@@ -1245,7 +1245,7 @@ OUString INetMIME::decodeHeaderFieldBody(const OString& rBody)
                             if (bEncodedWord)
                             {
                                 for (int nShift = 16; nCount-- > 0; nShift -= 8)
-                                    sText.append(sal_Char(nValue >> nShift & 0xFF));
+                                    sText.append(char(nValue >> nShift & 0xFF));
                                 if (*q == '?')
                                 {
                                     ++q;
@@ -1262,8 +1262,8 @@ OUString INetMIME::decodeHeaderFieldBody(const OString& rBody)
                 }
                 else
                 {
-                    const sal_Char * pEncodedTextBegin = q;
-                    const sal_Char * pEncodedTextCopyBegin = q;
+                    const char * pEncodedTextBegin = q;
+                    const char * pEncodedTextCopyBegin = q;
                     for (bool bDone = false; !bDone;)
                         if (q == pEnd)
                         {
@@ -1294,7 +1294,7 @@ OUString INetMIME::decodeHeaderFieldBody(const OString& rBody)
                                     sText.append(rBody.copy(
                                         (pEncodedTextCopyBegin - pBegin),
                                         (q - 1 - pEncodedTextCopyBegin)));
-                                    sText.append(sal_Char(nDigit1 << 4 | nDigit2));
+                                    sText.append(char(nDigit1 << 4 | nDigit2));
                                     q += 2;
                                     pEncodedTextCopyBegin = q;
                                     break;
@@ -1384,8 +1384,8 @@ OUString INetMIME::decodeHeaderFieldBody(const OString& rBody)
 
             default:
             {
-                const sal_Char * pUTF8Begin = p - 1;
-                const sal_Char * pUTF8End = pUTF8Begin;
+                const char * pUTF8Begin = p - 1;
+                const char * pUTF8End = pUTF8Begin;
                 sal_uInt32 nCharacter = 0;
                 if (translateUTF8Char(pUTF8End, pEnd, nCharacter))
                 {
diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx
index 918746eeaea5..f8912bb9d231 100644
--- a/tools/source/inet/inetmsg.cxx
+++ b/tools/source/inet/inetmsg.cxx
@@ -46,7 +46,7 @@ void INetMIMEMessage::SetHeaderField_Impl (
  *   1*DIGIT                                     (delta seconds)
  */
 
-static const sal_Char *months[12] =
+static const char *months[12] =
 {
     "Jan", "Feb", "Mar", "Apr", "May", "Jun",
     "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
@@ -259,7 +259,7 @@ void INetMIMEMessage::EnableAttachMultipartFormDataChild()
         return;
 
     // Generate a unique boundary from current time.
-    sal_Char sTail[16 + 1];
+    char sTail[16 + 1];
     tools::Time aCurTime( tools::Time::SYSTEM );
     sal_uInt64 nThis = reinterpret_cast< sal_uIntPtr >( this ); // we can be on a 64bit architecture
     nThis = ( ( nThis >> 32 ) ^ nThis ) & SAL_MAX_UINT32;
diff --git a/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx
index a26212fa1761..e2a0e9770d13 100644
--- a/tools/source/inet/inetstrm.cxx
+++ b/tools/source/inet/inetstrm.cxx
@@ -26,9 +26,9 @@
 #include <tools/inetmsg.hxx>
 #include <tools/inetstrm.hxx>
 
-int INetMIMEMessageStream::GetHeaderLine(sal_Char* pData, sal_uInt32 nSize)
+int INetMIMEMessageStream::GetHeaderLine(char* pData, sal_uInt32 nSize)
 {
-    sal_Char* pWBuf = pData;
+    char* pWBuf = pData;
 
     sal_uInt32 i, n;
 
@@ -49,7 +49,7 @@ int INetMIMEMessageStream::GetHeaderLine(sal_Char* pData, sal_uInt32 nSize)
             }
         }
 
-        pMsgWrite = const_cast<char *>(static_cast<sal_Char const *>(maMsgBuffer.GetData()));
+        pMsgWrite = const_cast<char *>(static_cast<char const *>(maMsgBuffer.GetData()));
         pMsgRead  = pMsgWrite + maMsgBuffer.Tell();
     }
 
@@ -69,10 +69,10 @@ int INetMIMEMessageStream::GetHeaderLine(sal_Char* pData, sal_uInt32 nSize)
     return (pWBuf - pData);
 }
 
-int INetMIMEMessageStream::GetBodyLine(sal_Char* pData, sal_uInt32 nSize)
+int INetMIMEMessageStream::GetBodyLine(char* pData, sal_uInt32 nSize)
 {
-    sal_Char* pWBuf = pData;
-    sal_Char* pWEnd = pData + nSize;
+    char* pWBuf = pData;
+    char* pWEnd = pData + nSize;
 
     if (pSourceMsg->GetDocumentLB())
     {
@@ -86,7 +86,7 @@ int INetMIMEMessageStream::GetBodyLine(sal_Char* pData, sal_uInt32 nSize)
     return (pWBuf - pData);
 }
 
-int INetMIMEMessageStream::GetMsgLine(sal_Char* pData, sal_uInt32 nSize)
+int INetMIMEMessageStream::GetMsgLine(char* pData, sal_uInt32 nSize)
 {
     // Check for header or body.
     if (!bHeaderGenerated)
@@ -246,10 +246,10 @@ INetMIMEMessageStream::~INetMIMEMessageStream()
     pChildStrm.reset();
 }
 
-int INetMIMEMessageStream::Read(sal_Char* pData, sal_uInt32 nSize)
+int INetMIMEMessageStream::Read(char* pData, sal_uInt32 nSize)
 {
-    sal_Char* pWBuf = pData;
-    sal_Char* pWEnd = pData + nSize;
+    char* pWBuf = pData;
+    char* pWEnd = pData + nSize;
 
     while (pWBuf < pWEnd)
     {
diff --git a/tools/source/ref/globname.cxx b/tools/source/ref/globname.cxx
index eed9b8fd5a04..b4ce33f9a339 100644
--- a/tools/source/ref/globname.cxx
+++ b/tools/source/ref/globname.cxx
@@ -229,7 +229,7 @@ OUString SvGlobalName::GetHexName() const
 {
     OStringBuffer aHexBuffer(36);
 
-    sal_Char buf[ 10 ];
+    char buf[ 10 ];
     sprintf( buf, "%8.8" SAL_PRIXUINT32, pImp->szData.Data1 );
     aHexBuffer.append(buf);
     aHexBuffer.append('-');
diff --git a/tools/source/reversemap/bestreversemap.cxx b/tools/source/reversemap/bestreversemap.cxx
index 83b642368caa..e2b51bf5c000 100644
--- a/tools/source/reversemap/bestreversemap.cxx
+++ b/tools/source/reversemap/bestreversemap.cxx
@@ -32,7 +32,7 @@ struct Encoder
     }
     void checkSupports(sal_Unicode c)
     {
-        sal_Char aTempArray[8];
+        char aTempArray[8];
         sal_Size nTempSize;
         sal_uInt32 nCvtInfo;
 
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 06b09c2a4a6d..a85f4d1be5a2 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -450,10 +450,10 @@ bool SvStream::ReadByteStringLine( OUString& rStr, rtl_TextEncoding eSrcCharSet,
 
 bool SvStream::ReadLine( OString& rStr, sal_Int32 nMaxBytesToRead )
 {
-    sal_Char    buf[256+1];
+    char    buf[256+1];
     bool        bEnd        = false;
     sal_uInt64  nOldFilePos = Tell();
-    sal_Char    c           = 0;
+    char    c           = 0;
     std::size_t nTotalLen   = 0;
 
     OStringBuffer aBuf(4096);
@@ -621,7 +621,7 @@ OString read_zeroTerminated_uInt8s_ToOString(SvStream& rStream)
 {
     OStringBuffer aOutput(256);
 
-    sal_Char buf[ 256 + 1 ];
+    char buf[ 256 + 1 ];
     bool bEnd = false;
     sal_uInt64 nFilePos = rStream.Tell();
 
@@ -632,7 +632,7 @@ OString read_zeroTerminated_uInt8s_ToOString(SvStream& rStream)
             break;
 
         std::size_t nReallyRead = nLen;
-        const sal_Char* pPtr = buf;
+        const char* pPtr = buf;
         while (nLen && *pPtr)
         {
             ++pPtr;
@@ -1516,7 +1516,7 @@ void SvStream::EncryptBuffer(void* pStart, std::size_t nLen) const
     }
 }
 
-static unsigned char implGetCryptMask(const sal_Char* pStr, sal_Int32 nLen, long nVersion)
+static unsigned char implGetCryptMask(const char* pStr, sal_Int32 nLen, long nVersion)
 {
     unsigned char nCryptMask = 0;