INTEGRATION: CWS sb17 (1.4.28); FILE MERGED

2004/04/05 15:35:58 sb 1.4.28.1: #i25672# Extended ImplHandleBadInputMbTextToUnicodeConversion to single-byte scenarios.

3 files changed, 24 insertions, 36 deletions

diff --git a/sal/textenc/converteuctw.c b/sal/textenc/converteuctw.c
index 3ddf5bb42d30..afdc60da2e67 100644
--- a/sal/textenc/converteuctw.c
+++ b/sal/textenc/converteuctw.c
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: converteuctw.c,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: hr $ $Date: 2004-02-04 13:50:35 $
+ *  last change: $Author: rt $ $Date: 2004-06-17 11:40:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -279,11 +279,9 @@ sal_Size ImplConvertEucTwToUnicode(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_EUC_TW_TO_UNICODE_STATE_0;
@@ -311,11 +309,9 @@ sal_Size ImplConvertEucTwToUnicode(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/convertgb18030.c b/sal/textenc/convertgb18030.c
index 37a09f724db8..27fd841cd205 100644
--- a/sal/textenc/convertgb18030.c
+++ b/sal/textenc/convertgb18030.c
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: convertgb18030.c,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: hr $ $Date: 2004-02-04 13:50:54 $
+ *  last change: $Author: rt $ $Date: 2004-06-17 11:40:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -272,11 +272,9 @@ sal_Size ImplConvertGb18030ToUnicode(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_GB_18030_TO_UNICODE_STATE_0;
@@ -304,11 +302,9 @@ sal_Size ImplConvertGb18030ToUnicode(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/convertiso2022jp.c b/sal/textenc/convertiso2022jp.c
index 5df268a183df..624dc644ac72 100644
--- a/sal/textenc/convertiso2022jp.c
+++ b/sal/textenc/convertiso2022jp.c
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: convertiso2022jp.c,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: hr $ $Date: 2004-02-04 13:51:30 $
+ *  last change: $Author: rt $ $Date: 2004-06-17 11:41:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -300,11 +300,9 @@ sal_Size ImplConvertIso2022JpToUnicode(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_JP_TO_UNICODE_STATE_ASCII;
@@ -332,11 +330,9 @@ sal_Size ImplConvertIso2022JpToUnicode(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: