diff options
| author | Ryan Harrison <rharrison@chromium.org> | 2018-01-05 11:06:55 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-01-05 16:36:57 +0000 |
| commit | 2c0ca7ddbc38e33cc692b2be02c32419b97927e0 (patch) | |
| tree | ff91c2bc992ec1a718e87f923e70e550f0555160 /fxjs | |
| parent | 1f04e6111013673880767e98834fa9bb649c7aac (diff) | |
| download | pdfium-2c0ca7ddbc38e33cc692b2be02c32419b97927e0.tar.xz | |
Convert GetSOMExpression methods to return WideString
Change-Id: I34eb40ff1c14e7b9362d4e52166243eacc6710da
Reviewed-on: https://pdfium-review.googlesource.com/22270
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'fxjs')
| -rw-r--r-- | fxjs/cfxjse_engine.cpp | 6 | ||||
| -rw-r--r-- | fxjs/cfxjse_engine.h | 2 | ||||
| -rw-r--r-- | fxjs/xfa/cjx_tree.cpp | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/fxjs/cfxjse_engine.cpp b/fxjs/cfxjse_engine.cpp index b9cd502e96..179866b555 100644 --- a/fxjs/cfxjse_engine.cpp +++ b/fxjs/cfxjse_engine.cpp @@ -738,11 +738,9 @@ int32_t CFXJSE_Engine::GetIndexByClassName(CXFA_Node* refNode) { lpNodeHelper->NodeIsProperty(refNode), true); } -void CFXJSE_Engine::GetSomExpression(CXFA_Node* refNode, - WideString& wsExpression) { +WideString CFXJSE_Engine::GetSomExpression(CXFA_Node* refNode) { CXFA_NodeHelper* lpNodeHelper = m_ResolveProcessor->GetNodeHelper(); - wsExpression = - lpNodeHelper->GetNameExpression(refNode, true, XFA_LOGIC_Transparent); + return lpNodeHelper->GetNameExpression(refNode, true, XFA_LOGIC_Transparent); } void CFXJSE_Engine::SetNodesOfRunScript(std::vector<CXFA_Node*>* pArray) { diff --git a/fxjs/cfxjse_engine.h b/fxjs/cfxjse_engine.h index 777921dfc4..0b360bdbb2 100644 --- a/fxjs/cfxjse_engine.h +++ b/fxjs/cfxjse_engine.h @@ -70,7 +70,7 @@ class CFXJSE_Engine : public CJS_V8 { int32_t GetIndexByName(CXFA_Node* refNode); int32_t GetIndexByClassName(CXFA_Node* refNode); - void GetSomExpression(CXFA_Node* refNode, WideString& wsExpression); + WideString GetSomExpression(CXFA_Node* refNode); void SetNodesOfRunScript(std::vector<CXFA_Node*>* pArray); void AddNodesOfRunScript(CXFA_Node* pNode); diff --git a/fxjs/xfa/cjx_tree.cpp b/fxjs/xfa/cjx_tree.cpp index 1a20611cad..4a7a2fcc17 100644 --- a/fxjs/xfa/cjx_tree.cpp +++ b/fxjs/xfa/cjx_tree.cpp @@ -196,8 +196,7 @@ void CJX_Tree::somExpression(CFXJSE_Value* pValue, return; } - WideString wsSOMExpression; - GetXFAObject()->GetSOMExpression(wsSOMExpression); + WideString wsSOMExpression = GetXFAObject()->GetSOMExpression(); pValue->SetString(wsSOMExpression.UTF8Encode().AsStringView()); } |