From afe94306e3c542f0d499e7f7706ee5dec4028d8a Mon Sep 17 00:00:00 2001
From: tsepez <tsepez@chromium.org>
Date: Fri, 13 May 2016 17:21:31 -0700
Subject: Make CFX_WideString(const CFX_WideString&) explicit.

BUG=

Review-Url: https://codereview.chromium.org/1979723003
---
 fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp')

diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp
index 4b44669c0d..deba943072 100644
--- a/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp
+++ b/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp
@@ -614,18 +614,16 @@ void CPDFXFA_Document::GetTitle(CXFA_FFDoc* hDoc, CFX_WideString& wsTitle) {
   wsTitle = wsTitle.FromLocal(csTitle.GetBuffer(csTitle.GetLength()));
   csTitle.ReleaseBuffer(csTitle.GetLength());
 }
+
 void CPDFXFA_Document::SetTitle(CXFA_FFDoc* hDoc,
-                                const CFX_WideStringC& wsTitle) {
-  if (hDoc != m_pXFADoc)
-    return;
-  if (m_pPDFDoc == NULL)
+                                const CFX_WideString& wsTitle) {
+  if (hDoc != m_pXFADoc || !m_pPDFDoc)
     return;
-  CPDF_Dictionary* pInfoDict = m_pPDFDoc->GetInfo();
 
-  if (pInfoDict == NULL)
-    return;
-  pInfoDict->SetAt("Title", new CPDF_String(wsTitle));
+  if (CPDF_Dictionary* pInfoDict = m_pPDFDoc->GetInfo())
+    pInfoDict->SetAt("Title", new CPDF_String(wsTitle));
 }
+
 void CPDFXFA_Document::ExportData(CXFA_FFDoc* hDoc,
                                   const CFX_WideStringC& wsFilePath,
                                   FX_BOOL bXDP) {
@@ -1140,7 +1138,7 @@ FX_BOOL CPDFXFA_Document::_SubmitData(CXFA_FFDoc* hDoc, CXFA_Submit submit) {
     return FALSE;
   CFX_WideStringC csURLC;
   submit.GetSubmitTarget(csURLC);
-  CFX_WideString csURL = csURLC;
+  CFX_WideString csURL(csURLC);
   if (csURL.IsEmpty()) {
     CFX_WideString ws;
     ws.FromLocal("Submit cancelled.");
-- 
cgit v1.2.3