Rename both As{Byte,Wide}StringC() helpers to AsStringC().

xfa/fxfa/fm2js/xfa_fm2jscontext.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/fxfa/fm2js/xfa_fm2jscontext.h"
 
 #include <time.h>
 
@@ skipping 297 matching lines @@
                 uCount++;
               }
               FXJSE_Value_Release(defaultPropValue);
             }
           } else {
             CFX_ByteString propertyStr;
             FXJSE_Value_ToUTF8String(propertyValue, propertyStr);
             FXJSE_HVALUE newPropertyValue = FXJSE_Value_Create(hruntime);
             for (int32_t j = 2; j < iLength; j++) {
               FXJSE_Value_GetObjectPropByIdx(argValue, j, jsObjectValue);
-              FXJSE_Value_GetObjectProp(
-                  jsObjectValue, propertyStr.AsByteStringC(), newPropertyValue);
+              FXJSE_Value_GetObjectProp(jsObjectValue, propertyStr.AsStringC(),
+                                        newPropertyValue);
               if (!FXJSE_Value_IsNull(newPropertyValue)) {
                 dSum += HValueToDouble(hThis, newPropertyValue);
                 uCount++;
               }
             }
             FXJSE_Value_Release(newPropertyValue);
           }
           FXJSE_Value_Release(jsObjectValue);
           FXJSE_Value_Release(propertyValue);
         }
@@ skipping 61 matching lines @@
             GetObjectDefaultValue(jsObjectValue, newPropertyValue);
             if (!FXJSE_Value_IsNull(newPropertyValue)) {
               uCount++;
             }
           }
         } else {
           CFX_ByteString propertyStr;
           FXJSE_Value_ToUTF8String(propertyValue, propertyStr);
           for (int32_t i = 2; i < iLength; i++) {
             FXJSE_Value_GetObjectPropByIdx(argValue, i, jsObjectValue);
-            FXJSE_Value_GetObjectProp(
-                jsObjectValue, propertyStr.AsByteStringC(), newPropertyValue);
+            FXJSE_Value_GetObjectProp(jsObjectValue, propertyStr.AsStringC(),
+                                      newPropertyValue);
             uCount += (FXJSE_Value_IsNull(newPropertyValue) ? 0 : 1);
           }
         }
         FXJSE_Value_Release(propertyValue);
         FXJSE_Value_Release(jsObjectValue);
         FXJSE_Value_Release(newPropertyValue);
       } else {
         pContext->ThrowScriptErrorMessage(XFA_IDS_ARGUMENT_MISMATCH);
       }
     } else if (FXJSE_Value_IsObject(argValue)) {
@@ skipping 70 matching lines @@
                   dMaxValue = dValue;
                 }
               }
             }
           }
         } else {
           CFX_ByteString propertyStr;
           FXJSE_Value_ToUTF8String(propertyValue, propertyStr);
           for (int32_t i = 2; i < iLength; i++) {
             FXJSE_Value_GetObjectPropByIdx(argValue, i, jsObjectValue);
-            FXJSE_Value_GetObjectProp(
-                jsObjectValue, propertyStr.AsByteStringC(), newPropertyValue);
+            FXJSE_Value_GetObjectProp(jsObjectValue, propertyStr.AsStringC(),
+                                      newPropertyValue);
             if (!FXJSE_Value_IsNull(newPropertyValue)) {
               uCount++;
               if (uCount == 1) {
                 dMaxValue = HValueToDouble(hThis, newPropertyValue);
               } else {
                 FX_DOUBLE dValue = HValueToDouble(hThis, newPropertyValue);
                 if (dMaxValue < dValue) {
                   dMaxValue = dValue;
                 }
               }
@@ skipping 81 matching lines @@
                   dMinValue = dValue;
                 }
               }
             }
           }
         } else {
           CFX_ByteString propertyStr;
           FXJSE_Value_ToUTF8String(propertyValue, propertyStr);
           for (int32_t i = 2; i < iLength; i++) {
             FXJSE_Value_GetObjectPropByIdx(argValue, i, jsObjectValue);
-            FXJSE_Value_GetObjectProp(
-                jsObjectValue, propertyStr.AsByteStringC(), newPropertyValue);
+            FXJSE_Value_GetObjectProp(jsObjectValue, propertyStr.AsStringC(),
+                                      newPropertyValue);
             if (!FXJSE_Value_IsNull(newPropertyValue)) {
               uCount++;
               if (uCount == 1) {
                 dMinValue = HValueToDouble(hThis, newPropertyValue);
               } else {
                 FX_DOUBLE dValue = HValueToDouble(hThis, newPropertyValue);
                 if (dMinValue > dValue) {
                   dMinValue = dValue;
                 }
               }
@@ skipping 64 matching lines @@
           FXJSE_HVALUE propertyValue = FXJSE_Value_Create(hruntime);
           FXJSE_HVALUE jsObjectValue = FXJSE_Value_Create(hruntime);
           FXJSE_Value_GetObjectPropByIdx(argOne, 1, propertyValue);
           FXJSE_Value_GetObjectPropByIdx(argOne, 2, jsObjectValue);
           if (FXJSE_Value_IsNull(propertyValue)) {
             dDividend = HValueToDouble(hThis, jsObjectValue);
           } else {
             CFX_ByteString propertyStr;
             FXJSE_Value_ToUTF8String(propertyValue, propertyStr);
             FXJSE_HVALUE newPropertyValue = FXJSE_Value_Create(hruntime);
-            FXJSE_Value_GetObjectProp(
-                jsObjectValue, propertyStr.AsByteStringC(), newPropertyValue);
+            FXJSE_Value_GetObjectProp(jsObjectValue, propertyStr.AsStringC(),
+                                      newPropertyValue);
             dDividend = HValueToDouble(hThis, newPropertyValue);
             FXJSE_Value_Release(newPropertyValue);
           }
           FXJSE_Value_Release(propertyValue);
           FXJSE_Value_Release(jsObjectValue);
         } else {
           pContext->ThrowScriptErrorMessage(XFA_IDS_ARGUMENT_MISMATCH);
         }
       } else {
         dDividend = HValueToDouble(hThis, argOne);
       }
       if (FXJSE_Value_IsArray(argTwo)) {
         FXJSE_HVALUE lengthValue = FXJSE_Value_Create(hruntime);
         FXJSE_Value_GetObjectProp(argTwo, "length", lengthValue);
         int32_t iLength = FXJSE_Value_ToInteger(lengthValue);
         FXJSE_Value_Release(lengthValue);
         if (iLength > 2) {
           FXJSE_HVALUE propertyValue = FXJSE_Value_Create(hruntime);
           FXJSE_HVALUE jsObjectValue = FXJSE_Value_Create(hruntime);
           FXJSE_Value_GetObjectPropByIdx(argTwo, 1, propertyValue);
           FXJSE_Value_GetObjectPropByIdx(argTwo, 2, jsObjectValue);
           if (FXJSE_Value_IsNull(propertyValue)) {
             dDividor = HValueToDouble(hThis, jsObjectValue);
           } else {
             CFX_ByteString propertyStr;
             FXJSE_Value_ToUTF8String(propertyValue, propertyStr);
             FXJSE_HVALUE newPropertyValue = FXJSE_Value_Create(hruntime);
-            FXJSE_Value_GetObjectProp(
-                jsObjectValue, propertyStr.AsByteStringC(), newPropertyValue);
+            FXJSE_Value_GetObjectProp(jsObjectValue, propertyStr.AsStringC(),
+                                      newPropertyValue);
             dDividor = HValueToDouble(hThis, newPropertyValue);
             FXJSE_Value_Release(newPropertyValue);
           }
           FXJSE_Value_Release(propertyValue);
           FXJSE_Value_Release(jsObjectValue);
         } else {
           pContext->ThrowScriptErrorMessage(XFA_IDS_ARGUMENT_MISMATCH);
         }
       } else {
         dDividor = HValueToDouble(hThis, argTwo);
@@ skipping 31 matching lines @@
         FXJSE_HVALUE propertyValue = FXJSE_Value_Create(hruntime);
         FXJSE_HVALUE jsObjectValue = FXJSE_Value_Create(hruntime);
         FXJSE_Value_GetObjectPropByIdx(argOne, 1, propertyValue);
         FXJSE_Value_GetObjectPropByIdx(argOne, 2, jsObjectValue);
         if (FXJSE_Value_IsNull(propertyValue)) {
           dValue = HValueToDouble(hThis, jsObjectValue);
         } else {
           CFX_ByteString propertyStr;
           FXJSE_Value_ToUTF8String(propertyValue, propertyStr);
           FXJSE_HVALUE newPropertyValue = FXJSE_Value_Create(hruntime);
-          FXJSE_Value_GetObjectProp(jsObjectValue, propertyStr.AsByteStringC(),
+          FXJSE_Value_GetObjectProp(jsObjectValue, propertyStr.AsStringC(),
                                     newPropertyValue);
           dValue = HValueToDouble(hThis, newPropertyValue);
           FXJSE_Value_Release(newPropertyValue);
         }
         FXJSE_Value_Release(propertyValue);
         FXJSE_Value_Release(jsObjectValue);
       } else {
         dValue = HValueToDouble(hThis, argOne);
       }
       CFX_Decimal decimalValue((FX_FLOAT)dValue, uPrecision);
       CFX_WideString wsValue = decimalValue;
       FXJSE_Value_SetUTF8String(args.GetReturnValue(),
-                                wsValue.UTF8Encode().AsByteStringC());
+                                wsValue.UTF8Encode().AsStringC());
     }
     FXJSE_Value_Release(argOne);
   } else if (argc == 2) {
     FXJSE_HVALUE argOne = args.GetValue(0);
     FXJSE_HVALUE argTwo = args.GetValue(1);
     if (FXJSE_Value_IsNull(argOne) || FXJSE_Value_IsNull(argTwo)) {
       FXJSE_Value_SetNull(args.GetReturnValue());
     } else {
       FX_DOUBLE dValue = 0.0;
       if (FXJSE_Value_IsArray(argOne)) {
         FXJSE_HVALUE propertyValue = FXJSE_Value_Create(hruntime);
         FXJSE_HVALUE jsObjectValue = FXJSE_Value_Create(hruntime);
         FXJSE_Value_GetObjectPropByIdx(argOne, 1, propertyValue);
         FXJSE_Value_GetObjectPropByIdx(argOne, 2, jsObjectValue);
         if (FXJSE_Value_IsNull(propertyValue)) {
           dValue = HValueToDouble(hThis, jsObjectValue);
         } else {
           CFX_ByteString propertyStr;
           FXJSE_Value_ToUTF8String(propertyValue, propertyStr);
           FXJSE_HVALUE newPropertyValue = FXJSE_Value_Create(hruntime);
-          FXJSE_Value_GetObjectProp(jsObjectValue, propertyStr.AsByteStringC(),
+          FXJSE_Value_GetObjectProp(jsObjectValue, propertyStr.AsStringC(),
                                     newPropertyValue);
           dValue = HValueToDouble(hThis, newPropertyValue);
           FXJSE_Value_Release(newPropertyValue);
         }
         FXJSE_Value_Release(propertyValue);
         FXJSE_Value_Release(jsObjectValue);
       } else {
         dValue = HValueToDouble(hThis, argOne);
       }
       FX_DOUBLE dPrecision = 0.0;
       if (FXJSE_Value_IsArray(argTwo)) {
         FXJSE_HVALUE propertyValue = FXJSE_Value_Create(hruntime);
         FXJSE_HVALUE jsObjectValue = FXJSE_Value_Create(hruntime);
         FXJSE_Value_GetObjectPropByIdx(argTwo, 1, propertyValue);
         FXJSE_Value_GetObjectPropByIdx(argTwo, 2, jsObjectValue);
         if (FXJSE_Value_IsNull(propertyValue)) {
           dPrecision = HValueToDouble(hThis, jsObjectValue);
         } else {
           CFX_ByteString propertyStr;
           FXJSE_Value_ToUTF8String(propertyValue, propertyStr);
           FXJSE_HVALUE newPropertyValue = FXJSE_Value_Create(hruntime);
-          FXJSE_Value_GetObjectProp(jsObjectValue, propertyStr.AsByteStringC(),
+          FXJSE_Value_GetObjectProp(jsObjectValue, propertyStr.AsStringC(),
                                     newPropertyValue);
           dPrecision = HValueToDouble(hThis, newPropertyValue);
           FXJSE_Value_Release(newPropertyValue);
         }
         FXJSE_Value_Release(propertyValue);
         FXJSE_Value_Release(jsObjectValue);
       } else {
         dPrecision = HValueToDouble(hThis, argTwo);
       }
       if (dPrecision < 0) {
         uPrecision = 0;
       } else if (dPrecision > 12.0) {
         uPrecision = 12;
       } else {
         uPrecision = (uint8_t)dPrecision;
       }
       CFX_Decimal decimalValue((FX_FLOAT)dValue, uPrecision);
       CFX_WideString wsValue = decimalValue;
       FXJSE_Value_SetUTF8String(args.GetReturnValue(),
-                                wsValue.UTF8Encode().AsByteStringC());
+                                wsValue.UTF8Encode().AsStringC());
     }
     FXJSE_Value_Release(argOne);
     FXJSE_Value_Release(argTwo);
   } else {
     pContext->ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
                                       L"Round");
   }
 }
 void CXFA_FM2JSContext::Sum(FXJSE_HOBJECT hThis,
                             const CFX_ByteStringC& szFuncName,
@@ skipping 28 matching lines @@
               if (!FXJSE_Value_IsNull(newPropertyValue)) {
                 dSum += HValueToDouble(hThis, jsObjectValue);
                 uCount++;
               }
             }
           } else {
             CFX_ByteString propertyStr;
             FXJSE_Value_ToUTF8String(propertyValue, propertyStr);
             for (int32_t j = 2; j < iLength; j++) {
               FXJSE_Value_GetObjectPropByIdx(argValue, j, jsObjectValue);
-              FXJSE_Value_GetObjectProp(
-                  jsObjectValue, propertyStr.AsByteStringC(), newPropertyValue);
+              FXJSE_Value_GetObjectProp(jsObjectValue, propertyStr.AsStringC(),
+                                        newPropertyValue);
               if (!FXJSE_Value_IsNull(newPropertyValue)) {
                 dSum += HValueToDouble(hThis, newPropertyValue);
                 uCount++;
               }
             }
           }
           FXJSE_Value_Release(newPropertyValue);
           FXJSE_Value_Release(jsObjectValue);
           FXJSE_Value_Release(propertyValue);
         } else {
@@ skipping 29 matching lines @@
     time_t currentTime;
     time(&currentTime);
     pTmStruct = gmtime(&currentTime);
     CFX_ByteString bufferYear;
     CFX_ByteString bufferMon;
     CFX_ByteString bufferDay;
     bufferYear.Format("%d", pTmStruct->tm_year + 1900);
     bufferMon.Format("%02d", pTmStruct->tm_mon + 1);
     bufferDay.Format("%02d", pTmStruct->tm_mday);
     CFX_ByteString bufferCurrent = bufferYear + bufferMon + bufferDay;
-    int32_t dDays = DateString2Num(bufferCurrent.AsByteStringC());
+    int32_t dDays = DateString2Num(bufferCurrent.AsStringC());
     FXJSE_Value_SetInteger(args.GetReturnValue(), dDays);
   } else {
     CXFA_FM2JSContext* pContext =
         (CXFA_FM2JSContext*)FXJSE_Value_ToObject(hThis, NULL);
     pContext->ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
                                       L"Date");
   }
 }
 void CXFA_FM2JSContext::Date2Num(FXJSE_HOBJECT hThis,
                                  const CFX_ByteStringC& szFuncName,
@@ skipping 23 matching lines @@
     if (argc == 3) {
       localValue = GetSimpleHValue(hThis, args, 2);
       if (HValueIsNull(hThis, localValue)) {
         bFlags = TRUE;
       } else {
         HValueToUTF8String(localValue, localString);
       }
     }
     if (!bFlags) {
       CFX_ByteString szIsoDateString;
-      FX_BOOL bRet = Local2IsoDate(
-          hThis, dateString.AsByteStringC(), formatString.AsByteStringC(),
-          localString.AsByteStringC(), szIsoDateString);
+      FX_BOOL bRet =
+          Local2IsoDate(hThis, dateString.AsStringC(), formatString.AsStringC(),
+                        localString.AsStringC(), szIsoDateString);
       if (bRet) {
         FXJSE_Value_SetInteger(args.GetReturnValue(),
-                               DateString2Num(szIsoDateString.AsByteStringC()));
+                               DateString2Num(szIsoDateString.AsStringC()));
       } else {
         FXJSE_Value_SetInteger(args.GetReturnValue(), 0);
       }
     } else {
       FXJSE_Value_SetNull(args.GetReturnValue());
     }
     FXJSE_Value_Release(dateValue);
     if (argc > 1) {
       FXJSE_Value_Release(formatValue);
       if (argc == 3) {
@@ skipping 30 matching lines @@
     if (argc == 2) {
       argLocal = GetSimpleHValue(hThis, args, 1);
       if (FXJSE_Value_IsNull(argLocal)) {
         bFlags = TRUE;
       } else {
         HValueToUTF8String(argLocal, szLocal);
       }
     }
     if (!bFlags) {
       CFX_ByteString formatStr;
-      GetStandardDateFormat(hThis, iStyle, szLocal.AsByteStringC(), formatStr);
+      GetStandardDateFormat(hThis, iStyle, szLocal.AsStringC(), formatStr);
       if (formatStr.IsEmpty()) {
         formatStr = "";
       }
-      FXJSE_Value_SetUTF8String(args.GetReturnValue(),
-                                formatStr.AsByteStringC());
+      FXJSE_Value_SetUTF8String(args.GetReturnValue(), formatStr.AsStringC());
     } else {
       FXJSE_Value_SetNull(args.GetReturnValue());
     }
     if (argc > 0) {
       FXJSE_Value_Release(argStyle);
       if (argc == 2) {
         FXJSE_Value_Release(argLocal);
       }
     }
   } else {
     CXFA_FM2JSContext* pContext =
         (CXFA_FM2JSContext*)FXJSE_Value_ToObject(hThis, NULL);
     pContext->ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
                                       L"Date2Num");
   }
 }
 void CXFA_FM2JSContext::IsoDate2Num(FXJSE_HOBJECT hThis,
                                     const CFX_ByteStringC& szFuncName,
                                     CFXJSE_Arguments& args) {
   if (args.GetLength() == 1) {
     FXJSE_HVALUE argOne = GetSimpleHValue(hThis, args, 0);
     if (FXJSE_Value_IsNull(argOne)) {
       FXJSE_Value_SetNull(args.GetReturnValue());
     } else {
       CFX_ByteString szArgString;
       HValueToUTF8String(argOne, szArgString);
-      int32_t dDays = DateString2Num(szArgString.AsByteStringC());
+      int32_t dDays = DateString2Num(szArgString.AsStringC());
       FXJSE_Value_SetInteger(args.GetReturnValue(), (int32_t)dDays);
     }
     FXJSE_Value_Release(argOne);
   } else {
     CXFA_FM2JSContext* pContext =
         (CXFA_FM2JSContext*)FXJSE_Value_ToObject(hThis, NULL);
     pContext->ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
                                       L"IsoDate2Num");
   }
 }
