diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-01-06 12:09:01 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-01-06 15:00:44 +0100 |
| commit | 353bed10cf7d41881654b82b0a833da8dff36a69 (patch) | |
| tree | 0d1a287f9bb243fa7f2d155d125ef65beaeca67b /sal/textenc/convertsinglebytetobmpunicode.cxx | |
| parent | 5689b61ac9eac4d4be2d6aa378b732a5eae4784a (diff) | |
Made textenc/converter cleanly usable by both sal and sal_textenc.
Diffstat (limited to 'sal/textenc/convertsinglebytetobmpunicode.cxx')
| -rw-r--r-- | sal/textenc/convertsinglebytetobmpunicode.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sal/textenc/convertsinglebytetobmpunicode.cxx b/sal/textenc/convertsinglebytetobmpunicode.cxx index f94eed26d100..787dee0b7459 100644 --- a/sal/textenc/convertsinglebytetobmpunicode.cxx +++ b/sal/textenc/convertsinglebytetobmpunicode.cxx @@ -64,17 +64,17 @@ sal_Size rtl_textenc_convertSingleByteToBmpUnicode( *destBufPtr++ = c; continue; bad_input: - switch (ImplHandleBadInputTextToUnicodeConversion( + switch (sal::detail::textenc::handleBadInputTextToUnicodeConversion( undefined, false, b, flags, &destBufPtr, destBufEnd, &infoFlags)) { - case IMPL_BAD_INPUT_STOP: + case sal::detail::textenc::BAD_INPUT_STOP: break; - case IMPL_BAD_INPUT_CONTINUE: + case sal::detail::textenc::BAD_INPUT_CONTINUE: continue; - case IMPL_BAD_INPUT_NO_OUTPUT: + case sal::detail::textenc::BAD_INPUT_NO_OUTPUT: goto no_output; } break; @@ -152,19 +152,19 @@ sal_Size rtl_textenc_convertBmpUnicodeToSingleByte( highSurrogate = 0; continue; bad_input: - switch (ImplHandleBadInputUnicodeToTextConversion( + switch (sal::detail::textenc::handleBadInputUnicodeToTextConversion( undefined, c, flags, &destBufPtr, destBufEnd, &infoFlags, 0, 0, 0)) { - case IMPL_BAD_INPUT_STOP: + case sal::detail::textenc::BAD_INPUT_STOP: highSurrogate = 0; break; - case IMPL_BAD_INPUT_CONTINUE: + case sal::detail::textenc::BAD_INPUT_CONTINUE: highSurrogate = 0; continue; - case IMPL_BAD_INPUT_NO_OUTPUT: + case sal::detail::textenc::BAD_INPUT_NO_OUTPUT: goto no_output; } break; @@ -182,16 +182,16 @@ sal_Size rtl_textenc_convertBmpUnicodeToSingleByte( if ((flags & RTL_UNICODETOTEXT_FLAGS_FLUSH) != 0) { infoFlags |= RTL_UNICODETOTEXT_INFO_SRCBUFFERTOSMALL; } else { - switch (ImplHandleBadInputUnicodeToTextConversion( + switch (sal::detail::textenc::handleBadInputUnicodeToTextConversion( false, 0, flags, &destBufPtr, destBufEnd, &infoFlags, 0, 0, 0)) { - case IMPL_BAD_INPUT_STOP: - case IMPL_BAD_INPUT_CONTINUE: + case sal::detail::textenc::BAD_INPUT_STOP: + case sal::detail::textenc::BAD_INPUT_CONTINUE: highSurrogate = 0; break; - case IMPL_BAD_INPUT_NO_OUTPUT: + case sal::detail::textenc::BAD_INPUT_NO_OUTPUT: infoFlags |= RTL_UNICODETOTEXT_INFO_DESTBUFFERTOSMALL; break; } |