diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 04:31:05 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 04:31:05 +0000 |
| commit | 7e302a20e022037d9926ed707ae4e786340a4fff (patch) | |
| tree | f4e6825bdfa6d021e2517c173f5471254b6e8270 /ucb/source | |
| parent | 652e1fcce0c2e5301a6dfca153a004161fcb852b (diff) | |
INTEGRATION: CWS warnings01 (1.15.10); FILE MERGED
2005/11/10 17:15:22 pl 1.15.10.1: #i55991# removed warnings
Diffstat (limited to 'ucb/source')
| -rw-r--r-- | ucb/source/ucp/package/pkguri.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ucb/source/ucp/package/pkguri.cxx b/ucb/source/ucp/package/pkguri.cxx index bafb8667c566..b9da02794831 100644 --- a/ucb/source/ucp/package/pkguri.cxx +++ b/ucb/source/ucp/package/pkguri.cxx @@ -4,9 +4,9 @@ * * $RCSfile: pkguri.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: rt $ $Date: 2005-09-09 15:57:45 $ + * last change: $Author: hr $ $Date: 2006-06-20 05:31:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -593,7 +593,7 @@ sal_uInt32 getUTF32(sal_Unicode const *& rBegin, sal_Unicode const * pEnd, { int nWeight1; int nWeight2; - if (nUTF32 == cEscapePrefix && rBegin + 1 < pEnd + if (nUTF32 == sal::static_int_cast<sal_uInt32>(cEscapePrefix) && rBegin + 1 < pEnd && (nWeight1 = getHexWeight(rBegin[0])) >= 0 && (nWeight2 = getHexWeight(rBegin[1])) >= 0) { @@ -685,7 +685,7 @@ sal_uInt32 getUTF32(sal_Unicode const *& rBegin, sal_Unicode const * pEnd, { int nWeight1; int nWeight2; - if (nUTF32 == cEscapePrefix && rBegin + 1 < pEnd + if (nUTF32 == sal::static_int_cast<sal_uInt32>(cEscapePrefix) && rBegin + 1 < pEnd && ((nWeight1 = getHexWeight(rBegin[0])) >= 0) && ((nWeight2 = getHexWeight(rBegin[1])) >= 0)) { @@ -733,6 +733,9 @@ static rtl::OUString decode(sal_Unicode const * pBegin, case DECODE_TO_IURI: eCharset = RTL_TEXTENCODING_UTF8; break; + case DECODE_WITH_CHARSET: + // do nothing ? + break; } rtl::OUStringBuffer aResult; while (pBegin < pEnd) |