summaryrefslogtreecommitdiff
path: root/xfa/fee
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fee')
-rw-r--r--xfa/fee/fde_txtedtengine.cpp6
-rw-r--r--xfa/fee/fde_txtedtpage.cpp6
-rw-r--r--xfa/fee/fde_txtedtparag.cpp4
-rw-r--r--xfa/fee/fx_wordbreak/fx_wordbreak_impl.cpp4
4 files changed, 10 insertions, 10 deletions
diff --git a/xfa/fee/fde_txtedtengine.cpp b/xfa/fee/fde_txtedtengine.cpp
index 3afd20cf80..d397afd7e3 100644
--- a/xfa/fee/fde_txtedtengine.cpp
+++ b/xfa/fee/fde_txtedtengine.cpp
@@ -1053,7 +1053,7 @@ void CFDE_TxtEdtEngine::UpdatePages() {
}
}
void CFDE_TxtEdtEngine::UpdateTxtBreak() {
- FX_DWORD dwStyle = m_pTextBreak->GetLayoutStyles();
+ uint32_t dwStyle = m_pTextBreak->GetLayoutStyles();
if (m_Param.dwMode & FDE_TEXTEDITMODE_MultiLines) {
dwStyle &= ~FX_TXTLAYOUTSTYLE_SingleLine;
} else {
@@ -1100,7 +1100,7 @@ void CFDE_TxtEdtEngine::UpdateTxtBreak() {
dwStyle &= ~FX_TXTLAYOUTSTYLE_ArabicShapes;
}
m_pTextBreak->SetLayoutStyles(dwStyle);
- FX_DWORD dwAligment = 0;
+ uint32_t dwAligment = 0;
if (m_Param.dwAlignment & FDE_TEXTEDITALIGN_Justified) {
dwAligment |= FX_TXTLINEALIGNMENT_Justified;
} else if (m_Param.dwAlignment & FDE_TEXTEDITALIGN_Distributed) {
@@ -1515,7 +1515,7 @@ FX_BOOL CFDE_TxtEdtEngine::IsFitArea(CFX_WideString& wsText) {
pTextOut->SetFontSize(m_Param.fFontSize);
CFX_RectF rcText;
FXSYS_memset(&rcText, 0, sizeof(rcText));
- FX_DWORD dwStyle = 0;
+ uint32_t dwStyle = 0;
if (!(m_Param.dwMode & FDE_TEXTEDITMODE_MultiLines)) {
dwStyle |= FDE_TTOSTYLE_SingleLine;
}
diff --git a/xfa/fee/fde_txtedtpage.cpp b/xfa/fee/fde_txtedtpage.cpp
index 5ecbceaf40..f75fcd1426 100644
--- a/xfa/fee/fde_txtedtpage.cpp
+++ b/xfa/fee/fde_txtedtpage.cpp
@@ -77,7 +77,7 @@ int32_t CFDE_TxtEdtTextSet::GetDisplayPos(FDE_HVISUALOBJ hText,
CFDE_TxtEdtEngine* pEngine = (CFDE_TxtEdtEngine*)(m_pPage->GetEngine());
const FDE_TXTEDTPARAMS* pTextParams = pEngine->GetEditParams();
IFX_TxtBreak* pBreak = pEngine->GetTextBreak();
- FX_DWORD dwLayoutStyle = pBreak->GetLayoutStyles();
+ uint32_t dwLayoutStyle = pBreak->GetLayoutStyles();
FX_TXTRUN tr;
tr.pAccess = m_pPage;
tr.pIdentity = (void*)hText;
@@ -110,7 +110,7 @@ int32_t CFDE_TxtEdtTextSet::GetCharRects_Impl(FDE_HVISUALOBJ hText,
return 0;
}
const FDE_TXTEDTPARAMS* pTextParams = pEngine->GetEditParams();
- FX_DWORD dwLayoutStyle = pEngine->GetTextBreak()->GetLayoutStyles();
+ uint32_t dwLayoutStyle = pEngine->GetTextBreak()->GetLayoutStyles();
FX_TXTRUN tr;
tr.pAccess = m_pPage;
tr.pIdentity = (void*)hText;
@@ -428,7 +428,7 @@ int32_t CFDE_TxtEdtPage::LoadPage(const CFX_RectF* pClipBox,
m_pTextSet = new CFDE_TxtEdtTextSet(this);
}
m_PieceMassArr.RemoveAll(TRUE);
- FX_DWORD dwBreakStatus = FX_TXTBREAK_None;
+ uint32_t dwBreakStatus = FX_TXTBREAK_None;
int32_t nPieceStart = 0;
if (m_pCharWidth != NULL) {
delete[] m_pCharWidth;
diff --git a/xfa/fee/fde_txtedtparag.cpp b/xfa/fee/fde_txtedtparag.cpp
index 427bbbc2ce..cac8c3c455 100644
--- a/xfa/fee/fde_txtedtparag.cpp
+++ b/xfa/fee/fde_txtedtparag.cpp
@@ -44,7 +44,7 @@ void CFDE_TxtEdtParag::LoadParag() {
int32_t nEndIndex = m_nCharStart + m_nCharCount;
CFX_ArrayTemplate<int32_t> LineBaseArr;
FX_BOOL bReload = FALSE;
- FX_DWORD dwBreakStatus = FX_TXTBREAK_None;
+ uint32_t dwBreakStatus = FX_TXTBREAK_None;
do {
if (bReload) {
dwBreakStatus = pTxtBreak->EndBreak(FX_TXTBREAK_ParagraphBreak);
@@ -105,7 +105,7 @@ void CFDE_TxtEdtParag::CalcLines() {
IFDE_TxtEdtBuf* pTxtBuf = m_pEngine->GetTextBuf();
IFX_CharIter* pIter = new CFDE_TxtEdtBufIter((CFDE_TxtEdtBuf*)pTxtBuf);
int32_t nCount = 0;
- FX_DWORD dwBreakStatus = FX_TXTBREAK_None;
+ uint32_t dwBreakStatus = FX_TXTBREAK_None;
int32_t nEndIndex = m_nCharStart + m_nCharCount;
pIter->SetAt(m_nCharStart);
FX_BOOL bReload = FALSE;
diff --git a/xfa/fee/fx_wordbreak/fx_wordbreak_impl.cpp b/xfa/fee/fx_wordbreak/fx_wordbreak_impl.cpp
index 6b8ae806d6..3f6e240430 100644
--- a/xfa/fee/fx_wordbreak/fx_wordbreak_impl.cpp
+++ b/xfa/fee/fx_wordbreak/fx_wordbreak_impl.cpp
@@ -7,8 +7,8 @@
#include "xfa/fee/fx_wordbreak/fx_wordbreak_impl.h"
FX_WordBreakProp FX_GetWordBreakProperty(FX_WCHAR wcCodePoint) {
- FX_DWORD dwProperty =
- (FX_DWORD)gs_FX_WordBreak_CodePointProperties[wcCodePoint >> 1];
+ uint32_t dwProperty =
+ (uint32_t)gs_FX_WordBreak_CodePointProperties[wcCodePoint >> 1];
return (FX_WordBreakProp)(((wcCodePoint)&1) ? (dwProperty & 0x0F)
: (dwProperty >> 4));
}