diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-06-17 10:42:22 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-06-17 10:42:22 +0000 |
| commit | a5ba7d535577ef6b43e29bdbdacfb58f0c1c5b27 (patch) | |
| tree | 2d7e5a6c016775ea13fe9ff1ad305ce1faacd1c3 /sal | |
| parent | 25ea8ed50e7e82ffe7e0ea48e4ebea4174ac2a60 (diff) | |
INTEGRATION: CWS sb17 (1.6.78); FILE MERGED
2004/04/05 15:35:59 sb 1.6.78.1: #i25672# Extended ImplHandleBadInputMbTextToUnicodeConversion to single-byte scenarios.
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/textenc/tcvtutf8.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/sal/textenc/tcvtutf8.c b/sal/textenc/tcvtutf8.c index f52db3b95c47..30ca0fb11d6f 100644 --- a/sal/textenc/tcvtutf8.c +++ b/sal/textenc/tcvtutf8.c @@ -2,9 +2,9 @@ * * $RCSfile: tcvtutf8.c,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: hr $ $Date: 2003-08-07 14:58:51 $ + * last change: $Author: rt $ $Date: 2004-06-17 11:42:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -218,10 +218,9 @@ sal_Size ImplConvertUtf8ToUnicode(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: nShift = -1; @@ -256,11 +255,9 @@ sal_Size ImplConvertUtf8ToUnicode(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: |