diff options
Diffstat (limited to 'xfa/fxfa/app')
-rw-r--r-- | xfa/fxfa/app/xfa_ffchoicelist.cpp | 2 | ||||
-rw-r--r-- | xfa/fxfa/app/xfa_ffdocview.cpp | 2 | ||||
-rw-r--r-- | xfa/fxfa/app/xfa_ffnotify.h | 2 | ||||
-rw-r--r-- | xfa/fxfa/app/xfa_fftextedit.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/xfa/fxfa/app/xfa_ffchoicelist.cpp b/xfa/fxfa/app/xfa_ffchoicelist.cpp index da778ff0ad..e6cb1090ad 100644 --- a/xfa/fxfa/app/xfa_ffchoicelist.cpp +++ b/xfa/fxfa/app/xfa_ffchoicelist.cpp @@ -287,7 +287,7 @@ FX_BOOL CXFA_FFComboBox::OnRButtonUp(uint32_t dwFlags, if (!CXFA_FFField::OnRButtonUp(dwFlags, fx, fy)) return FALSE; - GetDoc()->GetDocProvider()->PopupMenu(this, CFX_PointF(fx, fy), nullptr); + GetDoc()->GetDocProvider()->PopupMenu(this, CFX_PointF(fx, fy)); return TRUE; } FX_BOOL CXFA_FFComboBox::OnKillFocus(CXFA_FFWidget* pNewWidget) { diff --git a/xfa/fxfa/app/xfa_ffdocview.cpp b/xfa/fxfa/app/xfa_ffdocview.cpp index 3609e55cba..0efdef6db1 100644 --- a/xfa/fxfa/app/xfa_ffdocview.cpp +++ b/xfa/fxfa/app/xfa_ffdocview.cpp @@ -560,7 +560,7 @@ void CXFA_FFDocView::AddInvalidateRect(CXFA_FFPageView* pPageView, void CXFA_FFDocView::RunInvalidate() { for (const auto& pair : m_mapPageInvalidate) - m_pDoc->GetDocProvider()->InvalidateRect(pair.first, *pair.second); + m_pDoc->GetDocProvider()->InvalidateRect(pair.first, *pair.second, 0); m_mapPageInvalidate.clear(); } diff --git a/xfa/fxfa/app/xfa_ffnotify.h b/xfa/fxfa/app/xfa_ffnotify.h index 07e5419842..ef34afb7b8 100644 --- a/xfa/fxfa/app/xfa_ffnotify.h +++ b/xfa/fxfa/app/xfa_ffnotify.h @@ -70,7 +70,7 @@ class CXFA_FFNotify { CXFA_Node* GetFocusWidgetNode(); void SetFocusWidgetNode(CXFA_Node* pNode); - protected: + private: CXFA_FFDoc* const m_pDoc; }; diff --git a/xfa/fxfa/app/xfa_fftextedit.cpp b/xfa/fxfa/app/xfa_fftextedit.cpp index bd92a45e4c..8418da4a81 100644 --- a/xfa/fxfa/app/xfa_fftextedit.cpp +++ b/xfa/fxfa/app/xfa_fftextedit.cpp @@ -146,7 +146,7 @@ FX_BOOL CXFA_FFTextEdit::OnRButtonUp(uint32_t dwFlags, if (!CXFA_FFField::OnRButtonUp(dwFlags, fx, fy)) return FALSE; - GetDoc()->GetDocProvider()->PopupMenu(this, CFX_PointF(fx, fy), nullptr); + GetDoc()->GetDocProvider()->PopupMenu(this, CFX_PointF(fx, fy)); return TRUE; } FX_BOOL CXFA_FFTextEdit::OnSetFocus(CXFA_FFWidget* pOldWidget) { |