@@ skipping 12 matching lines @@
       IFX_LocaleMgr* pMgr = (IFX_LocaleMgr*)pDoc->GetLocalMgr();
       CFX_ByteString szArgString;
       HValueToUTF8String(argOne, szArgString);
       szArgString = szArgString.Mid(szArgString.Find('T', 0) + 1);
       if (szArgString.IsEmpty()) {
         FXJSE_Value_SetInteger(args.GetReturnValue(), 0);
         FXJSE_Value_Release(argOne);
         return;
       }
       CXFA_LocaleValue timeValue(
-          XFA_VT_TIME, CFX_WideString::FromUTF8(szArgString.AsByteStringC()),
+          XFA_VT_TIME, CFX_WideString::FromUTF8(szArgString.AsStringC()),
           (CXFA_LocaleMgr*)pMgr);
       if (timeValue.IsValid()) {
         CFX_Unitime uniTime = timeValue.GetTime();
         int32_t hour = uniTime.GetHour();
         int32_t min = uniTime.GetMinute();
         int32_t second = uniTime.GetSecond();
         int32_t milSecond = uniTime.GetMillisecond();
         IFX_Locale* pDefLocale = pMgr->GetDefLocale();
         FXSYS_assert(pDefLocale);
         FX_TIMEZONE tzLocale;
@@ skipping 44 matching lines @@
     if (argc == 2) {
       argLocal = GetSimpleHValue(hThis, args, 1);
       if (FXJSE_Value_IsNull(argLocal)) {
         bFlags = TRUE;
       } else {
         HValueToUTF8String(argLocal, szLocal);
       }
     }
     if (!bFlags) {
       CFX_ByteString formatStr;
-      GetLocalDateFormat(hThis, iStyle, szLocal.AsByteStringC(), formatStr,
-                         FALSE);
+      GetLocalDateFormat(hThis, iStyle, szLocal.AsStringC(), formatStr, FALSE);
       if (formatStr.IsEmpty()) {
         formatStr = "";
       }
-      FXJSE_Value_SetUTF8String(args.GetReturnValue(),
-                                formatStr.AsByteStringC());
+      FXJSE_Value_SetUTF8String(args.GetReturnValue(), formatStr.AsStringC());
     } else {
       FXJSE_Value_SetNull(args.GetReturnValue());
     }
     if (argc > 0) {
       FXJSE_Value_Release(argStyle);
       if (argc == 2) {
         FXJSE_Value_Release(argLocal);
       }
     }
   } else {
@@ skipping 26 matching lines @@
     if (argc == 2) {
       argLocal = GetSimpleHValue(hThis, args, 1);
       if (FXJSE_Value_IsNull(argLocal)) {
         bFlags = TRUE;
       } else {
         HValueToUTF8String(argLocal, szLocal);
       }
     }
     if (!bFlags) {
       CFX_ByteString formatStr;
-      GetLocalTimeFormat(hThis, iStyle, szLocal.AsByteStringC(), formatStr,
-                         FALSE);
+      GetLocalTimeFormat(hThis, iStyle, szLocal.AsStringC(), formatStr, FALSE);
       if (formatStr.IsEmpty()) {
         formatStr = "";
       }
-      FXJSE_Value_SetUTF8String(args.GetReturnValue(),
-                                formatStr.AsByteStringC());
+      FXJSE_Value_SetUTF8String(args.GetReturnValue(), formatStr.AsStringC());
     } else {
       FXJSE_Value_SetNull(args.GetReturnValue());
     }
     if (argc > 0) {
       FXJSE_Value_Release(argStyle);
       if (argc == 2) {
         FXJSE_Value_Release(argLocal);
       }
     }
   } else {
@@ skipping 126 matching lines @@
             } else {
               iDay += static_cast<int32_t>(dDate) - 1;
               dDate = 0;
             }
           }
         }
       }
       CFX_ByteString szIsoDateString;
       szIsoDateString.Format("%d%02d%02d", iYear + i, iMonth, iDay);
       CFX_ByteString szLocalDateString;
-      IsoDate2Local(hThis, szIsoDateString.AsByteStringC(),
-                    formatString.AsByteStringC(), localString.AsByteStringC(),
+      IsoDate2Local(hThis, szIsoDateString.AsStringC(),
+                    formatString.AsStringC(), localString.AsStringC(),
                     szLocalDateString);
       if (szLocalDateString.IsEmpty()) {
         szLocalDateString = "";
       }
       FXJSE_Value_SetUTF8String(args.GetReturnValue(),
-                                szLocalDateString.AsByteStringC());
+                                szLocalDateString.AsStringC());
     } else {
       FXJSE_Value_SetNull(args.GetReturnValue());
     }
     FXJSE_Value_Release(dateValue);
     if (argc > 1) {
       FXJSE_Value_Release(formatValue);
       if (argc == 3) {
         FXJSE_Value_Release(localValue);
       }
     }
@@ skipping 35 matching lines @@
     if (argc == 3) {
       localValue = GetSimpleHValue(hThis, args, 2);
       if (FXJSE_Value_IsNull(localValue)) {
         bFlags = TRUE;
       } else {
         HValueToUTF8String(localValue, localString);
       }
     }
     if (!bFlags) {
       CFX_ByteString szGMTTimeString;
-      Num2AllTime(hThis, iTime, formatString.AsByteStringC(),
-                  localString.AsByteStringC(), TRUE, szGMTTimeString);
+      Num2AllTime(hThis, iTime, formatString.AsStringC(),
+                  localString.AsStringC(), TRUE, szGMTTimeString);
       if (szGMTTimeString.IsEmpty()) {
         szGMTTimeString = "";
       }
       FXJSE_Value_SetUTF8String(args.GetReturnValue(),
-                                szGMTTimeString.AsByteStringC());
+                                szGMTTimeString.AsStringC());
     } else {
       FXJSE_Value_SetNull(args.GetReturnValue());
     }
     FXJSE_Value_Release(timeValue);
     if (argc > 1) {
       FXJSE_Value_Release(formatValue);
       if (argc == 3) {
         FXJSE_Value_Release(localValue);
       }
     }
@@ skipping 35 matching lines @@
     if (argc == 3) {
       localValue = GetSimpleHValue(hThis, args, 2);
       if (FXJSE_Value_IsNull(localValue)) {
         bFlags = TRUE;
       } else {
         HValueToUTF8String(localValue, localString);
       }
     }
     if (!bFlags) {
       CFX_ByteString szLocalTimeString;
-      Num2AllTime(hThis, (int32_t)fTime, formatString.AsByteStringC(),
-                  localString.AsByteStringC(), FALSE, szLocalTimeString);
+      Num2AllTime(hThis, (int32_t)fTime, formatString.AsStringC(),
+                  localString.AsStringC(), FALSE, szLocalTimeString);
       if (szLocalTimeString.IsEmpty()) {
         szLocalTimeString = "";
       }
       FXJSE_Value_SetUTF8String(args.GetReturnValue(),
-                                szLocalTimeString.AsByteStringC());
+                                szLocalTimeString.AsStringC());
     } else {
       FXJSE_Value_SetNull(args.GetReturnValue());
     }
     FXJSE_Value_Release(timeValue);
     if (argc > 1) {
       FXJSE_Value_Release(formatValue);
       if (argc == 3) {
         FXJSE_Value_Release(localValue);
       }
     }
@@ skipping 63 matching lines @@
       IFX_LocaleMgr* pMgr = (IFX_LocaleMgr*)pDoc->GetLocalMgr();
       IFX_Locale* pLocale = NULL;
       if (localString.IsEmpty()) {
         CXFA_Node* pThisNode =
             ToNode(pDoc->GetScriptContext()->GetThisObject());
         FXSYS_assert(pThisNode);
         CXFA_WidgetData widgetData(pThisNode);
         pLocale = widgetData.GetLocal();
       } else {
         pLocale = pMgr->GetLocaleByName(
-            CFX_WideString::FromUTF8(localString.AsByteStringC())
-                .AsWideStringC());
+            CFX_WideString::FromUTF8(localString.AsStringC()).AsStringC());
       }
       CFX_WideString wsFormat;
       if (formatString.IsEmpty()) {
         pLocale->GetTimePattern(FX_LOCALEDATETIMESUBCATEGORY_Default, wsFormat);
       } else {
-        wsFormat = CFX_WideString::FromUTF8(formatString.AsByteStringC());
+        wsFormat = CFX_WideString::FromUTF8(formatString.AsStringC());
       }
       wsFormat = FX_WSTRC(L"time{") + wsFormat;
       wsFormat += FX_WSTRC(L"}");
       CXFA_LocaleValue timeValue(
-          XFA_VT_TIME, CFX_WideString::FromUTF8(timeString.AsByteStringC()),
+          XFA_VT_TIME, CFX_WideString::FromUTF8(timeString.AsStringC()),
           wsFormat, pLocale, (CXFA_LocaleMgr*)pMgr);
       if (timeValue.IsValid()) {
         CFX_Unitime uniTime = timeValue.GetTime();
         int32_t hour = uniTime.GetHour();
         int32_t min = uniTime.GetMinute();
         int32_t second = uniTime.GetSecond();
         int32_t milSecond = uniTime.GetMillisecond();
         int32_t mins = hour * 60 + min;
         CXFA_TimeZoneProvider* pProvider = CXFA_TimeZoneProvider::Get();
         if (pProvider) {
@@ skipping 55 matching lines @@
     if (argc == 2) {
       argLocal = GetSimpleHValue(hThis, args, 1);
       if (FXJSE_Value_IsNull(argLocal)) {
         bFlags = TRUE;
       } else {
         HValueToUTF8String(argLocal, szLocal);
       }
     }
     if (!bFlags) {
       CFX_ByteString formatStr;
-      GetStandardTimeFormat(hThis, iStyle, szLocal.AsByteStringC(), formatStr);
+      GetStandardTimeFormat(hThis, iStyle, szLocal.AsStringC(), formatStr);
       if (formatStr.IsEmpty()) {
         formatStr = "";
       }
-      FXJSE_Value_SetUTF8String(args.GetReturnValue(),
-                                formatStr.AsByteStringC());
+      FXJSE_Value_SetUTF8String(args.GetReturnValue(), formatStr.AsStringC());
     } else {
       FXJSE_Value_SetNull(args.GetReturnValue());
     }
     if (argc > 0) {
       FXJSE_Value_Release(argStyle);
       if (argc == 2) {
         FXJSE_Value_Release(argLocal);
       }
     }
   } else {
@@ skipping 334 matching lines @@
     return FALSE;
   }
   IFX_LocaleMgr* pMgr = (IFX_LocaleMgr*)pDoc->GetLocalMgr();
   IFX_Locale* pLocale = NULL;
   if (szLocale.IsEmpty()) {
     CXFA_Node* pThisNode = ToNode(pDoc->GetScriptContext()->GetThisObject());
     FXSYS_assert(pThisNode);
     CXFA_WidgetData widgetData(pThisNode);
     pLocale = widgetData.GetLocal();
   } else {
-    pLocale = pMgr->GetLocaleByName(
-        CFX_WideString::FromUTF8(szLocale).AsWideStringC());
+    pLocale =
+        pMgr->GetLocaleByName(CFX_WideString::FromUTF8(szLocale).AsStringC());
   }
   if (!pLocale) {
     return FALSE;
   }
   CFX_WideString wsFormat;
   if (szFormat.IsEmpty()) {
     pLocale->GetDatePattern(FX_LOCALEDATETIMESUBCATEGORY_Default, wsFormat);
   } else {
     wsFormat = CFX_WideString::FromUTF8(szFormat);
   }
@@ skipping 15 matching lines @@
     return FALSE;
   }
   IFX_LocaleMgr* pMgr = (IFX_LocaleMgr*)pDoc->GetLocalMgr();
   IFX_Locale* pLocale = NULL;
   if (szLocale.IsEmpty()) {
     CXFA_Node* pThisNode = ToNode(pDoc->GetScriptContext()->GetThisObject());
     FXSYS_assert(pThisNode);
     CXFA_WidgetData widgetData(pThisNode);
     pLocale = widgetData.GetLocal();
   } else {
-    pLocale = pMgr->GetLocaleByName(
-        CFX_WideString::FromUTF8(szLocale).AsWideStringC());
+    pLocale =
+        pMgr->GetLocaleByName(CFX_WideString::FromUTF8(szLocale).AsStringC());
   }
   if (!pLocale) {
     return FALSE;
   }
   CFX_WideString wsFormat;
   if (szFormat.IsEmpty()) {
     pLocale->GetTimePattern(FX_LOCALEDATETIMESUBCATEGORY_Default, wsFormat);
   } else {
     wsFormat = CFX_WideString::FromUTF8(szFormat);
   }
