diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-11-27 12:52:17 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-11-27 12:52:32 +0100 |
| commit | a39d07e13495cd06df7169b7778c8d07018794c5 (patch) | |
| tree | dde67f05acf71fcf181f90bce8dbcc1103e6d400 /svtools | |
| parent | d8565bd266939b4ae4231f5b2c7d6260bee404e9 (diff) | |
Unwind occurrences of deprecated sal_sChar, sal_uChar
Change-Id: I76be464200d486efef9c8a7e957c310c9adae3b8
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/svhtml/parhtml.cxx | 14 | ||||
| -rw-r--r-- | svtools/source/svrtf/svparser.cxx | 4 |
2 files changed, 9 insertions, 9 deletions
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() && |