diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:37:39 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:37:39 +0000 |
| commit | 04aa50e5ff7d6c19b02f15ed75b437f6bfdbd9be (patch) | |
| tree | 5f2d05f9fa62bab269f9c09eb73ca503e2c640da /sal | |
| parent | 880e80152056a5ff03ead6c02e2521e9e4257810 (diff) | |
INTEGRATION: CWS warnings01 (1.2.134); FILE MERGED
2005/11/18 09:13:28 sb 1.2.134.3: #i53898# Made code warning-free (in some cases reverting previous attempts).
2005/09/23 01:49:29 sb 1.2.134.2: RESYNC: (1.2-1.3); FILE MERGED
2005/08/30 17:03:18 sb 1.2.134.1: #i53898# Made code warning-free.
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/textenc/convertsinglebytetobmpunicode.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sal/textenc/convertsinglebytetobmpunicode.cxx b/sal/textenc/convertsinglebytetobmpunicode.cxx index 4e480b943a6c..4d129a37c43c 100644 --- a/sal/textenc/convertsinglebytetobmpunicode.cxx +++ b/sal/textenc/convertsinglebytetobmpunicode.cxx @@ -4,9 +4,9 @@ * * $RCSfile: convertsinglebytetobmpunicode.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-08 16:34:38 $ + * last change: $Author: hr $ $Date: 2006-06-20 04:37:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -45,7 +45,7 @@ #include <cstddef> sal_Size rtl_textenc_convertSingleByteToBmpUnicode( - ImplTextConverterData const * data, void * context, sal_Char const * srcBuf, + ImplTextConverterData const * data, void *, sal_Char const * srcBuf, sal_Size srcBytes, sal_Unicode * destBuf, sal_Size destChars, sal_uInt32 flags, sal_uInt32 * info, sal_Size * srcCvtBytes) { @@ -141,7 +141,9 @@ sal_Size rtl_textenc_convertBmpUnicodeToSingleByte( for (std::size_t i = 0; i < entries; ++i) { if (c < ranges[i].unicode) { break; - } else if (c <= ranges[i].unicode + ranges[i].range) { + } else if (c <= sal::static_int_cast< sal_uInt32 >( + ranges[i].unicode + ranges[i].range)) + { if (destBufEnd - destBufPtr < 1) { goto no_output; } |