diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:36:41 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:36:41 +0000 |
| commit | afa4af3186f8494e668393a33aa8de024acc92e6 (patch) | |
| tree | 84e2e17034017ec9479e80214096ddb074151db7 /sal/textenc | |
| parent | 805585db3e85eab61cf0c6fc7287d0f5472f76df (diff) | |
INTEGRATION: CWS warnings01 (1.6.62); FILE MERGED
2005/11/18 09:13:27 sb 1.6.62.3: #i53898# Made code warning-free (in some cases reverting previous attempts).
2005/09/23 01:46:25 sb 1.6.62.2: RESYNC: (1.6-1.7); FILE MERGED
2005/08/29 13:56:06 sb 1.6.62.1: #i53898# Made code warning-free.
Diffstat (limited to 'sal/textenc')
| -rw-r--r-- | sal/textenc/converteuctw.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sal/textenc/converteuctw.c b/sal/textenc/converteuctw.c index ba933158132b..bc88d43512b7 100644 --- a/sal/textenc/converteuctw.c +++ b/sal/textenc/converteuctw.c @@ -4,9 +4,9 @@ * * $RCSfile: converteuctw.c,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2005-09-08 16:30:01 $ + * last change: $Author: hr $ $Date: 2006-06-20 04:36:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -280,6 +280,7 @@ sal_Size ImplConvertEucTwToUnicode(ImplTextConverterData const * pData, && (nInfo & (RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL)) == 0) + { if ((nFlags & RTL_TEXTTOUNICODE_FLAGS_FLUSH) == 0) nInfo |= RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL; else @@ -296,6 +297,7 @@ sal_Size ImplConvertEucTwToUnicode(ImplTextConverterData const * pData, nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL; break; } + } if (pContext) { @@ -396,7 +398,7 @@ sal_Size ImplConvertUnicodeToEucTw(ImplTextConverterData const * pData, goto no_output; if (nPlane != 1) { - *pDestBufPtr++ = (sal_Char) 0x8E; + *pDestBufPtr++ = (sal_Char) (unsigned char) 0x8E; *pDestBufPtr++ = (sal_Char) (0xA0 + nPlane); } *pDestBufPtr++ = (sal_Char) (0xA0 + pCns116431992Data[nOffset++]); @@ -439,6 +441,7 @@ sal_Size ImplConvertUnicodeToEucTw(ImplTextConverterData const * pData, && (nInfo & (RTL_UNICODETOTEXT_INFO_ERROR | RTL_UNICODETOTEXT_INFO_DESTBUFFERTOSMALL)) == 0) + { if ((nFlags & RTL_UNICODETOTEXT_FLAGS_FLUSH) != 0) nInfo |= RTL_UNICODETOTEXT_INFO_SRCBUFFERTOSMALL; else @@ -461,6 +464,7 @@ sal_Size ImplConvertUnicodeToEucTw(ImplTextConverterData const * pData, nInfo |= RTL_UNICODETOTEXT_INFO_DESTBUFFERTOSMALL; break; } + } if (pContext) ((ImplUnicodeToTextContext *) pContext)->m_nHighSurrogate |