@@ skipping 18 matching lines @@
     return FALSE;
   }
   IFX_LocaleMgr* pMgr = (IFX_LocaleMgr*)pDoc->GetLocalMgr();
   IFX_Locale* pLocale = NULL;
   if (szLocale.IsEmpty()) {
     CXFA_Node* pThisNode = ToNode(pDoc->GetScriptContext()->GetThisObject());
     FXSYS_assert(pThisNode);
     CXFA_WidgetData widgetData(pThisNode);
     pLocale = widgetData.GetLocal();
   } else {
-    pLocale = pMgr->GetLocaleByName(
-        CFX_WideString::FromUTF8(szLocale).AsWideStringC());
+    pLocale =
+        pMgr->GetLocaleByName(CFX_WideString::FromUTF8(szLocale).AsStringC());
   }
   if (!pLocale) {
     return FALSE;
   }
   CFX_WideString wsFormat;
   if (szFormat.IsEmpty()) {
     pLocale->GetDatePattern(FX_LOCALEDATETIMESUBCATEGORY_Default, wsFormat);
   } else {
     wsFormat = CFX_WideString::FromUTF8(szFormat);
   }
@@ skipping 17 matching lines @@
     return FALSE;
   }
   IFX_LocaleMgr* pMgr = (IFX_LocaleMgr*)pDoc->GetLocalMgr();
   IFX_Locale* pLocale = NULL;
   if (szLocale.IsEmpty()) {
     CXFA_Node* pThisNode = ToNode(pDoc->GetScriptContext()->GetThisObject());
     FXSYS_assert(pThisNode);
     CXFA_WidgetData widgetData(pThisNode);
     pLocale = widgetData.GetLocal();
   } else {
-    pLocale = pMgr->GetLocaleByName(
-        CFX_WideString::FromUTF8(szLocale).AsWideStringC());
+    pLocale =
+        pMgr->GetLocaleByName(CFX_WideString::FromUTF8(szLocale).AsStringC());
   }
   if (!pLocale) {
     return FALSE;
   }
   CFX_WideString wsFormat;
   if (szFormat.IsEmpty()) {
     pLocale->GetTimePattern(FX_LOCALEDATETIMESUBCATEGORY_Default, wsFormat);
   } else {
     wsFormat = CFX_WideString::FromUTF8(szFormat);
   }
@@ skipping 19 matching lines @@
     return FALSE;
   }
   IFX_LocaleMgr* pMgr = (IFX_LocaleMgr*)pDoc->GetLocalMgr();
   IFX_Locale* pLocale = NULL;
   if (szLocale.IsEmpty()) {
     CXFA_Node* pThisNode = ToNode(pDoc->GetScriptContext()->GetThisObject());
     FXSYS_assert(pThisNode);
     CXFA_WidgetData widgetData(pThisNode);
     pLocale = widgetData.GetLocal();
   } else {
-    pLocale = pMgr->GetLocaleByName(
-        CFX_WideString::FromUTF8(szLocale).AsWideStringC());
+    pLocale =
+        pMgr->GetLocaleByName(CFX_WideString::FromUTF8(szLocale).AsStringC());
   }
   if (!pLocale) {
     return FALSE;
   }
   CFX_WideString wsFormat;
   if (szFormat.IsEmpty()) {
     pLocale->GetTimePattern(FX_LOCALEDATETIMESUBCATEGORY_Default, wsFormat);
   } else {
     wsFormat = CFX_WideString::FromUTF8(szFormat);
   }
@@ skipping 160 matching lines @@
     return;
   }
   IFX_LocaleMgr* pMgr = (IFX_LocaleMgr*)pDoc->GetLocalMgr();
   IFX_Locale* pLocale = NULL;
   if (szLocalStr.IsEmpty()) {
     CXFA_Node* pThisNode = ToNode(pDoc->GetScriptContext()->GetThisObject());
     FXSYS_assert(pThisNode);
     CXFA_WidgetData widgetData(pThisNode);
     pLocale = widgetData.GetLocal();
   } else {
-    pLocale = pMgr->GetLocaleByName(
-        CFX_WideString::FromUTF8(szLocalStr).AsWideStringC());
+    pLocale =
+        pMgr->GetLocaleByName(CFX_WideString::FromUTF8(szLocalStr).AsStringC());
   }
   if (!pLocale) {
     return;
   }
   CFX_WideString strRet;
   pLocale->GetDatePattern(strStyle, strRet);
   if (!bStandard) {
     CFX_WideString wsSymbols;
     pLocale->GetDateTimeSymbols(wsSymbols);
     XFA_FM_AlternateDateTimeSymbols(strRet, wsSymbols, g_sAltTable_Date);
@@ skipping 33 matching lines @@
     return;
   }
   IFX_LocaleMgr* pMgr = (IFX_LocaleMgr*)pDoc->GetLocalMgr();
   IFX_Locale* pLocale = NULL;
   if (szLocalStr.IsEmpty()) {
     CXFA_Node* pThisNode = ToNode(pDoc->GetScriptContext()->GetThisObject());
     FXSYS_assert(pThisNode);
     CXFA_WidgetData widgetData(pThisNode);
     pLocale = widgetData.GetLocal();
   } else {
-    pLocale = pMgr->GetLocaleByName(
-        CFX_WideString::FromUTF8(szLocalStr).AsWideStringC());
+    pLocale =
+        pMgr->GetLocaleByName(CFX_WideString::FromUTF8(szLocalStr).AsStringC());
   }
   if (!pLocale) {
     return;
   }
   CFX_WideString strRet;
   pLocale->GetTimePattern(strStyle, strRet);
   if (!bStandard) {
     CFX_WideString wsSymbols;
     pLocale->GetDateTimeSymbols(wsSymbols);
     XFA_FM_AlternateDateTimeSymbols(strRet, wsSymbols, g_sAltTable_Time);
@@ skipping 30 matching lines @@
   if (!bGM) {
     GetLocalTimeZone(iZoneHour, iZoneMin, iZoneSec);
     iHour += iZoneHour;
     iMin += iZoneMin;
     iSec += iZoneSec;
   }
   int32_t iRet = 0;
   CFX_ByteString strIsoTime;
   strIsoTime.Format("%02d:%02d:%02d", iHour, iMin, iSec);
   if (bGM) {
-    iRet = GetGMTTime(hThis, strIsoTime.AsByteStringC(), szFormat, szLocale,
-                      strTime);
+    iRet =
+        GetGMTTime(hThis, strIsoTime.AsStringC(), szFormat, szLocale, strTime);
   } else {
-    iRet = IsoTime2Local(hThis, strIsoTime.AsByteStringC(), szFormat, szLocale,
+    iRet = IsoTime2Local(hThis, strIsoTime.AsStringC(), szFormat, szLocale,
                          strTime);
   }
   if (!iRet) {
     strTime = "";
   }
 }
 
 void CXFA_FM2JSContext::GetLocalTimeZone(int32_t& iHour,
                                          int32_t& iMin,
                                          int32_t& iSec) {
@@ skipping 564 matching lines @@
             FXJSE_HVALUE newProperty = FXJSE_Value_Create(hruntime);
             FXJSE_Value_GetObjectPropByIdx(argIndexValue, 1, propertyValue);
             FXJSE_Value_GetObjectPropByIdx(
                 argIndexValue, ((iLength - 1) - (iValueIndex - iIndex)),
                 jsobjectValue);
             if (FXJSE_Value_IsNull(propertyValue)) {
               GetObjectDefaultValue(jsobjectValue, newProperty);
             } else {
               CFX_ByteString propStr;
               FXJSE_Value_ToUTF8String(propertyValue, propStr);
-              FXJSE_Value_GetObjectProp(jsobjectValue, propStr.AsByteStringC(),
+              FXJSE_Value_GetObjectProp(jsobjectValue, propStr.AsStringC(),
                                         newProperty);
             }
             CFX_ByteString bsChoosed;
             HValueToUTF8String(newProperty, bsChoosed);
             FXJSE_Value_SetUTF8String(args.GetReturnValue(),
-                                      bsChoosed.AsByteStringC());
+                                      bsChoosed.AsStringC());
             FXJSE_Value_Release(newProperty);
             FXJSE_Value_Release(jsobjectValue);
             FXJSE_Value_Release(propertyValue);
             bFound = TRUE;
           }
         } else {
           iValueIndex++;
           if (iValueIndex == iIndex) {
             CFX_ByteString bsChoosed;
             HValueToUTF8String(argIndexValue, bsChoosed);
             FXJSE_Value_SetUTF8String(args.GetReturnValue(),
-                                      bsChoosed.AsByteStringC());
+                                      bsChoosed.AsStringC());
             bFound = TRUE;
           }
         }
         FXJSE_Value_Release(argIndexValue);
         iArgIndex++;
       }
       if (!bFound) {
         FXJSE_Value_SetUTF8String(args.GetReturnValue(), "");
       }
     }
@@ skipping 91 matching lines @@
             ((oneNumber >= lowNumber) && (oneNumber <= heightNumber)));
       } else {
         CFX_ByteString oneString;
         CFX_ByteString lowString;
         CFX_ByteString heightString;
         HValueToUTF8String(argOne, oneString);
         HValueToUTF8String(argLow, lowString);
         HValueToUTF8String(argHeight, heightString);
         FXJSE_Value_SetInteger(
             args.GetReturnValue(),
-            ((oneString.Compare(lowString.AsByteStringC()) >= 0) &&
-             (oneString.Compare(heightString.AsByteStringC()) <= 0)));
+            ((oneString.Compare(lowString.AsStringC()) >= 0) &&
+             (oneString.Compare(heightString.AsStringC()) <= 0)));
       }
       FXJSE_Value_Release(argLow);
       FXJSE_Value_Release(argHeight);
     }
     FXJSE_Value_Release(argOne);
   } else {
     CXFA_FM2JSContext* pContext =
         (CXFA_FM2JSContext*)FXJSE_Value_ToObject(hThis, NULL);
     pContext->ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
                                       L"Within");
@@ skipping 29 matching lines @@
     FXJSE_HVALUE scriptValue = GetSimpleHValue(hThis, args, 0);
     CFX_ByteString utf8ScriptString;
     HValueToUTF8String(scriptValue, utf8ScriptString);
     if (utf8ScriptString.IsEmpty()) {
       FXJSE_Value_SetNull(args.GetReturnValue());
     } else {
       CFX_WideTextBuf wsJavaScriptBuf;
       CFX_WideString javaScript;
       CFX_WideString wsError;
       XFA_FM2JS_Translate(
-          CFX_WideString::FromUTF8(utf8ScriptString.AsByteStringC())
-              .AsWideStringC(),
+          CFX_WideString::FromUTF8(utf8ScriptString.AsStringC()).AsStringC(),
           wsJavaScriptBuf, wsError);
       FXJSE_HCONTEXT hContext = FXJSE_Context_Create(hruntime);
       FXJSE_HVALUE returnValue = FXJSE_Value_Create(hruntime);
       javaScript = wsJavaScriptBuf.GetWideString();
       FXJSE_ExecuteScript(hContext,
                           FX_UTF8Encode(javaScript, javaScript.GetLength()),
                           returnValue);
       FXJSE_Value_Set(args.GetReturnValue(), returnValue);
       FXJSE_Value_Release(returnValue);
       FXJSE_Context_Release(hContext);
@@ skipping 101 matching lines @@
         VALUETYPE_HAVEDIGIT,
         VALUETYPE_HAVEDIGITWHITE,
         VALUETYPE_ISCM,
         VALUETYPE_ISMM,
         VALUETYPE_ISPT,
         VALUETYPE_ISMP,
         VALUETYPE_ISIN,
       };
       unitspanString.MakeLower();
       CFX_WideString wsTypeString =
-          CFX_WideString::FromUTF8(unitspanString.AsByteStringC());
+          CFX_WideString::FromUTF8(unitspanString.AsStringC());
       const FX_WCHAR* pData = wsTypeString;
       int32_t u = 0;
       int32_t uLen = wsTypeString.GetLength();
       while (*(pData + u) == 0x20 || *(pData + u) == 0x09 ||
              *(pData + u) == 0x0B || *(pData + u) == 0x0C ||
              *(pData + u) == 0x0A || *(pData + u) == 0x0D) {
         u++;
       }
       XFA_FM2JS_VALUETYPE_ParserStatus eParserStatus = VALUETYPE_START;
       FX_WCHAR typeChar;
@@ skipping 245 matching lines @@
     if (HValueIsNull(hThis, argOne) || HValueIsNull(hThis, argTwo)) {
       FXJSE_Value_SetNull(args.GetReturnValue());
     } else {
       CFX_ByteString stringTwo;
       HValueToUTF8String(argTwo, stringTwo);
       if (stringTwo.IsEmpty()) {
         FXJSE_Value_SetInteger(args.GetReturnValue(), 1);
       } else {
         CFX_ByteString stringOne;
         HValueToUTF8String(argOne, stringOne);
-        FX_STRSIZE iPosition = stringOne.Find(stringTwo.AsByteStringC());
+        FX_STRSIZE iPosition = stringOne.Find(stringTwo.AsStringC());
         FXJSE_Value_SetInteger(args.GetReturnValue(), iPosition + 1);
       }
     }
     FXJSE_Value_Release(argOne);
     FXJSE_Value_Release(argTwo);
   } else {
     pContext->ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
                                       L"At");
   }
 }
