diff options
author | Lei Zhang <thestig@chromium.org> | 2016-01-05 16:46:58 -0800 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2016-01-05 16:46:58 -0800 |
commit | c2fb35f2bbcf6c8fcf37380000544ae39d9a8cec (patch) | |
tree | 6b8da05d1624cbbe5a0c7042c9820f02180f442c /fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp | |
parent | 62664cee15230d6cbe08ed010721a4557b36dc22 (diff) | |
download | pdfium-c2fb35f2bbcf6c8fcf37380000544ae39d9a8cec.tar.xz |
Merge to XFA: Remove header files that only have includes.
Also do some cleanups in affected files.
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1552583002 .
(cherry picked from commit d794d34b5deb6ad691c19af758090f9ce46015a3)
Review URL: https://codereview.chromium.org/1566583002 .
Diffstat (limited to 'fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp')
-rw-r--r-- | fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp b/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp index b08ce35d41..1649eaf35d 100644 --- a/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp +++ b/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp @@ -5,7 +5,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h" -#include "fpdfsdk/include/formfiller/FormFiller.h" + +#include "core/include/fpdfapi/fpdf_page.h" +#include "fpdfsdk/include/fsdk_baseannot.h" CBA_FontMap::CBA_FontMap(CPDFSDK_Annot* pAnnot, IFX_SystemHandler* pSystemHandler) @@ -35,9 +37,9 @@ void CBA_FontMap::Initialize() { if (!m_pDefaultFont) { m_pDefaultFont = GetAnnotDefaultFont(m_sDefaultFontName); if (m_pDefaultFont) { - if (const CFX_SubstFont* pSubstFont = m_pDefaultFont->GetSubstFont()) + if (const CFX_SubstFont* pSubstFont = m_pDefaultFont->GetSubstFont()) { nCharset = pSubstFont->m_Charset; - else { + } else { if (m_sDefaultFontName == "Wingdings" || m_sDefaultFontName == "Wingdings2" || m_sDefaultFontName == "Wingdings3" || |