diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-12-19 10:59:25 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-12-19 11:00:03 +0100 |
| commit | 8ee1a76b735acd39861f13a0dbb9c56f8eec96f4 (patch) | |
| tree | 2fd0c0481d26908460df741dab864e55f890331f /sal/textenc | |
| parent | f233f3973631c664e0953f04f88a58234390c088 (diff) | |
-Werror=shadow and -Werror=sign-promo fixes
Diffstat (limited to 'sal/textenc')
| -rw-r--r-- | sal/textenc/convertbig5hkscs.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sal/textenc/convertbig5hkscs.c b/sal/textenc/convertbig5hkscs.c index 2237a96475d9..0839e56acee1 100644 --- a/sal/textenc/convertbig5hkscs.c +++ b/sal/textenc/convertbig5hkscs.c @@ -119,12 +119,10 @@ sal_Size ImplConvertBig5HkscsToUnicode(ImplTextConverterData const * pData, } if (nUnicode == 0xFFFF) { - sal_uInt32 nFirst = pBig5Data[nRow].mnTrailStart; - if (nChar >= nFirst - && nChar <= pBig5Data[nRow].mnTrailEnd) + sal_uInt32 n = pBig5Data[nRow].mnTrailStart; + if (nChar >= n && nChar <= pBig5Data[nRow].mnTrailEnd) { - nUnicode - = pBig5Data[nRow].mpToUniTrailTab[nChar - nFirst]; + nUnicode = pBig5Data[nRow].mpToUniTrailTab[nChar - n]; if (nUnicode == 0) nUnicode = 0xFFFF; OSL_VERIFY(!ImplIsHighSurrogate(nUnicode)); |