diff options
Diffstat (limited to 'fxjs/xfa')
| -rw-r--r-- | fxjs/xfa/cjx_layoutpseudomodel.cpp | 4 | ||||
| -rw-r--r-- | fxjs/xfa/cjx_object.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fxjs/xfa/cjx_layoutpseudomodel.cpp b/fxjs/xfa/cjx_layoutpseudomodel.cpp index a5dcf98b00..e448aea252 100644 --- a/fxjs/xfa/cjx_layoutpseudomodel.cpp +++ b/fxjs/xfa/cjx_layoutpseudomodel.cpp @@ -7,6 +7,7 @@ #include "fxjs/xfa/cjx_layoutpseudomodel.h" #include <set> +#include <utility> #include "core/fxcrt/fx_coordinates.h" #include "fxjs/cfxjse_engine.h" @@ -84,10 +85,9 @@ CJS_Return CJX_LayoutPseudoModel::HWXY( if (params.size() >= 2) { WideString tmp_unit = runtime->ToWideString(params[1]); if (!tmp_unit.IsEmpty()) - unit = tmp_unit; + unit = std::move(tmp_unit); } int32_t iIndex = params.size() >= 3 ? runtime->ToInt32(params[2]) : 0; - CXFA_LayoutProcessor* pDocLayout = GetDocument()->GetLayoutProcessor(); if (!pDocLayout) return CJS_Return(); diff --git a/fxjs/xfa/cjx_object.cpp b/fxjs/xfa/cjx_object.cpp index a6b1d122ae..2cf6f6755d 100644 --- a/fxjs/xfa/cjx_object.cpp +++ b/fxjs/xfa/cjx_object.cpp @@ -1175,9 +1175,9 @@ void CJX_Object::Script_Attribute_String(CFXJSE_Value* pValue, WideString wsSOM; if (!wsValue.IsEmpty()) { if (wsValue[0] == '#') - wsID = WideString(wsValue.c_str() + 1, wsValue.GetLength() - 1); + wsID = wsValue.Mid(1, wsValue.GetLength() - 1); else - wsSOM = wsValue; + wsSOM = std::move(wsValue); } CXFA_Node* pProtoNode = nullptr; |