diff options
Diffstat (limited to 'xfa/fxfa/include')
-rw-r--r-- | xfa/fxfa/include/fxfa.h | 2 | ||||
-rw-r--r-- | xfa/fxfa/include/fxfa_widget.h | 2 | ||||
-rw-r--r-- | xfa/fxfa/include/xfa_ffdoc.h | 2 | ||||
-rw-r--r-- | xfa/fxfa/include/xfa_ffwidget.h | 4 | ||||
-rw-r--r-- | xfa/fxfa/include/xfa_ffwidgethandler.h | 4 | ||||
-rw-r--r-- | xfa/fxfa/include/xfa_rendercontext.h | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/xfa/fxfa/include/fxfa.h b/xfa/fxfa/include/fxfa.h index 4541cba9c2..04962937e3 100644 --- a/xfa/fxfa/include/fxfa.h +++ b/xfa/fxfa/include/fxfa.h @@ -313,7 +313,7 @@ class IXFA_DocProvider { CFX_RectF& rtPopup) = 0; virtual FX_BOOL PopupMenu(CXFA_FFWidget* hWidget, CFX_PointF ptPopup, - const CFX_RectF* pRectExclude = NULL) = 0; + const CFX_RectF* pRectExclude = nullptr) = 0; virtual void PageViewEvent(CXFA_FFPageView* pPageView, uint32_t dwFlags) = 0; virtual void WidgetPostAdd(CXFA_FFWidget* hWidget, CXFA_WidgetAcc* pWidgetData) = 0; diff --git a/xfa/fxfa/include/fxfa_widget.h b/xfa/fxfa/include/fxfa_widget.h index cf52bbe205..fa6d7fa49d 100644 --- a/xfa/fxfa/include/fxfa_widget.h +++ b/xfa/fxfa/include/fxfa_widget.h @@ -70,7 +70,7 @@ class CXFA_WidgetAcc : public CXFA_WidgetData { CFX_DIBitmap* GetImageEditImage(); void SetImageImage(CFX_DIBitmap* newImage); void SetImageEditImage(CFX_DIBitmap* newImage); - void UpdateUIDisplay(CXFA_FFWidget* pExcept = NULL); + void UpdateUIDisplay(CXFA_FFWidget* pExcept = nullptr); CXFA_Node* GetDatasets(); CFGAS_GEFont* GetFDEFont(); diff --git a/xfa/fxfa/include/xfa_ffdoc.h b/xfa/fxfa/include/xfa_ffdoc.h index af1f8d79cf..2ea829885c 100644 --- a/xfa/fxfa/include/xfa_ffdoc.h +++ b/xfa/fxfa/include/xfa_ffdoc.h @@ -31,7 +31,7 @@ class CXFA_FFDoc { IXFA_DocProvider* GetDocProvider() { return m_pDocProvider; } uint32_t GetDocType(); int32_t StartLoad(); - int32_t DoLoad(IFX_Pause* pPause = NULL); + int32_t DoLoad(IFX_Pause* pPause = nullptr); void StopLoad(); CXFA_FFDocView* CreateDocView(uint32_t dwView = 0); FX_BOOL OpenDoc(IFX_FileRead* pStream, FX_BOOL bTakeOverFile); diff --git a/xfa/fxfa/include/xfa_ffwidget.h b/xfa/fxfa/include/xfa_ffwidget.h index 9d337d7fbe..23a9a82c85 100644 --- a/xfa/fxfa/include/xfa_ffwidget.h +++ b/xfa/fxfa/include/xfa_ffwidget.h @@ -114,8 +114,8 @@ class CXFA_FFWidget : public CXFA_ContentLayoutItem { CXFA_FFDoc* GetDoc(); CXFA_FFApp* GetApp(); IXFA_AppProvider* GetAppProvider(); - void InvalidateWidget(const CFX_RectF* pRect = NULL); - void AddInvalidateRect(const CFX_RectF* pRect = NULL); + void InvalidateWidget(const CFX_RectF* pRect = nullptr); + void AddInvalidateRect(const CFX_RectF* pRect = nullptr); FX_BOOL GetCaptionText(CFX_WideString& wsCap); bool IsFocused(); void Rotate2Normal(FX_FLOAT& fx, FX_FLOAT& fy); diff --git a/xfa/fxfa/include/xfa_ffwidgethandler.h b/xfa/fxfa/include/xfa_ffwidgethandler.h index 4aa86d21f0..1cd28ce2f0 100644 --- a/xfa/fxfa/include/xfa_ffwidgethandler.h +++ b/xfa/fxfa/include/xfa_ffwidgethandler.h @@ -23,7 +23,7 @@ class CXFA_FFWidgetHandler { CXFA_FFWidget* CreateWidget(CXFA_FFWidget* hParent, XFA_WIDGETTYPE eType, - CXFA_FFWidget* hBefore = NULL); + CXFA_FFWidget* hBefore = nullptr); FX_BOOL OnMouseEnter(CXFA_FFWidget* hWidget); FX_BOOL OnMouseExit(CXFA_FFWidget* hWidget); @@ -111,7 +111,7 @@ class CXFA_FFWidgetHandler { CXFA_Node* pBefore) const; CXFA_Node* CreateCopyNode(XFA_Element eElement, CXFA_Node* pParent, - CXFA_Node* pBefore = NULL) const; + CXFA_Node* pBefore = nullptr) const; CXFA_Node* CreateTemplateNode(XFA_Element eElement, CXFA_Node* pParent, CXFA_Node* pBefore) const; diff --git a/xfa/fxfa/include/xfa_rendercontext.h b/xfa/fxfa/include/xfa_rendercontext.h index 7716c7140b..8bd6a287a3 100644 --- a/xfa/fxfa/include/xfa_rendercontext.h +++ b/xfa/fxfa/include/xfa_rendercontext.h @@ -28,7 +28,7 @@ class CXFA_RenderContext { CFX_Graphics* pGS, const CFX_Matrix& matrix, const CXFA_RenderOptions& options); - int32_t DoRender(IFX_Pause* pPause = NULL); + int32_t DoRender(IFX_Pause* pPause = nullptr); void StopRender(); protected: |