2 files changed, 8 insertions, 7 deletions
diff --git a/xfa/fde/css/fde_csscache.cpp b/xfa/fde/css/fde_csscache.cpp
index 49934aee6d..d8fc1a1b19 100644
--- a/xfa/fde/css/fde_csscache.cpp
+++ b/xfa/fde/css/fde_csscache.cpp
@@ -108,21 +108,22 @@ FDE_CSSTagCache::FDE_CSSTagCache(FDE_CSSTagCache* parent,
   FXSYS_assert(pTag != NULL);
   CFX_WideStringC wsValue, wsName = pTag->GetTagName();
   dwTagHash =
-      FX_HashCode_String_GetW(wsName.GetPtr(), wsName.GetLength(), TRUE);
+      FX_HashCode_String_GetW(wsName.raw_str(), wsName.GetLength(), TRUE);
   FX_POSITION pos = pTag->GetFirstAttribute();
   while (pos != NULL) {
     pTag->GetNextAttribute(pos, wsName, wsValue);
     uint32_t dwNameHash =
-        FX_HashCode_String_GetW(wsName.GetPtr(), wsName.GetLength(), TRUE);
+        FX_HashCode_String_GetW(wsName.raw_str(), wsName.GetLength(), TRUE);
     static const uint32_t s_dwIDHash = FX_HashCode_String_GetW(L"id", 2, TRUE);
     static const uint32_t s_dwClassHash =
         FX_HashCode_String_GetW(L"class", 5, TRUE);
     if (dwNameHash == s_dwClassHash) {
       uint32_t dwHash =
-          FX_HashCode_String_GetW(wsValue.GetPtr(), wsValue.GetLength());
+          FX_HashCode_String_GetW(wsValue.raw_str(), wsValue.GetLength());
       dwClassHashs.Add(dwHash);
     } else if (dwNameHash == s_dwIDHash) {
-      dwIDHash = FX_HashCode_String_GetW(wsValue.GetPtr(), wsValue.GetLength());
+      dwIDHash =
+          FX_HashCode_String_GetW(wsValue.raw_str(), wsValue.GetLength());
     }
   }
 }
diff --git a/xfa/fde/css/fde_cssstyleselector.cpp b/xfa/fde/css/fde_cssstyleselector.cpp
index 39d0df04c7..1a27a7e5c9 100644
--- a/xfa/fde/css/fde_cssstyleselector.cpp
+++ b/xfa/fde/css/fde_cssstyleselector.cpp
@@ -437,7 +437,7 @@ void CFDE_CSSStyleSelector::ComputeStyle(
     do {
       pTag->GetNextAttribute(pos, wsAttri, wsValue);
       dwAttriHash =
-          FX_HashCode_String_GetW(wsAttri.GetPtr(), wsAttri.GetLength(), TRUE);
+          FX_HashCode_String_GetW(wsAttri.raw_str(), wsAttri.GetLength(), TRUE);
       static const uint32_t s_dwStyleHash =
           FX_HashCode_String_GetW(L"style", 5, TRUE);
       static const uint32_t s_dwAlignHash =
@@ -446,7 +446,7 @@ void CFDE_CSSStyleSelector::ComputeStyle(
         if (pDecl == NULL) {
           pDecl = FXTARGET_NewWith(m_pInlineStyleStore) CFDE_CSSDeclaration;
         }
-        AppendInlineStyle(pDecl, wsValue.GetPtr(), wsValue.GetLength());
+        AppendInlineStyle(pDecl, wsValue.raw_str(), wsValue.GetLength());
       } else if (dwAttriHash == s_dwAlignHash) {
         if (pDecl == NULL) {
           pDecl = FXTARGET_NewWith(m_pInlineStyleStore) CFDE_CSSDeclaration;
@@ -455,7 +455,7 @@ void CFDE_CSSStyleSelector::ComputeStyle(
         args.pStringCache = NULL;
         args.pStaticStore = m_pInlineStyleStore;
         args.pProperty = FDE_GetCSSPropertyByEnum(FDE_CSSPROPERTY_TextAlign);
-        pDecl->AddProperty(&args, wsValue.GetPtr(), wsValue.GetLength());
+        pDecl->AddProperty(&args, wsValue.raw_str(), wsValue.GetLength());
       }
     } while (pos != NULL);
     if (pDecl != NULL) {