sal_Char->char in svtools..svl

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

9 files changed, 43 insertions, 43 deletions

diff --git a/svtools/source/config/fontsubstconfig.cxx b/svtools/source/config/fontsubstconfig.cxx
index 34a11f6147b7..e0fb350d8cba 100644
--- a/svtools/source/config/fontsubstconfig.cxx
+++ b/svtools/source/config/fontsubstconfig.cxx
@@ -32,13 +32,13 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::beans;
 
 
-const sal_Char cReplacement[] = "Replacement";
-const sal_Char cFontPairs[] = "FontPairs";
+const char cReplacement[] = "Replacement";
+const char cFontPairs[] = "FontPairs";
 
-const sal_Char cReplaceFont[]   = "ReplaceFont";
-const sal_Char cSubstituteFont[]= "SubstituteFont";
-const sal_Char cOnScreenOnly[]  = "OnScreenOnly";
-const sal_Char cAlways[]        = "Always";
+const char cReplaceFont[]   = "ReplaceFont";
+const char cSubstituteFont[]= "SubstituteFont";
+const char cOnScreenOnly[]  = "OnScreenOnly";
+const char cAlways[]        = "Always";
 
 typedef std::vector<SubstitutionStruct> SubstitutionStructArr;
 
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index d6f84191fa05..9550e7bc232b 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -246,10 +246,10 @@ namespace svt
     protected:
         css::uno::Any   getProperty(const OUString& _rLocalName) const;
 
-        OUString        getStringProperty(const sal_Char* _pLocalName) const;
+        OUString        getStringProperty(const char* _pLocalName) const;
         OUString        getStringProperty(const OUString& _rLocalName) const;
 
-        void            setStringProperty(const sal_Char* _pLocalName, const OUString& _rValue);
+        void            setStringProperty(const char* _pLocalName, const OUString& _rValue);
 
     public:
         AssignmentPersistentData();
@@ -326,7 +326,7 @@ void AssignmentPersistentData::ImplCommit()
     }
 
 
-    OUString AssignmentPersistentData::getStringProperty(const sal_Char* _pLocalName) const
+    OUString AssignmentPersistentData::getStringProperty(const char* _pLocalName) const
     {
         OUString sReturn;
         getProperty(OUString::createFromAscii(_pLocalName)) >>= sReturn;
@@ -334,7 +334,7 @@ void AssignmentPersistentData::ImplCommit()
     }
 
 
