From e0947b37c012144cefb523a33e548d3fadc211d8 Mon Sep 17 00:00:00 2001
From: Lei Zhang <thestig@chromium.org>
Date: Thu, 17 Sep 2015 14:51:48 -0700
Subject: Merge to XFA: Implement FPDFAction_GetFilePath().

The API is the same as the Foxit version, except the encoding is
specified as UTF-8 instead of local encoding.

Also remove CPDF_LWinParam since it's unused.

BUG=chromium:517713
R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1335373002 .

(cherry picked from commit 0b3c8f742613da294f812e2f6e908f4026499f96)
(cherry picked from commit a9d4bc541179ec0436adc4b2e18b7fdecc5952dc)
(cherry picked from commit 4ffd89ed556e32a6527d0e88952fe20ec1e2f362)

Review URL: https://codereview.chromium.org/1345953002 .
---
 core/include/fpdfdoc/fpdf_doc.h | 20 --------------------
 core/src/fpdfdoc/doc_action.cpp | 10 +---------
 2 files changed, 1 insertion(+), 29 deletions(-)

(limited to 'core')

diff --git a/core/include/fpdfdoc/fpdf_doc.h b/core/include/fpdfdoc/fpdf_doc.h
index eb99e9234a..b2ac747427 100644
--- a/core/include/fpdfdoc/fpdf_doc.h
+++ b/core/include/fpdfdoc/fpdf_doc.h
@@ -33,7 +33,6 @@ class CPDF_FormNotify;
 class CPDF_IconFit;
 class CPDF_InterForm;
 class CPDF_Link;
-class CPDF_LWinParam;
 class CPDF_Metadata;
 class CPDF_NumberTree;
 class CPDF_OCContext;
@@ -163,24 +162,7 @@ class CPDF_OCContext : public IPDF_OCContext {
 
   std::map<const CPDF_Dictionary*, FX_BOOL> m_OCGStates;
 };
-class CPDF_LWinParam {
- public:
-  CPDF_LWinParam(CPDF_Dictionary* pDict) { m_pDict = pDict; }
-
-  operator CPDF_Dictionary*() const { return m_pDict; }
-
-  inline CFX_ByteString GetFileName() { return m_pDict->GetString("F"); }
-
-  inline CFX_ByteString GetDefaultDirectory() {
-    return m_pDict->GetString("D");
-  }
 
-  inline CFX_ByteString GetOperation() { return m_pDict->GetString("O"); }
-
-  inline CFX_ByteString GetParameter() { return m_pDict->GetString("P"); }
-
-  CPDF_Dictionary* m_pDict;
-};
 class CPDF_ActionFields {
  public:
   CPDF_ActionFields(const CPDF_Action* pAction) {
@@ -244,8 +226,6 @@ class CPDF_Action {
 
   FX_BOOL GetNewWindow() const { return m_pDict->GetBoolean("NewWindow"); }
 
-  CPDF_LWinParam GetWinParam() const;
-
   CFX_ByteString GetURI(CPDF_Document* pDoc) const;
 
   FX_BOOL GetMouseMap() const { return m_pDict->GetBoolean("IsMap"); }
diff --git a/core/src/fpdfdoc/doc_action.cpp b/core/src/fpdfdoc/doc_action.cpp
index f8a11e5682..759a06c656 100644
--- a/core/src/fpdfdoc/doc_action.cpp
+++ b/core/src/fpdfdoc/doc_action.cpp
@@ -179,15 +179,7 @@ CPDF_Object* CPDF_ActionFields::GetField(FX_DWORD iIndex) const {
   }
   return pFindObj;
 }
-CPDF_LWinParam CPDF_Action::GetWinParam() const {
-  if (m_pDict == NULL) {
-    return NULL;
-  }
-  if (m_pDict->GetString("S") != "Launch") {
-    return NULL;
-  }
-  return m_pDict->GetDict("Win");
-}
+
 CFX_WideString CPDF_Action::GetJavaScript() const {
   CFX_WideString csJS;
   if (m_pDict == NULL) {
-- 
cgit v1.2.3