diff options
45 files changed, 198 insertions, 198 deletions
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx index 325d70e31849..cb3134c74fa5 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx @@ -456,7 +456,7 @@ struct ExceptionType sal_uInt32 _pCopyCtor; // copyctor inline ExceptionType( - sal_uChar * pCode, + unsigned char * pCode, sal_uInt64 pCodeBase, typelib_TypeDescription * pTD ) throw () : _n0( 0 ) @@ -506,7 +506,7 @@ struct RaiseInfo // Additional fields typelib_TypeDescription * _pTD; - sal_uChar * _code; + unsigned char * _code; sal_uInt64 _codeBase; RaiseInfo( typelib_TypeDescription * pTD ) throw (); @@ -533,7 +533,7 @@ RaiseInfo::RaiseInfo( typelib_TypeDescription * pTD )throw () codeSize += codeSnippetSize; } - sal_uChar * pCode = _code = (sal_uChar *)::rtl_allocateMemory( codeSize ); + unsigned char * pCode = _code = (unsigned char *)::rtl_allocateMemory( codeSize ); _codeBase = (sal_uInt64)pCode & ~(ExceptionInfos::allocationGranularity-1); diff --git a/dtrans/source/win32/dtobj/FmtFilter.cxx b/dtrans/source/win32/dtobj/FmtFilter.cxx index 199d30163d06..532c49c8b930 100644 --- a/dtrans/source/win32/dtobj/FmtFilter.cxx +++ b/dtrans/source/win32/dtobj/FmtFilter.cxx @@ -142,7 +142,7 @@ Sequence< sal_Int8 > SAL_CALL WinENHMFPictToOOMFPict( HENHMETAFILE hEnhMetaFile { aRet.realloc( nSize ); - if( GetEnhMetaFileBits( hEnhMetaFile, nSize, (sal_uChar*) aRet.getArray() ) != nSize ) + if( GetEnhMetaFileBits( hEnhMetaFile, nSize, (unsigned char*) aRet.getArray() ) != nSize ) aRet.realloc( 0 ); } @@ -156,7 +156,7 @@ Sequence< sal_Int8 > SAL_CALL WinENHMFPictToOOMFPict( HENHMETAFILE hEnhMetaFile HMETAFILEPICT SAL_CALL OOMFPictToWinMFPict( Sequence< sal_Int8 >& aOOMetaFilePict ) { HMETAFILEPICT hPict = NULL; - HMETAFILE hMtf = SetMetaFileBitsEx( aOOMetaFilePict.getLength(), (sal_uChar*) aOOMetaFilePict.getConstArray() ); + HMETAFILE hMtf = SetMetaFileBitsEx( aOOMetaFilePict.getLength(), (unsigned char*) aOOMetaFilePict.getConstArray() ); if( hMtf ) { @@ -179,7 +179,7 @@ HMETAFILEPICT SAL_CALL OOMFPictToWinMFPict( Sequence< sal_Int8 >& aOOMetaFilePic HENHMETAFILE SAL_CALL OOMFPictToWinENHMFPict( Sequence< sal_Int8 >& aOOMetaFilePict ) { - HENHMETAFILE hEnhMtf = SetEnhMetaFileBits( aOOMetaFilePict.getLength(), (sal_uChar*) aOOMetaFilePict.getConstArray() ); + HENHMETAFILE hEnhMtf = SetEnhMetaFileBits( aOOMetaFilePict.getLength(), (unsigned char*) aOOMetaFilePict.getConstArray() ); return hEnhMtf; } diff --git a/idlc/source/astexpression.cxx b/idlc/source/astexpression.cxx index 2f02d896376e..69b5f9f6248a 100644 --- a/idlc/source/astexpression.cxx +++ b/idlc/source/astexpression.cxx @@ -628,37 +628,37 @@ coerce_value(AstExprValue *ev, ExprType t) case ET_short: if (ev->u.sval < SAL_MIN_INT8 || ev->u.sval > SAL_MAX_UINT8) return NULL; - ev->u.byval = (sal_uChar)ev->u.sval; + ev->u.byval = (unsigned char)ev->u.sval; ev->et = ET_byte; return ev; case ET_ushort: if (ev->u.usval > SAL_MAX_UINT8) return NULL; - ev->u.byval = (sal_uChar)ev->u.usval; + ev->u.byval = (unsigned char)ev->u.usval; ev->et = ET_byte; return ev; case ET_long: if (ev->u.lval < SAL_MIN_INT8 || ev->u.lval > SAL_MAX_UINT8) return NULL; - ev->u.byval = (sal_uChar) ev->u.lval; + ev->u.byval = (unsigned char) ev->u.lval; ev->et = ET_byte; return ev; case ET_ulong: if (ev->u.ulval > SAL_MAX_UINT8) return NULL; - ev->u.byval = (sal_uChar) ev->u.ulval; + ev->u.byval = (unsigned char) ev->u.ulval; ev->et = ET_byte; return ev; case ET_hyper: if (ev->u.hval < SAL_MIN_INT8 || ev->u.hval > SAL_MAX_UINT8) return NULL; - ev->u.byval = (sal_uChar) ev->u.hval; + ev->u.byval = (unsigned char) ev->u.hval; ev->et = ET_byte; return ev; case ET_uhyper: if (ev->u.uhval > SAL_MAX_UINT8) return NULL; - ev->u.byval = (sal_uChar) ev->u.uhval; + ev->u.byval = (unsigned char) ev->u.uhval; ev->et = ET_byte; return ev; case ET_boolean: @@ -668,13 +668,13 @@ coerce_value(AstExprValue *ev, ExprType t) case ET_float: if (ev->u.fval < SAL_MIN_INT8 || ev->u.fval > SAL_MAX_UINT8) return NULL; - ev->u.byval = (sal_uChar) ev->u.fval; + ev->u.byval = (unsigned char) ev->u.fval; ev->et = ET_byte; return ev; case ET_double: if (ev->u.dval < SAL_MIN_INT8 || ev->u.dval > SAL_MAX_UINT8) return NULL; - ev->u.byval = (sal_uChar) ev->u.dval; + ev->u.byval = (unsigned char) ev->u.dval; ev->et = ET_byte; return ev; case ET_byte: diff --git a/sal/rtl/ustring.cxx b/sal/rtl/ustring.cxx index 7b266edc0e06..edbfc9dada26 100644 --- a/sal/rtl/ustring.cxx +++ b/sal/rtl/ustring.cxx @@ -555,14 +555,14 @@ void SAL_CALL rtl_uString_newFromCodePoints( static int rtl_ImplGetFastUTF8UnicodeLen( const sal_Char* pStr, sal_Int32 nLen ) { int n; - sal_uChar c; + unsigned char c; const sal_Char* pEndStr; n = 0; pEndStr = pStr+nLen; while ( pStr < pEndStr ) { - c = (sal_uChar)*pStr; + c = (unsigned char)*pStr; if ( !(c & 0x80) ) pStr++; diff --git a/sal/textenc/convertbig5hkscs.cxx b/sal/textenc/convertbig5hkscs.cxx index 0039203d3e52..7b882db98a03 100644 --- a/sal/textenc/convertbig5hkscs.cxx +++ b/sal/textenc/convertbig5hkscs.cxx @@ -89,7 +89,7 @@ sal_Size ImplConvertBig5HkscsToUnicode(void const * pData, for (; nConverted < nSrcBytes; ++nConverted) { bool bUndefined = true; - sal_uInt32 nChar = *(sal_uChar const *) pSrcBuf++; + sal_uInt32 nChar = *(unsigned char const *) pSrcBuf++; if (nRow == 0) if (nChar < 0x80) if (pDestBufPtr != pDestBufEnd) diff --git a/sal/textenc/converter.cxx b/sal/textenc/converter.cxx index 53a564453c05..bbf172d977ad 100644 --- a/sal/textenc/converter.cxx +++ b/sal/textenc/converter.cxx @@ -58,7 +58,7 @@ sal::detail::textenc::handleBadInputTextToUnicodeConversion( if (*pDestBufPtr != pDestBufEnd) { *(*pDestBufPtr)++ = RTL_TEXTCVT_BYTE_PRIVATE_START - | ((sal_uChar) cByte); + | ((unsigned char) cByte); return BAD_INPUT_CONTINUE; } else diff --git a/sal/textenc/converteuctw.cxx b/sal/textenc/converteuctw.cxx index 66b0f21626b1..5dd5898d0b31 100644 --- a/sal/textenc/converteuctw.cxx +++ b/sal/textenc/converteuctw.cxx @@ -104,7 +104,7 @@ sal_Size ImplConvertEucTwToUnicode(void const * pData, for (; nConverted < nSrcBytes; ++nConverted) { bool bUndefined = true; - sal_uInt32 nChar = *(sal_uChar const *) pSrcBuf++; + sal_uInt32 nChar = *(unsigned char const *) pSrcBuf++; switch (eState) { case IMPL_EUC_TW_TO_UNICODE_STATE_0: diff --git a/sal/textenc/convertgb18030.cxx b/sal/textenc/convertgb18030.cxx index 7852d0156ba8..0a36b292a1ad 100644 --- a/sal/textenc/convertgb18030.cxx +++ b/sal/textenc/convertgb18030.cxx @@ -96,7 +96,7 @@ sal_Size ImplConvertGb18030ToUnicode(void const * pData, for (; nConverted < nSrcBytes; ++nConverted) { bool bUndefined = true; - sal_uInt32 nChar = *(sal_uChar const *) pSrcBuf++; + sal_uInt32 nChar = *(unsigned char const *) pSrcBuf++; switch (eState) { case IMPL_GB_18030_TO_UNICODE_STATE_0: diff --git a/sal/textenc/convertiso2022cn.cxx b/sal/textenc/convertiso2022cn.cxx index 87302f537ffe..90a27ac648ea 100644 --- a/sal/textenc/convertiso2022cn.cxx +++ b/sal/textenc/convertiso2022cn.cxx @@ -137,7 +137,7 @@ sal_Size ImplConvertIso2022CnToUnicode(void const * pData, for (; nConverted < nSrcBytes; ++nConverted) { bool bUndefined = true; - sal_uInt32 nChar = *(sal_uChar const *) pSrcBuf++; + sal_uInt32 nChar = *(unsigned char const *) pSrcBuf++; sal_uInt32 nPlane; switch (eState) { diff --git a/sal/textenc/convertiso2022jp.cxx b/sal/textenc/convertiso2022jp.cxx index b7230424fa15..7a821d55cac4 100644 --- a/sal/textenc/convertiso2022jp.cxx +++ b/sal/textenc/convertiso2022jp.cxx @@ -105,7 +105,7 @@ sal_Size ImplConvertIso2022JpToUnicode(void const * pData, for (; nConverted < nSrcBytes; ++nConverted) { bool bUndefined = true; - sal_uInt32 nChar = *(sal_uChar const *) pSrcBuf++; + sal_uInt32 nChar = *(unsigned char const *) pSrcBuf++; switch (eState) { case IMPL_ISO_2022_JP_TO_UNICODE_STATE_ASCII: diff --git a/sal/textenc/convertiso2022kr.cxx b/sal/textenc/convertiso2022kr.cxx index 50e209b5649e..10e15bb36403 100644 --- a/sal/textenc/convertiso2022kr.cxx +++ b/sal/textenc/convertiso2022kr.cxx @@ -111,7 +111,7 @@ sal_Size ImplConvertIso2022KrToUnicode(void const * pData, for (; nConverted < nSrcBytes; ++nConverted) { bool bUndefined = true; - sal_uInt32 nChar = *(sal_uChar const *) pSrcBuf++; + sal_uInt32 nChar = *(unsigned char const *) pSrcBuf++; switch (eState) { case IMPL_ISO_2022_KR_TO_UNICODE_STATE_ASCII: diff --git a/sal/textenc/convertsimple.cxx b/sal/textenc/convertsimple.cxx index f94ad63b63f6..d60adc7bd8ea 100644 --- a/sal/textenc/convertsimple.cxx +++ b/sal/textenc/convertsimple.cxx @@ -517,7 +517,7 @@ sal_Size sal::detail::textenc::convertCharToUnicode( sal_Size nSrcBytes, sal_Unicode * pDestBuf, sal_Size nDestChars, sal_uInt32 nFlags, sal_uInt32 * pInfo, sal_Size * pSrcCvtBytes) { - sal_uChar c; + unsigned char c; sal_Unicode cConv; const ImplByteConvertData* pConvertData = (const ImplByteConvertData*)pData; sal_Unicode* pEndDestBuf; @@ -528,7 +528,7 @@ sal_Size sal::detail::textenc::convertCharToUnicode( pEndSrcBuf = pSrcBuf+nSrcBytes; while ( pSrcBuf < pEndSrcBuf ) { - c = (sal_uChar)*pSrcBuf; + c = (unsigned char)*pSrcBuf; if ( c < 0x80 ) cConv = c; else diff --git a/sal/textenc/handleundefinedunicodetotextchar.cxx b/sal/textenc/handleundefinedunicodetotextchar.cxx index b92a98118383..22f1baa74cd6 100644 --- a/sal/textenc/handleundefinedunicodetotextchar.cxx +++ b/sal/textenc/handleundefinedunicodetotextchar.cxx @@ -90,7 +90,7 @@ bool sal::detail::textenc::handleUndefinedUnicodeToTextChar( { if ( nFlags & RTL_UNICODETOTEXT_FLAGS_PRIVATE_MAPTO0 ) { - **ppDestBuf = (char)(sal_uChar)(c-RTL_TEXTCVT_BYTE_PRIVATE_START); + **ppDestBuf = (char)(unsigned char)(c-RTL_TEXTCVT_BYTE_PRIVATE_START); (*ppDestBuf)++; (*ppSrcBuf)++; return true; diff --git a/sal/textenc/tables.cxx b/sal/textenc/tables.cxx index 35fe61a64000..90b40ce60f85 100644 --- a/sal/textenc/tables.cxx +++ b/sal/textenc/tables.cxx @@ -45,7 +45,7 @@ static sal_uInt16 const aImpl8090SameToUniTab[SAME8090UNI_END #define SAME8090CHAR_START 0x0080 #define SAME8090CHAR_END 0x009F -static sal_uChar const aImpl8090SameToCharTab[SAME8090CHAR_END +static unsigned char const aImpl8090SameToCharTab[SAME8090CHAR_END - SAME8090CHAR_START + 1] = { 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, /* 0x0080 */ diff --git a/sal/textenc/tcvtarb1.tab b/sal/textenc/tcvtarb1.tab index 00e191837b43..c12b96deaa74 100644 --- a/sal/textenc/tcvtarb1.tab +++ b/sal/textenc/tcvtarb1.tab @@ -64,7 +64,7 @@ static sal_uInt16 const aImplIBM862ToUniTab[IBM862UNI_END - IBM862UNI_START + 1] #define IBM862CHAR_START 0x05D0 #define IBM862CHAR_END 0x05EA -static sal_uChar const aImplIBM862ToCharTab[IBM862CHAR_END - IBM862CHAR_START + 1] = +static unsigned char const aImplIBM862ToCharTab[IBM862CHAR_END - IBM862CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -259,7 +259,7 @@ static sal_uInt16 const aImplIBM864ToUniTab[IBM864UNI_END - IBM864UNI_START + 1] #define IBM864CHAR_START 0xFE7D #define IBM864CHAR_END 0xFEFC -static sal_uChar const aImplIBM864ToCharTab[IBM864CHAR_END - IBM864CHAR_START + 1] = +static unsigned char const aImplIBM864ToCharTab[IBM864CHAR_END - IBM864CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -417,7 +417,7 @@ static sal_uInt16 const aImplMS1255ToUniTab[MS1255UNI_END - MS1255UNI_START + 1] #define MS1255CHAR_START 0x05B0 #define MS1255CHAR_END 0x05F4 -static sal_uChar const aImplMS1255ToCharTab[MS1255CHAR_END - MS1255CHAR_START + 1] = +static unsigned char const aImplMS1255ToCharTab[MS1255CHAR_END - MS1255CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -569,7 +569,7 @@ static sal_uInt16 const aImplMS1256ToUniTab[MS1256UNI_END - MS1256UNI_START + 1] #define MS1256CHAR_START 0x061B #define MS1256CHAR_END 0x0652 -static sal_uChar const aImplMS1256ToCharTab[MS1256CHAR_END - MS1256CHAR_START + 1] = +static unsigned char const aImplMS1256ToCharTab[MS1256CHAR_END - MS1256CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -743,7 +743,7 @@ static sal_uInt16 const aImplISO88596ToUniTab[ISO88596UNI_END - ISO88596UNI_STAR #define ISO88596CHAR_START 0x061B #define ISO88596CHAR_END 0x0669 -static sal_uChar const aImplISO88596ToCharTab[ISO88596CHAR_END - ISO88596CHAR_START + 1] = +static unsigned char const aImplISO88596ToCharTab[ISO88596CHAR_END - ISO88596CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -842,7 +842,7 @@ static sal_uInt16 const aImplISO88598ToUniTab[ISO88598UNI_END - ISO88598UNI_STAR #define ISO88598CHAR_START 0x05D0 #define ISO88598CHAR_END 0x05EA -static sal_uChar const aImplISO88598ToCharTab[ISO88598CHAR_END - ISO88598CHAR_START + 1] = +static unsigned char const aImplISO88598ToCharTab[ISO88598CHAR_END - ISO88598CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ diff --git a/sal/textenc/tcvtbyte.cxx b/sal/textenc/tcvtbyte.cxx index 118ec9c4f1b2..94336da659e3 100644 --- a/sal/textenc/tcvtbyte.cxx +++ b/sal/textenc/tcvtbyte.cxx @@ -32,7 +32,7 @@ sal_Size ImplSymbolToUnicode( SAL_UNUSED_PARAMETER const void*, SAL_UNUSED_PARAMETER sal_uInt32, sal_uInt32* pInfo, sal_Size* pSrcCvtBytes ) { - sal_uChar c; + unsigned char c; sal_Unicode* pEndDestBuf; const char* pEndSrcBuf; @@ -48,7 +48,7 @@ sal_Size ImplSymbolToUnicode( SAL_UNUSED_PARAMETER const void*, } /* 0-31 (all Control-Character get the same Unicode value) */ - c = (sal_uChar)*pSrcBuf; + c = (unsigned char)*pSrcBuf; if ( c <= 0x1F ) *pDestBuf = (sal_Unicode)c; else @@ -127,7 +127,7 @@ sal_Size ImplUpperCharToUnicode( const void* pData, SAL_UNUSED_PARAMETER sal_uInt32, sal_uInt32* pInfo, sal_Size* pSrcCvtBytes ) { - sal_uChar c; + unsigned char c; sal_Unicode cConv; const ImplByteConvertData* pConvertData = (const ImplByteConvertData*)pData; sal_Unicode* pEndDestBuf; @@ -144,7 +144,7 @@ sal_Size ImplUpperCharToUnicode( const void* pData, } while ( pSrcBuf < pEndSrcBuf ) { - c = (sal_uChar)*pSrcBuf; + c = (unsigned char)*pSrcBuf; if (c < 0x80) cConv = c; else diff --git a/sal/textenc/tcvteas1.tab b/sal/textenc/tcvteas1.tab index 9e153ee7ce67..71551694cfeb 100644 --- a/sal/textenc/tcvteas1.tab +++ b/sal/textenc/tcvteas1.tab @@ -64,7 +64,7 @@ static sal_uInt16 const aImplMS874ToUniTab[MS874UNI_END - MS874UNI_START + 1] = #define MS874CHAR_START 0x0E01 #define MS874CHAR_END 0x0E5B -static sal_uChar const aImplMS874ToCharTab[MS874CHAR_END - MS874CHAR_START + 1] = +static unsigned char const aImplMS874ToCharTab[MS874CHAR_END - MS874CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -225,7 +225,7 @@ static sal_uInt16 const aImplMS1258ToUniTab[MS1258UNI_END - MS1258UNI_START + 1] #define MS1258CHAR_START 0x00A0 #define MS1258CHAR_END 0x00FF -static sal_uChar const aImplMS1258ToCharTab[MS1258CHAR_END - MS1258CHAR_START + 1] = +static unsigned char const aImplMS1258ToCharTab[MS1258CHAR_END - MS1258CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ diff --git a/sal/textenc/tcvtest1.tab b/sal/textenc/tcvtest1.tab index 7251fb69c9d3..bd308ec777ea 100644 --- a/sal/textenc/tcvtest1.tab +++ b/sal/textenc/tcvtest1.tab @@ -64,7 +64,7 @@ static sal_uInt16 const aImplIBM737ToUniTab[IBM737UNI_END - IBM737UNI_START + 1] #define IBM737CHAR_START 0x0386 #define IBM737CHAR_END 0x03CE -static sal_uChar const aImplIBM737ToCharTab[IBM737CHAR_END - IBM737CHAR_START + 1] = +static unsigned char const aImplIBM737ToCharTab[IBM737CHAR_END - IBM737CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -635,7 +635,7 @@ static sal_uInt16 const aImplIBM855ToUniTab[IBM855UNI_END - IBM855UNI_START + 1] #define IBM855CHAR_START 0x0401 #define IBM855CHAR_END 0x045F -static sal_uChar const aImplIBM855ToCharTab[IBM855CHAR_END - IBM855CHAR_START + 1] = +static unsigned char const aImplIBM855ToCharTab[IBM855CHAR_END - IBM855CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -771,7 +771,7 @@ static sal_uInt16 const aImplIBM857ToUniTab[IBM857UNI_END - IBM857UNI_START + 1] #define IBM857CHAR_START 0x00A0 #define IBM857CHAR_END 0x00FF -static sal_uChar const aImplIBM857ToCharTab[IBM857CHAR_END - IBM857CHAR_START + 1] = +static unsigned char const aImplIBM857ToCharTab[IBM857CHAR_END - IBM857CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -906,7 +906,7 @@ static sal_uInt16 const aImplIBM866ToUniTab[IBM866UNI_END - IBM866UNI_START + 1] #define IBM866CHAR_START 0x0401 #define IBM866CHAR_END 0x045E -static sal_uChar const aImplIBM866ToCharTab[IBM866CHAR_END - IBM866CHAR_START + 1] = +static unsigned char const aImplIBM866ToCharTab[IBM866CHAR_END - IBM866CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -1062,7 +1062,7 @@ static sal_uInt16 const aImplIBM869ToUniTab[IBM869UNI_END - IBM869UNI_START + 1] #define IBM869CHAR_START 0x0384 #define IBM869CHAR_END 0x03CE -static sal_uChar const aImplIBM869ToCharTab[IBM869CHAR_END - IBM869CHAR_START + 1] = +static unsigned char const aImplIBM869ToCharTab[IBM869CHAR_END - IBM869CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -1409,7 +1409,7 @@ static sal_uInt16 const aImplMS1251ToUniTab[MS1251UNI_END - MS1251UNI_START + 1] #define MS1251CHAR_START 0x0401 #define MS1251CHAR_END 0x045F -static sal_uChar const aImplMS1251ToCharTab[MS1251CHAR_END - MS1251CHAR_START + 1] = +static unsigned char const aImplMS1251ToCharTab[MS1251CHAR_END - MS1251CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -1544,7 +1544,7 @@ static sal_uInt16 const aImplMS1253ToUniTab[MS1253UNI_END - MS1253UNI_START + 1] #define MS1253CHAR_START 0x0384 #define MS1253CHAR_END 0x03CE -static sal_uChar const aImplMS1253ToCharTab[MS1253CHAR_END - MS1253CHAR_START + 1] = +static unsigned char const aImplMS1253ToCharTab[MS1253CHAR_END - MS1253CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -1682,7 +1682,7 @@ static sal_uInt16 const aImplMS1254ToUniTab[MS1254UNI_END - MS1254UNI_START + 1] #define MS1254CHAR_START 0x00A0 #define MS1254CHAR_END 0x00FF -static sal_uChar const aImplMS1254ToCharTab[MS1254CHAR_END - MS1254CHAR_START + 1] = +static unsigned char const aImplMS1254ToCharTab[MS1254CHAR_END - MS1254CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -1813,7 +1813,7 @@ static sal_uInt16 const aImplMS1257ToUniTab[MS1257UNI_END - MS1257UNI_START + 1] #define MS1257CHAR_START 0x00A0 #define MS1257CHAR_END 0x017E -static sal_uChar const aImplMS1257ToCharTab[MS1257CHAR_END - MS1257CHAR_START + 1] = +static unsigned char const aImplMS1257ToCharTab[MS1257CHAR_END - MS1257CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -2440,7 +2440,7 @@ static sal_uInt16 const aImplISO88595ToUniTab[ISO88595UNI_END - ISO88595UNI_STAR #define ISO88595CHAR_START 0x0401 #define ISO88595CHAR_END 0x045F -static sal_uChar const aImplISO88595ToCharTab[ISO88595CHAR_END - ISO88595CHAR_START + 1] = +static unsigned char const aImplISO88595ToCharTab[ISO88595CHAR_END - ISO88595CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -2538,7 +2538,7 @@ static sal_uInt16 const aImplISO88597ToUniTab[ISO88597UNI_END - ISO88597UNI_STAR #define ISO88597CHAR_START 0x0384 #define ISO88597CHAR_END 0x03CE -static sal_uChar const aImplISO88597ToCharTab[ISO88597CHAR_END - ISO88597CHAR_START + 1] = +static unsigned char const aImplISO88597ToCharTab[ISO88597CHAR_END - ISO88597CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -2649,7 +2649,7 @@ static sal_uInt16 const aImplISO88599ToUniTab[ISO88599UNI_END - ISO88599UNI_STAR #define ISO88599CHAR_START 0x00A0 #define ISO88599CHAR_END 0x00FF -static sal_uChar const aImplISO88599ToCharTab[ISO88599CHAR_END - ISO88599CHAR_START + 1] = +static unsigned char const aImplISO88599ToCharTab[ISO88599CHAR_END - ISO88599CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -2749,7 +2749,7 @@ static sal_uInt16 const aImplISO885910ToUniTab[ISO885910UNI_END - ISO885910UNI_S #define ISO885910CHAR_START 0x00C1 #define ISO885910CHAR_END 0x00FE -static sal_uChar const aImplISO885910ToCharTab[ISO885910CHAR_END - ISO885910CHAR_START + 1] = +static unsigned char const aImplISO885910ToCharTab[ISO885910CHAR_END - ISO885910CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -3268,7 +3268,7 @@ static sal_uInt16 const aImplAPPLECROATIANToUniTab[APPLECROATIANUNI_END - APPLEC #define APPLECROATIANCHAR_START 0x00A0 #define APPLECROATIANCHAR_END 0x00FC -static sal_uChar const aImplAPPLECROATIANToCharTab[APPLECROATIANCHAR_END - APPLECROATIANCHAR_START + 1] = +static unsigned char const aImplAPPLECROATIANToCharTab[APPLECROATIANCHAR_END - APPLECROATIANCHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -3416,7 +3416,7 @@ static sal_uInt16 const aImplAPPLECYRILLICToUniTab[APPLECYRILLICUNI_END - APPLEC #define APPLECYRILLICCHAR_START 0x0401 #define APPLECYRILLICCHAR_END 0x045F -static sal_uChar const aImplAPPLECYRILLICToCharTab[APPLECYRILLICCHAR_END - APPLECYRILLICCHAR_START + 1] = +static unsigned char const aImplAPPLECYRILLICToCharTab[APPLECYRILLICCHAR_END - APPLECYRILLICCHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -3551,7 +3551,7 @@ static sal_uInt16 const aImplAPPLEGREEKToUniTab[APPLEGREEKUNI_END - APPLEGREEKUN #define APPLEGREEKCHAR_START 0x0384 #define APPLEGREEKCHAR_END 0x03CE -static sal_uChar const aImplAPPLEGREEKToCharTab[APPLEGREEKCHAR_END - APPLEGREEKCHAR_START + 1] = +static unsigned char const aImplAPPLEGREEKToCharTab[APPLEGREEKCHAR_END - APPLEGREEKCHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -3709,7 +3709,7 @@ static sal_uInt16 const aImplAPPLEROMANIANToUniTab[APPLEROMANIANUNI_END - APPLER #define APPLEROMANIANCHAR_START 0x00A0 #define APPLEROMANIANCHAR_END 0x00FF -static sal_uChar const aImplAPPLEROMANIANToCharTab[APPLEROMANIANCHAR_END - APPLEROMANIANCHAR_START + 1] = +static unsigned char const aImplAPPLEROMANIANToCharTab[APPLEROMANIANCHAR_END - APPLEROMANIANCHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -3859,7 +3859,7 @@ static sal_uInt16 const aImplAPPLETURKISHToUniTab[APPLETURKISHUNI_END - APPLETUR #define APPLETURKISHCHAR_START 0x00A0 #define APPLETURKISHCHAR_END 0x00FF -static sal_uChar const aImplAPPLETURKISHToCharTab[APPLETURKISHCHAR_END - APPLETURKISHCHAR_START + 1] = +static unsigned char const aImplAPPLETURKISHToCharTab[APPLETURKISHCHAR_END - APPLETURKISHCHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -4006,7 +4006,7 @@ static sal_uInt16 const aImplAPPLEUKRAINIANToUniTab[APPLEUKRAINIANUNI_END - APPL #define APPLEUKRAINIANCHAR_START 0x0401 #define APPLEUKRAINIANCHAR_END 0x045F -static sal_uChar const aImplAPPLEUKRAINIANToCharTab[APPLEUKRAINIANCHAR_END - APPLEUKRAINIANCHAR_START + 1] = +static unsigned char const aImplAPPLEUKRAINIANToCharTab[APPLEUKRAINIANCHAR_END - APPLEUKRAINIANCHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -4141,7 +4141,7 @@ static sal_uInt16 const aImplKOI8RToUniTab[KOI8RUNI_END - KOI8RUNI_START + 1] = #define KOI8RCHAR_START 0x0410 #define KOI8RCHAR_END 0x044F -static sal_uChar const aImplKOI8RToCharTab[KOI8RCHAR_END - KOI8RCHAR_START + 1] = +static unsigned char const aImplKOI8RToCharTab[KOI8RCHAR_END - KOI8RCHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -4296,7 +4296,7 @@ static sal_uInt16 const aImplKOI8UToUniTab[KOI8UUNI_END - KOI8UUNI_START + 1] = #define KOI8UCHAR_START 0x0410 #define KOI8UCHAR_END 0x044F -static sal_uChar const +static unsigned char const aImplKOI8UToCharTab[KOI8UCHAR_END - KOI8UCHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ @@ -4457,7 +4457,7 @@ static sal_uInt16 const aImplPT154ToUniTab[PT154UNI_END - PT154UNI_START + 1] = #define PT154CHAR_START 0x0410 #define PT154CHAR_END 0x044F -static sal_uChar const aImplPT154ToCharTab[PT154CHAR_END - PT154CHAR_START + 1] = +static unsigned char const aImplPT154ToCharTab[PT154CHAR_END - PT154CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ diff --git a/sal/textenc/tcvtjp6.tab b/sal/textenc/tcvtjp6.tab index 63235a3afda3..a5b1d1b792a0 100644 --- a/sal/textenc/tcvtjp6.tab +++ b/sal/textenc/tcvtjp6.tab @@ -2544,7 +2544,7 @@ static ImplTextEncodingData const aImplEUCJPTextEncodingData #define HALFWIDTHKANA_START 0xFF61 #define HALFWIDTHKANA_END 0xFF9F -static sal_uChar const aImplJISX0201Tab[HALFWIDTHKANA_END - HALFWIDTHKANA_START + 1] = +static unsigned char const aImplJISX0201Tab[HALFWIDTHKANA_END - HALFWIDTHKANA_START + 1] = { 0xA1, 0xA2, 0xA3, 0xA4, 0x5A, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF, diff --git a/sal/textenc/tcvtlat1.tab b/sal/textenc/tcvtlat1.tab index 4a34974bdb70..b8a396652f6d 100644 --- a/sal/textenc/tcvtlat1.tab +++ b/sal/textenc/tcvtlat1.tab @@ -65,7 +65,7 @@ static sal_uInt16 const aImplIBM437ToUniTab[IBM437UNI_END - IBM437UNI_START + 1] #define IBM437CHAR_START 0x00A0 #define IBM437CHAR_END 0x00FF -static sal_uChar const aImplIBM437ToCharTab[IBM437CHAR_END - IBM437CHAR_START + 1] = +static unsigned char const aImplIBM437ToCharTab[IBM437CHAR_END - IBM437CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -241,7 +241,7 @@ static sal_uInt16 const aImplIBM850ToUniTab[IBM850UNI_END - IBM850UNI_START + 1] #define IBM850CHAR_START 0x00A0 #define IBM850CHAR_END 0x00FF -static sal_uChar const aImplIBM850ToCharTab[IBM850CHAR_END - IBM850CHAR_START + 1] = +static unsigned char const aImplIBM850ToCharTab[IBM850CHAR_END - IBM850CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -374,7 +374,7 @@ static sal_uInt16 const aImplIBM860ToUniTab[IBM860UNI_END - IBM860UNI_START + 1] #define IBM860CHAR_START 0x00A0 #define IBM860CHAR_END 0x00FC -static sal_uChar const aImplIBM860ToCharTab[IBM860CHAR_END - IBM860CHAR_START + 1] = +static unsigned char const aImplIBM860ToCharTab[IBM860CHAR_END - IBM860CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -547,7 +547,7 @@ static sal_uInt16 const aImplIBM861ToUniTab[IBM861UNI_END - IBM861UNI_START + 1] #define IBM861CHAR_START 0x00A0 #define IBM861CHAR_END 0x00FE -static sal_uChar const aImplIBM861ToCharTab[IBM861CHAR_END - IBM861CHAR_START + 1] = +static unsigned char const aImplIBM861ToCharTab[IBM861CHAR_END - IBM861CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -722,7 +722,7 @@ static sal_uInt16 const aImplIBM863ToUniTab[IBM863UNI_END - IBM863UNI_START + 1] #define IBM863CHAR_START 0x00A0 #define IBM863CHAR_END 0x00FC -static sal_uChar const aImplIBM863ToCharTab[IBM863CHAR_END - IBM863CHAR_START + 1] = +static unsigned char const aImplIBM863ToCharTab[IBM863CHAR_END - IBM863CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -897,7 +897,7 @@ static sal_uInt16 const aImplIBM865ToUniTab[IBM865UNI_END - IBM865UNI_START + 1] #define IBM865CHAR_START 0x00A0 #define IBM865CHAR_END 0x00FF -static sal_uChar const aImplIBM865ToCharTab[IBM865CHAR_END - IBM865CHAR_START + 1] = +static unsigned char const aImplIBM865ToCharTab[IBM865CHAR_END - IBM865CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -1066,7 +1066,7 @@ static sal_uInt16 const aImplISO885914ToUniTab[ISO885914UNI_END - ISO885914UNI_S #define ISO885914CHAR_START 0x00C0 #define ISO885914CHAR_END 0x00FF -static sal_uChar const aImplISO885914ToCharTab[ISO885914CHAR_END - ISO885914CHAR_START + 1] = +static unsigned char const aImplISO885914ToCharTab[ISO885914CHAR_END - ISO885914CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -1194,7 +1194,7 @@ static sal_uInt16 const aImplISO885915ToUniTab[ISO885915UNI_END - ISO885915UNI_S #define ISO885915CHAR_START 0x00A0 #define ISO885915CHAR_END 0x00FF -static sal_uChar const aImplISO885915ToCharTab[ISO885915CHAR_END - ISO885915CHAR_START + 1] = +static unsigned char const aImplISO885915ToCharTab[ISO885915CHAR_END - ISO885915CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -1301,7 +1301,7 @@ static sal_uInt16 const aImplAPPLEICELANDToUniTab[APPLEICELANDUNI_END - APPLEICE #define APPLEICELANDCHAR_START 0x00A0 #define APPLEICELANDCHAR_END 0x00FF -static sal_uChar const aImplAPPLEICELANDToCharTab[APPLEICELANDCHAR_END - APPLEICELANDCHAR_START + 1] = +static unsigned char const aImplAPPLEICELANDToCharTab[APPLEICELANDCHAR_END - APPLEICELANDCHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -1441,7 +1441,7 @@ static sal_uInt16 const aImplAPPLEROMANToUniTab[APPLEROMANUNI_END - APPLEROMANUN #define APPLEROMANCHAR_START 0x00A0 #define APPLEROMANCHAR_END 0x00FF -static sal_uChar const aImplAPPLEROMANToCharTab[APPLEROMANCHAR_END - APPLEROMANCHAR_START + 1] = +static unsigned char const aImplAPPLEROMANToCharTab[APPLEROMANCHAR_END - APPLEROMANCHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ diff --git a/sal/textenc/tcvtmb.cxx b/sal/textenc/tcvtmb.cxx index ec5159e36d89..8f84e7f077da 100644 --- a/sal/textenc/tcvtmb.cxx +++ b/sal/textenc/tcvtmb.cxx @@ -40,8 +40,8 @@ sal_Size ImplDBCSToUnicode( const void* pData, SAL_UNUSED_PARAMETER void*, sal_uInt32 nFlags, sal_uInt32* pInfo, sal_Size* pSrcCvtBytes ) { - sal_uChar cLead; - sal_uChar cTrail; + unsigned char cLead; + unsigned char cTrail; sal_Unicode cConv; const ImplDBCSToUniLeadTab* pLeadEntry; const ImplDBCSConvertData* pConvertData = (const ImplDBCSConvertData*)pData; @@ -54,7 +54,7 @@ sal_Size ImplDBCSToUnicode( const void* pData, SAL_UNUSED_PARAMETER void*, pEndSrcBuf = pSrcBuf+nSrcBytes; while ( pSrcBuf < pEndSrcBuf ) { - cLead = (sal_uChar)*pSrcBuf; + cLead = (unsigned char)*pSrcBuf; /* get entry for the lead byte */ pLeadEntry = pLeadTab+cLead; @@ -92,7 +92,7 @@ sal_Size ImplDBCSToUnicode( const void* pData, SAL_UNUSED_PARAMETER void*, } pSrcBuf++; - cTrail = (sal_uChar)*pSrcBuf; + cTrail = (unsigned char)*pSrcBuf; if ( (cTrail >= pLeadEntry->mnTrailStart) && (cTrail <= pLeadEntry->mnTrailEnd) ) cConv = pLeadEntry->mpToUniTrailTab[cTrail-pLeadEntry->mnTrailStart]; else @@ -221,8 +221,8 @@ sal_Size ImplUnicodeToDBCS( const void* pData, SAL_UNUSED_PARAMETER void*, { sal_uInt16 cConv; sal_Unicode c; - sal_uChar nHighChar; - sal_uChar nLowChar; + unsigned char nHighChar; + unsigned char nLowChar; const ImplUniToDBCSHighTab* pHighEntry; const ImplDBCSConvertData* pConvertData = (const ImplDBCSConvertData*)pData; const ImplUniToDBCSHighTab* pHighTab = pConvertData->mpToDBCSHighTab; @@ -241,8 +241,8 @@ sal_Size ImplUnicodeToDBCS( const void* pData, SAL_UNUSED_PARAMETER void*, while ( pSrcBuf < pEndSrcBuf ) { c = *pSrcBuf; - nHighChar = (sal_uChar)((c >> 8) & 0xFF); - nLowChar = (sal_uChar)(c & 0xFF); + nHighChar = (unsigned char)((c >> 8) & 0xFF); + nLowChar = (unsigned char)(c & 0xFF); /* get entry for the high byte */ pHighEntry = pHighTab+nHighChar; @@ -382,9 +382,9 @@ sal_Size ImplEUCJPToUnicode( const void* pData, sal_uInt32 nFlags, sal_uInt32* pInfo, sal_Size* pSrcCvtBytes ) { - sal_uChar c; - sal_uChar cLead = '\0'; - sal_uChar cTrail = '\0'; + unsigned char c; + unsigned char cLead = '\0'; + unsigned char cTrail = '\0'; sal_Unicode cConv; const ImplDBCSToUniLeadTab* pLeadEntry; const ImplDBCSToUniLeadTab* pLeadTab; @@ -397,7 +397,7 @@ sal_Size ImplEUCJPToUnicode( const void* pData, pEndSrcBuf = pSrcBuf+nSrcBytes; while ( pSrcBuf < pEndSrcBuf ) { - c = (sal_uChar)*pSrcBuf; + c = (unsigned char)*pSrcBuf; /* ASCII */ if ( c <= 0x7F ) @@ -416,7 +416,7 @@ sal_Size ImplEUCJPToUnicode( const void* pData, } pSrcBuf++; - c = (sal_uChar)*pSrcBuf; + c = (unsigned char)*pSrcBuf; if ( (c >= 0xA1) && (c <= 0xDF) ) cConv = 0xFF61+(c-0xA1); else @@ -440,9 +440,9 @@ sal_Size ImplEUCJPToUnicode( const void* pData, } pSrcBuf++; - cLead = (sal_uChar)*pSrcBuf; + cLead = (unsigned char)*pSrcBuf; pSrcBuf++; - cTrail = (sal_uChar)*pSrcBuf; + cTrail = (unsigned char)*pSrcBuf; pLeadTab = pConvertData->mpJIS0212ToUniLeadTab; } /* CodeSet 2 JIS 0208-1997 */ @@ -458,7 +458,7 @@ sal_Size ImplEUCJPToUnicode( const void* pData, cLead = c; pSrcBuf++; - cTrail = (sal_uChar)*pSrcBuf; + cTrail = (unsigned char)*pSrcBuf; pLeadTab = pConvertData->mpJIS0208ToUniLeadTab; } @@ -546,8 +546,8 @@ sal_Size ImplUnicodeToEUCJP( const void* pData, { sal_uInt32 cConv; sal_Unicode c; - sal_uChar nHighChar; - sal_uChar nLowChar; + unsigned char nHighChar; + unsigned char nLowChar; const ImplUniToDBCSHighTab* pHighEntry; const ImplUniToDBCSHighTab* pHighTab; const ImplEUCJPConvertData* pConvertData = (const ImplEUCJPConvertData*)pData; @@ -569,8 +569,8 @@ sal_Size ImplUnicodeToEUCJP( const void* pData, cConv = 0x8E00+0xA1+(c-0xFF61); else { - nHighChar = (sal_uChar)((c >> 8) & 0xFF); - nLowChar = (sal_uChar)(c & 0xFF); + nHighChar = (unsigned char)((c >> 8) & 0xFF); + nLowChar = (unsigned char)(c & 0xFF); /* JIS 0208 */ pHighTab = pConvertData->mpUniToJIS0208HighTab; diff --git a/sal/textenc/tcvtutf7.cxx b/sal/textenc/tcvtutf7.cxx index 24b0be93d70f..ed87e6ffbc53 100644 --- a/sal/textenc/tcvtutf7.cxx +++ b/sal/textenc/tcvtutf7.cxx @@ -26,7 +26,7 @@ /* ======================================================================= */ -static sal_uChar const aImplBase64Tab[64] = +static unsigned char const aImplBase64Tab[64] = { /* A-Z */ 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, @@ -44,7 +44,7 @@ static sal_uChar const aImplBase64Tab[64] = }; /* Index in Base64Tab or 0xFF, when is a invalid character */ -static sal_uChar const aImplBase64IndexTab[128] = +static unsigned char const aImplBase64IndexTab[128] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, /* 0x00-0x07 */ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, /* 0x08-0x0F */ @@ -64,7 +64,7 @@ static sal_uChar const aImplBase64IndexTab[128] = 49, 50, 51, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF /* 0x78-0x7F xyz{|}~ */ }; -static sal_uChar const aImplMustShiftTab[128] = +static unsigned char const aImplMustShiftTab[128] = { 1, 1, 1, 1, 1, 1, 1, 1, /* 0x00-0x07 */ 1, 0, 0, 1, 0, 1, 1, 1, /* 0x08-0x0F 0x09 == HTAB, 0x0A == LF 0x0C == CR */ @@ -141,8 +141,8 @@ sal_Size ImplUTF7ToUnicode( SAL_UNUSED_PARAMETER const void*, void* pContext, sal_Size* pSrcCvtBytes ) { ImplUTF7ToUCContextData* pContextData = (ImplUTF7ToUCContextData*)pContext; - sal_uChar c ='\0'; - sal_uChar nBase64Value = 0; + unsigned char c ='\0'; + unsigned char nBase64Value = 0; int bEnd = sal_False; int bShifted; int bFirst; @@ -180,7 +180,7 @@ sal_Size ImplUTF7ToUnicode( SAL_UNUSED_PARAMETER const void*, void* pContext, { if ( pSrcBuf < pEndSrcBuf ) { - c = (sal_uChar)*pSrcBuf; + c = (unsigned char)*pSrcBuf; /* End, when not a base64 character */ bBase64End = sal_False; @@ -235,7 +235,7 @@ sal_Size ImplUTF7ToUnicode( SAL_UNUSED_PARAMETER const void*, void* pContext, /* Skip character */ pSrcBuf++; if ( pSrcBuf < pEndSrcBuf ) - c = (sal_uChar)*pSrcBuf; + c = (unsigned char)*pSrcBuf; else bEnd = sal_True; } diff --git a/sal/textenc/tcvtutf8.cxx b/sal/textenc/tcvtutf8.cxx index 9490980095d8..a8b262ac51de 100644 --- a/sal/textenc/tcvtutf8.cxx +++ b/sal/textenc/tcvtutf8.cxx @@ -80,8 +80,8 @@ sal_Size ImplConvertUtf8ToUnicode( int nShift = -1; bool bCheckBom = true; sal_uInt32 nInfo = 0; - sal_uChar const * pSrcBufPtr = (sal_uChar const *) pSrcBuf; - sal_uChar const * pSrcBufEnd = pSrcBufPtr + nSrcBytes; + unsigned char const * pSrcBufPtr = (unsigned char const *) pSrcBuf; + unsigned char const * pSrcBufEnd = pSrcBufPtr + nSrcBytes; sal_Unicode * pDestBufPtr = pDestBuf; sal_Unicode * pDestBufEnd = pDestBufPtr + nDestChars; diff --git a/sal/textenc/tenchelp.hxx b/sal/textenc/tenchelp.hxx index 67bbcd0c6099..b2f7fa51995e 100644 --- a/sal/textenc/tenchelp.hxx +++ b/sal/textenc/tenchelp.hxx @@ -106,8 +106,8 @@ struct ImplTextEncodingData struct ImplUniCharTabData { sal_uInt16 mnUniChar; - sal_uChar mnChar; - sal_uChar mnChar2; + unsigned char mnChar; + unsigned char mnChar2; // to cater for mappings like MS1258 with 1--2 bytes per Unicode char, // 0 if unused }; @@ -116,12 +116,12 @@ struct ImplByteConvertData { const sal_uInt16* mpToUniTab1; const sal_uInt16* mpToUniTab2; - sal_uChar mnToUniStart1; - sal_uChar mnToUniEnd1; - sal_uChar mnToUniStart2; - sal_uChar mnToUniEnd2; - const sal_uChar* mpToCharTab1; - const sal_uChar* mpToCharTab2; + unsigned char mnToUniStart1; + unsigned char mnToUniEnd1; + unsigned char mnToUniStart2; + unsigned char mnToUniEnd2; + const unsigned char* mpToCharTab1; + const unsigned char* mpToCharTab2; const ImplUniCharTabData* mpToCharExTab; sal_uInt16 mnToCharStart1; sal_uInt16 mnToCharEnd1; @@ -136,15 +136,15 @@ struct ImplByteConvertData struct ImplDBCSEUDCData { - sal_uChar mnLeadStart; - sal_uChar mnLeadEnd; - sal_uChar mnTrail1Start; - sal_uChar mnTrail1End; - sal_uChar mnTrail2Start; - sal_uChar mnTrail2End; - sal_uChar mnTrail3Start; - sal_uChar mnTrail3End; - sal_uChar mnTrailCount; + unsigned char mnLeadStart; + unsigned char mnLeadEnd; + unsigned char mnTrail1Start; + unsigned char mnTrail1End; + unsigned char mnTrail2Start; + unsigned char mnTrail2End; + unsigned char mnTrail3Start; + unsigned char mnTrail3End; + unsigned char mnTrailCount; sal_uInt16 mnTrailRangeCount; sal_uInt16 mnUniStart; sal_uInt16 mnUniEnd; @@ -169,10 +169,10 @@ struct ImplDBCSConvertData { const ImplDBCSToUniLeadTab* mpToUniLeadTab; const ImplUniToDBCSHighTab* mpToDBCSHighTab; - sal_uChar mnLeadStart; - sal_uChar mnLeadEnd; - sal_uChar mnTrailStart; - sal_uChar mnTrailEnd; + unsigned char mnLeadStart; + unsigned char mnLeadEnd; + unsigned char mnTrailStart; + unsigned char mnTrailEnd; const ImplDBCSEUDCData* mpEUDCTab; sal_uInt16 mnEUDCCount; }; @@ -194,7 +194,7 @@ struct ImplEUCJPConvertData /* --------------------------------- */ inline sal_Unicode ImplGetUndefinedUnicodeChar( - sal_uChar cChar, sal_uInt32 nFlags) + unsigned char cChar, sal_uInt32 nFlags) { return ((nFlags & RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_MASK) == RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_MAPTOPRIVATE) ? diff --git a/sal/textenc/textcvt.cxx b/sal/textenc/textcvt.cxx index c84a9b607c39..6e497f4e9935 100644 --- a/sal/textenc/textcvt.cxx +++ b/sal/textenc/textcvt.cxx @@ -54,7 +54,7 @@ static sal_Size ImplDummyToUnicode( const char* pSrcBuf, sal_Size nSrcBytes, break; } - *pDestBuf = (sal_Unicode)(sal_uChar)*pSrcBuf; + *pDestBuf = (sal_Unicode)(unsigned char)*pSrcBuf; pDestBuf++; pSrcBuf++; } @@ -91,7 +91,7 @@ static sal_Size ImplUnicodeToDummy( const sal_Unicode* pSrcBuf, sal_Size nSrcCha break; } - *pDestBuf = (char)(sal_uChar)(*pSrcBuf & 0x00FF); + *pDestBuf = (char)(unsigned char)(*pSrcBuf & 0x00FF); pDestBuf++; pSrcBuf++; } diff --git a/sal/textenc/textenc.cxx b/sal/textenc/textenc.cxx index d4f658194d61..94fe67de9ebe 100644 --- a/sal/textenc/textenc.cxx +++ b/sal/textenc/textenc.cxx @@ -60,7 +60,7 @@ static sal_uInt16 const aImpl8090SameToUniTab[SAME8090UNI_END #define SAME8090CHAR_START 0x0080 #define SAME8090CHAR_END 0x009F -static sal_uChar const aImpl8090SameToCharTab[SAME8090CHAR_END +static unsigned char const aImpl8090SameToCharTab[SAME8090CHAR_END - SAME8090CHAR_START + 1] = { 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, /* 0x0080 */ @@ -70,7 +70,7 @@ static sal_uChar const aImpl8090SameToCharTab[SAME8090CHAR_END #define SAMEA0FFCHAR_START 0x00A0 #define SAMEA0FFCHAR_END 0x00FF -static sal_uChar const aImplA0FFSameToCharTab[SAMEA0FFCHAR_END +static unsigned char const aImplA0FFSameToCharTab[SAMEA0FFCHAR_END - SAMEA0FFCHAR_START + 1] = { 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, /* 0x00A0 */ diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 9bd56805d277..f6b5382b97ec 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -3258,7 +3258,7 @@ void ScInterpreter::ScCode() RTL_UNICODETOTEXT_FLAGS_UNDEFINED_DEFAULT | RTL_UNICODETOTEXT_FLAGS_INVALID_DEFAULT | RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACE; - PushInt( (sal_uChar) OUStringToOString(OUString(aStr[0]), osl_getThreadTextEncoding(), convertFlags).toChar() ); + PushInt( (unsigned char) OUStringToOString(OUString(aStr[0]), osl_getThreadTextEncoding(), convertFlags).toChar() ); } diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index d61383af8608..49f49bb4c537 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -1456,7 +1456,7 @@ void XclExpSheetProtectOptions::WriteBody( XclExpStream& rStrm ) sal_uInt16 nBytes = 0x0867; rStrm << nBytes; - sal_uChar nZero = 0x00; + unsigned char nZero = 0x00; for (int i = 0; i < 9; ++i) rStrm << nZero; diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx index 7598e4f2dade..139429776a19 100644 --- a/sfx2/source/doc/graphhelp.cxx +++ b/sfx2/source/doc/graphhelp.cxx @@ -148,7 +148,7 @@ void* GraphicHelper::getWinMetaFileFromGDI_Impl( const GDIMetaFile* pGDIMeta, co if ( nLength > 22 ) { HMETAFILE hMeta = SetMetaFileBitsEx( nLength - 22, - ( reinterpret_cast< const sal_uChar*>( pStream->GetData() ) ) + 22 ); + ( reinterpret_cast< const unsigned char*>( pStream->GetData() ) ) + 22 ); if ( hMeta ) { diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index a86fad6b6bba..9d1b5d98ac40 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -1875,14 +1875,14 @@ bool HTMLParser::IsHTMLFormat( const sal_Char* pHeader, bool bUCS2B = false; if( bSwitchToUCS2 ) { - if( 0xfeU == (sal_uChar)pHeader[0] && - 0xffU == (sal_uChar)pHeader[1] ) + if( 0xfeU == (unsigned char)pHeader[0] && + 0xffU == (unsigned char)pHeader[1] ) { eEnc = RTL_TEXTENCODING_UCS2; bUCS2B = true; } - else if( 0xffU == (sal_uChar)pHeader[0] && - 0xfeU == (sal_uChar)pHeader[1] ) + else if( 0xffU == (unsigned char)pHeader[0] && + 0xfeU == (unsigned char)pHeader[1] ) { eEnc = RTL_TEXTENCODING_UCS2; } @@ -1891,12 +1891,12 @@ bool HTMLParser::IsHTMLFormat( const sal_Char* pHeader, ( RTL_TEXTENCODING_UCS2 == eEnc && ( - (0xfe == (sal_uChar)pHeader[0] && 0xff == (sal_uChar)pHeader[1]) || - (0xff == (sal_uChar)pHeader[0] && 0xfe == (sal_uChar)pHeader[1]) + (0xfe == (unsigned char)pHeader[0] && 0xff == (unsigned char)pHeader[1]) || + (0xff == (unsigned char)pHeader[0] && 0xfe == (unsigned char)pHeader[1]) ) ) { - if( 0xfe == (sal_uChar)pHeader[0] ) + if( 0xfe == (unsigned char)pHeader[0] ) bUCS2B = true; sal_Int32 nLen = 2; diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx index b28afa229418..4647a2f68536 100644 --- a/svtools/source/svrtf/svparser.cxx +++ b/svtools/source/svrtf/svparser.cxx @@ -146,7 +146,7 @@ sal_Unicode SvParser::GetNextChar() sal_Bool bErr; if( bSwitchToUCS2 && 0 == rInput.Tell() ) { - sal_uChar c1, c2; + unsigned char c1, c2; sal_Bool bSeekBack = sal_True; rInput >> c1; @@ -185,7 +185,7 @@ sal_Unicode SvParser::GetNextChar() if( RTL_TEXTENCODING_UCS2 == eSrcEnc ) { sal_Unicode cUC = USHRT_MAX; - sal_uChar c1, c2; + unsigned char c1, c2; rInput >> c1 >> c2; if( 2 == rInput.Tell() && diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index 7cd89ed42f92..e9a05c5abb8a 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -2212,16 +2212,16 @@ INetURLObject::PrefixInfo const * INetURLObject::getPrefix(sal_Unicode const *& if (p >= pEnd) break; sal_uInt32 nChar = rtl::toAsciiLowerCase(*p++); - while (pFirst <= pLast && sal_uChar(pFirst->m_pPrefix[i]) < nChar) + while (pFirst <= pLast && static_cast<unsigned char>(pFirst->m_pPrefix[i]) < nChar) ++pFirst; - while (pFirst <= pLast && sal_uChar(pLast->m_pPrefix[i]) > nChar) + while (pFirst <= pLast && static_cast<unsigned char>(pLast->m_pPrefix[i]) > nChar) --pLast; } if (pFirst == pLast) { sal_Char const * q = pFirst->m_pPrefix + i; while (p < pEnd && *q != '\0' - && rtl::toAsciiLowerCase(*p) == sal_uChar(*q)) + && rtl::toAsciiLowerCase(*p) == static_cast<unsigned char>(*q)) { ++p; ++q; @@ -5051,7 +5051,7 @@ sal_uInt32 INetURLObject::getUTF32(sal_Unicode const *& rBegin, { int nWeight1; int nWeight2; - if (nUTF32 == sal_uChar(cEscapePrefix) && rBegin + 1 < pEnd + if (nUTF32 == static_cast<unsigned char>(cEscapePrefix) && rBegin + 1 < pEnd && (nWeight1 = INetMIME::getHexWeight(rBegin[0])) >= 0 && (nWeight2 = INetMIME::getHexWeight(rBegin[1])) >= 0) { @@ -5149,7 +5149,7 @@ sal_uInt32 INetURLObject::getUTF32(sal_Unicode const *& rBegin, { int nWeight1; int nWeight2; - if (nUTF32 == sal_uChar(cEscapePrefix) && rBegin + 1 < pEnd + if (nUTF32 == static_cast<unsigned char>(cEscapePrefix) && rBegin + 1 < pEnd && ((nWeight1 = INetMIME::getHexWeight(rBegin[0])) >= 0) && ((nWeight2 = INetMIME::getHexWeight(rBegin[1])) >= 0)) { diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx index 83ca17e16e65..f0cac3aa6a94 100644 --- a/tools/source/inet/inetmime.cxx +++ b/tools/source/inet/inetmime.cxx @@ -181,7 +181,7 @@ void appendISO88591(OUString & rText, sal_Char const * pBegin, sal_Int32 nLength = pEnd - pBegin; sal_Unicode * pBuffer = new sal_Unicode[nLength]; for (sal_Unicode * p = pBuffer; pBegin != pEnd;) - *p++ = sal_uChar(*pBegin++); + *p++ = static_cast<unsigned char>(*pBegin++); rText += OUString(pBuffer, nLength); delete[] pBuffer; } @@ -321,13 +321,13 @@ bool parseParameters(ParameterList const & rInput, for (sal_Int32 i = 0; i < pNext->m_aValue.getLength(); ++i) aValue += OUString(sal_Unicode( sal_Unicode( - sal_uChar(pNext->m_aValue[i])) + static_cast<unsigned char>(pNext->m_aValue[i])) | 0xF800)); } else { for (sal_Int32 i = 0; i < pNext->m_aValue.getLength(); ++i) - aValue += OUString( sal_Unicode(sal_uChar(pNext->m_aValue[i])) ); + aValue += OUString( sal_Unicode(static_cast<unsigned char>(pNext->m_aValue[i])) ); } pNext = pNext->m_pNext; if (!pNext || pNext->m_nSection == 0) @@ -912,7 +912,7 @@ sal_Unicode const * INetMIME::scanParameters(sal_Unicode const * pBegin, bInvalid = true; break; } - nChar = sal_uChar(*p++); + nChar = static_cast<unsigned char>(*p++); } else if (nChar == '\\') { @@ -3275,7 +3275,7 @@ void INetMIMEEncodedWordOutputSink::finish(bool bWriteTrailer) nSize = nTargetSize; for (sal_Size k = 0; k < nTargetSize; ++k) - if (needsEncodedWordEscape(sal_uChar( + if (needsEncodedWordEscape(static_cast<unsigned char>( pTargetBuffer[k]))) nSize += 2; } @@ -3428,7 +3428,7 @@ void INetMIMEEncodedWordOutputSink::finish(bool bWriteTrailer) { for (sal_Size k = 0; k < nTargetSize; ++k) { - sal_uInt32 nUCS4 = sal_uChar(pTargetBuffer[k]); + sal_uInt32 nUCS4 = static_cast<unsigned char>(pTargetBuffer[k]); bool bEscape = needsEncodedWordEscape(nUCS4); if (k > 0 && m_rSink.getColumn() + (bEscape ? 5 : 3) diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index 7cbdca78292b..808008919398 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -854,7 +854,7 @@ bool SvStream::StartReadingUnicodeText( rtl_TextEncoding eReadBomCharSet ) } if (bTryUtf8) { - sal_uChar nChar; + unsigned char nChar; nBack += sizeof(nChar); *this >> nChar; if (nChar == 0xbf) diff --git a/ucb/source/regexp/regexp.cxx b/ucb/source/regexp/regexp.cxx index 44c2d8c54fa0..7e84f19780a1 100644 --- a/ucb/source/regexp/regexp.cxx +++ b/ucb/source/regexp/regexp.cxx @@ -301,8 +301,8 @@ bool matchString(sal_Unicode const ** pBegin, sal_Unicode const * pEnd, { sal_Unicode const * p = *pBegin; - sal_uChar const * q = reinterpret_cast< sal_uChar const * >(pString); - sal_uChar const * qEnd = q + nStringLength; + unsigned char const * q = reinterpret_cast< unsigned char const * >(pString); + unsigned char const * qEnd = q + nStringLength; if (pEnd - p < qEnd - q) return false; diff --git a/vcl/generic/print/bitmap_gfx.cxx b/vcl/generic/print/bitmap_gfx.cxx index 31ea82fe58a1..6ea8e33438d2 100644 --- a/vcl/generic/print/bitmap_gfx.cxx +++ b/vcl/generic/print/bitmap_gfx.cxx @@ -495,7 +495,7 @@ PrinterGfx::DrawPS1GrayImage (const PrinterBmp& rBitmap, const Rectangle& rArea) { for (long nColumn = rArea.Left(); nColumn <= rArea.Right(); nColumn++) { - sal_uChar nByte = rBitmap.GetPixelGray (nRow, nColumn); + unsigned char nByte = rBitmap.GetPixelGray (nRow, nColumn); pEncoder->EncodeByte (nByte); } } @@ -604,7 +604,7 @@ PrinterGfx::DrawPS2GrayImage (const PrinterBmp& rBitmap, const Rectangle& rArea) { for (long nColumn = rArea.Left(); nColumn <= rArea.Right(); nColumn++) { - sal_uChar nByte = rBitmap.GetPixelGray (nRow, nColumn); + unsigned char nByte = rBitmap.GetPixelGray (nRow, nColumn); pEncoder->EncodeByte (nByte); } } @@ -624,8 +624,8 @@ PrinterGfx::DrawPS2MonoImage (const PrinterBmp& rBitmap, const Rectangle& rArea) for (long nRow = rArea.Top(); nRow <= rArea.Bottom(); nRow++) { long nBitPos = 0; - sal_uChar nBit = 0; - sal_uChar nByte = 0; + unsigned char nBit = 0; + unsigned char nByte = 0; for (long nColumn = rArea.Left(); nColumn <= rArea.Right(); nColumn++) { @@ -660,7 +660,7 @@ PrinterGfx::DrawPS2PaletteImage (const PrinterBmp& rBitmap, const Rectangle& rAr { for (long nColumn = rArea.Left(); nColumn <= rArea.Right(); nColumn++) { - sal_uChar nByte = rBitmap.GetPixelIdx (nRow, nColumn); + unsigned char nByte = rBitmap.GetPixelIdx (nRow, nColumn); pEncoder->EncodeByte (nByte); } } diff --git a/vcl/generic/print/common_gfx.cxx b/vcl/generic/print/common_gfx.cxx index 260fbc951cd5..05825375fc7b 100644 --- a/vcl/generic/print/common_gfx.cxx +++ b/vcl/generic/print/common_gfx.cxx @@ -1025,7 +1025,7 @@ PrinterGfx::PSScale (double fScaleX, double fScaleY) /* psshowtext helper routines: draw an hex string for show/xshow */ void -PrinterGfx::PSHexString (const sal_uChar* pString, sal_Int16 nLen) +PrinterGfx::PSHexString (const unsigned char* pString, sal_Int16 nLen) { sal_Char pHexString [128]; sal_Int32 nChar = 0; @@ -1077,7 +1077,7 @@ PrinterGfx::PSDeltaArray (const sal_Int32 *pArray, sal_Int16 nEntries) * fonts in general nBytes and nGlyphs is the same. For printer resident Composite * fonts it may be different (these fonts may be SJIS encoded for example) */ void -PrinterGfx::PSShowText (const sal_uChar* pStr, sal_Int16 nGlyphs, sal_Int16 nBytes, +PrinterGfx::PSShowText (const unsigned char* pStr, sal_Int16 nGlyphs, sal_Int16 nBytes, const sal_Int32* pDeltaArray) { PSSetColor (maTextColor); diff --git a/vcl/generic/print/glyphset.cxx b/vcl/generic/print/glyphset.cxx index b2e982efd623..60fb95be771d 100644 --- a/vcl/generic/print/glyphset.cxx +++ b/vcl/generic/print/glyphset.cxx @@ -82,7 +82,7 @@ GlyphSet::IsVertical () sal_Bool GlyphSet::GetCharID ( sal_Unicode nChar, - sal_uChar* nOutGlyphID, + unsigned char* nOutGlyphID, sal_Int32* nOutGlyphSetID ) { @@ -94,7 +94,7 @@ sal_Bool GlyphSet::GetGlyphID ( sal_uInt32 nGlyph, sal_Unicode nUnicode, - sal_uChar* nOutGlyphID, + unsigned char* nOutGlyphID, sal_Int32* nOutGlyphSetID ) { @@ -105,7 +105,7 @@ GlyphSet::GetGlyphID ( sal_Bool GlyphSet::LookupCharID ( sal_Unicode nChar, - sal_uChar* nOutGlyphID, + unsigned char* nOutGlyphID, sal_Int32* nOutGlyphSetID ) { @@ -136,7 +136,7 @@ GlyphSet::LookupCharID ( sal_Bool GlyphSet::LookupGlyphID ( sal_uInt32 nGlyph, - sal_uChar* nOutGlyphID, + unsigned char* nOutGlyphID, sal_Int32* nOutGlyphSetID ) { @@ -164,7 +164,7 @@ GlyphSet::LookupGlyphID ( return sal_False; } -sal_uChar +unsigned char GlyphSet::GetAnsiMapping (sal_Unicode nUnicodeChar) { static rtl_UnicodeToTextConverter aConverter = @@ -182,16 +182,16 @@ GlyphSet::GetAnsiMapping (sal_Unicode nUnicodeChar) &nUnicodeChar, 1, &nAnsiChar, 1, nCvtFlags, &nCvtInfo, &nCvtChars ); - return nSize == 1 ? (sal_uChar)nAnsiChar : (sal_uChar)0; + return nSize == 1 ? (unsigned char)nAnsiChar : (unsigned char)0; } -sal_uChar +unsigned char GlyphSet::GetSymbolMapping (sal_Unicode nUnicodeChar) { if (0x0000 < nUnicodeChar && nUnicodeChar < 0x0100) - return (sal_uChar)nUnicodeChar; + return (unsigned char)nUnicodeChar; if (0xf000 < nUnicodeChar && nUnicodeChar < 0xf100) - return (sal_uChar)nUnicodeChar; + return (unsigned char)nUnicodeChar; return 0; } @@ -212,11 +212,11 @@ GlyphSet::AddNotdef (glyph_map_t &rGlyphMap) sal_Bool GlyphSet::AddCharID ( sal_Unicode nChar, - sal_uChar* nOutGlyphID, + unsigned char* nOutGlyphID, sal_Int32* nOutGlyphSetID ) { - sal_uChar nMappedChar; + unsigned char nMappedChar; // XXX important: avoid to reencode type1 symbol fonts if (mnBaseEncoding == RTL_TEXTENCODING_SYMBOL) @@ -271,11 +271,11 @@ sal_Bool GlyphSet::AddGlyphID ( sal_uInt32 nGlyph, sal_Unicode nUnicode, - sal_uChar* nOutGlyphID, + unsigned char* nOutGlyphID, sal_Int32* nOutGlyphSetID ) { - sal_uChar nMappedChar = 0; + unsigned char nMappedChar = 0; // XXX important: avoid to reencode type1 symbol fonts if (mnBaseEncoding == RTL_TEXTENCODING_SYMBOL) @@ -469,7 +469,7 @@ void GlyphSet::DrawGlyphs( const sal_Int32* pDeltaArray, const sal_Bool bUseGlyphs) { - sal_uChar *pGlyphID = (sal_uChar*)alloca (nLen * sizeof(sal_uChar)); + unsigned char *pGlyphID = (unsigned char*)alloca (nLen * sizeof(unsigned char)); sal_Int32 *pGlyphSetID = (sal_Int32*)alloca (nLen * sizeof(sal_Int32)); std::set< sal_Int32 > aGlyphSet; @@ -486,7 +486,7 @@ void GlyphSet::DrawGlyphs( // loop over all glyph sets to detect substrings that can be xshown together // without changing the postscript font sal_Int32 *pDeltaSubset = (sal_Int32*)alloca (nLen * sizeof(sal_Int32)); - sal_uChar *pGlyphSubset = (sal_uChar*)alloca (nLen * sizeof(sal_uChar)); + unsigned char *pGlyphSubset = (unsigned char*)alloca (nLen * sizeof(unsigned char)); std::set< sal_Int32 >::iterator aSet; for (aSet = aGlyphSet.begin(); aSet != aGlyphSet.end(); ++aSet) @@ -566,7 +566,7 @@ GlyphSet::ImplDrawText (PrinterGfx &rGfx, const Point& rPoint, } int nChar; - sal_uChar *pGlyphID = (sal_uChar*)alloca (nLen * sizeof(sal_uChar)); + unsigned char *pGlyphID = (unsigned char*)alloca (nLen * sizeof(unsigned char)); sal_Int32 *pGlyphSetID = (sal_Int32*)alloca (nLen * sizeof(sal_Int32)); // convert unicode to glyph id and char set (font subset) @@ -703,7 +703,7 @@ GlyphSet::PSUploadEncoding(osl::File* pOutFile, PrinterGfx &rGfx) struct EncEntry { - sal_uChar aEnc; + unsigned char aEnc; long aGID; EncEntry() : aEnc( 0 ), aGID( 0 ) {} @@ -714,7 +714,7 @@ struct EncEntry static void CreatePSUploadableFont( TrueTypeFont* pSrcFont, FILE* pTmpFile, const char* pGlyphSetName, int nGlyphCount, - /*const*/ sal_uInt16* pRequestedGlyphs, /*const*/ sal_uChar* pEncoding, + /*const*/ sal_uInt16* pRequestedGlyphs, /*const*/ unsigned char* pEncoding, bool bAllowType42, bool /*bAllowCID*/ ) { // match the font-subset to the printer capabilities @@ -732,7 +732,7 @@ static void CreatePSUploadableFont( TrueTypeFont* pSrcFont, FILE* pTmpFile, std::stable_sort( aSorted.begin(), aSorted.end() ); - std::vector< sal_uChar > aEncoding( nGlyphCount ); + std::vector< unsigned char > aEncoding( nGlyphCount ); std::vector< long > aRequestedGlyphs( nGlyphCount ); for( int i = 0; i < nGlyphCount; i++ ) @@ -771,7 +771,7 @@ GlyphSet::PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAllowType42 // encoding vector maps character encoding to the ordinal number // of the glyph in the output file - sal_uChar pEncoding[256]; + unsigned char pEncoding[256]; sal_uInt16 pTTGlyphMapping[256]; const bool bAllowCID = false; // TODO: nPSLanguageLevel>=3 @@ -840,7 +840,7 @@ GlyphSet::PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAllowType42 rewind(pTmpFile); fflush(pTmpFile); - sal_uChar pBuffer[0x2000]; + unsigned char pBuffer[0x2000]; sal_uInt64 nIn; sal_uInt64 nOut; do diff --git a/vcl/generic/print/glyphset.hxx b/vcl/generic/print/glyphset.hxx index 0225109c7dd8..7a65b64610f7 100644 --- a/vcl/generic/print/glyphset.hxx +++ b/vcl/generic/print/glyphset.hxx @@ -65,23 +65,23 @@ private: sal_Int32 nGlyphSetID); sal_Bool GetCharID (sal_Unicode nChar, - sal_uChar* nOutGlyphID, sal_Int32* nOutGlyphSetID); + unsigned char* nOutGlyphID, sal_Int32* nOutGlyphSetID); sal_Bool LookupCharID (sal_Unicode nChar, - sal_uChar* nOutGlyphID, sal_Int32* nOutGlyphSetID); + unsigned char* nOutGlyphID, sal_Int32* nOutGlyphSetID); sal_Bool AddCharID (sal_Unicode nChar, - sal_uChar* nOutGlyphID, + unsigned char* nOutGlyphID, sal_Int32* nOutGlyphSetID); sal_Bool GetGlyphID (sal_uInt32 nGlyph, sal_Unicode nUnicode, - sal_uChar* nOutGlyphID, sal_Int32* nOutGlyphSetID); + unsigned char* nOutGlyphID, sal_Int32* nOutGlyphSetID); sal_Bool LookupGlyphID (sal_uInt32 nGlyph, - sal_uChar* nOutGlyphID, sal_Int32* nOutGlyphSetID); + unsigned char* nOutGlyphID, sal_Int32* nOutGlyphSetID); sal_Bool AddGlyphID (sal_uInt32 nGlyph, sal_Unicode nUnicode, - sal_uChar* nOutGlyphID, + unsigned char* nOutGlyphID, sal_Int32* nOutGlyphSetID); void AddNotdef (char_map_t &rCharMap); void AddNotdef (glyph_map_t &rGlyphMap); - sal_uChar GetAnsiMapping (sal_Unicode nUnicodeChar); - sal_uChar GetSymbolMapping (sal_Unicode nUnicodeChar); + unsigned char GetAnsiMapping (sal_Unicode nUnicodeChar); + unsigned char GetSymbolMapping (sal_Unicode nUnicodeChar); void ImplDrawText (PrinterGfx &rGfx, const Point& rPoint, const sal_Unicode* pStr, sal_Int16 nLen); diff --git a/vcl/generic/print/printerjob.cxx b/vcl/generic/print/printerjob.cxx index 7c1b359cd836..a979d5c66f96 100644 --- a/vcl/generic/print/printerjob.cxx +++ b/vcl/generic/print/printerjob.cxx @@ -56,7 +56,7 @@ namespace psp { sal_Bool -AppendPS (FILE* pDst, osl::File* pSrc, sal_uChar* pBuffer, +AppendPS (FILE* pDst, osl::File* pSrc, unsigned char* pBuffer, sal_uInt32 nBlockSize = nBLOCKSIZE) { if ((pDst == NULL) || (pSrc == NULL)) @@ -68,7 +68,7 @@ AppendPS (FILE* pDst, osl::File* pSrc, sal_uChar* pBuffer, if (nBlockSize == 0) nBlockSize = nBLOCKSIZE; if (pBuffer == NULL) - pBuffer = (sal_uChar*)alloca (nBlockSize); + pBuffer = (unsigned char*)alloca (nBlockSize); sal_uInt64 nIn = 0; sal_uInt64 nOut = 0; @@ -484,7 +484,7 @@ PrinterJob::EndJob () /* spool the document parts to the destination */ - sal_uChar pBuffer[ nBLOCKSIZE ]; + unsigned char pBuffer[ nBLOCKSIZE ]; AppendPS (pDestFILE, mpJobHeader, pBuffer); mpJobHeader->close(); diff --git a/vcl/generic/print/psputil.cxx b/vcl/generic/print/psputil.cxx index 81da3844c5f0..e6bd2c467c76 100644 --- a/vcl/generic/print/psputil.cxx +++ b/vcl/generic/print/psputil.cxx @@ -213,7 +213,7 @@ ConverterFactory::Get (rtl_TextEncoding nEncoding) // textconversion in drawtext sal_Size ConverterFactory::Convert (const sal_Unicode *pText, int nTextLen, - sal_uChar *pBuffer, sal_Size nBufferSize, rtl_TextEncoding nEncoding) + unsigned char *pBuffer, sal_Size nBufferSize, rtl_TextEncoding nEncoding) { const sal_uInt32 nCvtFlags = RTL_UNICODETOTEXT_FLAGS_UNDEFINED_QUESTIONMARK | RTL_UNICODETOTEXT_FLAGS_INVALID_QUESTIONMARK ; diff --git a/vcl/generic/print/psputil.hxx b/vcl/generic/print/psputil.hxx index e085f4704278..c2092c17b76a 100644 --- a/vcl/generic/print/psputil.hxx +++ b/vcl/generic/print/psputil.hxx @@ -54,7 +54,7 @@ public: ~ConverterFactory(); rtl_UnicodeToTextConverter Get (rtl_TextEncoding nEncoding); sal_Size Convert (const sal_Unicode *pText, int nTextLen, - sal_uChar *pBuffer, sal_Size nBufferSize, + unsigned char *pBuffer, sal_Size nBufferSize, rtl_TextEncoding nEncoding); private: diff --git a/vcl/generic/print/text_gfx.cxx b/vcl/generic/print/text_gfx.cxx index 751936b9d414..7dfa13068c4f 100644 --- a/vcl/generic/print/text_gfx.cxx +++ b/vcl/generic/print/text_gfx.cxx @@ -543,7 +543,7 @@ PrinterGfx::LicenseWarning(const Point& rPoint, const sal_Unicode* pStr, PSSetFont (aFontName, RTL_TEXTENCODING_ISO_8859_1); sal_Size nSize = 4 * nLen; - sal_uChar* pBuffer = (sal_uChar*)alloca (nSize* sizeof(sal_uChar)); + unsigned char* pBuffer = (unsigned char*)alloca (nSize* sizeof(unsigned char)); ConverterFactory &rCvt = GetConverterFactory (); nSize = rCvt.Convert (pStr, nLen, pBuffer, nSize, RTL_TEXTENCODING_ISO_8859_1); diff --git a/vcl/inc/generic/printergfx.hxx b/vcl/inc/generic/printergfx.hxx index 48f759b867ba..b2ecf2a86fdd 100644 --- a/vcl/inc/generic/printergfx.hxx +++ b/vcl/inc/generic/printergfx.hxx @@ -290,9 +290,9 @@ public: void PSScale (double fScaleX, double fScaleY); void PSLineTo(const Point& rPoint ); void PSPointOp (const Point& rPoint, const sal_Char* pOperator); - void PSHexString (const sal_uChar* pString, sal_Int16 nLen); + void PSHexString (const unsigned char* pString, sal_Int16 nLen); void PSDeltaArray (const sal_Int32 *pArray, sal_Int16 nEntries); - void PSShowText (const sal_uChar* pString, + void PSShowText (const unsigned char* pString, sal_Int16 nGlyphs, sal_Int16 nBytes, const sal_Int32* pDeltaArray = NULL); void PSComment (const sal_Char* pComment ); diff --git a/vcl/source/filter/sgvmain.hxx b/vcl/source/filter/sgvmain.hxx index 989954133599..04791e9723b0 100644 --- a/vcl/source/filter/sgvmain.hxx +++ b/vcl/source/filter/sgvmain.hxx @@ -110,7 +110,7 @@ public: sal_uInt16 LnFeed; // 1..32767% vom max. Schriftgrad der Zeile sal_uInt16 Slant; // Kursivwinkel 0.00..89.99"u default 15.00"u doppelt Breit angesehen) sal_uInt8 ZAbst; // Zeichenabstand 0..255% (0=auf der Stelle; 100=normal; 200=Zeichen wird als - sal_sChar ChrVPos; // Zeichen V-Position default 0= on Baseline, 10= 5Pt drunter (-64..63"u) + signed char ChrVPos; // Zeichen V-Position default 0= on Baseline, 10= 5Pt drunter (-64..63"u) ObjLineType ShdL; // Schatten-Outline (neu 2.0) ObjAreaType ShdF; // Schatten-innen (neu 2.0) PointType ShdVers; // Schattenversatz Max.300.00% |