diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-06-17 10:41:32 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-06-17 10:41:32 +0000 |
| commit | dc9c9797c8845d1e7a47cc7013046441a548ab82 (patch) | |
| tree | a5dd77237fc7636ff5d00b0e8f6fdc47225b330f /sal | |
| parent | be9a67d6a673ffd8d02af4d6088f9ee21b52eda6 (diff) | |
INTEGRATION: CWS sb17 (1.2.28); FILE MERGED
2004/04/05 15:35:58 sb 1.2.28.1: #i25672# Extended ImplHandleBadInputMbTextToUnicodeConversion to single-byte scenarios.
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/textenc/convertiso2022cn.c | 20 | ||||
| -rw-r--r-- | sal/textenc/convertiso2022kr.c | 20 |
2 files changed, 16 insertions, 24 deletions
diff --git a/sal/textenc/convertiso2022cn.c b/sal/textenc/convertiso2022cn.c index 2879d02a72fe..b574fb3e3300 100644 --- a/sal/textenc/convertiso2022cn.c +++ b/sal/textenc/convertiso2022cn.c @@ -2,9 +2,9 @@ * * $RCSfile: convertiso2022cn.c,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: hr $ $Date: 2004-02-04 13:51:13 $ + * last change: $Author: rt $ $Date: 2004-06-17 11:41:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -403,11 +403,9 @@ sal_Size ImplConvertIso2022CnToUnicode(ImplTextConverterData const * pData, } bad_input: - switch (ImplHandleBadInputMbTextToUnicodeConversion(bUndefined, - nFlags, - &pDestBufPtr, - pDestBufEnd, - &nInfo)) + switch (ImplHandleBadInputTextToUnicodeConversion( + bUndefined, sal_True, 0, nFlags, &pDestBufPtr, pDestBufEnd, + &nInfo)) { case IMPL_BAD_INPUT_STOP: eState = IMPL_ISO_2022_CN_TO_UNICODE_STATE_ASCII; @@ -437,11 +435,9 @@ sal_Size ImplConvertIso2022CnToUnicode(ImplTextConverterData const * pData, if ((nFlags & RTL_TEXTTOUNICODE_FLAGS_FLUSH) == 0) nInfo |= RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL; else - switch (ImplHandleBadInputMbTextToUnicodeConversion(sal_False, - nFlags, - &pDestBufPtr, - pDestBufEnd, - &nInfo)) + switch (ImplHandleBadInputTextToUnicodeConversion( + sal_False, sal_True, 0, nFlags, &pDestBufPtr, pDestBufEnd, + &nInfo)) { case IMPL_BAD_INPUT_STOP: case IMPL_BAD_INPUT_CONTINUE: diff --git a/sal/textenc/convertiso2022kr.c b/sal/textenc/convertiso2022kr.c index e73a9207d5a2..3ff3c3fb8e38 100644 --- a/sal/textenc/convertiso2022kr.c +++ b/sal/textenc/convertiso2022kr.c @@ -2,9 +2,9 @@ * * $RCSfile: convertiso2022kr.c,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: hr $ $Date: 2004-02-04 13:51:46 $ + * last change: $Author: rt $ $Date: 2004-06-17 11:41:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -256,11 +256,9 @@ sal_Size ImplConvertIso2022KrToUnicode(ImplTextConverterData const * pData, continue; bad_input: - switch (ImplHandleBadInputMbTextToUnicodeConversion(bUndefined, - nFlags, - &pDestBufPtr, - pDestBufEnd, - &nInfo)) + switch (ImplHandleBadInputTextToUnicodeConversion( + bUndefined, sal_True, 0, nFlags, &pDestBufPtr, pDestBufEnd, + &nInfo)) { case IMPL_BAD_INPUT_STOP: eState = IMPL_ISO_2022_KR_TO_UNICODE_STATE_ASCII; @@ -288,11 +286,9 @@ sal_Size ImplConvertIso2022KrToUnicode(ImplTextConverterData const * pData, if ((nFlags & RTL_TEXTTOUNICODE_FLAGS_FLUSH) == 0) nInfo |= RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL; else - switch (ImplHandleBadInputMbTextToUnicodeConversion(sal_False, - nFlags, - &pDestBufPtr, - pDestBufEnd, - &nInfo)) + switch (ImplHandleBadInputTextToUnicodeConversion( + sal_False, sal_True, 0, nFlags, &pDestBufPtr, pDestBufEnd, + &nInfo)) { case IMPL_BAD_INPUT_STOP: case IMPL_BAD_INPUT_CONTINUE: |