@@ skipping 17 matching lines @@
       }
     }
     for (int32_t i = 0; i < argc; i++) {
       FXJSE_Value_Release(argValues[i]);
     }
     FX_Free(argValues);
     if (bAllNull) {
       FXJSE_Value_SetNull(args.GetReturnValue());
     } else {
       FXJSE_Value_SetUTF8String(args.GetReturnValue(),
-                                resultString.AsByteStringC());
+                                resultString.AsStringC());
     }
   } else {
     pContext->ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
                                       L"Concat");
   }
 }
 void CXFA_FM2JSContext::Decode(FXJSE_HOBJECT hThis,
                                const CFX_ByteStringC& szFuncName,
                                CFXJSE_Arguments& args) {
   CXFA_FM2JSContext* pContext =
       (CXFA_FM2JSContext*)FXJSE_Value_ToObject(hThis, NULL);
   int32_t argc = args.GetLength();
   if (argc == 1) {
     FXJSE_HVALUE argOne = GetSimpleHValue(hThis, args, 0);
     if (HValueIsNull(hThis, argOne)) {
       FXJSE_Value_SetNull(args.GetReturnValue());
     } else {
       CFX_ByteString toDecodeString;
       HValueToUTF8String(argOne, toDecodeString);
       CFX_ByteTextBuf resultBuf;
-      DecodeURL(toDecodeString.AsByteStringC(), resultBuf);
+      DecodeURL(toDecodeString.AsStringC(), resultBuf);
       FXJSE_Value_SetUTF8String(args.GetReturnValue(),
                                 resultBuf.GetByteString());
     }
     FXJSE_Value_Release(argOne);
   } else if (argc == 2) {
     FXJSE_HVALUE argOne = GetSimpleHValue(hThis, args, 0);
     FXJSE_HVALUE argTwo = GetSimpleHValue(hThis, args, 1);
     if (HValueIsNull(hThis, argOne) || HValueIsNull(hThis, argTwo)) {
       FXJSE_Value_SetNull(args.GetReturnValue());
     } else {
       CFX_ByteString toDecodeString;
       HValueToUTF8String(argOne, toDecodeString);
       CFX_ByteString identifyString;
       HValueToUTF8String(argTwo, identifyString);
       CFX_ByteTextBuf resultBuf;
       if (identifyString.EqualNoCase("html")) {
-        DecodeHTML(toDecodeString.AsByteStringC(), resultBuf);
+        DecodeHTML(toDecodeString.AsStringC(), resultBuf);
       } else if (identifyString.EqualNoCase("xml")) {
-        DecodeXML(toDecodeString.AsByteStringC(), resultBuf);
+        DecodeXML(toDecodeString.AsStringC(), resultBuf);
       } else {
-        DecodeURL(toDecodeString.AsByteStringC(), resultBuf);
+        DecodeURL(toDecodeString.AsStringC(), resultBuf);
       }
       FXJSE_Value_SetUTF8String(args.GetReturnValue(),
                                 resultBuf.GetByteString());
     }
     FXJSE_Value_Release(argOne);
     FXJSE_Value_Release(argTwo);
   } else {
     pContext->ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
                                       L"Decode");
   }
@@ skipping 44 matching lines @@
       wsResultBuf.AppendChar(chTemp);
     } else {
       wsResultBuf.AppendChar(ch);
     }
     ++i;
   }
   wsResultBuf.AppendChar(0);
   szResultString.Clear();
   szResultString << FX_UTF8Encode(wsResultBuf.GetBuffer(),
                                   wsResultBuf.GetLength())
-                        .AsByteStringC();
+                        .AsStringC();
 }
 void CXFA_FM2JSContext::DecodeHTML(const CFX_ByteStringC& szHTMLString,
                                    CFX_ByteTextBuf& szResultString) {
   CFX_WideString wsHTMLString = CFX_WideString::FromUTF8(szHTMLString);
   FX_WCHAR strString[9];
   int32_t iStrIndex = 0;
   int32_t iLen = wsHTMLString.GetLength();
   int32_t i = 0;
   int32_t iCode = 0;
   FX_WCHAR ch = 0;
@@ skipping 53 matching lines @@
       wsResultBuf.AppendChar(iCode);
     }
     iStrIndex = 0;
     strString[iStrIndex] = 0;
     ++i;
   }
   wsResultBuf.AppendChar(0);
   szResultString.Clear();
   szResultString << FX_UTF8Encode(wsResultBuf.GetBuffer(),
                                   wsResultBuf.GetLength())
-                        .AsByteStringC();
+                        .AsStringC();
 }
 void CXFA_FM2JSContext::DecodeXML(const CFX_ByteStringC& szXMLString,
                                   CFX_ByteTextBuf& szResultString) {
   CFX_WideString wsXMLString = CFX_WideString::FromUTF8(szXMLString);
   FX_WCHAR strString[9];
   int32_t iStrIndex = 0;
   int32_t iLen = wsXMLString.GetLength();
   int32_t i = 0;
   int32_t iCode = 0;
   FX_WCHAR ch = 0;
@@ skipping 76 matching lines @@
         break;
     }
     iStrIndex = 0;
     strString[iStrIndex] = 0;
     ++i;
     iCode = 0;
   }
   wsXMLBuf.AppendChar(0);
   szResultString.Clear();
   szResultString << FX_UTF8Encode(wsXMLBuf.GetBuffer(), wsXMLBuf.GetLength())
-                        .AsByteStringC();
+                        .AsStringC();
 }
 void CXFA_FM2JSContext::Encode(FXJSE_HOBJECT hThis,
                                const CFX_ByteStringC& szFuncName,
                                CFXJSE_Arguments& args) {
   CXFA_FM2JSContext* pContext =
       (CXFA_FM2JSContext*)FXJSE_Value_ToObject(hThis, NULL);
   int32_t argc = args.GetLength();
   if (argc == 1) {
     FXJSE_HVALUE argOne = GetSimpleHValue(hThis, args, 0);
     if (HValueIsNull(hThis, argOne)) {
       FXJSE_Value_SetNull(args.GetReturnValue());
     } else {
       CFX_ByteString toEncodeString;
       HValueToUTF8String(argOne, toEncodeString);
       CFX_ByteTextBuf resultBuf;
-      EncodeURL(toEncodeString.AsByteStringC(), resultBuf);
+      EncodeURL(toEncodeString.AsStringC(), resultBuf);
       FXJSE_Value_SetUTF8String(args.GetReturnValue(),
                                 resultBuf.GetByteString());
     }
     FXJSE_Value_Release(argOne);
   } else if (argc == 2) {
     FXJSE_HVALUE argOne = GetSimpleHValue(hThis, args, 0);
     FXJSE_HVALUE argTwo = GetSimpleHValue(hThis, args, 1);
     if (HValueIsNull(hThis, argOne) || HValueIsNull(hThis, argTwo)) {
       FXJSE_Value_SetNull(args.GetReturnValue());
     } else {
       CFX_ByteString toEncodeString;
       HValueToUTF8String(argOne, toEncodeString);
       CFX_ByteString identifyString;
       HValueToUTF8String(argTwo, identifyString);
       CFX_ByteTextBuf resultBuf;
       if (identifyString.EqualNoCase("html")) {
-        EncodeHTML(toEncodeString.AsByteStringC(), resultBuf);
+        EncodeHTML(toEncodeString.AsStringC(), resultBuf);
       } else if (identifyString.EqualNoCase("xml")) {
-        EncodeXML(toEncodeString.AsByteStringC(), resultBuf);
+        EncodeXML(toEncodeString.AsStringC(), resultBuf);
       } else {
-        EncodeURL(toEncodeString.AsByteStringC(), resultBuf);
+        EncodeURL(toEncodeString.AsStringC(), resultBuf);
       }
       FXJSE_Value_SetUTF8String(args.GetReturnValue(),
                                 resultBuf.GetByteString());
     }
     FXJSE_Value_Release(argOne);
     FXJSE_Value_Release(argTwo);
   } else {
     pContext->ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
                                       L"Encode");
   }
@@ skipping 96 matching lines @@
         strEncode[1] = strTmp.GetAt(iIndex);
         strEncode[2] = strTmp.GetAt(iIndex - 1);
         iIndex -= 2;
         wsResultBuf << FX_WSTRC(strEncode);
       }
     }
   }
   wsResultBuf.AppendChar(0);
   szResultBuf.Clear();
   szResultBuf << FX_UTF8Encode(wsResultBuf.GetBuffer(), wsResultBuf.GetLength())
-                     .AsByteStringC();
+                     .AsStringC();
 }
 void CXFA_FM2JSContext::EncodeHTML(const CFX_ByteStringC& szHTMLString,
                                    CFX_ByteTextBuf& szResultBuf) {
   CFX_ByteString str = szHTMLString.c_str();
-  CFX_WideString wsHTMLString = CFX_WideString::FromUTF8(str.AsByteStringC());
+  CFX_WideString wsHTMLString = CFX_WideString::FromUTF8(str.AsStringC());
   const FX_WCHAR* strCode = L"0123456789abcdef";
   FX_WCHAR strEncode[9];
   strEncode[0] = '&';
   strEncode[1] = '#';
   strEncode[2] = 'x';
   strEncode[5] = ';';
   strEncode[6] = 0;
   strEncode[7] = ';';
   strEncode[8] = 0;
   CFX_WideTextBuf wsResultBuf;
@@ skipping 28 matching lines @@
         strEncode[5] = strCode[iLittleByte / 16];
         strEncode[6] = strCode[iLittleByte % 16];
         wsResultBuf << FX_WSTRC(strEncode);
       }
     }
     ++i;
   }
   wsResultBuf.AppendChar(0);
   szResultBuf.Clear();
   szResultBuf << FX_UTF8Encode(wsResultBuf.GetBuffer(), wsResultBuf.GetLength())
-                     .AsByteStringC();
+                     .AsStringC();
 }
 void CXFA_FM2JSContext::EncodeXML(const CFX_ByteStringC& szXMLString,
                                   CFX_ByteTextBuf& szResultBuf) {
   CFX_WideString wsXMLString = CFX_WideString::FromUTF8(szXMLString);
   CFX_WideTextBuf wsResultBuf;
   enum {
     QUOT,
     AMP,
     APOS,
     LT,
@@ skipping 60 matching lines @@
           strEncode[5] = strCode[iLittleByte / 16];
           strEncode[6] = strCode[iLittleByte % 16];
           wsResultBuf << FX_WSTRC(strEncode);
         }
       } break;
     }
   }
   wsResultBuf.AppendChar(0);
   szResultBuf.Clear();
   szResultBuf << FX_UTF8Encode(wsResultBuf.GetBuffer(), wsResultBuf.GetLength())
-                     .AsByteStringC();
+                     .AsStringC();
 }
 FX_BOOL CXFA_FM2JSContext::HTMLSTR2Code(const CFX_WideStringC& pData,
                                         uint32_t& iCode) {
   int32_t iLength = pData.GetLength();
   uint32_t uHash = FX_HashCode_String_GetW(pData.c_str(), iLength);
   XFA_FMHtmlHashedReserveCode htmlhashedreservecode;
   int32_t iStart = 0,
           iEnd = (sizeof(reservesForDecode) / sizeof(reservesForDecode[0])) - 1;
   int32_t iMid = (iStart + iEnd) / 2;
   do {
@@ skipping 128 matching lines @@
     CFX_ByteString szValue;
     HValueToUTF8String(argTwo, szValue);
     CXFA_Document* pDoc = pContext->GetDocument();
     IFX_LocaleMgr* pMgr = (IFX_LocaleMgr*)pDoc->GetLocalMgr();
     CXFA_Node* pThisNode = ToNode(pDoc->GetScriptContext()->GetThisObject());
     FXSYS_assert(pThisNode);
     CXFA_WidgetData widgetData(pThisNode);
     IFX_Locale* pLocale = widgetData.GetLocal();
     uint32_t patternType;
     FX_BOOL bCompelte =
-        XFA_PATTERN_STRING_Type(szPattern.AsByteStringC(), patternType);
-    CFX_WideString wsPattern =
-        CFX_WideString::FromUTF8(szPattern.AsByteStringC());
-    CFX_WideString wsValue = CFX_WideString::FromUTF8(szValue.AsByteStringC());
+        XFA_PATTERN_STRING_Type(szPattern.AsStringC(), patternType);
+    CFX_WideString wsPattern = CFX_WideString::FromUTF8(szPattern.AsStringC());
+    CFX_WideString wsValue = CFX_WideString::FromUTF8(szValue.AsStringC());
     if (!bCompelte) {
       switch (patternType) {
         case XFA_VT_DATETIME: {
           FX_STRSIZE iTChar = wsPattern.Find(L'T');
           CFX_WideString wsDatePattern = FX_WSTRC(L"date{");
           wsDatePattern += wsPattern.Left(iTChar);
           wsDatePattern += FX_WSTRC(L"} ");
           CFX_WideString wsTimePattern = FX_WSTRC(L"time{");
           wsTimePattern += wsPattern.Mid(iTChar + 1);
           wsTimePattern += FX_WSTRC(L"}");
@@ skipping 33 matching lines @@
         } break;
       }
     }
     CXFA_LocaleValue localeValue(patternType, wsValue, wsPattern, pLocale,
                                  (CXFA_LocaleMgr*)pMgr);
     CFX_WideString wsRet;
     if (localeValue.FormatPatterns(wsRet, wsPattern, pLocale,
                                    XFA_VALUEPICTURE_Display)) {
       FXJSE_Value_SetUTF8String(
           args.GetReturnValue(),
-          FX_UTF8Encode(wsRet, wsRet.GetLength()).AsByteStringC());
+          FX_UTF8Encode(wsRet, wsRet.GetLength()).AsStringC());
     } else {
       FXJSE_Value_SetUTF8String(args.GetReturnValue(), "");
     }
     FXJSE_Value_Release(argOne);
     FXJSE_Value_Release(argTwo);
   } else {
     pContext->ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
                                       L"Format");
   }
 }
