summaryrefslogtreecommitdiff
path: root/xfa/fde
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fde')
-rw-r--r--xfa/fde/cfde_txtedtparag.cpp20
-rw-r--r--xfa/fde/cfde_txtedtparag.h2
2 files changed, 11 insertions, 11 deletions
diff --git a/xfa/fde/cfde_txtedtparag.cpp b/xfa/fde/cfde_txtedtparag.cpp
index 11015f59fd..9ba0fa5431 100644
--- a/xfa/fde/cfde_txtedtparag.cpp
+++ b/xfa/fde/cfde_txtedtparag.cpp
@@ -29,7 +29,7 @@ CFDE_TxtEdtParag::~CFDE_TxtEdtParag() {
void CFDE_TxtEdtParag::LoadParag() {
if (m_lpData) {
- ((int32_t*)m_lpData)[0]++;
+ m_lpData[0]++;
return;
}
CFX_TxtBreak* pTxtBreak = m_pEngine->GetTextBreak();
@@ -77,12 +77,12 @@ void CFDE_TxtEdtParag::LoadParag() {
pTxtBreak->ClearBreakPieces();
int32_t nLineCount = LineBaseArr.GetSize();
m_nLineCount = nLineCount;
- if (m_lpData)
- m_lpData = FX_Realloc(int32_t, m_lpData, (nLineCount + 1));
- else
+ if (m_lpData) {
+ m_lpData = FX_Realloc(int32_t, m_lpData, nLineCount + 1);
+ } else {
m_lpData = FX_Alloc(int32_t, nLineCount + 1);
-
- int32_t* pIntArr = (int32_t*)m_lpData;
+ }
+ int32_t* pIntArr = m_lpData;
pIntArr[0] = 1;
m_nLineCount = nLineCount;
pIntArr++;
@@ -93,9 +93,9 @@ void CFDE_TxtEdtParag::LoadParag() {
}
void CFDE_TxtEdtParag::UnloadParag() {
- ((int32_t*)m_lpData)[0]--;
- ASSERT(((int32_t*)m_lpData)[0] >= 0);
- if (((int32_t*)m_lpData)[0] == 0) {
+ m_lpData[0]--;
+ ASSERT(m_lpData[0] >= 0);
+ if (m_lpData[0] == 0) {
FX_Free(m_lpData);
m_lpData = nullptr;
}
@@ -140,7 +140,7 @@ void CFDE_TxtEdtParag::CalcLines() {
void CFDE_TxtEdtParag::GetLineRange(int32_t nLineIndex,
int32_t& nStart,
int32_t& nCount) const {
- int32_t* pLineBaseArr = (int32_t*)m_lpData;
+ int32_t* pLineBaseArr = m_lpData;
ASSERT(nLineIndex < m_nLineCount);
nStart = m_nCharStart;
pLineBaseArr++;
diff --git a/xfa/fde/cfde_txtedtparag.h b/xfa/fde/cfde_txtedtparag.h
index 74eaaff088..4521f3be0c 100644
--- a/xfa/fde/cfde_txtedtparag.h
+++ b/xfa/fde/cfde_txtedtparag.h
@@ -36,7 +36,7 @@ class CFDE_TxtEdtParag {
int32_t m_nCharStart;
int32_t m_nCharCount;
int32_t m_nLineCount;
- void* m_lpData;
+ int32_t* m_lpData;
CFDE_TxtEdtEngine* m_pEngine;
};