diff options
Diffstat (limited to 'fpdfsdk')
| -rw-r--r-- | fpdfsdk/cpdfsdk_pageview.cpp | 4 | ||||
| -rw-r--r-- | fpdfsdk/formfiller/cffl_interactiveformfiller.cpp | 4 | ||||
| -rw-r--r-- | fpdfsdk/javascript/cjs_event_context.cpp | 4 | ||||
| -rw-r--r-- | fpdfsdk/pwl/cpwl_edit_impl.cpp | 14 |
4 files changed, 13 insertions, 13 deletions
diff --git a/fpdfsdk/cpdfsdk_pageview.cpp b/fpdfsdk/cpdfsdk_pageview.cpp index f22d575150..a8dc88c7d6 100644 --- a/fpdfsdk/cpdfsdk_pageview.cpp +++ b/fpdfsdk/cpdfsdk_pageview.cpp @@ -13,7 +13,7 @@ #include "core/fpdfapi/render/cpdf_renderoptions.h" #include "core/fpdfdoc/cpdf_annotlist.h" #include "core/fpdfdoc/cpdf_interform.h" -#include "core/fxcrt/cfx_autorestorer.h" +#include "core/fxcrt/autorestorer.h" #include "fpdfsdk/cpdfsdk_annot.h" #include "fpdfsdk/cpdfsdk_annotiteration.h" #include "fpdfsdk/cpdfsdk_formfillenvironment.h" @@ -422,7 +422,7 @@ void CPDFSDK_PageView::LoadFXAnnots() { CPDFSDK_AnnotHandlerMgr* pAnnotHandlerMgr = m_pFormFillEnv->GetAnnotHandlerMgr(); - CFX_AutoRestorer<bool> lock(&m_bLocked); + AutoRestorer<bool> lock(&m_bLocked); m_bLocked = true; #ifdef PDF_ENABLE_XFA diff --git a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp index 3625e9db38..70d3990ea3 100644 --- a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp +++ b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp @@ -8,7 +8,7 @@ #include "core/fpdfapi/page/cpdf_page.h" #include "core/fpdfapi/parser/cpdf_document.h" -#include "core/fxcrt/cfx_autorestorer.h" +#include "core/fxcrt/autorestorer.h" #include "core/fxge/cfx_graphstatedata.h" #include "core/fxge/cfx_pathdata.h" #include "core/fxge/cfx_renderdevice.h" @@ -880,7 +880,7 @@ std::pair<bool, bool> CFFL_InteractiveFormFiller::OnBeforeKeyStroke( return {true, false}; } - CFX_AutoRestorer<bool> restorer(&m_bNotifying); + AutoRestorer<bool> restorer(&m_bNotifying); m_bNotifying = true; uint32_t nAge = privateData.pWidget->GetAppearanceAge(); diff --git a/fpdfsdk/javascript/cjs_event_context.cpp b/fpdfsdk/javascript/cjs_event_context.cpp index b820bc309b..bf6b337a70 100644 --- a/fpdfsdk/javascript/cjs_event_context.cpp +++ b/fpdfsdk/javascript/cjs_event_context.cpp @@ -6,7 +6,7 @@ #include "fpdfsdk/javascript/cjs_event_context.h" -#include "core/fxcrt/cfx_autorestorer.h" +#include "core/fxcrt/autorestorer.h" #include "fpdfsdk/javascript/JS_EventHandler.h" #include "fpdfsdk/javascript/cjs_runtime.h" #include "fpdfsdk/javascript/resource.h" @@ -35,7 +35,7 @@ bool CJS_EventContext::RunScript(const WideString& script, WideString* info) { return false; } - CFX_AutoRestorer<bool> restorer(&m_bBusy); + AutoRestorer<bool> restorer(&m_bBusy); m_bBusy = true; ASSERT(m_pEventHandler->IsValid()); diff --git a/fpdfsdk/pwl/cpwl_edit_impl.cpp b/fpdfsdk/pwl/cpwl_edit_impl.cpp index c65199955b..89b19de63d 100644 --- a/fpdfsdk/pwl/cpwl_edit_impl.cpp +++ b/fpdfsdk/pwl/cpwl_edit_impl.cpp @@ -22,7 +22,7 @@ #include "core/fpdfdoc/cpvt_section.h" #include "core/fpdfdoc/cpvt_word.h" #include "core/fpdfdoc/ipvt_fontmap.h" -#include "core/fxcrt/cfx_autorestorer.h" +#include "core/fxcrt/autorestorer.h" #include "core/fxcrt/fx_codepage.h" #include "core/fxge/cfx_graphstatedata.h" #include "core/fxge/cfx_pathdata.h" @@ -1012,7 +1012,7 @@ void CPWL_EditImpl::SetScrollInfo() { if (m_bNotifyFlag) return; - CFX_AutoRestorer<bool> restorer(&m_bNotifyFlag); + AutoRestorer<bool> restorer(&m_bNotifyFlag); m_bNotifyFlag = true; PWL_SCROLL_INFO Info; @@ -1047,7 +1047,7 @@ void CPWL_EditImpl::SetScrollPosY(float fy) { if (m_pNotify) { if (!m_bNotifyFlag) { - CFX_AutoRestorer<bool> restorer(&m_bNotifyFlag); + AutoRestorer<bool> restorer(&m_bNotifyFlag); m_bNotifyFlag = true; m_pNotify->SetScrollPosition(fy); } @@ -1157,7 +1157,7 @@ void CPWL_EditImpl::Refresh() { if (m_pNotify) { if (!m_bNotifyFlag) { - CFX_AutoRestorer<bool> restorer(&m_bNotifyFlag); + AutoRestorer<bool> restorer(&m_bNotifyFlag); m_bNotifyFlag = true; if (const CPWL_EditImpl_RectArray* pRects = m_Refresh.GetRefreshRects()) { @@ -1227,7 +1227,7 @@ void CPWL_EditImpl::RefreshWordRange(const CPVT_WordRange& wr) { if (m_pNotify) { if (!m_bNotifyFlag) { - CFX_AutoRestorer<bool> restorer(&m_bNotifyFlag); + AutoRestorer<bool> restorer(&m_bNotifyFlag); m_bNotifyFlag = true; CFX_FloatRect rcRefresh = VTToEdit(rcWord); m_pNotify->InvalidateRect(&rcRefresh); @@ -1241,7 +1241,7 @@ void CPWL_EditImpl::RefreshWordRange(const CPVT_WordRange& wr) { if (m_pNotify) { if (!m_bNotifyFlag) { - CFX_AutoRestorer<bool> restorer(&m_bNotifyFlag); + AutoRestorer<bool> restorer(&m_bNotifyFlag); m_bNotifyFlag = true; CFX_FloatRect rcRefresh = VTToEdit(rcLine); m_pNotify->InvalidateRect(&rcRefresh); @@ -1280,7 +1280,7 @@ void CPWL_EditImpl::SetCaretInfo() { ptFoot.y = line.ptLine.y + line.fLineDescent; } - CFX_AutoRestorer<bool> restorer(&m_bNotifyFlag); + AutoRestorer<bool> restorer(&m_bNotifyFlag); m_bNotifyFlag = true; m_pNotify->SetCaret(m_SelState.IsEmpty(), VTToEdit(ptHead), VTToEdit(ptFoot)); |