@@ skipping 12 matching lines @@
     if (argIsNull) {
       FXJSE_Value_SetNull(args.GetReturnValue());
     } else {
       CFX_ByteString sourceString;
       HValueToUTF8String(argOne, sourceString);
       int32_t count = HValueToInteger(hThis, argTwo);
       if (count < 0) {
         count = 0;
       }
       FXJSE_Value_SetUTF8String(args.GetReturnValue(),
-                                sourceString.Left(count).AsByteStringC());
+                                sourceString.Left(count).AsStringC());
     }
     FXJSE_Value_Release(argOne);
     FXJSE_Value_Release(argTwo);
   } else {
     pContext->ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
                                       L"Left");
   }
 }
 void CXFA_FM2JSContext::Len(FXJSE_HOBJECT hThis,
                             const CFX_ByteStringC& szFuncName,
@@ skipping 25 matching lines @@
     FXJSE_HVALUE localeValue = 0;
     if (HValueIsNull(hThis, argOne)) {
       FXJSE_Value_SetNull(args.GetReturnValue());
     } else {
       if (argc == 2) {
         localeValue = GetSimpleHValue(hThis, args, 1);
       }
       HValueToUTF8String(argOne, argString);
       CFX_WideTextBuf lowStringBuf;
       CFX_WideString wsArgString =
-          CFX_WideString::FromUTF8(argString.AsByteStringC());
+          CFX_WideString::FromUTF8(argString.AsStringC());
       const FX_WCHAR* pData = wsArgString;
       int32_t iLen = argString.GetLength();
       int32_t i = 0;
       int32_t ch = 0;
       while (i < iLen) {
         ch = *(pData + i);
         if (ch >= 0x41 && ch <= 0x5A) {
           ch += 32;
         } else if (ch >= 0xC0 && ch <= 0xDE) {
           ch += 32;
         } else if (ch == 0x100 || ch == 0x102 || ch == 0x104) {
           ch += 1;
         }
         lowStringBuf.AppendChar(ch);
         ++i;
       }
       lowStringBuf.AppendChar(0);
       FXJSE_Value_SetUTF8String(
           args.GetReturnValue(),
           FX_UTF8Encode(lowStringBuf.GetBuffer(), lowStringBuf.GetLength())
-              .AsByteStringC());
+              .AsStringC());
       if (argc == 2) {
         FXJSE_Value_Release(localeValue);
       }
     }
     FXJSE_Value_Release(argOne);
   } else {
     CXFA_FM2JSContext* pContext =
         (CXFA_FM2JSContext*)FXJSE_Value_ToObject(hThis, NULL);
     pContext->ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
                                       L"Lower");
   }
 }
 void CXFA_FM2JSContext::Ltrim(FXJSE_HOBJECT hThis,
                               const CFX_ByteStringC& szFuncName,
                               CFXJSE_Arguments& args) {
   CXFA_FM2JSContext* pContext =
       (CXFA_FM2JSContext*)FXJSE_Value_ToObject(hThis, NULL);
   if (args.GetLength() == 1) {
     FXJSE_HVALUE argOne = GetSimpleHValue(hThis, args, 0);
     if (HValueIsNull(hThis, argOne)) {
       FXJSE_Value_SetNull(args.GetReturnValue());
     } else {
       CFX_ByteString sourceString;
       HValueToUTF8String(argOne, sourceString);
       sourceString.TrimLeft();
       FXJSE_Value_SetUTF8String(args.GetReturnValue(),
-                                sourceString.AsByteStringC());
+                                sourceString.AsStringC());
     }
     FXJSE_Value_Release(argOne);
   } else {
     pContext->ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
                                       L"Ltrim");
   }
 }
 void CXFA_FM2JSContext::Parse(FXJSE_HOBJECT hThis,
                               const CFX_ByteStringC& szFuncName,
                               CFXJSE_Arguments& args) {
@@ skipping 10 matching lines @@
       CFX_ByteString szValue;
       HValueToUTF8String(argTwo, szValue);
       CXFA_Document* pDoc = pContext->GetDocument();
       IFX_LocaleMgr* pMgr = (IFX_LocaleMgr*)pDoc->GetLocalMgr();
       CXFA_Node* pThisNode = ToNode(pDoc->GetScriptContext()->GetThisObject());
       FXSYS_assert(pThisNode);
       CXFA_WidgetData widgetData(pThisNode);
       IFX_Locale* pLocale = widgetData.GetLocal();
       uint32_t patternType;
       FX_BOOL bCompletePattern =
-          XFA_PATTERN_STRING_Type(szPattern.AsByteStringC(), patternType);
+          XFA_PATTERN_STRING_Type(szPattern.AsStringC(), patternType);
       CFX_WideString wsPattern =
-          CFX_WideString::FromUTF8(szPattern.AsByteStringC());
-      CFX_WideString wsValue =
-          CFX_WideString::FromUTF8(szValue.AsByteStringC());
+          CFX_WideString::FromUTF8(szPattern.AsStringC());
+      CFX_WideString wsValue = CFX_WideString::FromUTF8(szValue.AsStringC());
       CFX_ByteString szParsedValue;
       if (bCompletePattern) {
         CXFA_LocaleValue localeValue(patternType, wsValue, wsPattern, pLocale,
                                      (CXFA_LocaleMgr*)pMgr);
         if (localeValue.IsValid()) {
           szParsedValue = FX_UTF8Encode(localeValue.GetValue());
           FXJSE_Value_SetUTF8String(args.GetReturnValue(),
-                                    szParsedValue.AsByteStringC());
+                                    szParsedValue.AsStringC());
         } else {
           FXJSE_Value_SetUTF8String(args.GetReturnValue(), "");
         }
       } else {
         switch (patternType) {
           case XFA_VT_DATETIME: {
             FX_STRSIZE iTChar = wsPattern.Find(L'T');
             CFX_WideString wsDatePattern = FX_WSTRC(L"date{");
             wsDatePattern += wsPattern.Left(iTChar);
             wsDatePattern += FX_WSTRC(L"} ");
             CFX_WideString wsTimePattern = FX_WSTRC(L"time{");
             wsTimePattern += wsPattern.Mid(iTChar + 1);
             wsTimePattern += FX_WSTRC(L"}");
             wsPattern = wsDatePattern + wsTimePattern;
             CXFA_LocaleValue localeValue(patternType, wsValue, wsPattern,
                                          pLocale, (CXFA_LocaleMgr*)pMgr);
             if (localeValue.IsValid()) {
               szParsedValue = FX_UTF8Encode(localeValue.GetValue());
               FXJSE_Value_SetUTF8String(args.GetReturnValue(),
-                                        szParsedValue.AsByteStringC());
+                                        szParsedValue.AsStringC());
             } else {
               FXJSE_Value_SetUTF8String(args.GetReturnValue(), "");
             }
           } break;
           case XFA_VT_DATE: {
             wsPattern = FX_WSTRC(L"date{") + wsPattern;
             wsPattern += FX_WSTRC(L"}");
             CXFA_LocaleValue localeValue(patternType, wsValue, wsPattern,
                                          pLocale, (CXFA_LocaleMgr*)pMgr);
             if (localeValue.IsValid()) {
               szParsedValue = FX_UTF8Encode(localeValue.GetValue());
               FXJSE_Value_SetUTF8String(args.GetReturnValue(),
-                                        szParsedValue.AsByteStringC());
+                                        szParsedValue.AsStringC());
             } else {
               FXJSE_Value_SetUTF8String(args.GetReturnValue(), "");
             }
           } break;
           case XFA_VT_TIME: {
             wsPattern = FX_WSTRC(L"time{") + wsPattern;
             wsPattern += FX_WSTRC(L"}");
             CXFA_LocaleValue localeValue(patternType, wsValue, wsPattern,
                                          pLocale, (CXFA_LocaleMgr*)pMgr);
             if (localeValue.IsValid()) {
               szParsedValue = FX_UTF8Encode(localeValue.GetValue());
               FXJSE_Value_SetUTF8String(args.GetReturnValue(),
-                                        szParsedValue.AsByteStringC());
+                                        szParsedValue.AsStringC());
             } else {
               FXJSE_Value_SetUTF8String(args.GetReturnValue(), "");
             }
           } break;
           case XFA_VT_TEXT: {
             wsPattern = FX_WSTRC(L"text{") + wsPattern;
             wsPattern += FX_WSTRC(L"}");
             CXFA_LocaleValue localeValue(XFA_VT_TEXT, wsValue, wsPattern,
                                          pLocale, (CXFA_LocaleMgr*)pMgr);
             if (localeValue.IsValid()) {
               szParsedValue = FX_UTF8Encode(localeValue.GetValue());
               FXJSE_Value_SetUTF8String(args.GetReturnValue(),
-                                        szParsedValue.AsByteStringC());
+                                        szParsedValue.AsStringC());
             } else {
               FXJSE_Value_SetUTF8String(args.GetReturnValue(), "");
             }
           } break;
           case XFA_VT_FLOAT: {
             wsPattern = FX_WSTRC(L"num{") + wsPattern;
             wsPattern += FX_WSTRC(L"}");
             CXFA_LocaleValue localeValue(XFA_VT_FLOAT, wsValue, wsPattern,
                                          pLocale, (CXFA_LocaleMgr*)pMgr);
             if (localeValue.IsValid()) {
@@ skipping 13 matching lines @@
               FXJSE_Value_SetDouble(args.GetReturnValue(),
                                     localeValue.GetDoubleNum());
             } else {
               wsTestPattern = FX_WSTRC(L"text{") + wsPattern;
               wsTestPattern += FX_WSTRC(L"}");
               CXFA_LocaleValue localeValue(XFA_VT_TEXT, wsValue, wsTestPattern,
                                            pLocale, (CXFA_LocaleMgr*)pMgr);
               if (localeValue.IsValid()) {
                 szParsedValue = FX_UTF8Encode(localeValue.GetValue());
                 FXJSE_Value_SetUTF8String(args.GetReturnValue(),
-                                          szParsedValue.AsByteStringC());
+                                          szParsedValue.AsStringC());
               } else {
                 FXJSE_Value_SetUTF8String(args.GetReturnValue(), "");
               }
             }
           } break;
         }
       }
     }
     FXJSE_Value_Release(argOne);
     FXJSE_Value_Release(argTwo);
@@ skipping 36 matching lines @@
           chTemp = oneString.GetAt(iTemp);
           if (chTemp == twoString.GetAt(iFindIndex)) {
             ++iTemp;
             ++iFindIndex;
           } else {
             iFindIndex = 0;
             break;
           }
         }
         if (iFindIndex == iFindLen) {
-          resultString << threeString.AsByteStringC();
+          resultString << threeString.AsStringC();
           u += iFindLen - 1;
           iFindIndex = 0;
         } else {
           resultString.AppendChar(ch);
         }
       } else {
         resultString.AppendChar(ch);
       }
     }
     resultString.AppendChar(0);
@@ skipping 26 matching lines @@
     if (argIsNull) {
       FXJSE_Value_SetNull(args.GetReturnValue());
     } else {
       CFX_ByteString sourceString;
       HValueToUTF8String(argOne, sourceString);
       int32_t count = HValueToInteger(hThis, argTwo);
       if (count < 0) {
         count = 0;
       }
       FXJSE_Value_SetUTF8String(args.GetReturnValue(),
-                                sourceString.Right(count).AsByteStringC());
+                                sourceString.Right(count).AsStringC());
     }
     FXJSE_Value_Release(argOne);
     FXJSE_Value_Release(argTwo);
   } else {
     pContext->ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
                                       L"Right");
   }
 }
 void CXFA_FM2JSContext::Rtrim(FXJSE_HOBJECT hThis,
                               const CFX_ByteStringC& szFuncName,
                               CFXJSE_Arguments& args) {
   CXFA_FM2JSContext* pContext =
       (CXFA_FM2JSContext*)FXJSE_Value_ToObject(hThis, NULL);
   if (args.GetLength() == 1) {
     FXJSE_HVALUE argOne = GetSimpleHValue(hThis, args, 0);
     if (HValueIsNull(hThis, argOne)) {
       FXJSE_Value_SetNull(args.GetReturnValue());
     } else {
       CFX_ByteString sourceString;
       HValueToUTF8String(argOne, sourceString);
       sourceString.TrimRight();
       FXJSE_Value_SetUTF8String(args.GetReturnValue(),
-                                sourceString.AsByteStringC());
+                                sourceString.AsStringC());
     }
     FXJSE_Value_Release(argOne);
   } else {
     pContext->ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
                                       L"Rtrim");
   }
 }
 void CXFA_FM2JSContext::Space(FXJSE_HOBJECT hThis,
                               const CFX_ByteStringC& szFuncName,
                               CFXJSE_Arguments& args) {
@@ skipping 184 matching lines @@
       insertValue = GetSimpleHValue(hThis, args, 3);
       HValueToUTF8String(insertValue, insertString);
     }
     iStart -= 1;
     CFX_ByteTextBuf resultString;
     int32_t i = 0;
     while (i < iStart) {
       resultString.AppendChar(sourceString.GetAt(i));
       ++i;
     }
-    resultString << insertString.AsByteStringC();
+    resultString << insertString.AsStringC();
     i = iStart + iDelete;
     while (i < iLength) {
       resultString.AppendChar(sourceString.GetAt(i));
       ++i;
     }
     resultString.AppendChar(0);
     FXJSE_Value_SetUTF8String(args.GetReturnValue(),
                               resultString.GetByteString());
     FXJSE_Value_Release(sourceValue);
     FXJSE_Value_Release(startValue);
@@ skipping 33 matching lines @@
         if (iStart < 1) {
           iStart = 1;
         }
         if (iStart > iLength) {
           iStart = iLength;
         }
         if (iCount <= 0) {
           iCount = 0;
         }
         iStart -= 1;
-        FXJSE_Value_SetUTF8String(
-            args.GetReturnValue(),
-            szSourceStr.Mid(iStart, iCount).AsByteStringC());
+        FXJSE_Value_SetUTF8String(args.GetReturnValue(),
+                                  szSourceStr.Mid(iStart, iCount).AsStringC());
       }
     }
     FXJSE_Value_Release(stringValue);
     FXJSE_Value_Release(startValue);
     FXJSE_Value_Release(endValue);
   } else {
     CXFA_FM2JSContext* pContext =
         (CXFA_FM2JSContext*)FXJSE_Value_ToObject(hThis, NULL);
     pContext->ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
                                       L"Substr");
   }
 }
 void CXFA_FM2JSContext::Uuid(FXJSE_HOBJECT hThis,
                              const CFX_ByteStringC& szFuncName,
                              CFXJSE_Arguments& args) {
   int32_t argc = args.GetLength();
   if ((argc == 0) || (argc == 1)) {
     int32_t iNum = 0;
     FXJSE_HVALUE argOne = 0;
     if (argc == 1) {
       argOne = GetSimpleHValue(hThis, args, 0);
       iNum = (int32_t)HValueToFloat(hThis, argOne);
     }
     FX_GUID guid;
     FX_GUID_CreateV4(&guid);
     CFX_ByteString bsUId;
     FX_GUID_ToString(&guid, bsUId, iNum);
-    FXJSE_Value_SetUTF8String(args.GetReturnValue(), bsUId.AsByteStringC());
+    FXJSE_Value_SetUTF8String(args.GetReturnValue(), bsUId.AsStringC());
     if (argc == 1) {
       FXJSE_Value_Release(argOne);
     }
   } else {
     CXFA_FM2JSContext* pContext =
         (CXFA_FM2JSContext*)FXJSE_Value_ToObject(hThis, NULL);
     pContext->ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
                                       L"Uuid");
   }
 }
 void CXFA_FM2JSContext::Upper(FXJSE_HOBJECT hThis,
                               const CFX_ByteStringC& szFuncName,
                               CFXJSE_Arguments& args) {
   int32_t argc = args.GetLength();
   if ((argc > 0) && (argc < 3)) {
     CFX_ByteString argString;
     FXJSE_HVALUE argOne = GetSimpleHValue(hThis, args, 0);
     FXJSE_HVALUE localeValue = 0;
     if (HValueIsNull(hThis, argOne)) {
       FXJSE_Value_SetNull(args.GetReturnValue());
     } else {
       if (argc == 2) {
         localeValue = GetSimpleHValue(hThis, args, 1);
       }
       HValueToUTF8String(argOne, argString);
       CFX_WideTextBuf upperStringBuf;
       CFX_WideString wsArgString =
-          CFX_WideString::FromUTF8(argString.AsByteStringC());
+          CFX_WideString::FromUTF8(argString.AsStringC());
       const FX_WCHAR* pData = wsArgString;
       int32_t iLen = wsArgString.GetLength();
       int32_t i = 0;
       int32_t ch = 0;
       while (i < iLen) {
         ch = *(pData + i);
         if (ch >= 0x61 && ch <= 0x7A) {
           ch -= 32;
         } else if (ch >= 0xE0 && ch <= 0xFE) {
           ch -= 32;
         } else if (ch == 0x101 || ch == 0x103 || ch == 0x105) {
           ch -= 1;
         }
         upperStringBuf.AppendChar(ch);
         ++i;
       }
       upperStringBuf.AppendChar(0);
       FXJSE_Value_SetUTF8String(
           args.GetReturnValue(),
           FX_UTF8Encode(upperStringBuf.GetBuffer(), upperStringBuf.GetLength())
-              .AsByteStringC());
+              .AsStringC());
       if (argc == 2) {
         FXJSE_Value_Release(localeValue);
       }
     }
     FXJSE_Value_Release(argOne);
   } else {
     CXFA_FM2JSContext* pContext =
         (CXFA_FM2JSContext*)FXJSE_Value_ToObject(hThis, NULL);
     pContext->ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
                                       L"Upper");
