3 files changed, 5 insertions, 5 deletions
diff --git a/xfa/src/fgas/include/fx_rbk.h b/xfa/src/fgas/include/fx_rbk.h
index 043361b0a3..ef76ab6243 100644
--- a/xfa/src/fgas/include/fx_rbk.h
+++ b/xfa/src/fgas/include/fx_rbk.h
@@ -89,7 +89,7 @@ struct FX_RTFTEXTOBJ {
   FX_DWORD dwLayoutStyles;
   int32_t iCharRotation;
   int32_t iBidiLevel;
-  FX_LPCRECTF pRect;
+  const CFX_RectF* pRect;
   FX_WCHAR wLineBreakChar;
   int32_t iHorizontalScale;
   int32_t iVerticalScale;
diff --git a/xfa/src/fgas/include/fx_tbk.h b/xfa/src/fgas/include/fx_tbk.h
index 073228883d..aa207a568f 100644
--- a/xfa/src/fgas/include/fx_tbk.h
+++ b/xfa/src/fgas/include/fx_tbk.h
@@ -109,7 +109,7 @@ struct FX_TXTRUN {
   int32_t iVerticalScale;
   int32_t iCharRotation;
   FX_DWORD dwCharStyles;
-  FX_LPCRECTF pRect;
+  const CFX_RectF* pRect;
   FX_WCHAR wLineBreakChar;
   FX_BOOL bSkipSpace;
 };
diff --git a/xfa/src/fgas/src/font/fx_gefont.cpp b/xfa/src/fgas/src/font/fx_gefont.cpp
index 37066a2a49..468e28ea96 100644
--- a/xfa/src/fgas/src/font/fx_gefont.cpp
+++ b/xfa/src/fgas/src/font/fx_gefont.cpp
@@ -447,10 +447,10 @@ FX_BOOL CFX_GEFont::GetCharBBox(FX_WCHAR wUnicode,
       }
     }
   }
-  if (pRect == NULL) {
+  if (!pRect)
     return FALSE;
-  }
-  bbox = *(FX_LPCRECT)pRect;
+
+  bbox = *static_cast<const CFX_Rect*>(pRect);
   return TRUE;
 }
 FX_BOOL CFX_GEFont::GetBBox(CFX_Rect& bbox) {