summaryrefslogtreecommitdiff
path: root/xfa/fgas/layout
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-03-25 14:38:58 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-25 14:38:58 -0700
commitdeee3d2ee201d62e7ef41e7d8378d7f52e057a9c (patch)
treef9f64d5f24376108a697299f8574ae3a7fe3511b /xfa/fgas/layout
parent736f28ab2434e2da1de66ff91b64741483ff9cba (diff)
downloadpdfium-deee3d2ee201d62e7ef41e7d8378d7f52e057a9c.tar.xz
Remove FX_DWORD from XFA, part 2
Some headers were missed in the previous CL. Review URL: https://codereview.chromium.org/1835703002
Diffstat (limited to 'xfa/fgas/layout')
-rw-r--r--xfa/fgas/layout/fgas_rtfbreak.h18
-rw-r--r--xfa/fgas/layout/fgas_textbreak.h22
2 files changed, 20 insertions, 20 deletions
diff --git a/xfa/fgas/layout/fgas_rtfbreak.h b/xfa/fgas/layout/fgas_rtfbreak.h
index 8549d0c93c..dd791c24df 100644
--- a/xfa/fgas/layout/fgas_rtfbreak.h
+++ b/xfa/fgas/layout/fgas_rtfbreak.h
@@ -85,7 +85,7 @@ struct FX_RTFTEXTOBJ {
int32_t iLength;
IFX_Font* pFont;
FX_FLOAT fFontSize;
- FX_DWORD dwLayoutStyles;
+ uint32_t dwLayoutStyles;
int32_t iCharRotation;
int32_t iBidiLevel;
const CFX_RectF* pRect;
@@ -172,7 +172,7 @@ class CFX_RTFPiece : public CFX_Target {
m_iHorizontalScale = 100;
m_iVerticalScale = 100;
}
- FX_DWORD m_dwStatus;
+ uint32_t m_dwStatus;
int32_t m_iStartPos;
int32_t m_iWidth;
int32_t m_iStartChar;
@@ -183,8 +183,8 @@ class CFX_RTFPiece : public CFX_Target {
int32_t m_iFontHeight;
int32_t m_iHorizontalScale;
int32_t m_iVerticalScale;
- FX_DWORD m_dwLayoutStyles;
- FX_DWORD m_dwIdentity;
+ uint32_t m_dwLayoutStyles;
+ uint32_t m_dwIdentity;
CFX_RTFCharArray* m_pChars;
IFX_Unknown* m_pUserData;
};
@@ -192,13 +192,13 @@ typedef CFX_BaseArrayTemplate<CFX_RTFPiece> CFX_RTFPieceArray;
class IFX_RTFBreak {
public:
- static IFX_RTFBreak* Create(FX_DWORD dwPolicies);
+ static IFX_RTFBreak* Create(uint32_t dwPolicies);
virtual ~IFX_RTFBreak() {}
virtual void Release() = 0;
virtual void SetLineBoundary(FX_FLOAT fLineStart, FX_FLOAT fLineEnd) = 0;
virtual void SetLineStartPos(FX_FLOAT fLinePos) = 0;
- virtual FX_DWORD GetLayoutStyles() const = 0;
- virtual void SetLayoutStyles(FX_DWORD dwLayoutStyles) = 0;
+ virtual uint32_t GetLayoutStyles() const = 0;
+ virtual void SetLayoutStyles(uint32_t dwLayoutStyles) = 0;
virtual void SetFont(IFX_Font* pFont) = 0;
virtual void SetFontSize(FX_FLOAT fFontSize) = 0;
virtual void SetTabWidth(FX_FLOAT fTabWidth) = 0;
@@ -216,8 +216,8 @@ class IFX_RTFBreak {
virtual void SetReadingOrder(FX_BOOL bRTL = FALSE) = 0;
virtual void SetAlignment(int32_t iAlignment = FX_RTFLINEALIGNMENT_Left) = 0;
virtual void SetUserData(IFX_Unknown* pUserData) = 0;
- virtual FX_DWORD AppendChar(FX_WCHAR wch) = 0;
- virtual FX_DWORD EndBreak(FX_DWORD dwStatus = FX_RTFBREAK_PieceBreak) = 0;
+ virtual uint32_t AppendChar(FX_WCHAR wch) = 0;
+ virtual uint32_t EndBreak(uint32_t dwStatus = FX_RTFBREAK_PieceBreak) = 0;
virtual int32_t CountBreakPieces() const = 0;
virtual const CFX_RTFPiece* GetBreakPiece(int32_t index) const = 0;
virtual void GetLineRect(CFX_RectF& rect) const = 0;
diff --git a/xfa/fgas/layout/fgas_textbreak.h b/xfa/fgas/layout/fgas_textbreak.h
index dd42fdf030..add156e971 100644
--- a/xfa/fgas/layout/fgas_textbreak.h
+++ b/xfa/fgas/layout/fgas_textbreak.h
@@ -104,11 +104,11 @@ struct FX_TXTRUN {
int32_t iLength;
IFX_Font* pFont;
FX_FLOAT fFontSize;
- FX_DWORD dwStyles;
+ uint32_t dwStyles;
int32_t iHorizontalScale;
int32_t iVerticalScale;
int32_t iCharRotation;
- FX_DWORD dwCharStyles;
+ uint32_t dwCharStyles;
const CFX_RectF* pRect;
FX_WCHAR wLineBreakChar;
FX_BOOL bSkipSpace;
@@ -162,7 +162,7 @@ class CFX_TxtPiece : public CFX_Target {
*pWidths++ = pChar->m_iCharWidth;
}
}
- FX_DWORD m_dwStatus;
+ uint32_t m_dwStatus;
int32_t m_iStartPos;
int32_t m_iWidth;
int32_t m_iStartChar;
@@ -171,7 +171,7 @@ class CFX_TxtPiece : public CFX_Target {
int32_t m_iBidiPos;
int32_t m_iHorizontalScale;
int32_t m_iVerticalScale;
- FX_DWORD m_dwCharStyles;
+ uint32_t m_dwCharStyles;
CFX_TxtCharArray* m_pChars;
void* m_pUserData;
};
@@ -179,13 +179,13 @@ typedef CFX_BaseArrayTemplate<CFX_TxtPiece> CFX_TxtPieceArray;
class IFX_TxtBreak {
public:
- static IFX_TxtBreak* Create(FX_DWORD dwPolicies);
+ static IFX_TxtBreak* Create(uint32_t dwPolicies);
virtual ~IFX_TxtBreak() {}
virtual void Release() = 0;
virtual void SetLineWidth(FX_FLOAT fLineWidth) = 0;
virtual void SetLinePos(FX_FLOAT fLinePos) = 0;
- virtual FX_DWORD GetLayoutStyles() const = 0;
- virtual void SetLayoutStyles(FX_DWORD dwLayoutStyles) = 0;
+ virtual uint32_t GetLayoutStyles() const = 0;
+ virtual void SetLayoutStyles(uint32_t dwLayoutStyles) = 0;
virtual void SetFont(IFX_Font* pFont) = 0;
virtual void SetFontSize(FX_FLOAT fFontSize) = 0;
virtual void SetTabWidth(FX_FLOAT fTabWidth, FX_BOOL bEquidistant) = 0;
@@ -197,12 +197,12 @@ class IFX_TxtBreak {
virtual void SetCharRotation(int32_t iCharRotation) = 0;
virtual void SetCharSpace(FX_FLOAT fCharSpace) = 0;
virtual void SetAlignment(int32_t iAlignment) = 0;
- virtual FX_DWORD GetContextCharStyles() const = 0;
- virtual void SetContextCharStyles(FX_DWORD dwCharStyles) = 0;
+ virtual uint32_t GetContextCharStyles() const = 0;
+ virtual void SetContextCharStyles(uint32_t dwCharStyles) = 0;
virtual void SetCombWidth(FX_FLOAT fCombWidth) = 0;
virtual void SetUserData(void* pUserData) = 0;
- virtual FX_DWORD AppendChar(FX_WCHAR wch) = 0;
- virtual FX_DWORD EndBreak(FX_DWORD dwStatus = FX_TXTBREAK_PieceBreak) = 0;
+ virtual uint32_t AppendChar(FX_WCHAR wch) = 0;
+ virtual uint32_t EndBreak(uint32_t dwStatus = FX_TXTBREAK_PieceBreak) = 0;
virtual int32_t CountBreakChars() const = 0;
virtual int32_t CountBreakPieces() const = 0;
virtual const CFX_TxtPiece* GetBreakPiece(int32_t index) const = 0;