@@ skipping 32 matching lines @@
         HValueToUTF8String(localeValue, localeString);
       }
     }
     if (!bFlags) {
       if ((fNumber < 0) || (fNumber > 922337203685477550)) {
         FXJSE_Value_SetUTF8String(args.GetReturnValue(), "*");
       } else {
         CFX_ByteTextBuf resultBuf;
         CFX_ByteString numberString;
         numberString.Format("%.2f", fNumber);
-        WordUS(numberString.AsByteStringC(), iIdentifier, resultBuf);
+        WordUS(numberString.AsStringC(), iIdentifier, resultBuf);
         FXJSE_Value_SetUTF8String(args.GetReturnValue(),
                                   resultBuf.GetByteString());
       }
     } else {
       FXJSE_Value_SetNull(args.GetReturnValue());
     }
     FXJSE_Value_Release(numberValue);
     if (argc > 1) {
       FXJSE_Value_Release(identifierValue);
       if (argc == 3) {
@@ skipping 215 matching lines @@
     }
     IXFA_AppProvider* pAppProvider =
         pDoc->GetParser()->GetNotify()->GetAppProvider();
     if (!pAppProvider) {
       return;
     }
     FXJSE_HVALUE argOne = GetSimpleHValue(hThis, args, 0);
     CFX_ByteString urlString;
     HValueToUTF8String(argOne, urlString);
     IFX_FileRead* pFile = pAppProvider->DownloadURL(
-        CFX_WideString::FromUTF8(urlString.AsByteStringC()).AsWideStringC());
+        CFX_WideString::FromUTF8(urlString.AsStringC()).AsStringC());
     if (pFile) {
       int32_t size = pFile->GetSize();
       uint8_t* pData = FX_Alloc(uint8_t, size);
       pFile->ReadBlock(pData, size);
       FXJSE_Value_SetUTF8String(args.GetReturnValue(),
                                 CFX_ByteStringC(pData, size));
       FX_Free(pData);
       pFile->Release();
     }
     FXJSE_Value_Release(argOne);
@@ skipping 39 matching lines @@
     if (argc > 3) {
       argFour = GetSimpleHValue(hThis, args, 3);
       HValueToUTF8String(argFour, bsEncode);
     }
     if (argc > 4) {
       argFive = GetSimpleHValue(hThis, args, 4);
       HValueToUTF8String(argFive, bsHeader);
     }
     CFX_WideString decodedResponse;
     FX_BOOL bFlags = pAppProvider->PostRequestURL(
-        CFX_WideString::FromUTF8(bsURL.AsByteStringC()).AsWideStringC(),
-        CFX_WideString::FromUTF8(bsData.AsByteStringC()).AsWideStringC(),
-        CFX_WideString::FromUTF8(bsContentType.AsByteStringC()).AsWideStringC(),
-        CFX_WideString::FromUTF8(bsEncode.AsByteStringC()).AsWideStringC(),
-        CFX_WideString::FromUTF8(bsHeader.AsByteStringC()).AsWideStringC(),
+        CFX_WideString::FromUTF8(bsURL.AsStringC()).AsStringC(),
+        CFX_WideString::FromUTF8(bsData.AsStringC()).AsStringC(),
+        CFX_WideString::FromUTF8(bsContentType.AsStringC()).AsStringC(),
+        CFX_WideString::FromUTF8(bsEncode.AsStringC()).AsStringC(),
+        CFX_WideString::FromUTF8(bsHeader.AsStringC()).AsStringC(),
         decodedResponse);
     FXJSE_Value_Release(argOne);
     FXJSE_Value_Release(argTwo);
     if (argc > 2) {
       FXJSE_Value_Release(argThree);
     }
     if (argc > 3) {
       FXJSE_Value_Release(argFour);
     }
     if (argc > 4) {
       FXJSE_Value_Release(argFive);
     }
     if (bFlags) {
       FXJSE_Value_SetUTF8String(
           args.GetReturnValue(),
           FX_UTF8Encode(decodedResponse, decodedResponse.GetLength())
-              .AsByteStringC());
+              .AsStringC());
     } else {
       pContext->ThrowScriptErrorMessage(XFA_IDS_SERVER_DENY);
     }
   } else {
     pContext->ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
                                       L"Post");
   }
 }
 void CXFA_FM2JSContext::Put(FXJSE_HOBJECT hThis,
                             const CFX_ByteStringC& szFuncName,
@@ skipping 19 matching lines @@
     FXJSE_HVALUE argThree;
     argOne = GetSimpleHValue(hThis, args, 0);
     HValueToUTF8String(argOne, bsURL);
     argTwo = GetSimpleHValue(hThis, args, 1);
     HValueToUTF8String(argTwo, bsData);
     if (argc > 2) {
       argThree = GetSimpleHValue(hThis, args, 2);
       HValueToUTF8String(argThree, bsEncode);
     }
     FX_BOOL bFlags = pAppProvider->PutRequestURL(
-        CFX_WideString::FromUTF8(bsURL.AsByteStringC()).AsWideStringC(),
-        CFX_WideString::FromUTF8(bsData.AsByteStringC()).AsWideStringC(),
-        CFX_WideString::FromUTF8(bsEncode.AsByteStringC()).AsWideStringC());
+        CFX_WideString::FromUTF8(bsURL.AsStringC()).AsStringC(),
+        CFX_WideString::FromUTF8(bsData.AsStringC()).AsStringC(),
+        CFX_WideString::FromUTF8(bsEncode.AsStringC()).AsStringC());
     FXJSE_Value_Release(argOne);
     FXJSE_Value_Release(argTwo);
     if (argc > 2) {
       FXJSE_Value_Release(argThree);
     }
     if (bFlags) {
       FXJSE_Value_SetUTF8String(args.GetReturnValue(), "");
     } else {
       pContext->ThrowScriptErrorMessage(XFA_IDS_SERVER_DENY);
     }
