summaryrefslogtreecommitdiff
path: root/sal/textenc
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-12-19 13:29:13 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-12-19 19:17:57 +0100
commite994b3fc3b2c9b7d39a715fc4d9453e06434d457 (patch)
tree444fc710a7e31168bba36319f65a862d393c69e6 /sal/textenc
parent7c18da2dc6963b6f3f74a72fc4f6a3eedd8f9eb7 (diff)
sal_Char->char in remotebridges..sax
Change-Id: I6d32942960a5e997f16eb1301c45495661cd4cea Reviewed-on: https://gerrit.libreoffice.org/85514 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sal/textenc')
-rw-r--r--sal/textenc/convertisciidevangari.cxx8
-rw-r--r--sal/textenc/convertsinglebytetobmpunicode.cxx12
-rw-r--r--sal/textenc/convertsinglebytetobmpunicode.hxx4
-rw-r--r--sal/textenc/tencinfo.cxx8
-rw-r--r--sal/textenc/textcvt.cxx4
5 files changed, 18 insertions, 18 deletions
diff --git a/sal/textenc/convertisciidevangari.cxx b/sal/textenc/convertisciidevangari.cxx
index ae25d811df2d..9367bbb747e9 100644
--- a/sal/textenc/convertisciidevangari.cxx
+++ b/sal/textenc/convertisciidevangari.cxx
@@ -257,13 +257,13 @@ sal_Size UnicodeToIsciiDevanagari::convert(sal_Unicode const* pSrcBuf, sal_Size
sal_Unicode cHighSurrogate = m_cHighSurrogate;
sal_uInt32 nInfo = 0;
sal_Size nConverted = 0;
- sal_Char* pDestBufPtr = pDestBuf;
- sal_Char* pDestBufEnd = pDestBuf + nDestBytes;
+ char* pDestBufPtr = pDestBuf;
+ char* pDestBufEnd = pDestBuf + nDestBytes;
for (; nConverted < nSrcChars; ++nConverted)
{
bool bUndefined = true;
sal_uInt32 c = *pSrcBuf++;
- sal_Char cSpecialChar = 0;
+ char cSpecialChar = 0;
if (cHighSurrogate == 0)
{
if (ImplIsHighSurrogate(c))
@@ -383,7 +383,7 @@ sal_Size UnicodeToIsciiDevanagari::convert(sal_Unicode const* pSrcBuf, sal_Size
{
goto no_output;
}
- *pDestBufPtr++ = static_cast< sal_Char >(
+ *pDestBufPtr++ = static_cast< char >(
ranges[i].byte + (c - ranges[i].unicode));
m_cPrevChar = c;
goto done;
diff --git a/sal/textenc/convertsinglebytetobmpunicode.cxx b/sal/textenc/convertsinglebytetobmpunicode.cxx
index 6dc7891a3001..b948ba0fbc5c 100644
--- a/sal/textenc/convertsinglebytetobmpunicode.cxx
+++ b/sal/textenc/convertsinglebytetobmpunicode.cxx
@@ -32,7 +32,7 @@
#include "unichars.hxx"
sal_Size rtl_textenc_convertSingleByteToBmpUnicode(
- void const * data, SAL_UNUSED_PARAMETER void *, sal_Char const * srcBuf,
+ void const * data, SAL_UNUSED_PARAMETER void *, char const * srcBuf,
sal_Size srcBytes, sal_Unicode * destBuf, sal_Size destChars,
sal_uInt32 flags, sal_uInt32 * info, sal_Size * srcCvtBytes)
{
@@ -44,7 +44,7 @@ sal_Size rtl_textenc_convertSingleByteToBmpUnicode(
sal_Unicode * destBufPtr = destBuf;
sal_Unicode * destBufEnd = destBuf + destChars;
for (; converted < srcBytes; ++converted) {
- sal_Char b = *srcBuf++;
+ char b = *srcBuf++;
sal_Unicode c = map[static_cast< sal_uInt8 >(b)];
if (c == 0xFFFF) {
goto bad_input;
@@ -88,7 +88,7 @@ sal_Size rtl_textenc_convertSingleByteToBmpUnicode(
sal_Size rtl_textenc_convertBmpUnicodeToSingleByte(
void const * data, void * context,
- sal_Unicode const * srcBuf, sal_Size srcChars, sal_Char * destBuf,
+ sal_Unicode const * srcBuf, sal_Size srcChars, char * destBuf,
sal_Size destBytes, sal_uInt32 flags, sal_uInt32 * info,
sal_Size * srcCvtChars)
{
@@ -101,8 +101,8 @@ sal_Size rtl_textenc_convertBmpUnicodeToSingleByte(
sal_Unicode highSurrogate = 0;
sal_uInt32 infoFlags = 0;
sal_Size converted = 0;
- sal_Char * destBufPtr = destBuf;
- sal_Char * destBufEnd = destBuf + destBytes;
+ char * destBufPtr = destBuf;
+ char * destBufEnd = destBuf + destBytes;
if (context != nullptr) {
highSurrogate = static_cast< ImplUnicodeToTextContext * >(context)->
m_nHighSurrogate;
@@ -139,7 +139,7 @@ sal_Size rtl_textenc_convertBmpUnicodeToSingleByte(
if (destBufEnd - destBufPtr < 1) {
goto no_output;
}
- *destBufPtr++ = static_cast< sal_Char >(
+ *destBufPtr++ = static_cast< char >(
ranges[i].byte + (c - ranges[i].unicode));
goto done;
}
diff --git a/sal/textenc/convertsinglebytetobmpunicode.hxx b/sal/textenc/convertsinglebytetobmpunicode.hxx
index 53749db49d46..aef3f627192c 100644
--- a/sal/textenc/convertsinglebytetobmpunicode.hxx
+++ b/sal/textenc/convertsinglebytetobmpunicode.hxx
@@ -101,7 +101,7 @@ struct BmpUnicodeToSingleByteConverterData {
@see ImplConvertToUnicodeProc
*/
sal_Size rtl_textenc_convertSingleByteToBmpUnicode(
- void const * data, void * context, sal_Char const * srcBuf,
+ void const * data, void * context, char const * srcBuf,
sal_Size srcBytes, sal_Unicode * destBuf, sal_Size destChars,
sal_uInt32 flags, sal_uInt32 * info, sal_Size * srcCvtBytes);
@@ -112,7 +112,7 @@ sal_Size rtl_textenc_convertSingleByteToBmpUnicode(
*/
sal_Size rtl_textenc_convertBmpUnicodeToSingleByte(
void const * data, void * context,
- sal_Unicode const * srcBuf, sal_Size srcChars, sal_Char * destBuf,
+ sal_Unicode const * srcBuf, sal_Size srcChars, char * destBuf,
sal_Size destBytes, sal_uInt32 flags, sal_uInt32 * info,
sal_Size * srcCvtChars);
diff --git a/sal/textenc/tencinfo.cxx b/sal/textenc/tencinfo.cxx
index b69cf4c586fd..c2ee6850f515 100644
--- a/sal/textenc/tencinfo.cxx
+++ b/sal/textenc/tencinfo.cxx
@@ -201,7 +201,7 @@ rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromWindowsCharset( sal_uInt8 nWinC
/* ----------------------------------------------------------------------- */
-rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromUnixCharset( const sal_Char* pUnixCharset )
+rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromUnixCharset( const char* pUnixCharset )
{
/* See <ftp://ftp.x.org/pub/DOCS/registry>, section 14 ("Font Charset
* (Registry and Encoding) Names").
@@ -472,7 +472,7 @@ rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromUnixCharset( const sal_Char* pU
/* ----------------------------------------------------------------------- */
-rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromMimeCharset( const sal_Char* pMimeCharset )
+rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromMimeCharset( const char* pMimeCharset )
{
/* All Identifiers are in lower case and contain only alphanumeric */
/* characters. The function search for the first equal string in */
@@ -792,7 +792,7 @@ sal_uInt8 SAL_CALL rtl_getBestWindowsCharsetFromTextEncoding( rtl_TextEncoding e
/* ----------------------------------------------------------------------- */
-const sal_Char* SAL_CALL rtl_getBestUnixCharsetFromTextEncoding( rtl_TextEncoding eTextEncoding )
+const char* SAL_CALL rtl_getBestUnixCharsetFromTextEncoding( rtl_TextEncoding eTextEncoding )
{
const ImplTextEncodingData* pData = Impl_getTextEncodingData( eTextEncoding );
if ( pData )
@@ -812,7 +812,7 @@ char const * SAL_CALL rtl_getMimeCharsetFromTextEncoding(rtl_TextEncoding
p->mpBestMimeCharset : nullptr;
}
-const sal_Char* SAL_CALL rtl_getBestMimeCharsetFromTextEncoding( rtl_TextEncoding eTextEncoding )
+const char* SAL_CALL rtl_getBestMimeCharsetFromTextEncoding( rtl_TextEncoding eTextEncoding )
{
const ImplTextEncodingData* pData = Impl_getTextEncodingData( eTextEncoding );
if ( pData )
diff --git a/sal/textenc/textcvt.cxx b/sal/textenc/textcvt.cxx
index 3ab1c9aea562..2d5add0a89e4 100644
--- a/sal/textenc/textcvt.cxx
+++ b/sal/textenc/textcvt.cxx
@@ -155,7 +155,7 @@ void SAL_CALL rtl_resetTextToUnicodeContext( rtl_TextToUnicodeConverter hConvert
sal_Size SAL_CALL rtl_convertTextToUnicode( rtl_TextToUnicodeConverter hConverter,
rtl_TextToUnicodeContext hContext,
- const sal_Char* pSrcBuf, sal_Size nSrcBytes,
+ const char* pSrcBuf, sal_Size nSrcBytes,
sal_Unicode* pDestBuf, sal_Size nDestChars,
sal_uInt32 nFlags, sal_uInt32* pInfo,
sal_Size* pSrcCvtBytes )
@@ -251,7 +251,7 @@ void SAL_CALL rtl_resetUnicodeToTextContext( rtl_UnicodeToTextConverter hConvert
sal_Size SAL_CALL rtl_convertUnicodeToText( rtl_UnicodeToTextConverter hConverter,
rtl_UnicodeToTextContext hContext,
const sal_Unicode* pSrcBuf, sal_Size nSrcChars,
- sal_Char* pDestBuf, sal_Size nDestBytes,
+ char* pDestBuf, sal_Size nDestBytes,
sal_uInt32 nFlags, sal_uInt32* pInfo,
sal_Size* pSrcCvtChars )
{