summaryrefslogtreecommitdiff
path: root/xfa/fde
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-04-04 15:09:44 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-04-04 19:42:55 +0000
commitb2fb20e0f8e7ea368c541d35ccb61506041f7ddd (patch)
tree9fe1fda4d2e188001028a5dc99b670e8d3a9cb36 /xfa/fde
parentee62ba2df7297147cccda472f229a8c82bfc22bc (diff)
downloadpdfium-b2fb20e0f8e7ea368c541d35ccb61506041f7ddd.tar.xz
Remove un-needed CFDE_XMLDeclaration
This was just used as the parent to CFDE_XMLCharData but didn't override anything over CFDE_XMLNode. Switch CFDE_XMLCharData to inherit from CFDE_XMLNode and remove CFDE_XMLDeclaration. Change-Id: Ide7507c0d4a6886331b6cebeae0bd7f9e9d738fb Reviewed-on: https://pdfium-review.googlesource.com/3671 Commit-Queue: dsinclair <dsinclair@chromium.org> Reviewed-by: Nicolás Peña <npm@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fde')
-rw-r--r--xfa/fde/xml/cfde_xmlchardata.cpp2
-rw-r--r--xfa/fde/xml/cfde_xmlchardata.h4
-rw-r--r--xfa/fde/xml/cfde_xmldeclaration.h18
3 files changed, 3 insertions, 21 deletions
diff --git a/xfa/fde/xml/cfde_xmlchardata.cpp b/xfa/fde/xml/cfde_xmlchardata.cpp
index 40e4730dea..2339307938 100644
--- a/xfa/fde/xml/cfde_xmlchardata.cpp
+++ b/xfa/fde/xml/cfde_xmlchardata.cpp
@@ -7,7 +7,7 @@
#include "xfa/fde/xml/cfde_xmlchardata.h"
CFDE_XMLCharData::CFDE_XMLCharData(const CFX_WideString& wsCData)
- : CFDE_XMLDeclaration(), m_wsCharData(wsCData) {}
+ : CFDE_XMLNode(), m_wsCharData(wsCData) {}
CFDE_XMLCharData::~CFDE_XMLCharData() {}
diff --git a/xfa/fde/xml/cfde_xmlchardata.h b/xfa/fde/xml/cfde_xmlchardata.h
index 308ec1721b..ea1d3aa4bf 100644
--- a/xfa/fde/xml/cfde_xmlchardata.h
+++ b/xfa/fde/xml/cfde_xmlchardata.h
@@ -8,9 +8,9 @@
#define XFA_FDE_XML_CFDE_XMLCHARDATA_H_
#include "core/fxcrt/fx_string.h"
-#include "xfa/fde/xml/cfde_xmldeclaration.h"
+#include "xfa/fde/xml/cfde_xmlnode.h"
-class CFDE_XMLCharData : public CFDE_XMLDeclaration {
+class CFDE_XMLCharData : public CFDE_XMLNode {
public:
explicit CFDE_XMLCharData(const CFX_WideString& wsCData);
~CFDE_XMLCharData() override;
diff --git a/xfa/fde/xml/cfde_xmldeclaration.h b/xfa/fde/xml/cfde_xmldeclaration.h
deleted file mode 100644
index ade66c470f..0000000000
--- a/xfa/fde/xml/cfde_xmldeclaration.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2017 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef XFA_FDE_XML_CFDE_XMLDECLARATION_H_
-#define XFA_FDE_XML_CFDE_XMLDECLARATION_H_
-
-#include "xfa/fde/xml/cfde_xmlnode.h"
-
-class CFDE_XMLDeclaration : public CFDE_XMLNode {
- public:
- CFDE_XMLDeclaration() {}
- ~CFDE_XMLDeclaration() override {}
-};
-
-#endif // XFA_FDE_XML_CFDE_XMLDECLARATION_H_