@@ skipping 27 matching lines @@
           if (!bSetStatus) {
             pContext->ThrowScriptErrorMessage(XFA_IDS_NOT_DEFAUL_VALUE);
             break;
           }
         }
       } else {
         CFX_ByteString propertyStr;
         FXJSE_Value_ToUTF8String(propertyValue, propertyStr);
         for (int32_t i = 2; i < iLeftLength; i++) {
           FXJSE_Value_GetObjectPropByIdx(lValue, i, jsObjectValue);
-          FXJSE_Value_SetObjectProp(jsObjectValue, propertyStr.AsByteStringC(),
+          FXJSE_Value_SetObjectProp(jsObjectValue, propertyStr.AsStringC(),
                                     rValue);
         }
       }
       FXJSE_Value_Release(jsObjectValue);
       FXJSE_Value_Release(propertyValue);
     } else if (FXJSE_Value_IsObject(lValue)) {
       bSetStatus = SetObjectDefaultValue(lValue, rValue);
       if (!bSetStatus) {
         pContext->ThrowScriptErrorMessage(XFA_IDS_NOT_DEFAUL_VALUE);
       }
@@ skipping 165 matching lines @@
     if (FXJSE_Value_IsNull(argFirst) || FXJSE_Value_IsNull(argSecond)) {
       FXJSE_Value_SetInteger(args.GetReturnValue(), 0);
     } else if (FXJSE_Value_IsUTF8String(argFirst) &&
                FXJSE_Value_IsUTF8String(argSecond)) {
       CFX_ByteString firstOutput;
       CFX_ByteString secondOutput;
       FXJSE_Value_ToUTF8String(argFirst, firstOutput);
       FXJSE_Value_ToUTF8String(argSecond, secondOutput);
       FXJSE_Value_SetInteger(
           args.GetReturnValue(),
-          firstOutput.Compare(secondOutput.AsByteStringC()) == -1);
+          firstOutput.Compare(secondOutput.AsStringC()) == -1);
     } else {
       FX_DOUBLE first = HValueToDouble(hThis, argFirst);
       FX_DOUBLE second = HValueToDouble(hThis, argSecond);
       FXJSE_Value_SetInteger(args.GetReturnValue(), (first < second) ? 1 : 0);
     }
     FXJSE_Value_Release(argFirst);
     FXJSE_Value_Release(argSecond);
   } else {
     CXFA_FM2JSContext* pContext =
         (CXFA_FM2JSContext*)FXJSE_Value_ToObject(hThis, NULL);
@@ skipping 12 matching lines @@
           (FXJSE_Value_IsNull(argFirst) && FXJSE_Value_IsNull(argSecond)) ? 1
                                                                           : 0);
     } else if (FXJSE_Value_IsUTF8String(argFirst) &&
                FXJSE_Value_IsUTF8String(argSecond)) {
       CFX_ByteString firstOutput;
       CFX_ByteString secondOutput;
       FXJSE_Value_ToUTF8String(argFirst, firstOutput);
       FXJSE_Value_ToUTF8String(argSecond, secondOutput);
       FXJSE_Value_SetInteger(
           args.GetReturnValue(),
-          firstOutput.Compare(secondOutput.AsByteStringC()) != 1);
+          firstOutput.Compare(secondOutput.AsStringC()) != 1);
     } else {
       FX_DOUBLE first = HValueToDouble(hThis, argFirst);
       FX_DOUBLE second = HValueToDouble(hThis, argSecond);
       FXJSE_Value_SetInteger(args.GetReturnValue(), (first <= second) ? 1 : 0);
     }
     FXJSE_Value_Release(argFirst);
     FXJSE_Value_Release(argSecond);
   } else {
     CXFA_FM2JSContext* pContext =
         (CXFA_FM2JSContext*)FXJSE_Value_ToObject(hThis, NULL);
     pContext->ThrowScriptErrorMessage(XFA_IDS_COMPILER_ERROR);
   }
 }
 void CXFA_FM2JSContext::greater_operator(FXJSE_HOBJECT hThis,
                                          const CFX_ByteStringC& szFuncName,
                                          CFXJSE_Arguments& args) {
   if (args.GetLength() == 2) {
     FXJSE_HVALUE argFirst = GetSimpleHValue(hThis, args, 0);
     FXJSE_HVALUE argSecond = GetSimpleHValue(hThis, args, 1);
     if (FXJSE_Value_IsNull(argFirst) || FXJSE_Value_IsNull(argSecond)) {
       FXJSE_Value_SetInteger(args.GetReturnValue(), 0);
     } else if (FXJSE_Value_IsUTF8String(argFirst) &&
                FXJSE_Value_IsUTF8String(argSecond)) {
       CFX_ByteString firstOutput;
       CFX_ByteString secondOutput;
       FXJSE_Value_ToUTF8String(argFirst, firstOutput);
       FXJSE_Value_ToUTF8String(argSecond, secondOutput);
       FXJSE_Value_SetInteger(
           args.GetReturnValue(),
-          firstOutput.Compare(secondOutput.AsByteStringC()) == 1);
+          firstOutput.Compare(secondOutput.AsStringC()) == 1);
     } else {
       FX_DOUBLE first = HValueToDouble(hThis, argFirst);
       FX_DOUBLE second = HValueToDouble(hThis, argSecond);
       FXJSE_Value_SetInteger(args.GetReturnValue(), (first > second) ? 1 : 0);
     }
     FXJSE_Value_Release(argFirst);
     FXJSE_Value_Release(argSecond);
   } else {
     CXFA_FM2JSContext* pContext =
         (CXFA_FM2JSContext*)FXJSE_Value_ToObject(hThis, NULL);
@@ skipping 12 matching lines @@
           (FXJSE_Value_IsNull(argFirst) && FXJSE_Value_IsNull(argSecond)) ? 1
                                                                           : 0);
     } else if (FXJSE_Value_IsUTF8String(argFirst) &&
                FXJSE_Value_IsUTF8String(argSecond)) {
       CFX_ByteString firstOutput;
       CFX_ByteString secondOutput;
       FXJSE_Value_ToUTF8String(argFirst, firstOutput);
       FXJSE_Value_ToUTF8String(argSecond, secondOutput);
       FXJSE_Value_SetInteger(
           args.GetReturnValue(),
-          firstOutput.Compare(secondOutput.AsByteStringC()) != -1);
+          firstOutput.Compare(secondOutput.AsStringC()) != -1);
     } else {
       FX_DOUBLE first = HValueToDouble(hThis, argFirst);
       FX_DOUBLE second = HValueToDouble(hThis, argSecond);
       FXJSE_Value_SetInteger(args.GetReturnValue(), (first >= second) ? 1 : 0);
     }
     FXJSE_Value_Release(argFirst);
     FXJSE_Value_Release(argSecond);
   } else {
     CXFA_FM2JSContext* pContext =
         (CXFA_FM2JSContext*)FXJSE_Value_ToObject(hThis, NULL);
@@ skipping 159 matching lines @@
     CFX_ByteString szName = args.GetUTF8String(2);
     int32_t iIndexFlags = args.GetInt32(3);
     int32_t iIndexValue = 0;
     FXJSE_HVALUE argIndex = NULL;
     if (argc == 5) {
       bIsStar = FALSE;
       argIndex = args.GetValue(4);
       iIndexValue = HValueToInteger(hThis, argIndex);
     }
     CFX_ByteString szSomExp;
-    GenerateSomExpression(szName.AsByteStringC(), iIndexFlags, iIndexValue,
-                          bIsStar, szSomExp);
+    GenerateSomExpression(szName.AsStringC(), iIndexFlags, iIndexValue, bIsStar,
+                          szSomExp);
     if (FXJSE_Value_IsArray(argAccessor)) {
       FXJSE_HVALUE hLengthValue = FXJSE_Value_Create(hruntime);
       FXJSE_Value_GetObjectProp(argAccessor, "length", hLengthValue);
       int32_t iLength = FXJSE_Value_ToInteger(hLengthValue);
       FXJSE_Value_Release(hLengthValue);
       int32_t iCounter = 0;
       FXJSE_HVALUE** hResolveValues = FX_Alloc(FXJSE_HVALUE*, iLength - 2);
       int32_t* iSizes = FX_Alloc(int32_t, iLength - 2);
       for (int32_t i = 0; i < (iLength - 2); i++) {
         iSizes[i] = 0;
       }
       FXJSE_HVALUE hJSObjValue = FXJSE_Value_Create(hruntime);
       FX_BOOL bAttribute = FALSE;
       for (int32_t i = 2; i < iLength; i++) {
         FXJSE_Value_GetObjectPropByIdx(argAccessor, i, hJSObjValue);
         XFA_RESOLVENODE_RS resoveNodeRS;
-        int32_t iRet =
-            ResolveObjects(hThis, hJSObjValue, szSomExp.AsByteStringC(),
-                           resoveNodeRS, TRUE, szName.IsEmpty());
+        int32_t iRet = ResolveObjects(hThis, hJSObjValue, szSomExp.AsStringC(),
+                                      resoveNodeRS, TRUE, szName.IsEmpty());
         if (iRet > 0) {
           ParseResolveResult(hThis, resoveNodeRS, hJSObjValue,
                              hResolveValues[i - 2], iSizes[i - 2], bAttribute);
           iCounter += iSizes[i - 2];
         }
       }
       FXJSE_Value_Release(hJSObjValue);
       if (iCounter > 0) {
         FXJSE_HVALUE* rgValues = FX_Alloc(FXJSE_HVALUE, iCounter + 2);
         for (int32_t i = 0; i < (iCounter + 2); i++) {
           rgValues[i] = FXJSE_Value_Create(hruntime);
         }
         FXJSE_Value_SetInteger(rgValues[0], 1);
         if (bAttribute) {
-          FXJSE_Value_SetUTF8String(rgValues[1], szName.AsByteStringC());
+          FXJSE_Value_SetUTF8String(rgValues[1], szName.AsStringC());
         } else {
           FXJSE_Value_SetNull(rgValues[1]);
         }
         int32_t iIndex = 2;
         for (int32_t i = 0; i < iLength - 2; i++) {
           for (int32_t j = 0; j < iSizes[i]; j++) {
             FXJSE_Value_Set(rgValues[iIndex], hResolveValues[i][j]);
             iIndex++;
           }
         }
         FXJSE_Value_SetArray(args.GetReturnValue(), (iCounter + 2), rgValues);
         for (int32_t i = 0; i < (iCounter + 2); i++) {
           FXJSE_Value_Release(rgValues[i]);
         }
         FX_Free(rgValues);
       } else {
         CFX_WideString wsPropertyName =
-            CFX_WideString::FromUTF8(szName.AsByteStringC());
+            CFX_WideString::FromUTF8(szName.AsStringC());
         CFX_WideString wsSomExpression =
-            CFX_WideString::FromUTF8(szSomExp.AsByteStringC());
+            CFX_WideString::FromUTF8(szSomExp.AsStringC());
         pContext->ThrowScriptErrorMessage(XFA_IDS_ACCESS_PROPERTY_IN_NOT_OBJECT,
                                           (const FX_WCHAR*)wsPropertyName,
                                           (const FX_WCHAR*)wsSomExpression);
       }
       for (int32_t i = 0; i < iLength - 2; i++) {
         for (int32_t j = 0; j < iSizes[i]; j++) {
           FXJSE_Value_Release(hResolveValues[i][j]);
         }
         if (iSizes[i] > 0) {
           FX_Free(hResolveValues[i]);
         }
       }
       FX_Free(hResolveValues);
       FX_Free(iSizes);
     } else {
       XFA_RESOLVENODE_RS resoveNodeRS;
       int32_t iRet = 0;
       if (FXJSE_Value_IsObject(argAccessor) ||
           (FXJSE_Value_IsNull(argAccessor) && bsAccessorName.IsEmpty())) {
-        iRet = ResolveObjects(hThis, argAccessor, szSomExp.AsByteStringC(),
+        iRet = ResolveObjects(hThis, argAccessor, szSomExp.AsStringC(),
                               resoveNodeRS, TRUE, szName.IsEmpty());
       } else if (!FXJSE_Value_IsObject(argAccessor) &&
                  !bsAccessorName.IsEmpty()) {
         FX_BOOL bGetObject =
-            GetObjectByName(hThis, argAccessor, bsAccessorName.AsByteStringC());
+            GetObjectByName(hThis, argAccessor, bsAccessorName.AsStringC());
         if (bGetObject) {
-          iRet = ResolveObjects(hThis, argAccessor, szSomExp.AsByteStringC(),
+          iRet = ResolveObjects(hThis, argAccessor, szSomExp.AsStringC(),
                                 resoveNodeRS, TRUE, szName.IsEmpty());
         }
       }
       if (iRet > 0) {
         FXJSE_HVALUE* hResolveValues;
         int32_t iSize = 0;
         FX_BOOL bAttribute = FALSE;
         ParseResolveResult(hThis, resoveNodeRS, argAccessor, hResolveValues,
                            iSize, bAttribute);
         FXJSE_HVALUE* rgValues = FX_Alloc(FXJSE_HVALUE, iSize + 2);
         for (int32_t i = 0; i < (iSize + 2); i++) {
           rgValues[i] = FXJSE_Value_Create(hruntime);
         }
         FXJSE_Value_SetInteger(rgValues[0], 1);
         if (bAttribute) {
-          FXJSE_Value_SetUTF8String(rgValues[1], szName.AsByteStringC());
+          FXJSE_Value_SetUTF8String(rgValues[1], szName.AsStringC());
         } else {
           FXJSE_Value_SetNull(rgValues[1]);
         }
         for (int32_t i = 0; i < iSize; i++) {
           FXJSE_Value_Set(rgValues[i + 2], hResolveValues[i]);
         }
         FXJSE_Value_SetArray(args.GetReturnValue(), (iSize + 2), rgValues);
         for (int32_t i = 0; i < (iSize + 2); i++) {
           FXJSE_Value_Release(rgValues[i]);
         }
         FX_Free(rgValues);
         for (int32_t i = 0; i < iSize; i++) {
           FXJSE_Value_Release(hResolveValues[i]);
         }
         FX_Free(hResolveValues);
       } else {
         CFX_WideString wsPropertyName =
-            CFX_WideString::FromUTF8(szName.AsByteStringC());
+            CFX_WideString::FromUTF8(szName.AsStringC());
         CFX_WideString wsSomExpression =
-            CFX_WideString::FromUTF8(szSomExp.AsByteStringC());
+            CFX_WideString::FromUTF8(szSomExp.AsStringC());
         pContext->ThrowScriptErrorMessage(XFA_IDS_ACCESS_PROPERTY_IN_NOT_OBJECT,
                                           (const FX_WCHAR*)wsPropertyName,
                                           (const FX_WCHAR*)wsSomExpression);
       }
     }
     if (argc == 5) {
       FXJSE_Value_Release(argIndex);
     }
     FXJSE_Value_Release(argAccessor);
   } else {
@@ skipping 14 matching lines @@
     CFX_ByteString szName = args.GetUTF8String(2);
     int32_t iIndexFlags = args.GetInt32(3);
     int32_t iIndexValue = 0;
     FXJSE_HVALUE argIndex = NULL;
     if (argc == 5) {
       bIsStar = FALSE;
       argIndex = args.GetValue(4);
       iIndexValue = HValueToInteger(hThis, argIndex);
     }
     CFX_ByteString szSomExp;
-    GenerateSomExpression(szName.AsByteStringC(), iIndexFlags, iIndexValue,
-                          bIsStar, szSomExp);
+    GenerateSomExpression(szName.AsStringC(), iIndexFlags, iIndexValue, bIsStar,
+                          szSomExp);
     if (FXJSE_Value_IsArray(argAccessor)) {
       FXJSE_HVALUE hLengthValue = FXJSE_Value_Create(hruntime);
       FXJSE_Value_GetObjectProp(argAccessor, "length", hLengthValue);
       int32_t iLength = FXJSE_Value_ToInteger(hLengthValue);
       int32_t iCounter = 0;
       FXJSE_HVALUE** hResolveValues = FX_Alloc(FXJSE_HVALUE*, iLength - 2);
       int32_t* iSizes = FX_Alloc(int32_t, iLength - 2);
       FXJSE_HVALUE hJSObjValue = FXJSE_Value_Create(hruntime);
       FX_BOOL bAttribute = FALSE;
       for (int32_t i = 2; i < iLength; i++) {
         FXJSE_Value_GetObjectPropByIdx(argAccessor, i, hJSObjValue);
         XFA_RESOLVENODE_RS resoveNodeRS;
-        int32_t iRet = ResolveObjects(
-            hThis, hJSObjValue, szSomExp.AsByteStringC(), resoveNodeRS, FALSE);
+        int32_t iRet = ResolveObjects(hThis, hJSObjValue, szSomExp.AsStringC(),
+                                      resoveNodeRS, FALSE);
         if (iRet > 0) {
           ParseResolveResult(hThis, resoveNodeRS, hJSObjValue,
                              hResolveValues[i - 2], iSizes[i - 2], bAttribute);
           iCounter += iSizes[i - 2];
         }
       }
       FXJSE_Value_Release(hJSObjValue);
       if (iCounter > 0) {
         FXJSE_HVALUE* rgValues = FX_Alloc(FXJSE_HVALUE, iCounter + 2);
         for (int32_t i = 0; i < (iCounter + 2); i++) {
           rgValues[i] = FXJSE_Value_Create(hruntime);
         }
         FXJSE_Value_SetInteger(rgValues[0], 1);
         if (bAttribute) {
-          FXJSE_Value_SetUTF8String(rgValues[1], szName.AsByteStringC());
+          FXJSE_Value_SetUTF8String(rgValues[1], szName.AsStringC());
         } else {
           FXJSE_Value_SetNull(rgValues[1]);
         }
         int32_t iIndex = 2;
         for (int32_t i = 0; i < iLength - 2; i++) {
           for (int32_t j = 0; j < iSizes[i]; j++) {
             FXJSE_Value_Set(rgValues[iIndex], hResolveValues[i][j]);
             iIndex++;
           }
         }
         FXJSE_Value_SetArray(args.GetReturnValue(), (iCounter + 2), rgValues);
         for (int32_t i = 0; i < (iCounter + 2); i++) {
           FXJSE_Value_Release(rgValues[i]);
         }
         FX_Free(rgValues);
       } else {
         CFX_WideString wsPropertyName =
-            CFX_WideString::FromUTF8(szName.AsByteStringC());
+            CFX_WideString::FromUTF8(szName.AsStringC());
         CFX_WideString wsSomExpression =
-            CFX_WideString::FromUTF8(szSomExp.AsByteStringC());
+            CFX_WideString::FromUTF8(szSomExp.AsStringC());
         pContext->ThrowScriptErrorMessage(XFA_IDS_ACCESS_PROPERTY_IN_NOT_OBJECT,
                                           (const FX_WCHAR*)wsPropertyName,
                                           (const FX_WCHAR*)wsSomExpression);
       }
       for (int32_t i = 0; i < iLength - 2; i++) {
         for (int32_t j = 0; j < iSizes[i]; j++) {
           FXJSE_Value_Release(hResolveValues[i][j]);
         }
         FX_Free(hResolveValues[i]);
       }
       FX_Free(hResolveValues);
       FX_Free(iSizes);
       FXJSE_Value_Release(hLengthValue);
     } else {
       XFA_RESOLVENODE_RS resoveNodeRS;
       int32_t iRet = 0;
       if (FXJSE_Value_IsObject(argAccessor) ||
           (FXJSE_Value_IsNull(argAccessor) && bsAccessorName.IsEmpty())) {
-        iRet = ResolveObjects(hThis, argAccessor, szSomExp.AsByteStringC(),
+        iRet = ResolveObjects(hThis, argAccessor, szSomExp.AsStringC(),
                               resoveNodeRS, FALSE);
       } else if (!FXJSE_Value_IsObject(argAccessor) &&
                  !bsAccessorName.IsEmpty()) {
         FX_BOOL bGetObject =
-            GetObjectByName(hThis, argAccessor, bsAccessorName.AsByteStringC());
+            GetObjectByName(hThis, argAccessor, bsAccessorName.AsStringC());
         if (bGetObject) {
-          iRet = ResolveObjects(hThis, argAccessor, szSomExp.AsByteStringC(),
+          iRet = ResolveObjects(hThis, argAccessor, szSomExp.AsStringC(),
                                 resoveNodeRS, FALSE);
         }
       }
       if (iRet > 0) {
         FXJSE_HVALUE* hResolveValues;
         int32_t iSize = 0;
         FX_BOOL bAttribute = FALSE;
         ParseResolveResult(hThis, resoveNodeRS, argAccessor, hResolveValues,
                            iSize, bAttribute);
         FXJSE_HVALUE* rgValues = FX_Alloc(FXJSE_HVALUE, iSize + 2);
         for (int32_t i = 0; i < (iSize + 2); i++) {
           rgValues[i] = FXJSE_Value_Create(hruntime);
         }
         FXJSE_Value_SetInteger(rgValues[0], 1);
         if (bAttribute) {
-          FXJSE_Value_SetUTF8String(rgValues[1], szName.AsByteStringC());
+          FXJSE_Value_SetUTF8String(rgValues[1], szName.AsStringC());
         } else {
           FXJSE_Value_SetNull(rgValues[1]);
         }
         for (int32_t i = 0; i < iSize; i++) {
           FXJSE_Value_Set(rgValues[i + 2], hResolveValues[i]);
         }
         FXJSE_Value_SetArray(args.GetReturnValue(), (iSize + 2), rgValues);
         for (int32_t i = 0; i < (iSize + 2); i++) {
           FXJSE_Value_Release(rgValues[i]);
         }
         FX_Free(rgValues);
         for (int32_t i = 0; i < iSize; i++) {
           FXJSE_Value_Release(hResolveValues[i]);
         }
         FX_Free(hResolveValues);
       } else {
         CFX_WideString wsPropertyName =
-            CFX_WideString::FromUTF8(szName.AsByteStringC());
+            CFX_WideString::FromUTF8(szName.AsStringC());
         CFX_WideString wsSomExpression =
-            CFX_WideString::FromUTF8(szSomExp.AsByteStringC());
+            CFX_WideString::FromUTF8(szSomExp.AsStringC());
         pContext->ThrowScriptErrorMessage(XFA_IDS_ACCESS_PROPERTY_IN_NOT_OBJECT,
                                           (const FX_WCHAR*)wsPropertyName,
                                           (const FX_WCHAR*)wsSomExpression);
       }
     }
     if (argc == 5) {
       FXJSE_Value_Release(argIndex);
     }
     FXJSE_Value_Release(argAccessor);
   } else {
     pContext->ThrowScriptErrorMessage(XFA_IDS_COMPILER_ERROR);
   }
 }
 void CXFA_FM2JSContext::eval_translation(FXJSE_HOBJECT hThis,
                                          const CFX_ByteStringC& szFuncName,
                                          CFXJSE_Arguments& args) {
   CXFA_FM2JSContext* pContext =
       (CXFA_FM2JSContext*)FXJSE_Value_ToObject(hThis, NULL);
   int32_t argc = args.GetLength();
   if (argc == 1) {
     FXJSE_HVALUE argOne = GetSimpleHValue(hThis, args, 0);
     CFX_ByteString argString;
     HValueToUTF8String(argOne, argString);
     if (argString.IsEmpty()) {
       pContext->ThrowScriptErrorMessage(XFA_IDS_ARGUMENT_MISMATCH);
     } else {
       CFX_WideString scriptString =
-          CFX_WideString::FromUTF8(argString.AsByteStringC());
+          CFX_WideString::FromUTF8(argString.AsStringC());
       CFX_WideTextBuf wsJavaScriptBuf;
       CFX_WideString wsError;
-      XFA_FM2JS_Translate(scriptString.AsWideStringC(), wsJavaScriptBuf,
-                          wsError);
+      XFA_FM2JS_Translate(scriptString.AsStringC(), wsJavaScriptBuf, wsError);
       if (wsError.IsEmpty()) {
         CFX_WideString javaScript = wsJavaScriptBuf.GetWideString();
         FXJSE_Value_SetUTF8String(
             args.GetReturnValue(),
-            FX_UTF8Encode(javaScript, javaScript.GetLength()).AsByteStringC());
+            FX_UTF8Encode(javaScript, javaScript.GetLength()).AsStringC());
       } else {
         pContext->ThrowScriptErrorMessage(XFA_IDS_COMPILER_ERROR);
       }
     }
     FXJSE_Value_Release(argOne);
   } else {
     pContext->ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD,
                                       L"Eval");
   }
 }
@@ skipping 34 matching lines @@
     if (FXJSE_Value_IsArray(argOne)) {
       FXJSE_HVALUE propertyValue = FXJSE_Value_Create(hruntime);
       FXJSE_HVALUE jsobjectValue = FXJSE_Value_Create(hruntime);
       FXJSE_Value_GetObjectPropByIdx(argOne, 1, propertyValue);
       FXJSE_Value_GetObjectPropByIdx(argOne, 2, jsobjectValue);
       if (FXJSE_Value_IsNull(propertyValue)) {
         GetObjectDefaultValue(jsobjectValue, args.GetReturnValue());
       } else {
         CFX_ByteString propertyStr;
         FXJSE_Value_ToUTF8String(propertyValue, propertyStr);
-        FXJSE_Value_GetObjectProp(jsobjectValue, propertyStr.AsByteStringC(),
+        FXJSE_Value_GetObjectProp(jsobjectValue, propertyStr.AsStringC(),
                                   args.GetReturnValue());
       }
       FXJSE_Value_Release(propertyValue);
       FXJSE_Value_Release(jsobjectValue);
     } else if (FXJSE_Value_IsObject(argOne)) {
       GetObjectDefaultValue(argOne, args.GetReturnValue());
     } else {
       FXJSE_Value_Set(args.GetReturnValue(), argOne);
     }
     FXJSE_Value_Release(argOne);
@@ skipping 148 matching lines @@
     if (iLength > 2) {
       FXJSE_HVALUE propertyValue = FXJSE_Value_Create(hruntime);
       FXJSE_HVALUE jsobjectValue = FXJSE_Value_Create(hruntime);
       FXJSE_Value_GetObjectPropByIdx(argIndex, 1, propertyValue);
       FXJSE_Value_GetObjectPropByIdx(argIndex, 2, jsobjectValue);
       if (FXJSE_Value_IsNull(propertyValue)) {
         GetObjectDefaultValue(jsobjectValue, simpleValue);
       } else {
         CFX_ByteString propertyStr;
         FXJSE_Value_ToUTF8String(propertyValue, propertyStr);
-        FXJSE_Value_GetObjectProp(jsobjectValue, propertyStr.AsByteStringC(),
+        FXJSE_Value_GetObjectProp(jsobjectValue, propertyStr.AsStringC(),
                                   simpleValue);
       }
       FXJSE_Value_Release(propertyValue);
       FXJSE_Value_Release(jsobjectValue);
     } else {
       FXJSE_Value_SetUndefined(simpleValue);
     }
     FXJSE_Value_Release(argIndex);
     return simpleValue;
   } else if (FXJSE_Value_IsObject(argIndex)) {
@@ skipping 23 matching lines @@
         FXJSE_HVALUE defaultValue = FXJSE_Value_Create(hruntime);
         GetObjectDefaultValue(jsObjectValue, defaultValue);
         if (FXJSE_Value_IsNull(defaultValue)) {
           isNull = TRUE;
         }
         FXJSE_Value_Release(defaultValue);
       } else {
         CFX_ByteString propertyStr;
         FXJSE_Value_ToUTF8String(propertyValue, propertyStr);
         FXJSE_HVALUE newPropertyValue = FXJSE_Value_Create(hruntime);
-        FXJSE_Value_GetObjectProp(jsObjectValue, propertyStr.AsByteStringC(),
+        FXJSE_Value_GetObjectProp(jsObjectValue, propertyStr.AsStringC(),
                                   newPropertyValue);
         if (FXJSE_Value_IsNull(newPropertyValue)) {
           isNull = TRUE;
         }
         FXJSE_Value_Release(newPropertyValue);
       }
       FXJSE_Value_Release(propertyValue);
       FXJSE_Value_Release(jsObjectValue);
     } else {
       isNull = TRUE;
@@ skipping 86 matching lines @@
           for (int32_t j = 2; j < iLength; j++) {
             FXJSE_Value_GetObjectPropByIdx(argsValue[i], j, jsObjectValue);
             GetObjectDefaultValue(jsObjectValue, resultValues[index]);
             index++;
           }
         } else {
           CFX_ByteString propertyString;
           FXJSE_Value_ToUTF8String(propertyValue, propertyString);
           for (int32_t j = 2; j < iLength; j++) {
             FXJSE_Value_GetObjectPropByIdx(argsValue[i], j, jsObjectValue);
-            FXJSE_Value_GetObjectProp(jsObjectValue,
-                                      propertyString.AsByteStringC(),
+            FXJSE_Value_GetObjectProp(jsObjectValue, propertyString.AsStringC(),
                                       resultValues[index]);
             index++;
           }
         }
         FXJSE_Value_Release(propertyValue);
         FXJSE_Value_Release(jsObjectValue);
       }
     } else if (FXJSE_Value_IsObject(argsValue[i])) {
       GetObjectDefaultValue(argsValue[i], resultValues[index]);
       index++;
@@ skipping 66 matching lines @@
   CXFA_Document* pDoc = pContext->GetDocument();
   if (!pDoc) {
     return bFlags;
   }
   CXFA_ScriptContext* pScriptContext = pDoc->GetScriptContext();
   XFA_RESOLVENODE_RS resoveNodeRS;
   uint32_t dwFlags = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Properties |
                      XFA_RESOLVENODE_Siblings | XFA_RESOLVENODE_Parent;
   int32_t iRet = pScriptContext->ResolveObjects(
       pScriptContext->GetThisObject(),
-      CFX_WideString::FromUTF8(szAccessorName).AsWideStringC(), resoveNodeRS,
+      CFX_WideString::FromUTF8(szAccessorName).AsStringC(), resoveNodeRS,
       dwFlags);
   if (iRet >= 1 && resoveNodeRS.dwFlags == XFA_RESOVENODE_RSTYPE_Nodes) {
     FXJSE_Value_Set(accessorValue, pScriptContext->GetJSValueFromMap(
                                        resoveNodeRS.nodes.GetAt(0)));
     bFlags = TRUE;
   }
   return bFlags;
 }
 int32_t CXFA_FM2JSContext::ResolveObjects(FXJSE_HOBJECT hThis,
                                           FXJSE_HVALUE hRefValue,
@@ skipping 35 matching lines @@
         dFlags = (bsSomExp == "*")
                      ? (XFA_RESOLVENODE_Children)
                      : (XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Attributes |
                         XFA_RESOLVENODE_Properties);
       }
     }
   } else {
     pNode = (CXFA_Object*)FXJSE_Value_ToObject(hRefValue, NULL);
     dFlags = XFA_RESOLVENODE_AnyChild;
   }
