diff options
Diffstat (limited to 'sal/textenc/convertbig5hkscs.cxx')
| -rw-r--r-- | sal/textenc/convertbig5hkscs.cxx | 52 |
1 files changed, 20 insertions, 32 deletions
diff --git a/sal/textenc/convertbig5hkscs.cxx b/sal/textenc/convertbig5hkscs.cxx index f1e1275b6690..22bf31091cde 100644 --- a/sal/textenc/convertbig5hkscs.cxx +++ b/sal/textenc/convertbig5hkscs.cxx @@ -229,19 +229,19 @@ sal_Size ImplConvertBig5HkscsToUnicode(void const * pData, continue; bad_input: - switch (ImplHandleBadInputTextToUnicodeConversion( + switch (sal::detail::textenc::handleBadInputTextToUnicodeConversion( bUndefined, true, 0, nFlags, &pDestBufPtr, pDestBufEnd, &nInfo)) { - case IMPL_BAD_INPUT_STOP: + case sal::detail::textenc::BAD_INPUT_STOP: nRow = 0; break; - case IMPL_BAD_INPUT_CONTINUE: + case sal::detail::textenc::BAD_INPUT_CONTINUE: nRow = 0; continue; - case IMPL_BAD_INPUT_NO_OUTPUT: + case sal::detail::textenc::BAD_INPUT_NO_OUTPUT: goto no_output; } break; @@ -260,16 +260,16 @@ sal_Size ImplConvertBig5HkscsToUnicode(void const * pData, if ((nFlags & RTL_TEXTTOUNICODE_FLAGS_FLUSH) == 0) nInfo |= RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL; else - switch (ImplHandleBadInputTextToUnicodeConversion( + switch (sal::detail::textenc::handleBadInputTextToUnicodeConversion( false, true, 0, nFlags, &pDestBufPtr, pDestBufEnd, &nInfo)) { - case IMPL_BAD_INPUT_STOP: - case IMPL_BAD_INPUT_CONTINUE: + case sal::detail::textenc::BAD_INPUT_STOP: + case sal::detail::textenc::BAD_INPUT_CONTINUE: nRow = 0; break; - case IMPL_BAD_INPUT_NO_OUTPUT: + case sal::detail::textenc::BAD_INPUT_NO_OUTPUT: nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOSMALL; break; } @@ -434,25 +434,19 @@ sal_Size ImplConvertUnicodeToBig5Hkscs(void const * pData, continue; bad_input: - switch (ImplHandleBadInputUnicodeToTextConversion(bUndefined, - nChar, - nFlags, - &pDestBufPtr, - pDestBufEnd, - &nInfo, - NULL, - 0, - NULL)) + switch (sal::detail::textenc::handleBadInputUnicodeToTextConversion( + bUndefined, nChar, nFlags, &pDestBufPtr, pDestBufEnd, + &nInfo, NULL, 0, NULL)) { - case IMPL_BAD_INPUT_STOP: + case sal::detail::textenc::BAD_INPUT_STOP: nHighSurrogate = 0; break; - case IMPL_BAD_INPUT_CONTINUE: + case sal::detail::textenc::BAD_INPUT_CONTINUE: nHighSurrogate = 0; continue; - case IMPL_BAD_INPUT_NO_OUTPUT: + case sal::detail::textenc::BAD_INPUT_NO_OUTPUT: goto no_output; } break; @@ -471,22 +465,16 @@ sal_Size ImplConvertUnicodeToBig5Hkscs(void const * pData, if ((nFlags & RTL_UNICODETOTEXT_FLAGS_FLUSH) != 0) nInfo |= RTL_UNICODETOTEXT_INFO_SRCBUFFERTOSMALL; else - switch (ImplHandleBadInputUnicodeToTextConversion(false, - 0, - nFlags, - &pDestBufPtr, - pDestBufEnd, - &nInfo, - NULL, - 0, - NULL)) + switch (sal::detail::textenc::handleBadInputUnicodeToTextConversion( + false, 0, nFlags, &pDestBufPtr, pDestBufEnd, &nInfo, + NULL, 0, NULL)) { - case IMPL_BAD_INPUT_STOP: - case IMPL_BAD_INPUT_CONTINUE: + case sal::detail::textenc::BAD_INPUT_STOP: + case sal::detail::textenc::BAD_INPUT_CONTINUE: nHighSurrogate = 0; break; - case IMPL_BAD_INPUT_NO_OUTPUT: + case sal::detail::textenc::BAD_INPUT_NO_OUTPUT: nInfo |= RTL_UNICODETOTEXT_INFO_DESTBUFFERTOSMALL; break; } |