3 files changed, 5 insertions, 7 deletions
diff --git a/xfa/fxfa/cxfa_fftextedit.cpp b/xfa/fxfa/cxfa_fftextedit.cpp
index 6f782b34cc..b97b218894 100644
--- a/xfa/fxfa/cxfa_fftextedit.cpp
+++ b/xfa/fxfa/cxfa_fftextedit.cpp
@@ -200,9 +200,7 @@ void CXFA_FFTextEdit::ValidateNumberField(const WideString& wsText) {
   if (!pAppProvider)
     return;
 
-  WideString wsSomField;
-  pAcc->GetNode()->GetSOMExpression(wsSomField);
-
+  WideString wsSomField = pAcc->GetNode()->GetSOMExpression();
   pAppProvider->MsgBox(WideString::Format(L"%ls can not contain %ls",
                                           wsText.c_str(), wsSomField.c_str()),
                        pAppProvider->GetAppTitle(), XFA_MBICON_Error,
diff --git a/xfa/fxfa/parser/cxfa_object.cpp b/xfa/fxfa/parser/cxfa_object.cpp
index 93d31244f6..666186c4ba 100644
--- a/xfa/fxfa/parser/cxfa_object.cpp
+++ b/xfa/fxfa/parser/cxfa_object.cpp
@@ -31,12 +31,12 @@ CXFA_Object::CXFA_Object(CXFA_Document* pDocument,
 
 CXFA_Object::~CXFA_Object() {}
 
-void CXFA_Object::GetSOMExpression(WideString& wsSOMExpression) {
+WideString CXFA_Object::GetSOMExpression() {
   CFXJSE_Engine* pScriptContext = m_pDocument->GetScriptContext();
   if (!pScriptContext)
-    return;
+    return WideString();
 
-  pScriptContext->GetSomExpression(ToNode(this), wsSOMExpression);
+  return pScriptContext->GetSomExpression(ToNode(this));
 }
 
 CXFA_Node* CXFA_Object::AsNode() {
diff --git a/xfa/fxfa/parser/cxfa_object.h b/xfa/fxfa/parser/cxfa_object.h
index ce9ce9333b..0b17273316 100644
--- a/xfa/fxfa/parser/cxfa_object.h
+++ b/xfa/fxfa/parser/cxfa_object.h
@@ -75,7 +75,7 @@ class CXFA_Object : public CFXJSE_HostObject {
   WideStringView GetClassName() const { return m_elementName; }
   uint32_t GetClassHashCode() const { return m_elementNameHash; }
 
-  void GetSOMExpression(WideString& wsSOMExpression);
+  WideString GetSOMExpression();
 
  protected:
   CXFA_Object(CXFA_Document* pDocument,