diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2020-09-11 17:38:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-09-12 18:54:15 +0200 |
| commit | 70666469b87ab1e3589db0f5f7a236d744e83733 (patch) | |
| tree | 88ee34da282712ea32e6354be92472f5fa52f1d4 | |
| parent | 8214051829468c783404faf19194b26b35833e41 (diff) | |
Replace remaining uses of sal_uChar
The goal is then to remove sal_uChar completely since it's been deprecated in 2013!
See http://document-foundation-mail-archive.969070.n3.nabble.com/About-removing-long-time-deprecated-types-from-public-API-tt4287268.html
Change-Id: I1ed6a56075a47fbfeac97388432bffcbd2ef1f7b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102491
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | svtools/source/svrtf/svparser.cxx | 6 | ||||
| -rw-r--r-- | vcl/source/font/font.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/gdi/dibtools.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx index cafb5b8d38e5..429e9e045f91 100644 --- a/svtools/source/svrtf/svparser.cxx +++ b/svtools/source/svrtf/svparser.cxx @@ -286,7 +286,7 @@ sal_uInt32 SvParser<T>::GetNextChar() ) { // no conversion shall take place - c = reinterpret_cast<sal_uChar&>( c1 ); + c = reinterpret_cast<unsigned char&>( c1 ); nChars = 1; } else @@ -390,7 +390,7 @@ sal_uInt32 SvParser<T>::GetNextChar() // There are still errors, so we use the first // character and restart after that. - c = reinterpret_cast<sal_uChar&>( sBuffer[0] ); + c = reinterpret_cast<unsigned char&>( sBuffer[0] ); rInput.SeekRel( -(nLen-1) ); nChars = 1; } @@ -412,7 +412,7 @@ sal_uInt32 SvParser<T>::GetNextChar() "there is no converted character and no error" ); // #73398#: If the character could not be converted, // because a conversion is not available, do no conversion at all. - c = reinterpret_cast<sal_uChar&>( c1 ); + c = reinterpret_cast<unsigned char&>( c1 ); nChars = 1; } diff --git a/vcl/source/font/font.cxx b/vcl/source/font/font.cxx index 046816510087..18f1aa0cd939 100644 --- a/vcl/source/font/font.cxx +++ b/vcl/source/font/font.cxx @@ -431,7 +431,7 @@ SvStream& WriteImplFont( SvStream& rOStm, const ImplFont& rImplFont ) rOStm.WriteUChar( static_cast<sal_uInt8>(rImplFont.meKerning) ); // new in version 2 - rOStm.WriteUChar( static_cast<sal_uChar>(rImplFont.meRelief) ); + rOStm.WriteUChar( static_cast<unsigned char>(rImplFont.meRelief) ); rOStm.WriteUInt16( static_cast<sal_uInt16>(rImplFont.maCJKLanguageTag.getLanguageType( false)) ); rOStm.WriteBool( rImplFont.mbVertical ); rOStm.WriteUInt16( static_cast<sal_uInt16>(rImplFont.meEmphasisMark) ); diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx index f2164b94d129..df91ad1659e5 100644 --- a/vcl/source/gdi/dibtools.cxx +++ b/vcl/source/gdi/dibtools.cxx @@ -1879,7 +1879,7 @@ bool WriteDIBBitmapEx( { rOStm.WriteUInt32( 0x25091962 ); rOStm.WriteUInt32( 0xACB20201 ); - rOStm.WriteUChar( static_cast<sal_uChar>(rSource.meTransparent) ); + rOStm.WriteUChar( static_cast<unsigned char>(rSource.meTransparent) ); if(TransparentType::Bitmap == rSource.meTransparent) { |