From 88f0bafb4163d297b51055124d4d35b769905216 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 14 Aug 2015 13:43:04 -0700 Subject: Merge to XFA: Cleanup: Remove unused CPDF_Metadata::m_pDoc. Also remove unused kAddinNameCJK variable. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1296513003 . (cherry picked from commit c6540e037ed1a9546d5a90455bf440a24b181ab4) Review URL: https://codereview.chromium.org/1283183007 . --- core/include/fpdfdoc/fpdf_doc.h | 1 - core/src/fpdfapi/fpdf_basic_module.cpp | 2 -- core/src/fpdfdoc/doc_metadata.cpp | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/core/include/fpdfdoc/fpdf_doc.h b/core/include/fpdfdoc/fpdf_doc.h index 071386e2e3..6e444149e4 100644 --- a/core/include/fpdfdoc/fpdf_doc.h +++ b/core/include/fpdfdoc/fpdf_doc.h @@ -1167,7 +1167,6 @@ class CPDF_Metadata { const CXML_Element* GetRoot() const; private: - CPDF_Document* const m_pDoc; // Not owned. nonstd::unique_ptr m_pXmlElement; }; diff --git a/core/src/fpdfapi/fpdf_basic_module.cpp b/core/src/fpdfapi/fpdf_basic_module.cpp index 198f1318be..37ad62f402 100644 --- a/core/src/fpdfapi/fpdf_basic_module.cpp +++ b/core/src/fpdfapi/fpdf_basic_module.cpp @@ -11,8 +11,6 @@ namespace { CPDF_ModuleMgr* g_FPDFAPI_pDefaultMgr = nullptr; -const char kAddinNameCJK[] = "Eastern Asian Language Support"; - } // namespace // static diff --git a/core/src/fpdfdoc/doc_metadata.cpp b/core/src/fpdfdoc/doc_metadata.cpp index c779f68354..3d0f12f3de 100644 --- a/core/src/fpdfdoc/doc_metadata.cpp +++ b/core/src/fpdfdoc/doc_metadata.cpp @@ -7,7 +7,7 @@ #include "../../include/fpdfdoc/fpdf_doc.h" #include "../../include/fxcrt/fx_xml.h" -CPDF_Metadata::CPDF_Metadata(CPDF_Document* pDoc) : m_pDoc(pDoc) { +CPDF_Metadata::CPDF_Metadata(CPDF_Document* pDoc) { CPDF_Dictionary* pRoot = pDoc->GetRoot(); if (!pRoot) return; -- cgit v1.2.3