summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-08-14 13:43:04 -0700
committerLei Zhang <thestig@chromium.org>2015-08-14 13:43:04 -0700
commit88f0bafb4163d297b51055124d4d35b769905216 (patch)
tree7956c4cb012e99db1b247a84ecee5648aac74821
parentfc9c930aef756d1567afae53f9c20935166c99f3 (diff)
downloadpdfium-88f0bafb4163d297b51055124d4d35b769905216.tar.xz
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 .
-rw-r--r--core/include/fpdfdoc/fpdf_doc.h1
-rw-r--r--core/src/fpdfapi/fpdf_basic_module.cpp2
-rw-r--r--core/src/fpdfdoc/doc_metadata.cpp2
3 files changed, 1 insertions, 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<CXML_Element> 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;