summaryrefslogtreecommitdiff
path: root/xfa/fxfa/app
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fxfa/app')
-rw-r--r--xfa/fxfa/app/xfa_checksum.h10
-rw-r--r--xfa/fxfa/app/xfa_ffbarcode.h6
-rw-r--r--xfa/fxfa/app/xfa_ffcheckbutton.h4
-rw-r--r--xfa/fxfa/app/xfa_ffchoicelist.h8
-rw-r--r--xfa/fxfa/app/xfa_ffdoc.h8
-rw-r--r--xfa/fxfa/app/xfa_ffdochandler.h4
-rw-r--r--xfa/fxfa/app/xfa_ffexclgroup.h2
-rw-r--r--xfa/fxfa/app/xfa_fffield.h32
-rw-r--r--xfa/fxfa/app/xfa_ffimage.h2
-rw-r--r--xfa/fxfa/app/xfa_ffimageedit.h4
-rw-r--r--xfa/fxfa/app/xfa_ffnotify.h2
-rw-r--r--xfa/fxfa/app/xfa_ffpageview.h12
-rw-r--r--xfa/fxfa/app/xfa_ffpath.h6
-rw-r--r--xfa/fxfa/app/xfa_ffpushbutton.h2
-rw-r--r--xfa/fxfa/app/xfa_ffsignature.h26
-rw-r--r--xfa/fxfa/app/xfa_fftext.h10
-rw-r--r--xfa/fxfa/app/xfa_fftextedit.h12
-rw-r--r--xfa/fxfa/app/xfa_ffwidget.h38
-rw-r--r--xfa/fxfa/app/xfa_ffwidgethandler.h36
-rw-r--r--xfa/fxfa/app/xfa_fontmgr.h10
-rw-r--r--xfa/fxfa/app/xfa_fwltheme.h12
-rw-r--r--xfa/fxfa/app/xfa_rendercontext.h2
-rw-r--r--xfa/fxfa/app/xfa_textlayout.h30
23 files changed, 139 insertions, 139 deletions
diff --git a/xfa/fxfa/app/xfa_checksum.h b/xfa/fxfa/app/xfa_checksum.h
index 5331800b82..c997dc76fa 100644
--- a/xfa/fxfa/app/xfa_checksum.h
+++ b/xfa/fxfa/app/xfa_checksum.h
@@ -26,7 +26,7 @@ class CXFA_SAXReaderHandler : public IFX_SAXReaderHandler {
virtual ~CXFA_SAXReaderHandler();
virtual void* OnTagEnter(const CFX_ByteStringC& bsTagName,
FX_SAXNODE eType,
- FX_DWORD dwStartPos);
+ uint32_t dwStartPos);
virtual void OnTagAttribute(void* pTag,
const CFX_ByteStringC& bsAttri,
const CFX_ByteStringC& bsValue);
@@ -34,16 +34,16 @@ class CXFA_SAXReaderHandler : public IFX_SAXReaderHandler {
virtual void OnTagData(void* pTag,
FX_SAXNODE eType,
const CFX_ByteStringC& bsData,
- FX_DWORD dwStartPos);
- virtual void OnTagClose(void* pTag, FX_DWORD dwEndPos);
+ uint32_t dwStartPos);
+ virtual void OnTagClose(void* pTag, uint32_t dwEndPos);
virtual void OnTagEnd(void* pTag,
const CFX_ByteStringC& bsTagName,
- FX_DWORD dwEndPos);
+ uint32_t dwEndPos);
virtual void OnTargetData(void* pTag,
FX_SAXNODE eType,
const CFX_ByteStringC& bsData,
- FX_DWORD dwStartPos);
+ uint32_t dwStartPos);
protected:
void UpdateChecksum(FX_BOOL bCheckSpace);
diff --git a/xfa/fxfa/app/xfa_ffbarcode.h b/xfa/fxfa/app/xfa_ffbarcode.h
index 2e00f4e3a2..77d8ba840a 100644
--- a/xfa/fxfa/app/xfa_ffbarcode.h
+++ b/xfa/fxfa/app/xfa_ffbarcode.h
@@ -18,11 +18,11 @@ class CXFA_FFBarcode : public CXFA_FFTextEdit {
virtual FX_BOOL LoadWidget();
virtual void RenderWidget(CFX_Graphics* pGS,
CFX_Matrix* pMatrix = NULL,
- FX_DWORD dwStatus = 0,
+ uint32_t dwStatus = 0,
int32_t iRotate = 0);
virtual void UpdateWidgetProperty();
- virtual FX_BOOL OnLButtonDown(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy);
- virtual FX_BOOL OnRButtonDown(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy);
+ virtual FX_BOOL OnLButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
+ virtual FX_BOOL OnRButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
};
enum XFA_BARCODETYPEENUM {
diff --git a/xfa/fxfa/app/xfa_ffcheckbutton.h b/xfa/fxfa/app/xfa_ffcheckbutton.h
index 852736577d..5eeb3e86a8 100644
--- a/xfa/fxfa/app/xfa_ffcheckbutton.h
+++ b/xfa/fxfa/app/xfa_ffcheckbutton.h
@@ -16,14 +16,14 @@ class CXFA_FFCheckButton : public CXFA_FFField {
virtual ~CXFA_FFCheckButton();
virtual void RenderWidget(CFX_Graphics* pGS,
CFX_Matrix* pMatrix = NULL,
- FX_DWORD dwStatus = 0,
+ uint32_t dwStatus = 0,
int32_t iRotate = 0);
virtual FX_BOOL LoadWidget();
virtual FX_BOOL PerformLayout();
virtual FX_BOOL UpdateFWLData();
virtual void UpdateWidgetProperty();
- virtual FX_BOOL OnLButtonUp(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy);
+ virtual FX_BOOL OnLButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
void SetFWLCheckState(XFA_CHECKSTATE eCheckState);
virtual int32_t OnProcessMessage(CFWL_Message* pMessage);
virtual FWL_ERR OnProcessEvent(CFWL_Event* pEvent);
diff --git a/xfa/fxfa/app/xfa_ffchoicelist.h b/xfa/fxfa/app/xfa_ffchoicelist.h
index 1699b18039..3d8863c066 100644
--- a/xfa/fxfa/app/xfa_ffchoicelist.h
+++ b/xfa/fxfa/app/xfa_ffchoicelist.h
@@ -21,7 +21,7 @@ class CXFA_FFListBox : public CXFA_FFField {
virtual FX_BOOL CommitData();
virtual FX_BOOL UpdateFWLData();
virtual FX_BOOL IsDataChanged();
- FX_DWORD GetAlignment();
+ uint32_t GetAlignment();
public:
void OnSelectChanged(IFWL_Widget* pWidget, const CFX_Int32Array& arrSels);
@@ -41,11 +41,11 @@ class CXFA_FFComboBox : public CXFA_FFField {
CXFA_FFComboBox(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc);
virtual ~CXFA_FFComboBox();
virtual FX_BOOL GetBBox(CFX_RectF& rtBox,
- FX_DWORD dwStatus,
+ uint32_t dwStatus,
FX_BOOL bDrawFocus = FALSE);
virtual FX_BOOL LoadWidget();
virtual void UpdateWidgetProperty();
- virtual FX_BOOL OnRButtonUp(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy);
+ virtual FX_BOOL OnRButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
virtual FX_BOOL OnKillFocus(CXFA_FFWidget* pNewWidget);
virtual FX_BOOL CanUndo();
virtual FX_BOOL CanRedo();
@@ -69,7 +69,7 @@ class CXFA_FFComboBox : public CXFA_FFField {
virtual FX_BOOL CommitData();
virtual FX_BOOL UpdateFWLData();
virtual FX_BOOL IsDataChanged();
- FX_DWORD GetAlignment();
+ uint32_t GetAlignment();
void FWLEventSelChange(CXFA_EventParam* pParam);
CFX_WideString m_wsNewValue;
diff --git a/xfa/fxfa/app/xfa_ffdoc.h b/xfa/fxfa/app/xfa_ffdoc.h
index d656d30de7..8b61bd228f 100644
--- a/xfa/fxfa/app/xfa_ffdoc.h
+++ b/xfa/fxfa/app/xfa_ffdoc.h
@@ -25,15 +25,15 @@ class CXFA_FFDoc : public IXFA_Doc {
CXFA_FFDoc(CXFA_FFApp* pApp, IXFA_DocProvider* pDocProvider);
~CXFA_FFDoc();
IXFA_DocProvider* GetDocProvider() { return m_pDocProvider; }
- FX_DWORD GetDocType();
+ uint32_t GetDocType();
int32_t StartLoad();
int32_t DoLoad(IFX_Pause* pPause = NULL);
void StopLoad();
- IXFA_DocView* CreateDocView(FX_DWORD dwView = 0);
+ IXFA_DocView* CreateDocView(uint32_t dwView = 0);
FX_BOOL OpenDoc(IFX_FileRead* pStream, FX_BOOL bTakeOverFile);
FX_BOOL OpenDoc(CPDF_Document* pPDFDoc);
FX_BOOL CloseDoc();
- void SetDocType(FX_DWORD dwType);
+ void SetDocType(uint32_t dwType);
CXFA_Document* GetXFADoc() { return m_pDocument; }
CXFA_FFApp* GetApp() { return m_pApp; }
CXFA_FFDocView* GetDocView(IXFA_DocLayout* pLayout);
@@ -57,7 +57,7 @@ class CXFA_FFDoc : public IXFA_Doc {
CPDF_Document* m_pPDFDoc;
CFX_MapPtrToPtr m_mapNamedImages;
CFX_MapPtrToPtr m_mapTypeToDocView;
- FX_DWORD m_dwDocType;
+ uint32_t m_dwDocType;
FX_BOOL m_bOwnStream;
};
diff --git a/xfa/fxfa/app/xfa_ffdochandler.h b/xfa/fxfa/app/xfa_ffdochandler.h
index 47dd85fa81..ff2491509a 100644
--- a/xfa/fxfa/app/xfa_ffdochandler.h
+++ b/xfa/fxfa/app/xfa_ffdochandler.h
@@ -15,12 +15,12 @@ class CXFA_FFDocHandler : public IXFA_DocHandler {
~CXFA_FFDocHandler();
virtual void ReleaseDoc(IXFA_Doc* hDoc);
virtual IXFA_DocProvider* GetDocProvider(IXFA_Doc* hDoc);
- virtual FX_DWORD GetDocType(IXFA_Doc* hDoc);
+ virtual uint32_t GetDocType(IXFA_Doc* hDoc);
virtual int32_t StartLoad(IXFA_Doc* hDoc);
virtual int32_t DoLoad(IXFA_Doc* hDoc, IFX_Pause* pPause = NULL);
virtual void StopLoad(IXFA_Doc* hDoc);
- virtual IXFA_DocView* CreateDocView(IXFA_Doc* hDoc, FX_DWORD dwView = 0);
+ virtual IXFA_DocView* CreateDocView(IXFA_Doc* hDoc, uint32_t dwView = 0);
virtual int32_t CountPackages(IXFA_Doc* hDoc);
virtual void GetPackageName(IXFA_Doc* hDoc,
int32_t iPackage,
diff --git a/xfa/fxfa/app/xfa_ffexclgroup.h b/xfa/fxfa/app/xfa_ffexclgroup.h
index fd3f4d80db..cdda4d0417 100644
--- a/xfa/fxfa/app/xfa_ffexclgroup.h
+++ b/xfa/fxfa/app/xfa_ffexclgroup.h
@@ -17,7 +17,7 @@ class CXFA_FFExclGroup : public CXFA_FFWidget {
virtual void RenderWidget(CFX_Graphics* pGS,
CFX_Matrix* pMatrix = NULL,
- FX_DWORD dwStatus = 0,
+ uint32_t dwStatus = 0,
int32_t iRotate = 0);
};
diff --git a/xfa/fxfa/app/xfa_fffield.h b/xfa/fxfa/app/xfa_fffield.h
index 952cfcda5a..a6174157d3 100644
--- a/xfa/fxfa/app/xfa_fffield.h
+++ b/xfa/fxfa/app/xfa_fffield.h
@@ -22,38 +22,38 @@ class CXFA_FFField : public CXFA_FFWidget, public IFWL_WidgetDelegate {
virtual ~CXFA_FFField();
virtual FX_BOOL GetBBox(CFX_RectF& rtBox,
- FX_DWORD dwStatus,
+ uint32_t dwStatus,
FX_BOOL bDrawFocus = FALSE);
virtual void RenderWidget(CFX_Graphics* pGS,
CFX_Matrix* pMatrix = NULL,
- FX_DWORD dwStatus = 0,
+ uint32_t dwStatus = 0,
int32_t iRotate = 0);
virtual FX_BOOL IsLoaded();
virtual FX_BOOL LoadWidget();
virtual void UnloadWidget();
virtual FX_BOOL PerformLayout();
virtual void UpdateFWL();
- FX_DWORD UpdateUIProperty();
+ uint32_t UpdateUIProperty();
virtual FX_BOOL OnMouseEnter();
virtual FX_BOOL OnMouseExit();
- virtual FX_BOOL OnLButtonDown(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy);
- virtual FX_BOOL OnLButtonUp(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy);
- virtual FX_BOOL OnLButtonDblClk(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy);
- virtual FX_BOOL OnMouseMove(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy);
- virtual FX_BOOL OnMouseWheel(FX_DWORD dwFlags,
+ virtual FX_BOOL OnLButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
+ virtual FX_BOOL OnLButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
+ virtual FX_BOOL OnLButtonDblClk(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
+ virtual FX_BOOL OnMouseMove(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
+ virtual FX_BOOL OnMouseWheel(uint32_t dwFlags,
int16_t zDelta,
FX_FLOAT fx,
FX_FLOAT fy);
- virtual FX_BOOL OnRButtonDown(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy);
- virtual FX_BOOL OnRButtonUp(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy);
- virtual FX_BOOL OnRButtonDblClk(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy);
+ virtual FX_BOOL OnRButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
+ virtual FX_BOOL OnRButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
+ virtual FX_BOOL OnRButtonDblClk(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
virtual FX_BOOL OnSetFocus(CXFA_FFWidget* pOldWidget);
virtual FX_BOOL OnKillFocus(CXFA_FFWidget* pNewWidget);
- virtual FX_BOOL OnKeyDown(FX_DWORD dwKeyCode, FX_DWORD dwFlags);
- virtual FX_BOOL OnKeyUp(FX_DWORD dwKeyCode, FX_DWORD dwFlags);
- virtual FX_BOOL OnChar(FX_DWORD dwChar, FX_DWORD dwFlags);
- virtual FX_DWORD OnHitTest(FX_FLOAT fx, FX_FLOAT fy);
+ virtual FX_BOOL OnKeyDown(uint32_t dwKeyCode, uint32_t dwFlags);
+ virtual FX_BOOL OnKeyUp(uint32_t dwKeyCode, uint32_t dwFlags);
+ virtual FX_BOOL OnChar(uint32_t dwChar, uint32_t dwFlags);
+ virtual uint32_t OnHitTest(FX_FLOAT fx, FX_FLOAT fy);
virtual FX_BOOL OnSetCursor(FX_FLOAT fx, FX_FLOAT fy);
protected:
@@ -72,7 +72,7 @@ class CXFA_FFField : public CXFA_FFWidget, public IFWL_WidgetDelegate {
virtual FX_BOOL IsDataChanged();
void DrawHighlight(CFX_Graphics* pGS,
CFX_Matrix* pMatrix,
- FX_DWORD dwStatus,
+ uint32_t dwStatus,
FX_BOOL bEllipse = FALSE);
void DrawFocus(CFX_Graphics* pGS, CFX_Matrix* pMatrix);
void TranslateFWLMessage(CFWL_Message* pMessage);
diff --git a/xfa/fxfa/app/xfa_ffimage.h b/xfa/fxfa/app/xfa_ffimage.h
index 71bb495be1..7bbeafc1ac 100644
--- a/xfa/fxfa/app/xfa_ffimage.h
+++ b/xfa/fxfa/app/xfa_ffimage.h
@@ -15,7 +15,7 @@ class CXFA_FFImage : public CXFA_FFDraw {
virtual ~CXFA_FFImage();
virtual void RenderWidget(CFX_Graphics* pGS,
CFX_Matrix* pMatrix = NULL,
- FX_DWORD dwStatus = 0,
+ uint32_t dwStatus = 0,
int32_t iRotate = 0);
virtual FX_BOOL IsLoaded();
virtual FX_BOOL LoadWidget();
diff --git a/xfa/fxfa/app/xfa_ffimageedit.h b/xfa/fxfa/app/xfa_ffimageedit.h
index 7ecd18a0c1..1acc13c7fa 100644
--- a/xfa/fxfa/app/xfa_ffimageedit.h
+++ b/xfa/fxfa/app/xfa_ffimageedit.h
@@ -16,11 +16,11 @@ class CXFA_FFImageEdit : public CXFA_FFField {
virtual void RenderWidget(CFX_Graphics* pGS,
CFX_Matrix* pMatrix = NULL,
- FX_DWORD dwStatus = 0,
+ uint32_t dwStatus = 0,
int32_t iRotate = 0);
virtual FX_BOOL LoadWidget();
virtual void UnloadWidget();
- virtual FX_BOOL OnLButtonDown(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy);
+ virtual FX_BOOL OnLButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
virtual int32_t OnProcessMessage(CFWL_Message* pMessage);
virtual FWL_ERR OnProcessEvent(CFWL_Event* pEvent);
virtual FWL_ERR OnDrawWidget(CFX_Graphics* pGraphics,
diff --git a/xfa/fxfa/app/xfa_ffnotify.h b/xfa/fxfa/app/xfa_ffnotify.h
index e61c07924e..30c8f0d107 100644
--- a/xfa/fxfa/app/xfa_ffnotify.h
+++ b/xfa/fxfa/app/xfa_ffnotify.h
@@ -25,7 +25,7 @@ class CXFA_FFNotify : public IXFA_Notify {
void* pParam3 = NULL,
void* pParam4 = NULL);
virtual void OnWidgetDataEvent(CXFA_WidgetData* pSender,
- FX_DWORD dwEvent,
+ uint32_t dwEvent,
void* pParam = NULL,
void* pAdditional = NULL,
void* pAdditional2 = NULL);
diff --git a/xfa/fxfa/app/xfa_ffpageview.h b/xfa/fxfa/app/xfa_ffpageview.h
index b68e828123..20818e7107 100644
--- a/xfa/fxfa/app/xfa_ffpageview.h
+++ b/xfa/fxfa/app/xfa_ffpageview.h
@@ -27,8 +27,8 @@ class CXFA_FFPageView : public CXFA_ContainerLayoutItem, public IXFA_PageView {
void UnloadPageView() override;
IXFA_Widget* GetWidgetByPos(FX_FLOAT fx, FX_FLOAT fy) override;
IXFA_WidgetIterator* CreateWidgetIterator(
- FX_DWORD dwTraverseWay = XFA_TRAVERSEWAY_Form,
- FX_DWORD dwWidgetFilter = XFA_WIDGETFILTER_Visible |
+ uint32_t dwTraverseWay = XFA_TRAVERSEWAY_Form,
+ uint32_t dwWidgetFilter = XFA_WIDGETFILTER_Visible |
XFA_WIDGETFILTER_Viewable |
XFA_WIDGETFILTER_AllType) override;
@@ -43,7 +43,7 @@ typedef CXFA_NodeIteratorTemplate<CXFA_LayoutItem,
CXFA_LayoutItemIterator;
class CXFA_FFPageWidgetIterator : public IXFA_WidgetIterator {
public:
- CXFA_FFPageWidgetIterator(CXFA_FFPageView* pPageView, FX_DWORD dwFilter);
+ CXFA_FFPageWidgetIterator(CXFA_FFPageView* pPageView, uint32_t dwFilter);
virtual ~CXFA_FFPageWidgetIterator();
virtual void Release() { delete this; }
@@ -59,7 +59,7 @@ class CXFA_FFPageWidgetIterator : public IXFA_WidgetIterator {
IXFA_Widget* GetWidget(CXFA_LayoutItem* pLayoutItem);
CXFA_FFPageView* m_pPageView;
IXFA_Widget* m_hCurWidget;
- FX_DWORD m_dwFilter;
+ uint32_t m_dwFilter;
FX_BOOL m_bIgnorerelevant;
CXFA_LayoutItemIterator m_sIterator;
};
@@ -75,7 +75,7 @@ class CXFA_TabParam {
class CXFA_FFTabOrderPageWidgetIterator : public IXFA_WidgetIterator {
public:
CXFA_FFTabOrderPageWidgetIterator(CXFA_FFPageView* pPageView,
- FX_DWORD dwFilter);
+ uint32_t dwFilter);
virtual ~CXFA_FFTabOrderPageWidgetIterator();
virtual void Release();
@@ -91,7 +91,7 @@ class CXFA_FFTabOrderPageWidgetIterator : public IXFA_WidgetIterator {
protected:
CXFA_WidgetArray m_TabOrderWidgetArray;
CXFA_FFPageView* m_pPageView;
- FX_DWORD m_dwFilter;
+ uint32_t m_dwFilter;
int32_t m_iCurWidget;
FX_BOOL m_bIgnorerelevant;
CXFA_FFWidget* GetTraverseWidget(CXFA_FFWidget* pWidget);
diff --git a/xfa/fxfa/app/xfa_ffpath.h b/xfa/fxfa/app/xfa_ffpath.h
index 2b2c40d01b..8152810c74 100644
--- a/xfa/fxfa/app/xfa_ffpath.h
+++ b/xfa/fxfa/app/xfa_ffpath.h
@@ -15,7 +15,7 @@ class CXFA_FFLine : public CXFA_FFDraw {
virtual ~CXFA_FFLine();
virtual void RenderWidget(CFX_Graphics* pGS,
CFX_Matrix* pMatrix = NULL,
- FX_DWORD dwStatus = 0,
+ uint32_t dwStatus = 0,
int32_t iRotate = 0);
private:
@@ -27,7 +27,7 @@ class CXFA_FFArc : public CXFA_FFDraw {
virtual ~CXFA_FFArc();
virtual void RenderWidget(CFX_Graphics* pGS,
CFX_Matrix* pMatrix = NULL,
- FX_DWORD dwStatus = 0,
+ uint32_t dwStatus = 0,
int32_t iRotate = 0);
};
class CXFA_FFRectangle : public CXFA_FFDraw {
@@ -36,7 +36,7 @@ class CXFA_FFRectangle : public CXFA_FFDraw {
virtual ~CXFA_FFRectangle();
virtual void RenderWidget(CFX_Graphics* pGS,
CFX_Matrix* pMatrix = NULL,
- FX_DWORD dwStatus = 0,
+ uint32_t dwStatus = 0,
int32_t iRotate = 0);
};
diff --git a/xfa/fxfa/app/xfa_ffpushbutton.h b/xfa/fxfa/app/xfa_ffpushbutton.h
index 39f6bd4b7b..a37670bb30 100644
--- a/xfa/fxfa/app/xfa_ffpushbutton.h
+++ b/xfa/fxfa/app/xfa_ffpushbutton.h
@@ -22,7 +22,7 @@ class CXFA_FFPushButton : public CXFA_FFField {
virtual ~CXFA_FFPushButton();
virtual void RenderWidget(CFX_Graphics* pGS,
CFX_Matrix* pMatrix = NULL,
- FX_DWORD dwStatus = 0,
+ uint32_t dwStatus = 0,
int32_t iRotate = 0);
virtual FX_BOOL LoadWidget();
virtual void UnloadWidget();
diff --git a/xfa/fxfa/app/xfa_ffsignature.h b/xfa/fxfa/app/xfa_ffsignature.h
index f976fed102..1b5f33ccc4 100644
--- a/xfa/fxfa/app/xfa_ffsignature.h
+++ b/xfa/fxfa/app/xfa_ffsignature.h
@@ -16,27 +16,27 @@ class CXFA_FFSignature final : public CXFA_FFField {
virtual void RenderWidget(CFX_Graphics* pGS,
CFX_Matrix* pMatrix = NULL,
- FX_DWORD dwStatus = 0,
+ uint32_t dwStatus = 0,
int32_t iRotate = 0);
virtual FX_BOOL LoadWidget();
virtual FX_BOOL OnMouseEnter();
virtual FX_BOOL OnMouseExit();
- virtual FX_BOOL OnLButtonDown(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy);
- virtual FX_BOOL OnLButtonUp(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy);
- virtual FX_BOOL OnLButtonDblClk(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy);
- virtual FX_BOOL OnMouseMove(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy);
- virtual FX_BOOL OnMouseWheel(FX_DWORD dwFlags,
+ virtual FX_BOOL OnLButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
+ virtual FX_BOOL OnLButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
+ virtual FX_BOOL OnLButtonDblClk(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
+ virtual FX_BOOL OnMouseMove(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
+ virtual FX_BOOL OnMouseWheel(uint32_t dwFlags,
int16_t zDelta,
FX_FLOAT fx,
FX_FLOAT fy);
- virtual FX_BOOL OnRButtonDown(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy);
- virtual FX_BOOL OnRButtonUp(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy);
- virtual FX_BOOL OnRButtonDblClk(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy);
+ virtual FX_BOOL OnRButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
+ virtual FX_BOOL OnRButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
+ virtual FX_BOOL OnRButtonDblClk(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
- virtual FX_BOOL OnKeyDown(FX_DWORD dwKeyCode, FX_DWORD dwFlags);
- virtual FX_BOOL OnKeyUp(FX_DWORD dwKeyCode, FX_DWORD dwFlags);
- virtual FX_BOOL OnChar(FX_DWORD dwChar, FX_DWORD dwFlags);
- virtual FX_DWORD OnHitTest(FX_FLOAT fx, FX_FLOAT fy);
+ virtual FX_BOOL OnKeyDown(uint32_t dwKeyCode, uint32_t dwFlags);
+ virtual FX_BOOL OnKeyUp(uint32_t dwKeyCode, uint32_t dwFlags);
+ virtual FX_BOOL OnChar(uint32_t dwChar, uint32_t dwFlags);
+ virtual uint32_t OnHitTest(FX_FLOAT fx, FX_FLOAT fy);
virtual FX_BOOL OnSetCursor(FX_FLOAT fx, FX_FLOAT fy);
};
diff --git a/xfa/fxfa/app/xfa_fftext.h b/xfa/fxfa/app/xfa_fftext.h
index edf12f5bee..847805b527 100644
--- a/xfa/fxfa/app/xfa_fftext.h
+++ b/xfa/fxfa/app/xfa_fftext.h
@@ -13,13 +13,13 @@ class CXFA_FFText : public CXFA_FFDraw {
public:
CXFA_FFText(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc);
virtual ~CXFA_FFText();
- virtual FX_BOOL OnLButtonDown(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy);
- virtual FX_BOOL OnLButtonUp(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy);
- virtual FX_BOOL OnMouseMove(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy);
- virtual FX_DWORD OnHitTest(FX_FLOAT fx, FX_FLOAT fy);
+ virtual FX_BOOL OnLButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
+ virtual FX_BOOL OnLButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
+ virtual FX_BOOL OnMouseMove(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
+ virtual uint32_t OnHitTest(FX_FLOAT fx, FX_FLOAT fy);
virtual void RenderWidget(CFX_Graphics* pGS,
CFX_Matrix* pMatrix = NULL,
- FX_DWORD dwStatus = 0,
+ uint32_t dwStatus = 0,
int32_t iRotate = 0);
virtual FX_BOOL IsLoaded();
virtual FX_BOOL PerformLayout();
diff --git a/xfa/fxfa/app/xfa_fftextedit.h b/xfa/fxfa/app/xfa_fftextedit.h
index d379ab1991..ecdc2da485 100644
--- a/xfa/fxfa/app/xfa_fftextedit.h
+++ b/xfa/fxfa/app/xfa_fftextedit.h
@@ -19,9 +19,9 @@ class CXFA_FFTextEdit : public CXFA_FFField {
// CXFA_FFField:
FX_BOOL LoadWidget() override;
void UpdateWidgetProperty() override;
- FX_BOOL OnLButtonDown(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) override;
- FX_BOOL OnRButtonDown(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) override;
- FX_BOOL OnRButtonUp(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) override;
+ FX_BOOL OnLButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) override;
+ FX_BOOL OnRButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) override;
+ FX_BOOL OnRButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) override;
FX_BOOL OnSetFocus(CXFA_FFWidget* pOldWidget) override;
FX_BOOL OnKillFocus(CXFA_FFWidget* pNewWidget) override;
FX_BOOL CanUndo() override;
@@ -58,7 +58,7 @@ class CXFA_FFTextEdit : public CXFA_FFField {
std::vector<CFX_ByteString>& sSuggest);
protected:
- FX_DWORD GetAlignment();
+ uint32_t GetAlignment();
FX_BOOL CommitData() override;
FX_BOOL UpdateFWLData() override;
FX_BOOL IsDataChanged() override;
@@ -98,7 +98,7 @@ class CXFA_FFDateTimeEdit : public CXFA_FFTextEdit {
virtual ~CXFA_FFDateTimeEdit();
virtual FX_BOOL GetBBox(CFX_RectF& rtBox,
- FX_DWORD dwStatus,
+ uint32_t dwStatus,
FX_BOOL bDrawFocus = FALSE);
virtual FX_BOOL LoadWidget();
virtual void UpdateWidgetProperty();
@@ -120,7 +120,7 @@ class CXFA_FFDateTimeEdit : public CXFA_FFTextEdit {
virtual FX_BOOL DeSelect();
protected:
- FX_DWORD GetAlignment();
+ uint32_t GetAlignment();
virtual FX_BOOL PtInActiveRect(FX_FLOAT fx, FX_FLOAT fy);
virtual FX_BOOL CommitData();
diff --git a/xfa/fxfa/app/xfa_ffwidget.h b/xfa/fxfa/app/xfa_ffwidget.h
index 3782e3b8a6..4cc6c0bbbb 100644
--- a/xfa/fxfa/app/xfa_ffwidget.h
+++ b/xfa/fxfa/app/xfa_ffwidget.h
@@ -46,16 +46,16 @@ class CXFA_FFWidget : public IXFA_Widget,
void SetPageView(IXFA_PageView* pPageView);
void GetWidgetRect(CFX_RectF& rtWidget);
CFX_RectF ReCacheWidgetRect();
- FX_DWORD GetStatus();
- void ModifyStatus(FX_DWORD dwAdded, FX_DWORD dwRemoved);
+ uint32_t GetStatus();
+ void ModifyStatus(uint32_t dwAdded, uint32_t dwRemoved);
virtual FX_BOOL GetBBox(CFX_RectF& rtBox,
- FX_DWORD dwStatus,
+ uint32_t dwStatus,
FX_BOOL bDrawFocus = FALSE);
CXFA_WidgetAcc* GetDataAcc();
FX_BOOL GetToolTip(CFX_WideString& wsToolTip);
virtual void RenderWidget(CFX_Graphics* pGS,
CFX_Matrix* pMatrix = NULL,
- FX_DWORD dwStatus = 0,
+ uint32_t dwStatus = 0,
int32_t iRotate = 0);
virtual FX_BOOL IsLoaded();
@@ -66,24 +66,24 @@ class CXFA_FFWidget : public IXFA_Widget,
virtual void UpdateWidgetProperty();
virtual FX_BOOL OnMouseEnter();
virtual FX_BOOL OnMouseExit();
- virtual FX_BOOL OnLButtonDown(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy);
- virtual FX_BOOL OnLButtonUp(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy);
- virtual FX_BOOL OnLButtonDblClk(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy);
- virtual FX_BOOL OnMouseMove(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy);
- virtual FX_BOOL OnMouseWheel(FX_DWORD dwFlags,
+ virtual FX_BOOL OnLButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
+ virtual FX_BOOL OnLButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
+ virtual FX_BOOL OnLButtonDblClk(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
+ virtual FX_BOOL OnMouseMove(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
+ virtual FX_BOOL OnMouseWheel(uint32_t dwFlags,
int16_t zDelta,
FX_FLOAT fx,
FX_FLOAT fy);
- virtual FX_BOOL OnRButtonDown(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy);
- virtual FX_BOOL OnRButtonUp(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy);
- virtual FX_BOOL OnRButtonDblClk(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy);
+ virtual FX_BOOL OnRButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
+ virtual FX_BOOL OnRButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
+ virtual FX_BOOL OnRButtonDblClk(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
virtual FX_BOOL OnSetFocus(CXFA_FFWidget* pOldWidget);
virtual FX_BOOL OnKillFocus(CXFA_FFWidget* pNewWidget);
- virtual FX_BOOL OnKeyDown(FX_DWORD dwKeyCode, FX_DWORD dwFlags);
- virtual FX_BOOL OnKeyUp(FX_DWORD dwKeyCode, FX_DWORD dwFlags);
- virtual FX_BOOL OnChar(FX_DWORD dwChar, FX_DWORD dwFlags);
- virtual FX_DWORD OnHitTest(FX_FLOAT fx, FX_FLOAT fy);
+ virtual FX_BOOL OnKeyDown(uint32_t dwKeyCode, uint32_t dwFlags);
+ virtual FX_BOOL OnKeyUp(uint32_t dwKeyCode, uint32_t dwFlags);
+ virtual FX_BOOL OnChar(uint32_t dwChar, uint32_t dwFlags);
+ virtual uint32_t OnHitTest(FX_FLOAT fx, FX_FLOAT fy);
virtual FX_BOOL OnSetCursor(FX_FLOAT fx, FX_FLOAT fy);
virtual FX_BOOL CanUndo() { return FALSE; }
virtual FX_BOOL CanRedo() { return FALSE; }
@@ -130,11 +130,11 @@ class CXFA_FFWidget : public IXFA_Widget,
CXFA_Box box,
const CFX_RectF& rtBorder,
CFX_Matrix* pMatrix,
- FX_DWORD dwFlags = 0);
+ uint32_t dwFlags = 0);
void GetMinMaxWidth(FX_FLOAT fMinWidth, FX_FLOAT fMaxWidth);
void GetMinMaxHeight(FX_FLOAT fMinHeight, FX_FLOAT fMaxHeight);
void GetRectWithoutRotate(CFX_RectF& rtWidget);
- FX_BOOL IsMatchVisibleStatus(FX_DWORD dwStatus);
+ FX_BOOL IsMatchVisibleStatus(uint32_t dwStatus);
void EventKillFocus();
FX_BOOL IsButtonDown();
@@ -182,6 +182,6 @@ void XFA_DrawBox(CXFA_Box box,
CFX_Graphics* pGS,
const CFX_RectF& rtWidget,
CFX_Matrix* pMatrix,
- FX_DWORD dwFlags = 0);
+ uint32_t dwFlags = 0);
#endif // XFA_FXFA_APP_XFA_FFWIDGET_H_
diff --git a/xfa/fxfa/app/xfa_ffwidgethandler.h b/xfa/fxfa/app/xfa_ffwidgethandler.h
index a9998b395c..931eb28437 100644
--- a/xfa/fxfa/app/xfa_ffwidgethandler.h
+++ b/xfa/fxfa/app/xfa_ffwidgethandler.h
@@ -23,10 +23,10 @@ class CXFA_FFWidgetHandler : public IXFA_WidgetHandler {
IXFA_Widget* hBefore = NULL);
virtual IXFA_PageView* GetPageView(IXFA_Widget* hWidget);
virtual void GetRect(IXFA_Widget* hWidget, CFX_RectF& rt);
- virtual FX_DWORD GetStatus(IXFA_Widget* hWidget);
+ virtual uint32_t GetStatus(IXFA_Widget* hWidget);
virtual FX_BOOL GetBBox(IXFA_Widget* hWidget,
CFX_RectF& rtBox,
- FX_DWORD dwStatus,
+ uint32_t dwStatus,
FX_BOOL bDrawFocus = FALSE);
virtual CXFA_WidgetAcc* GetDataAcc(IXFA_Widget* hWidget);
virtual void GetName(IXFA_Widget* hWidget,
@@ -41,49 +41,49 @@ class CXFA_FFWidgetHandler : public IXFA_WidgetHandler {
virtual FX_BOOL OnMouseEnter(IXFA_Widget* hWidget);
virtual FX_BOOL OnMouseExit(IXFA_Widget* hWidget);
virtual FX_BOOL OnLButtonDown(IXFA_Widget* hWidget,
- FX_DWORD dwFlags,
+ uint32_t dwFlags,
FX_FLOAT fx,
FX_FLOAT fy);
virtual FX_BOOL OnLButtonUp(IXFA_Widget* hWidget,
- FX_DWORD dwFlags,
+ uint32_t dwFlags,
FX_FLOAT fx,
FX_FLOAT fy);
virtual FX_BOOL OnLButtonDblClk(IXFA_Widget* hWidget,
- FX_DWORD dwFlags,
+ uint32_t dwFlags,
FX_FLOAT fx,
FX_FLOAT fy);
virtual FX_BOOL OnMouseMove(IXFA_Widget* hWidget,
- FX_DWORD dwFlags,
+ uint32_t dwFlags,
FX_FLOAT fx,
FX_FLOAT fy);
virtual FX_BOOL OnMouseWheel(IXFA_Widget* hWidget,
- FX_DWORD dwFlags,
+ uint32_t dwFlags,
int16_t zDelta,
FX_FLOAT fx,
FX_FLOAT fy);
virtual FX_BOOL OnRButtonDown(IXFA_Widget* hWidget,
- FX_DWORD dwFlags,
+ uint32_t dwFlags,
FX_FLOAT fx,
FX_FLOAT fy);
virtual FX_BOOL OnRButtonUp(IXFA_Widget* hWidget,
- FX_DWORD dwFlags,
+ uint32_t dwFlags,
FX_FLOAT fx,
FX_FLOAT fy);
virtual FX_BOOL OnRButtonDblClk(IXFA_Widget* hWidget,
- FX_DWORD dwFlags,
+ uint32_t dwFlags,
FX_FLOAT fx,
FX_FLOAT fy);
virtual FX_BOOL OnKeyDown(IXFA_Widget* hWidget,
- FX_DWORD dwKeyCode,
- FX_DWORD dwFlags);
+ uint32_t dwKeyCode,
+ uint32_t dwFlags);
virtual FX_BOOL OnKeyUp(IXFA_Widget* hWidget,
- FX_DWORD dwKeyCode,
- FX_DWORD dwFlags);
+ uint32_t dwKeyCode,
+ uint32_t dwFlags);
virtual FX_BOOL OnChar(IXFA_Widget* hWidget,
- FX_DWORD dwChar,
- FX_DWORD dwFlags);
- virtual FX_DWORD OnHitTest(IXFA_Widget* hWidget, FX_FLOAT fx, FX_FLOAT fy);
+ uint32_t dwChar,
+ uint32_t dwFlags);
+ virtual uint32_t OnHitTest(IXFA_Widget* hWidget, FX_FLOAT fx, FX_FLOAT fy);
virtual FX_BOOL OnSetCursor(IXFA_Widget* hWidget, FX_FLOAT fx, FX_FLOAT fy);
virtual void RenderWidget(IXFA_Widget* hWidget,
CFX_Graphics* pGS,
@@ -136,7 +136,7 @@ class CXFA_FFWidgetHandler : public IXFA_WidgetHandler {
CXFA_Node* pBefore) const;
CXFA_Node* CreateFontNode(CXFA_Node* pParent) const;
CXFA_Node* CreateMarginNode(CXFA_Node* pParent,
- FX_DWORD dwFlags,
+ uint32_t dwFlags,
FX_FLOAT fInsets[4]) const;
CXFA_Node* CreateValueNode(XFA_ELEMENT eValue, CXFA_Node* pParent) const;
IXFA_ObjFactory* GetObjFactory() const;
diff --git a/xfa/fxfa/app/xfa_fontmgr.h b/xfa/fxfa/app/xfa_fontmgr.h
index 516d7bb6e0..20d3e5656c 100644
--- a/xfa/fxfa/app/xfa_fontmgr.h
+++ b/xfa/fxfa/app/xfa_fontmgr.h
@@ -17,7 +17,7 @@
class CPDF_Font;
struct XFA_FONTINFO {
- FX_DWORD dwFontNameHash;
+ uint32_t dwFontNameHash;
const FX_WCHAR* pPsName;
const FX_WCHAR* pReplaceFont;
uint16_t dwStyles;
@@ -32,11 +32,11 @@ class CXFA_DefFontMgr : public IXFA_FontMgr {
// IXFA_FontMgr:
IFX_Font* GetFont(IXFA_Doc* hDoc,
const CFX_WideStringC& wsFontFamily,
- FX_DWORD dwFontStyles,
+ uint32_t dwFontStyles,
uint16_t wCodePage = 0xFFFF) override;
IFX_Font* GetDefaultFont(IXFA_Doc* hDoc,
const CFX_WideStringC& wsFontFamily,
- FX_DWORD dwFontStyles,
+ uint32_t dwFontStyles,
uint16_t wCodePage = 0xFFFF) override;
protected:
@@ -48,7 +48,7 @@ class CXFA_PDFFontMgr : public IFX_FontProvider {
CXFA_PDFFontMgr(CXFA_FFDoc* pDoc);
~CXFA_PDFFontMgr();
IFX_Font* GetFont(const CFX_WideStringC& wsFontFamily,
- FX_DWORD dwFontStyles,
+ uint32_t dwFontStyles,
CPDF_Font** pPDFFont,
FX_BOOL bStrictMatch = TRUE);
FX_BOOL GetCharWidth(IFX_Font* pFont,
@@ -82,7 +82,7 @@ class CXFA_FontMgr {
~CXFA_FontMgr();
IFX_Font* GetFont(IXFA_Doc* hDoc,
const CFX_WideStringC& wsFontFamily,
- FX_DWORD dwFontStyles,
+ uint32_t dwFontStyles,
uint16_t wCodePage = 0xFFFF);
void LoadDocFonts(IXFA_Doc* hDoc);
void ReleaseDocFonts(IXFA_Doc* hDoc);
diff --git a/xfa/fxfa/app/xfa_fwltheme.h b/xfa/fxfa/app/xfa_fwltheme.h
index 484c56967a..0266b8c24d 100644
--- a/xfa/fxfa/app/xfa_fwltheme.h
+++ b/xfa/fxfa/app/xfa_fwltheme.h
@@ -35,17 +35,17 @@ class CXFA_FWLTheme : public IFWL_ThemeProvider {
virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const {
return FWL_ERR_Succeeded;
}
- virtual FX_DWORD GetHashCode() const { return 0; }
+ virtual uint32_t GetHashCode() const { return 0; }
virtual FWL_ERR Initialize();
virtual FWL_ERR Finalize();
virtual FX_BOOL IsValidWidget(IFWL_Widget* pWidget);
- virtual FX_DWORD GetThemeID(IFWL_Widget* pWidget);
- virtual FX_DWORD SetThemeID(IFWL_Widget* pWidget,
- FX_DWORD dwThemeID,
+ virtual uint32_t GetThemeID(IFWL_Widget* pWidget);
+ virtual uint32_t SetThemeID(IFWL_Widget* pWidget,
+ uint32_t dwThemeID,
FX_BOOL bChildren = TRUE);
virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams);
virtual FX_BOOL DrawText(CFWL_ThemeText* pParams);
- virtual void* GetCapacity(CFWL_ThemePart* pThemePart, FX_DWORD dwCapacity);
+ virtual void* GetCapacity(CFWL_ThemePart* pThemePart, uint32_t dwCapacity);
virtual FX_BOOL IsCustomizedLayout(IFWL_Widget* pWidget);
virtual FWL_ERR GetPartRect(CFWL_ThemePart* pThemePart);
virtual FX_BOOL IsInPart(CFWL_ThemePart* pThemePart,
@@ -79,7 +79,7 @@ class CXFA_FWLTheme : public IFWL_ThemeProvider {
CFWL_BarcodeTP* m_pBarcodeTP;
IFDE_TextOut* m_pTextOut;
FX_FLOAT m_fCapacity;
- FX_DWORD m_dwCapacity;
+ uint32_t m_dwCapacity;
IFX_Font* m_pCalendarFont;
CFX_WideString m_wsResource;
CXFA_FFApp* m_pApp;
diff --git a/xfa/fxfa/app/xfa_rendercontext.h b/xfa/fxfa/app/xfa_rendercontext.h
index ef4b3069a6..c19adeddfa 100644
--- a/xfa/fxfa/app/xfa_rendercontext.h
+++ b/xfa/fxfa/app/xfa_rendercontext.h
@@ -28,7 +28,7 @@ class CXFA_RenderContext : public IXFA_RenderContext {
CFX_Graphics* m_pGS;
CFX_Matrix m_matrix;
CXFA_RenderOptions m_options;
- FX_DWORD m_dwStatus;
+ uint32_t m_dwStatus;
CFX_RectF m_rtClipRect;
};
diff --git a/xfa/fxfa/app/xfa_textlayout.h b/xfa/fxfa/app/xfa_textlayout.h
index 9cc1e29f3b..f6c3262536 100644
--- a/xfa/fxfa/app/xfa_textlayout.h
+++ b/xfa/fxfa/app/xfa_textlayout.h
@@ -74,12 +74,12 @@ class CXFA_TextParseContext : public CFX_Target {
const IFDE_CSSDeclaration** GetDecls() {
return (const IFDE_CSSDeclaration**)m_ppMatchedDecls;
}
- FX_DWORD CountDecls() const { return m_dwMatchedDecls; }
+ uint32_t CountDecls() const { return m_dwMatchedDecls; }
IFDE_CSSComputedStyle* m_pParentStyle;
protected:
IFDE_CSSDeclaration** m_ppMatchedDecls;
- FX_DWORD m_dwMatchedDecls;
+ uint32_t m_dwMatchedDecls;
FDE_CSSDISPLAY m_eDisplay;
};
@@ -169,7 +169,7 @@ class CXFA_LoaderContext {
CXFA_Node* m_pNode;
IFDE_CSSComputedStyle* m_pParentStyle;
CFX_ArrayTemplate<FX_FLOAT> m_lineHeights;
- FX_DWORD m_dwFlags;
+ uint32_t m_dwFlags;
CFX_FloatArray m_BlocksHeight;
};
@@ -180,21 +180,21 @@ class CXFA_LinkUserData : public IFX_Unknown, public CFX_Target {
m_pszURLContent = pszText;
}
~CXFA_LinkUserData() {}
- virtual FX_DWORD Release() {
- FX_DWORD dwRefCount = --m_dwRefCount;
+ virtual uint32_t Release() {
+ uint32_t dwRefCount = --m_dwRefCount;
if (dwRefCount <= 0) {
FXTARGET_DeleteWith(CXFA_LinkUserData, m_pAllocator, this);
}
return dwRefCount;
}
- virtual FX_DWORD AddRef() { return ++m_dwRefCount; }
+ virtual uint32_t AddRef() { return ++m_dwRefCount; }
public:
const FX_WCHAR* GetLinkURL() { return m_pszURLContent; }
protected:
IFX_MEMAllocator* m_pAllocator;
- FX_DWORD m_dwRefCount;
+ uint32_t m_dwRefCount;
CFX_WideString m_pszURLContent;
};
@@ -226,21 +226,21 @@ class CXFA_TextUserData : public IFX_Unknown, public CFX_Target {
if (m_pLinkData)
m_pLinkData->Release();
}
- virtual FX_DWORD Release() {
- FX_DWORD dwRefCount = --m_dwRefCount;
+ virtual uint32_t Release() {
+ uint32_t dwRefCount = --m_dwRefCount;
if (dwRefCount == 0) {
FXTARGET_DeleteWith(CXFA_TextUserData, m_pAllocator, this);
}
return dwRefCount;
}
- virtual FX_DWORD AddRef() { return ++m_dwRefCount; }
+ virtual uint32_t AddRef() { return ++m_dwRefCount; }
IFDE_CSSComputedStyle* m_pStyle;
CXFA_LinkUserData* m_pLinkData;
protected:
IFX_MEMAllocator* m_pAllocator;
- FX_DWORD m_dwRefCount;
+ uint32_t m_dwRefCount;
};
class XFA_TextPiece : public CFX_Target {
@@ -277,7 +277,7 @@ class CXFA_PieceLine : public CFX_Target {
typedef CFX_ArrayTemplate<CXFA_PieceLine*> CXFA_PieceLineArray;
struct XFA_TABSTOPS {
- FX_DWORD dwAlign;
+ uint32_t dwAlign;
FX_FLOAT fTabstops;
};
@@ -289,7 +289,7 @@ class CXFA_TextTabstopsContext {
m_bTabstops(FALSE),
m_fTabWidth(0),
m_fLeft(0) {}
- void Append(FX_DWORD dwAlign, FX_FLOAT fTabstops) {
+ void Append(uint32_t dwAlign, FX_FLOAT fTabstops) {
int32_t i = 0;
for (i = 0; i < m_iTabCount; i++) {
XFA_TABSTOPS* pTabstop = m_tabstops.GetDataPtr(i);
@@ -380,11 +380,11 @@ class CXFA_TextLayout {
FX_FLOAT& fLinePos,
FX_FLOAT fSpaceAbove,
FX_BOOL bSavePieces);
- void AppendTextLine(FX_DWORD dwStatus,
+ void AppendTextLine(uint32_t dwStatus,
FX_FLOAT& fLinePos,
FX_BOOL bSavePieces,
FX_BOOL bEndBreak = FALSE);
- void EndBreak(FX_DWORD dwStatus, FX_FLOAT& fLinePos, FX_BOOL bDefault);
+ void EndBreak(uint32_t dwStatus, FX_FLOAT& fLinePos, FX_BOOL bDefault);
FX_BOOL IsEnd(FX_BOOL bSavePieces);
void ProcessText(CFX_WideString& wsText);
void UpdateAlign(FX_FLOAT fHeight, FX_FLOAT fBottom);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 11:51:06 +0000