From b2fb20e0f8e7ea368c541d35ccb61506041f7ddd Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 4 Apr 2017 15:09:44 -0400 Subject: Remove un-needed CFDE_XMLDeclaration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Nicolás Peña Reviewed-by: Tom Sepez --- BUILD.gn | 1 - xfa/fde/xml/cfde_xmlchardata.cpp | 2 +- xfa/fde/xml/cfde_xmlchardata.h | 4 ++-- xfa/fde/xml/cfde_xmldeclaration.h | 18 ------------------ 4 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 xfa/fde/xml/cfde_xmldeclaration.h diff --git a/BUILD.gn b/BUILD.gn index 5c0017dd06..961a5108d9 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -1406,7 +1406,6 @@ if (pdf_enable_xfa) { "xfa/fde/ifde_txtedtpage.h", "xfa/fde/xml/cfde_xmlchardata.cpp", "xfa/fde/xml/cfde_xmlchardata.h", - "xfa/fde/xml/cfde_xmldeclaration.h", "xfa/fde/xml/cfde_xmldoc.cpp", "xfa/fde/xml/cfde_xmldoc.h", "xfa/fde/xml/cfde_xmlelement.cpp", 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_ -- cgit v1.2.3