diff options
Diffstat (limited to 'fpdfsdk')
| -rw-r--r-- | fpdfsdk/fpdfxfa/cpdfxfa_context.cpp | 4 | ||||
| -rw-r--r-- | fpdfsdk/fpdfxfa/cpdfxfa_page.cpp | 8 | ||||
| -rw-r--r-- | fpdfsdk/pwl/cpwl_edit_impl.cpp | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp index 05bb56ca99..ed58d24b1f 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp +++ b/fpdfsdk/fpdfxfa/cpdfxfa_context.cpp @@ -10,7 +10,6 @@ #include <utility> #include "core/fpdfapi/parser/cpdf_document.h" -#include "core/fxcrt/fx_fallthrough.h" #include "fpdfsdk/cpdfsdk_formfillenvironment.h" #include "fpdfsdk/cpdfsdk_helpers.h" #include "fpdfsdk/cpdfsdk_interform.h" @@ -20,6 +19,7 @@ #include "fxjs/cjs_runtime.h" #include "fxjs/ijs_runtime.h" #include "public/fpdf_formfill.h" +#include "third_party/base/compiler_specific.h" #include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" #include "xfa/fgas/font/cfgas_defaultfontmanager.h" @@ -131,7 +131,7 @@ int CPDFXFA_Context::GetPageCount() const { case FormType::kXFAForeground: if (m_pPDFDoc) return m_pPDFDoc->GetPageCount(); - FX_FALLTHROUGH; + FALLTHROUGH; case FormType::kXFAFull: if (m_pXFADoc) return m_pXFADocView->CountPageViews(); diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp index da1c1e521a..170f17ea7a 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp +++ b/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp @@ -8,11 +8,11 @@ #include "core/fpdfapi/page/cpdf_page.h" #include "core/fpdfapi/parser/cpdf_document.h" -#include "core/fxcrt/fx_fallthrough.h" #include "fpdfsdk/cpdfsdk_helpers.h" #include "fpdfsdk/fpdfxfa/cpdfxfa_context.h" #include "fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h" #include "public/fpdf_formfill.h" +#include "third_party/base/compiler_specific.h" #include "third_party/base/ptr_util.h" #include "xfa/fxfa/cxfa_ffdocview.h" #include "xfa/fxfa/cxfa_ffpageview.h" @@ -100,7 +100,7 @@ float CPDFXFA_Page::GetPageWidth() const { case FormType::kXFAForeground: if (m_pPDFPage) return m_pPDFPage->GetPageWidth(); - FX_FALLTHROUGH; + FALLTHROUGH; case FormType::kXFAFull: if (m_pXFAPageView) return m_pXFAPageView->GetPageViewRect().width; @@ -120,7 +120,7 @@ float CPDFXFA_Page::GetPageHeight() const { case FormType::kXFAForeground: if (m_pPDFPage) return m_pPDFPage->GetPageHeight(); - FX_FALLTHROUGH; + FALLTHROUGH; case FormType::kXFAFull: if (m_pXFAPageView) return m_pXFAPageView->GetPageViewRect().height; @@ -164,7 +164,7 @@ CFX_Matrix CPDFXFA_Page::GetDisplayMatrix(const FX_RECT& rect, case FormType::kXFAForeground: if (m_pPDFPage) return m_pPDFPage->GetDisplayMatrix(rect, iRotate); - FX_FALLTHROUGH; + FALLTHROUGH; case FormType::kXFAFull: if (m_pXFAPageView) return m_pXFAPageView->GetDisplayMatrix(rect, iRotate); diff --git a/fpdfsdk/pwl/cpwl_edit_impl.cpp b/fpdfsdk/pwl/cpwl_edit_impl.cpp index 6d9fd20445..70b483bd14 100644 --- a/fpdfsdk/pwl/cpwl_edit_impl.cpp +++ b/fpdfsdk/pwl/cpwl_edit_impl.cpp @@ -23,7 +23,6 @@ #include "core/fpdfdoc/ipvt_fontmap.h" #include "core/fxcrt/autorestorer.h" #include "core/fxcrt/fx_codepage.h" -#include "core/fxcrt/fx_fallthrough.h" #include "core/fxge/cfx_graphstatedata.h" #include "core/fxge/cfx_pathdata.h" #include "core/fxge/cfx_renderdevice.h" @@ -31,6 +30,7 @@ #include "fpdfsdk/pwl/cpwl_edit.h" #include "fpdfsdk/pwl/cpwl_edit_ctrl.h" #include "fpdfsdk/pwl/cpwl_scroll_bar.h" +#include "third_party/base/compiler_specific.h" #include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" @@ -1818,7 +1818,7 @@ CPVT_WordPlace CPWL_EditImpl::DoInsertText(const CPVT_WordPlace& place, break; case '\t': word = ' '; - FX_FALLTHROUGH; + FALLTHROUGH; default: wp = m_pVT->InsertWord(wp, word, GetCharSetFromUnicode(word, charset)); |