diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-06-17 10:40:23 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-06-17 10:40:23 +0000 |
| commit | 6ecb2bfb29660c56b5658e980bf7fc241c1c03a9 (patch) | |
| tree | 1c2f0ae79d5b60cbb55508d42e2bd34d7b184602 /sal | |
| parent | 932f678f3ce06910e7913420c732afd5e945b7af (diff) | |
INTEGRATION: CWS sb17 (1.3.256); FILE MERGED
2004/04/05 15:35:57 sb 1.3.256.1: #i25672# Extended ImplHandleBadInputMbTextToUnicodeConversion to single-byte scenarios.
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/textenc/converter.c | 43 | ||||
| -rw-r--r-- | sal/textenc/converter.h | 12 |
2 files changed, 35 insertions, 20 deletions
diff --git a/sal/textenc/converter.c b/sal/textenc/converter.c index f5459fc1bedc..8b8f45e90af1 100644 --- a/sal/textenc/converter.c +++ b/sal/textenc/converter.c @@ -2,9 +2,9 @@ * * $RCSfile: converter.c,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: sb $ $Date: 2001-11-19 17:46:37 $ + * last change: $Author: rt $ $Date: 2004-06-17 11:40:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,28 +77,45 @@ #include "sal/types.h" #endif -ImplBadInputConversionAction -ImplHandleBadInputMbTextToUnicodeConversion(sal_Bool bUndefined, - sal_uInt32 nFlags, - sal_Unicode ** pDestBufPtr, - sal_Unicode * pDestBufEnd, - sal_uInt32 * pInfo) +ImplBadInputConversionAction ImplHandleBadInputTextToUnicodeConversion( + sal_Bool bUndefined, sal_Bool bMultiByte, sal_Char cByte, sal_uInt32 nFlags, + sal_Unicode ** pDestBufPtr, sal_Unicode * pDestBufEnd, sal_uInt32 * pInfo) { - *pInfo |= bUndefined ? RTL_TEXTTOUNICODE_INFO_MBUNDEFINED : - RTL_TEXTTOUNICODE_INFO_INVALID; - switch (nFlags & (bUndefined ? RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_MASK : - RTL_TEXTTOUNICODE_FLAGS_INVALID_MASK)) + *pInfo |= bUndefined + ? (bMultiByte + ? RTL_TEXTTOUNICODE_INFO_MBUNDEFINED + : RTL_TEXTTOUNICODE_INFO_UNDEFINED) + : RTL_TEXTTOUNICODE_INFO_INVALID; + switch (nFlags + & (bUndefined + ? (bMultiByte + ? RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_MASK + : RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_MASK) + : RTL_TEXTTOUNICODE_FLAGS_INVALID_MASK)) { + case RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR: case RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR: case RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR: *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR; return IMPL_BAD_INPUT_STOP; + case RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_IGNORE: case RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_IGNORE: case RTL_TEXTTOUNICODE_FLAGS_INVALID_IGNORE: return IMPL_BAD_INPUT_CONTINUE; - default: /* RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_DEFAULT, + case RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_MAPTOPRIVATE: + if (*pDestBufPtr != pDestBufEnd) + { + *(*pDestBufPtr)++ = RTL_TEXTCVT_BYTE_PRIVATE_START + | ((sal_uChar) cByte); + return IMPL_BAD_INPUT_CONTINUE; + } + else + return IMPL_BAD_INPUT_NO_OUTPUT; + + default: /* RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_DEFAULT, + RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_DEFAULT, RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT */ if (*pDestBufPtr != pDestBufEnd) { diff --git a/sal/textenc/converter.h b/sal/textenc/converter.h index 634b9a408c20..c248e42b8bca 100644 --- a/sal/textenc/converter.h +++ b/sal/textenc/converter.h @@ -2,9 +2,9 @@ * * $RCSfile: converter.h,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: sb $ $Date: 2001-11-19 17:46:37 $ + * last change: $Author: rt $ $Date: 2004-06-17 11:40:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -90,11 +90,9 @@ typedef enum } ImplBadInputConversionAction; ImplBadInputConversionAction -ImplHandleBadInputMbTextToUnicodeConversion(sal_Bool bUndefined, - sal_uInt32 nFlags, - sal_Unicode ** pDestBufPtr, - sal_Unicode * pDestBufEnd, - sal_uInt32 * pInfo) +ImplHandleBadInputTextToUnicodeConversion( + sal_Bool bUndefined, sal_Bool bMultiByte, sal_Char cByte, sal_uInt32 nFlags, + sal_Unicode ** pDestBufPtr, sal_Unicode * pDestBufEnd, sal_uInt32 * pInfo) SAL_THROW_EXTERN_C(); ImplBadInputConversionAction |