summaryrefslogtreecommitdiff
path: root/xfa/src/fgas/src/layout/fx_textbreak.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/src/fgas/src/layout/fx_textbreak.cpp')
-rw-r--r--xfa/src/fgas/src/layout/fx_textbreak.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/xfa/src/fgas/src/layout/fx_textbreak.cpp b/xfa/src/fgas/src/layout/fx_textbreak.cpp
index 80d56c7191..7a740f5212 100644
--- a/xfa/src/fgas/src/layout/fx_textbreak.cpp
+++ b/xfa/src/fgas/src/layout/fx_textbreak.cpp
@@ -216,7 +216,7 @@ void CFX_TxtBreak::SetCombWidth(FX_FLOAT fCombWidth)
{
m_iCombWidth = FXSYS_round(fCombWidth * 20000.0f);
}
-void CFX_TxtBreak::SetUserData(FX_LPVOID pUserData)
+void CFX_TxtBreak::SetUserData(void* pUserData)
{
if (m_pUserData == pUserData) {
return;
@@ -1183,8 +1183,8 @@ int32_t CFX_TxtBreak::GetDisplayPos(FX_LPCTXTRUN pTxtRun, FXTEXT_CHARPOS *pCharP
return 0;
}
IFX_TxtAccess *pAccess = pTxtRun->pAccess;
- FX_LPVOID pIdentity = pTxtRun->pIdentity;
- FX_LPCWSTR pStr = pTxtRun->pStr;
+ void* pIdentity = pTxtRun->pIdentity;
+ const FX_WCHAR* pStr = pTxtRun->pStr;
int32_t *pWidths = pTxtRun->pWidths;
int32_t iLength = pTxtRun->iLength - 1;
IFX_Font *pFont = pTxtRun->pFont;
@@ -1550,8 +1550,8 @@ int32_t CFX_TxtBreak::GetCharRects(FX_LPCTXTRUN pTxtRun, CFX_RectFArray &rtArray
return 0;
}
IFX_TxtAccess *pAccess = pTxtRun->pAccess;
- FX_LPVOID pIdentity = pTxtRun->pIdentity;
- FX_LPCWSTR pStr = pTxtRun->pStr;
+ void* pIdentity = pTxtRun->pIdentity;
+ const FX_WCHAR* pStr = pTxtRun->pStr;
int32_t *pWidths = pTxtRun->pWidths;
int32_t iLength = pTxtRun->iLength;
CFX_RectF rect(*pTxtRun->pRect);