-    void AssignmentPersistentData::setStringProperty(const sal_Char* _pLocalName, const OUString& _rValue)
+    void AssignmentPersistentData::setStringProperty(const char* _pLocalName, const OUString& _rValue)
     {
         Sequence< OUString > aNames { OUString::createFromAscii(_pLocalName) };
         Sequence< Any > aValues(1);
diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx
index 75c5fb6e632a..5b387d275626 100644
--- a/svtools/source/dialogs/insdlg.cxx
+++ b/svtools/source/dialogs/insdlg.cxx
@@ -304,7 +304,7 @@ bool SvPasteObjectHelper::GetEmbeddedName(const TransferableDataHelper& rData, O
                 // the user friendly description string is '\0' terminated.
                 const sal_Unicode* pUserTypeName =
                     reinterpret_cast< sal_Unicode* >(
-                        reinterpret_cast< sal_Char* >( pOleObjDescr ) +
+                        reinterpret_cast< char* >( pOleObjDescr ) +
                             pOleObjDescr->dwFullUserTypeName );
 
                 _rName += pUserTypeName;
@@ -321,7 +321,7 @@ bool SvPasteObjectHelper::GetEmbeddedName(const TransferableDataHelper& rData, O
                 // the source string is '\0' terminated.
                 const sal_Unicode* pSrcOfCopy =
                     reinterpret_cast< sal_Unicode* >(
-                        reinterpret_cast< sal_Char* >( pOleObjDescr ) +
+                        reinterpret_cast< char* >( pOleObjDescr ) +
                             pOleObjDescr->dwSrcOfCopy );
 
                 _rSource += pSrcOfCopy;
diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx
index 841ff9f1f65c..ce43e2dd9cce 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -58,10 +58,10 @@ HTMLOutContext::~HTMLOutContext()
     rtl_destroyUnicodeToTextConverter( m_hConv );
 }
 
-static const sal_Char *lcl_svhtml_GetEntityForChar( sal_uInt32 c,
+static const char *lcl_svhtml_GetEntityForChar( sal_uInt32 c,
                                              rtl_TextEncoding eDestEnc )
 {
-    const sal_Char* pStr = nullptr;
+    const char* pStr = nullptr;
 
     // Note: We currently handle special cases for ISO-8859-2 here simply because
     // the code was already submitted.  But we should also handle other code pages
@@ -391,7 +391,7 @@ static const sal_Char *lcl_svhtml_GetEntityForChar( sal_uInt32 c,
     return pStr;
 }
 
-static sal_Size lcl_FlushContext(HTMLOutContext& rContext, sal_Char* pBuffer, sal_uInt32 nFlags)
+static sal_Size lcl_FlushContext(HTMLOutContext& rContext, char* pBuffer, sal_uInt32 nFlags)
 {
     sal_uInt32 nInfo = 0;
     sal_Size nSrcChars;
@@ -411,7 +411,7 @@ static OString lcl_ConvertCharToHTML( sal_uInt32 c,
     OStringBuffer aDest;
     DBG_ASSERT( RTL_TEXTENCODING_DONTKNOW != rContext.m_eDestEnc,
                     "wrong destination encoding" );
-    const sal_Char *pStr = nullptr;
+    const char *pStr = nullptr;
     switch( c )
     {
     case 0xA0:      // is a hard blank
@@ -433,7 +433,7 @@ static OString lcl_ConvertCharToHTML( sal_uInt32 c,
         break;
     }
 
-    sal_Char cBuffer[TXTCONV_BUFFER_SIZE];
+    char cBuffer[TXTCONV_BUFFER_SIZE];
     const sal_uInt32 nFlags = RTL_UNICODETOTEXT_FLAGS_NONSPACING_IGNORE|
                               RTL_UNICODETOTEXT_FLAGS_CONTROL_IGNORE|
                               RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR|
@@ -441,7 +441,7 @@ static OString lcl_ConvertCharToHTML( sal_uInt32 c,
     if( pStr )
     {
         sal_Size nLen = lcl_FlushContext(rContext, cBuffer, nFlags);
-        sal_Char *pBuffer = cBuffer;
+        char *pBuffer = cBuffer;
         while( nLen-- )
             aDest.append(*pBuffer++);
         aDest.append('&').append(pStr).append(';');
@@ -459,7 +459,7 @@ static OString lcl_ConvertCharToHTML( sal_uInt32 c,
                                                  nFlags, &nInfo, &nSrcChars);
         if( nLen > 0 && (nInfo & (RTL_UNICODETOTEXT_INFO_ERROR|RTL_UNICODETOTEXT_INFO_DESTBUFFERTOSMALL)) == 0 )
         {
-            sal_Char *pBuffer = cBuffer;
+            char *pBuffer = cBuffer;
             while( nLen-- )
                 aDest.append(*pBuffer++);
         }
@@ -470,7 +470,7 @@ static OString lcl_ConvertCharToHTML( sal_uInt32 c,
             // entity.
             // coverity[callee_ptr_arith] - its ok
             nLen = lcl_FlushContext(rContext, cBuffer, nFlags);
-            sal_Char *pBuffer = cBuffer;
+            char *pBuffer = cBuffer;
             while( nLen-- )
                 aDest.append(*pBuffer++);
 
@@ -492,13 +492,13 @@ static OString lcl_FlushToAscii( HTMLOutContext& rContext )
 {
     OStringBuffer aDest;
 
-    sal_Char cBuffer[TXTCONV_BUFFER_SIZE];
+    char cBuffer[TXTCONV_BUFFER_SIZE];
     const sal_uInt32 nFlags = RTL_UNICODETOTEXT_FLAGS_NONSPACING_IGNORE|
                               RTL_UNICODETOTEXT_FLAGS_CONTROL_IGNORE|
                               RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR|
                               RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR;
     sal_Size nLen = lcl_FlushContext(rContext, cBuffer, nFlags);
-    sal_Char *pBuffer = cBuffer;
+    char *pBuffer = cBuffer;
     while( nLen-- )
         aDest.append(*pBuffer++);
     return aDest.makeStringAndClear();
@@ -564,17 +564,17 @@ SvStream& HTMLOutFuncs::FlushToAscii( SvStream& rStream,
 
 SvStream& HTMLOutFuncs::Out_Hex( SvStream& rStream, sal_uLong nHex, sal_uInt8 nLen )
 {                                                  // out into a stream
-    sal_Char aNToABuf[] = "0000000000000000";
+    char aNToABuf[] = "0000000000000000";
 
     DBG_ASSERT( nLen < sizeof(aNToABuf), "too many places" );
     if( nLen>=sizeof(aNToABuf) )
         nLen = (sizeof(aNToABuf)-1);
 
     // set pointer to end of buffer
-    sal_Char *pStr = aNToABuf + (sizeof(aNToABuf)-1);
+    char *pStr = aNToABuf + (sizeof(aNToABuf)-1);
     for( sal_uInt8 n = 0; n < nLen; ++n )
     {
-        *(--pStr) = static_cast<sal_Char>(nHex & 0xf ) + 48;
+        *(--pStr) = static_cast<char>(nHex & 0xf ) + 48;
         if( *pStr > '9' )
             *pStr += 39;
         nHex >>= 4;
@@ -610,9 +610,9 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
                                       const OUString& rName,
                                       const HTMLOutEvent *pEventTable,
                                       bool bOutStarBasic,
-                                      const sal_Char *pDelim,
-                                      const sal_Char *pIndentArea,
-                                      const sal_Char *pIndentMap,
+                                      const char *pDelim,
+                                      const char *pIndentArea,
+                                      const char *pIndentMap,
                                       rtl_TextEncoding eDestEnc,
                                       OUString *pNonConvertableChars    )
 {
@@ -641,7 +641,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
 
         if( pObj )
         {
-            const sal_Char *pShape = nullptr;
+            const char *pShape = nullptr;
             OString aCoords;
             switch( pObj->GetType() )
             {
@@ -917,7 +917,7 @@ SvStream& HTMLOutFuncs::Out_Events( SvStream& rStrm,
         if( pMacro && pMacro->HasMacro() &&
             ( JAVASCRIPT == pMacro->GetScriptType() || bOutStarBasic ))
         {
-            const sal_Char *pStr = STARBASIC == pMacro->GetScriptType()
+            const char *pStr = STARBASIC == pMacro->GetScriptType()
                 ? pEventTable[i].pBasicName
                 : pEventTable[i].pJavaName;
 
@@ -1027,7 +1027,7 @@ void HtmlWriterHelper::applyEvents(HtmlWriter& rHtmlWriter, const SvxMacroTableD
 
         if (pMacro && pMacro->HasMacro() && (JAVASCRIPT == pMacro->GetScriptType() || bOutStarBasic))
         {
-            const sal_Char* pAttributeName = nullptr;
+            const char* pAttributeName = nullptr;
             if (STARBASIC == pMacro->GetScriptType())
                 pAttributeName = pEventTable[i].pBasicName;
             else
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index 523ed4fb28e4..6af8a3e73532 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -441,7 +441,7 @@ HtmlTokenId HTMLParser::ScanText( const sal_Unicode cBreak )
                                 RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_DEFAULT |
                                 RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT;
 
-                            sal_Char cEncodedChar = static_cast<sal_Char>(cChar);
+                            char cEncodedChar = static_cast<char>(cChar);
                             cChar = OUString(&cEncodedChar, 1, eSrcEnc, convertFlags).toChar();
                             if( 0U == cChar )
                             {
diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx
index 8a83512c06ae..16d3eb7146f4 100644
--- a/svtools/source/svrtf/parrtf.cxx
+++ b/svtools/source/svrtf/parrtf.cxx
@@ -341,7 +341,7 @@ void SvRTFParser::ScanText()
 
                             bool bBreak = false;
                             bool bEOF = false;
-                            sal_Char nSlash = '\\';
+                            char nSlash = '\\';
                             while (!bBreak)
                             {
                                 auto next = GetNextChar();
@@ -358,9 +358,9 @@ void SvRTFParser::ScanText()
 
                                     continue;
                                 }
-                                nSlash = static_cast<sal_Char>(next);
+                                nSlash = static_cast<char>(next);
                                 while (nSlash == 0xD || nSlash == 0xA)
-                                    nSlash = static_cast<sal_Char>(GetNextChar());
+                                    nSlash = static_cast<char>(GetNextChar());
 
                                 switch (nSlash)
                                 {
@@ -580,7 +580,7 @@ void SvRTFParser::ReadBitmapData()  { SkipGroup(); }
 
 SvParserState SvRTFParser::CallParser()
 {
-    sal_Char cFirstCh;
+    char cFirstCh;
     nNextChPos = rInput.Tell();
     rInput.ReadChar( cFirstCh );
     nNextCh = static_cast<unsigned char>(cFirstCh);
diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx
index bfb3b3c932d5..b06a04eedfa0 100644
--- a/svtools/source/svrtf/rtfout.cxx
+++ b/svtools/source/svrtf/rtfout.cxx
@@ -28,17 +28,17 @@ namespace {
 
 SvStream& Out_Hex( SvStream& rStream, sal_uLong nHex, sal_uInt8 nLen )
 {
-    sal_Char aNToABuf[] = "0000000000000000";
+    char aNToABuf[] = "0000000000000000";
 
     DBG_ASSERT( nLen < sizeof(aNToABuf), "too many places" );
     if( nLen >= sizeof(aNToABuf) )
         nLen = (sizeof(aNToABuf)-1);
 
     // set pointer to end of buffer
-    sal_Char* pStr = aNToABuf + (sizeof(aNToABuf)-1);
+    char* pStr = aNToABuf + (sizeof(aNToABuf)-1);
     for( sal_uInt8 n = 0; n < nLen; ++n )
     {
-        *(--pStr) = static_cast<sal_Char>(nHex & 0xf ) + 48;
+        *(--pStr) = static_cast<char>(nHex & 0xf ) + 48;
         if( *pStr > '9' )
             *pStr += 39;
         nHex >>= 4;
@@ -60,7 +60,7 @@ SvStream& Out_Hex( SvStream& rStream, sal_uLong nHex, sal_uInt8 nLen )
 SvStream& Out_Char(SvStream& rStream, sal_Unicode c,
     int *pUCMode, rtl_TextEncoding eDestEnc)
 {
-    const sal_Char* pStr = nullptr;
+    const char* pStr = nullptr;
     switch (c)
     {
     case 0x1:
diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx
index a2f41e8e62eb..cafb5b8d38e5 100644
--- a/svtools/source/svrtf/svparser.cxx
+++ b/svtools/source/svrtf/svparser.cxx
@@ -275,7 +275,7 @@ sal_uInt32 SvParser<T>::GetNextChar()
         sal_Size nChars = 0;
         do
         {
-            sal_Char c1;    // signed, that's the text converter expects
+            char c1;    // signed, that's the text converter expects
             rInput.ReadChar( c1 );
             bErr = !rInput.good();
             if( !bErr )
@@ -352,7 +352,7 @@ sal_uInt32 SvParser<T>::GetNextChar()
                         }
                         else
                         {
-                            sal_Char sBuffer[10];
+                            char sBuffer[10];
                             sBuffer[0] = c1;
                             sal_uInt16 nLen = 1;
                             while( (nInfo&RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOOSMALL) != 0 &&
diff --git a/svtools/source/uno/miscservices.cxx b/svtools/source/uno/miscservices.cxx
index 89368f922543..e921e55d3dc6 100644
--- a/svtools/source/uno/miscservices.cxx
+++ b/svtools/source/uno/miscservices.cxx
@@ -57,7 +57,7 @@ extern "C"
 {
 
 SAL_DLLPUBLIC_EXPORT void * svt_component_getFactory(
-    const sal_Char * pImplementationName, void * _pServiceManager, void * pRegistryKey)
+    const char * pImplementationName, void * _pServiceManager, void * pRegistryKey)
 {
     void * pResult = nullptr;
     if (_pServiceManager)