-  iRet = pScriptContext->ResolveObjects(pNode, wsSomExpression.AsWideStringC(),
+  iRet = pScriptContext->ResolveObjects(pNode, wsSomExpression.AsStringC(),
                                         resoveNodeRS, dFlags);
   return iRet;
 }
 void CXFA_FM2JSContext::ParseResolveResult(
     FXJSE_HOBJECT hThis,
     const XFA_RESOLVENODE_RS& resoveNodeRS,
     FXJSE_HVALUE hParentValue,
     FXJSE_HVALUE*& resultValues,
     int32_t& iSize,
     FX_BOOL& bAttribute) {
@@ skipping 44 matching lines @@
     FXJSE_HVALUE propertyValue = FXJSE_Value_Create(hruntime);
     FXJSE_HVALUE jsobjectValue = FXJSE_Value_Create(hruntime);
     FXJSE_HVALUE newProperty = FXJSE_Value_Create(hruntime);
     FXJSE_Value_GetObjectPropByIdx(hValue, 1, propertyValue);
     FXJSE_Value_GetObjectPropByIdx(hValue, 2, jsobjectValue);
     if (FXJSE_Value_IsNull(propertyValue)) {
       GetObjectDefaultValue(jsobjectValue, newProperty);
     } else {
       CFX_ByteString propertyStr;
       FXJSE_Value_ToUTF8String(propertyValue, propertyStr);
-      FXJSE_Value_GetObjectProp(jsobjectValue, propertyStr.AsByteStringC(),
+      FXJSE_Value_GetObjectProp(jsobjectValue, propertyStr.AsStringC(),
                                 newProperty);
     }
     iValue = HValueToInteger(hThis, newProperty);
     FXJSE_Value_Release(newProperty);
     FXJSE_Value_Release(jsobjectValue);
     FXJSE_Value_Release(propertyValue);
     return iValue;
   } else if (FXJSE_Value_IsObject(hValue)) {
     FXJSE_HVALUE newProperty = FXJSE_Value_Create(hruntime);
     GetObjectDefaultValue(hValue, newProperty);
@@ skipping 23 matching lines @@
     FXJSE_HVALUE propertyValue = FXJSE_Value_Create(hruntime);
     FXJSE_HVALUE jsobjectValue = FXJSE_Value_Create(hruntime);
     FXJSE_HVALUE newProperty = FXJSE_Value_Create(hruntime);
     FXJSE_Value_GetObjectPropByIdx(arg, 1, propertyValue);
     FXJSE_Value_GetObjectPropByIdx(arg, 2, jsobjectValue);
     if (FXJSE_Value_IsNull(propertyValue)) {
       GetObjectDefaultValue(jsobjectValue, newProperty);
     } else {
       CFX_ByteString propertyStr;
       FXJSE_Value_ToUTF8String(propertyValue, propertyStr);
-      FXJSE_Value_GetObjectProp(jsobjectValue, propertyStr.AsByteStringC(),
+      FXJSE_Value_GetObjectProp(jsobjectValue, propertyStr.AsStringC(),
                                 newProperty);
     }
     fRet = HValueToFloat(hThis, newProperty);
     FXJSE_Value_Release(newProperty);
     FXJSE_Value_Release(jsobjectValue);
     FXJSE_Value_Release(propertyValue);
   } else if (FXJSE_Value_IsObject(arg)) {
     FXJSE_HVALUE newProperty = FXJSE_Value_Create(hruntime);
     GetObjectDefaultValue(arg, newProperty);
     fRet = HValueToFloat(hThis, newProperty);
     FXJSE_Value_Release(newProperty);
   } else if (FXJSE_Value_IsUTF8String(arg)) {
     CFX_ByteString bsOutput;
     FXJSE_Value_ToUTF8String(arg, bsOutput);
-    fRet = (FX_FLOAT)StringToDouble(bsOutput.AsByteStringC());
+    fRet = (FX_FLOAT)StringToDouble(bsOutput.AsStringC());
   } else if (FXJSE_Value_IsUndefined(arg)) {
     fRet = 0;
   } else {
     fRet = FXJSE_Value_ToFloat(arg);
   }
   return fRet;
 }
 FX_DOUBLE CXFA_FM2JSContext::HValueToDouble(FXJSE_HOBJECT hThis,
                                             FXJSE_HVALUE arg) {
   CXFA_FM2JSContext* pContext =
       (CXFA_FM2JSContext*)FXJSE_Value_ToObject(hThis, NULL);
   FXJSE_HRUNTIME hruntime = pContext->GetScriptRuntime();
   FX_DOUBLE dRet = 0;
   if (FXJSE_Value_IsArray(arg)) {
     FXJSE_HVALUE propertyValue = FXJSE_Value_Create(hruntime);
     FXJSE_HVALUE jsobjectValue = FXJSE_Value_Create(hruntime);
     FXJSE_HVALUE newProperty = FXJSE_Value_Create(hruntime);
     FXJSE_Value_GetObjectPropByIdx(arg, 1, propertyValue);
     FXJSE_Value_GetObjectPropByIdx(arg, 2, jsobjectValue);
     if (FXJSE_Value_IsNull(propertyValue)) {
       GetObjectDefaultValue(jsobjectValue, newProperty);
     } else {
       CFX_ByteString propertyStr;
       FXJSE_Value_ToUTF8String(propertyValue, propertyStr);
-      FXJSE_Value_GetObjectProp(jsobjectValue, propertyStr.AsByteStringC(),
+      FXJSE_Value_GetObjectProp(jsobjectValue, propertyStr.AsStringC(),
                                 newProperty);
     }
     dRet = HValueToDouble(hThis, newProperty);
     FXJSE_Value_Release(newProperty);
     FXJSE_Value_Release(jsobjectValue);
     FXJSE_Value_Release(propertyValue);
   } else if (FXJSE_Value_IsObject(arg)) {
     FXJSE_HVALUE newProperty = FXJSE_Value_Create(hruntime);
     GetObjectDefaultValue(arg, newProperty);
     dRet = HValueToDouble(hThis, newProperty);
     FXJSE_Value_Release(newProperty);
   } else if (FXJSE_Value_IsUTF8String(arg)) {
     CFX_ByteString bsOutput;
     FXJSE_Value_ToUTF8String(arg, bsOutput);
-    dRet = StringToDouble(bsOutput.AsByteStringC());
+    dRet = StringToDouble(bsOutput.AsStringC());
   } else if (FXJSE_Value_IsUndefined(arg)) {
     dRet = 0;
   } else {
     dRet = FXJSE_Value_ToDouble(arg);
   }
   return dRet;
 }
 void CXFA_FM2JSContext::HValueToUTF8String(FXJSE_HVALUE arg,
                                            CFX_ByteString& szOutputString) {
   if (FXJSE_Value_IsNull(arg) || FXJSE_Value_IsUndefined(arg)) {
@@ skipping 140 matching lines @@
   IXFA_AppProvider* pAppProvider = m_pDocument->GetNotify()->GetAppProvider();
   FXSYS_assert(pAppProvider);
   CFX_WideString wsFormat;
   pAppProvider->LoadString(iStringID, wsFormat);
   CFX_WideString wsMessage;
   va_list arg_ptr;
   va_start(arg_ptr, iStringID);
   wsMessage.FormatV((const FX_WCHAR*)wsFormat, arg_ptr);
   va_end(arg_ptr);
   FXJSE_ThrowMessage(
-      "", FX_UTF8Encode(wsMessage, wsMessage.GetLength()).AsByteStringC());
+      "", FX_UTF8Encode(wsMessage, wsMessage.GetLength()).AsStringC());
 }