5 files changed, 15 insertions, 15 deletions
diff --git a/xfa/fxfa/parser/cxfa_dataexporter.cpp b/xfa/fxfa/parser/cxfa_dataexporter.cpp
index b0de057e2a..5433ba788e 100644
--- a/xfa/fxfa/parser/cxfa_dataexporter.cpp
+++ b/xfa/fxfa/parser/cxfa_dataexporter.cpp
@@ -225,7 +225,7 @@ void RegenerateFormFile_Changed(CXFA_Node* pNode,
           break;
 
         std::vector<WideString> wsSelTextArray;
-        FX_STRSIZE iStart = 0;
+        size_t iStart = 0;
         auto iEnd = wsRawValue.Find(L'\n', iStart);
         iEnd = !iEnd.has_value() ? wsRawValue.GetLength() : iEnd;
         while (iEnd.has_value() && iEnd >= iStart) {
@@ -335,7 +335,7 @@ void RegenerateFormFile_Container(
       !pNode->IsContainerNode()) {
     CFX_WideTextBuf buf;
     RegenerateFormFile_Changed(pNode, buf, bSaveXML);
-    FX_STRSIZE nLen = buf.GetLength();
+    size_t nLen = buf.GetLength();
     if (nLen > 0)
       pStream->WriteString(buf.AsStringView());
     return;
diff --git a/xfa/fxfa/parser/cxfa_document.cpp b/xfa/fxfa/parser/cxfa_document.cpp
index 3a46e26cb7..cd60f47bed 100644
--- a/xfa/fxfa/parser/cxfa_document.cpp
+++ b/xfa/fxfa/parser/cxfa_document.cpp
@@ -300,7 +300,7 @@ XFA_VERSION CXFA_Document::RecognizeXFAVersionNumber(
     const WideString& wsTemplateNS) {
   WideStringView wsTemplateURIPrefix =
       XFA_GetPacketByIndex(XFA_PACKET_Template)->pURI;
-  FX_STRSIZE nPrefixLength = wsTemplateURIPrefix.GetLength();
+  size_t nPrefixLength = wsTemplateURIPrefix.GetLength();
   if (WideStringView(wsTemplateNS.c_str(), wsTemplateNS.GetLength()) !=
       wsTemplateURIPrefix) {
     return XFA_VERSION_UNKNOWN;
@@ -374,7 +374,7 @@ void CXFA_Document::DoProtoMerge() {
         wsURI = wsUseVal.AsStringView();
       } else {
         wsURI = WideStringView(wsUseVal.c_str(), uSharpPos.value());
-        FX_STRSIZE uLen = wsUseVal.GetLength();
+        size_t uLen = wsUseVal.GetLength();
         if (uLen >= uSharpPos.value() + 5 &&
             WideStringView(wsUseVal.c_str() + uSharpPos.value(), 5) ==
                 L"#som(" &&
diff --git a/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp b/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp
index d8fdbb4ba1..a9e5449e3f 100644
--- a/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp
+++ b/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp
@@ -148,7 +148,7 @@ CXFA_Node* ResolveBreakTarget(CXFA_Node* pPageSetRoot,
   bool bTargetAllFind = true;
   while (iSplitIndex != -1) {
     WideString wsExpr;
-    pdfium::Optional<FX_STRSIZE> iSplitNextIndex = 0;
+    pdfium::Optional<size_t> iSplitNextIndex = 0;
     if (!bTargetAllFind) {
       iSplitNextIndex = wsTargetAll.Find(' ', iSplitIndex);
       if (!iSplitNextIndex.has_value())
diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp
index 1dc20485ab..0a95b5f0ee 100644
--- a/xfa/fxfa/parser/cxfa_node.cpp
+++ b/xfa/fxfa/parser/cxfa_node.cpp
@@ -4037,8 +4037,8 @@ bool CXFA_Node::SetScriptContent(const WideString& wsContent,
           std::vector<WideString> wsSaveTextArray;
           size_t iSize = 0;
           if (!wsContent.IsEmpty()) {
-            FX_STRSIZE iStart = 0;
-            FX_STRSIZE iLength = wsContent.GetLength();
+            size_t iStart = 0;
+            size_t iLength = wsContent.GetLength();
             auto iEnd = wsContent.Find(L'\n', iStart);
             iEnd = !iEnd.has_value() ? iLength : iEnd;
             while (iEnd.value() >= iStart) {
diff --git a/xfa/fxfa/parser/cxfa_widgetdata.cpp b/xfa/fxfa/parser/cxfa_widgetdata.cpp
index 1879377ae4..13ccf2b824 100644
--- a/xfa/fxfa/parser/cxfa_widgetdata.cpp
+++ b/xfa/fxfa/parser/cxfa_widgetdata.cpp
@@ -846,8 +846,8 @@ std::vector<WideString> CXFA_WidgetData::GetSelectedItemsValue() {
   WideString wsValue = GetRawValue();
   if (GetChoiceListOpen() == XFA_ATTRIBUTEENUM_MultiSelect) {
     if (!wsValue.IsEmpty()) {
-      FX_STRSIZE iStart = 0;
-      FX_STRSIZE iLength = wsValue.GetLength();
+      size_t iStart = 0;
+      size_t iLength = wsValue.GetLength();
       auto iEnd = wsValue.Find(L'\n', iStart);
       iEnd = (!iEnd.has_value()) ? iLength : iEnd;
       while (iEnd >= iStart) {
@@ -1766,22 +1766,22 @@ void CXFA_WidgetData::FormatNumStr(const WideString& wsValue,
     bNeg = true;
     wsSrcNum.Delete(0, 1);
   }
-  FX_STRSIZE len = wsSrcNum.GetLength();
+
   auto dot_index = wsSrcNum.Find('.');
-  dot_index = !dot_index.has_value() ? len : dot_index;
+  dot_index = !dot_index.has_value() ? wsSrcNum.GetLength() : dot_index;
 
   if (dot_index.value() >= 1) {
-    FX_STRSIZE nPos = dot_index.value() % 3;
+    size_t nPos = dot_index.value() % 3;
     wsOutput.clear();
-    for (FX_STRSIZE i = 0; i < dot_index.value(); i++) {
+    for (size_t i = 0; i < dot_index.value(); i++) {
       if (i % 3 == nPos && i != 0)
         wsOutput += wsGroupSymbol;
 
       wsOutput += wsSrcNum[i];
     }
-    if (dot_index.value() < len) {
+    if (dot_index.value() < wsSrcNum.GetLength()) {
       wsOutput += pLocale->GetNumbericSymbol(FX_LOCALENUMSYMBOL_Decimal);
-      wsOutput += wsSrcNum.Right(len - dot_index.value() - 1);
+      wsOutput += wsSrcNum.Right(wsSrcNum.GetLength() - dot_index.value() - 1);
     }
     if (bNeg) {
       wsOutput =