From 65c7c234d026101f69754f97f40e73eb29a3ef16 Mon Sep 17 00:00:00 2001 From: dan sinclair Date: Thu, 2 Feb 2017 14:05:30 -0800 Subject: Remove FX_WSTRC usage Not needed with modern compilers, removed. Change-Id: Ia8977262b5791bd4445f02be8456641d1a7e18f3 Reviewed-on: https://pdfium-review.googlesource.com/2431 Commit-Queue: dsinclair Reviewed-by: Tom Sepez --- xfa/fxfa/parser/cxfa_document.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'xfa/fxfa/parser/cxfa_document.cpp') diff --git a/xfa/fxfa/parser/cxfa_document.cpp b/xfa/fxfa/parser/cxfa_document.cpp index 374fb98c52..8ff3c2b06a 100644 --- a/xfa/fxfa/parser/cxfa_document.cpp +++ b/xfa/fxfa/parser/cxfa_document.cpp @@ -272,8 +272,7 @@ bool CXFA_Document::IsInteractive() { CXFA_Node* pFormFiller = pPDF->GetChild(0, XFA_Element::Interactive); if (pFormFiller) { m_dwDocFlags |= XFA_DOCFLAG_HasInteractive; - if (pFormFiller->TryContent(wsInteractive) && - wsInteractive == FX_WSTRC(L"1")) { + if (pFormFiller->TryContent(wsInteractive) && wsInteractive == L"1") { m_dwDocFlags |= XFA_DOCFLAG_Interactive; return true; } @@ -381,8 +380,7 @@ void CXFA_Document::DoProtoMerge() { wsURI = CFX_WideStringC(wsUseVal.c_str(), uSharpPos); FX_STRSIZE uLen = wsUseVal.GetLength(); if (uLen >= uSharpPos + 5 && - CFX_WideStringC(wsUseVal.c_str() + uSharpPos, 5) == - FX_WSTRC(L"#som(") && + CFX_WideStringC(wsUseVal.c_str() + uSharpPos, 5) == L"#som(" && wsUseVal[uLen - 1] == ')') { wsSOM = CFX_WideStringC(wsUseVal.c_str() + uSharpPos + 5, uLen - 1 - uSharpPos - 5); @@ -399,7 +397,7 @@ void CXFA_Document::DoProtoMerge() { wsSOM = CFX_WideStringC(wsUseVal.c_str(), wsUseVal.GetLength()); } - if (!wsURI.IsEmpty() && wsURI != FX_WSTRC(L".")) + if (!wsURI.IsEmpty() && wsURI != L".") continue; CXFA_Node* pProtoNode = nullptr; -- cgit v1.2.3