summaryrefslogtreecommitdiff
path: root/xfa/src/fwl
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/src/fwl')
-rw-r--r--xfa/src/fwl/src/basewidget/fwl_caretimp.cpp7
-rw-r--r--xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp2
-rw-r--r--xfa/src/fwl/src/basewidget/fwl_editimp.cpp2
-rw-r--r--xfa/src/fwl/src/basewidget/include/fwl_caretimp.h4
-rw-r--r--xfa/src/fwl/src/lightwidget/listbox.cpp2
5 files changed, 8 insertions, 9 deletions
diff --git a/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp b/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp
index ddd3db38cf..62fb997a49 100644
--- a/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp
+++ b/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp
@@ -128,9 +128,10 @@ FX_BOOL CFWL_CaretImp::DrawCaretBK(CFX_Graphics* pGraphics,
pTheme->DrawBackground(&param);
return FWL_ERR_Succeeded;
}
-CFWL_CaretImp::CFWL_CaretTimer::CFWL_CaretTimer(CFWL_CaretImp* m_pCaret) {
- this->m_pCaret = m_pCaret;
-}
+
+CFWL_CaretImp::CFWL_CaretTimer::CFWL_CaretTimer(CFWL_CaretImp* pCaret)
+ : m_pCaret(pCaret) {}
+
int32_t CFWL_CaretImp::CFWL_CaretTimer::Run(FWL_HTIMER hTimer) {
if (m_pCaret->GetStates() & FWL_STATE_CAT_HightLight) {
m_pCaret->SetStates(FWL_STATE_CAT_HightLight, FALSE);
diff --git a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp
index 8161acd4c3..85e8416c76 100644
--- a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp
+++ b/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp
@@ -1324,7 +1324,7 @@ void CFWL_ComboBoxImp::DisForm_Layout() {
FX_FLOAT borderWidth = 0;
{ borderWidth = FWL_PART_CMB_Border; }
FX_FLOAT fBtn = *pFWidth;
- if (!(this->GetStylesEx() & FWL_STYLEEXT_CMB_ReadOnly)) {
+ if (!(GetStylesEx() & FWL_STYLEEXT_CMB_ReadOnly)) {
m_rtBtn.Set(m_rtClient.right() - fBtn, m_rtClient.top + borderWidth,
fBtn - borderWidth, m_rtClient.height - 2 * borderWidth);
}
diff --git a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp
index ff3300b23b..0a5f6be6a5 100644
--- a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp
+++ b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp
@@ -433,7 +433,7 @@ void CFWL_EditImp::DrawSpellCheck(CFX_Graphics* pGraphics,
FX_FLOAT fOffSetX = m_rtEngine.left - m_fScrollOffsetX;
FX_FLOAT fOffSetY = m_rtEngine.top - m_fScrollOffsetY + m_fVAlignOffset;
CFX_WideString wsSpell;
- this->GetText(wsSpell);
+ GetText(wsSpell);
int32_t nContentLen = wsSpell.GetLength();
for (int i = 0; i < nContentLen; i++) {
if (FX_EDIT_ISLATINWORD(wsSpell[i])) {
diff --git a/xfa/src/fwl/src/basewidget/include/fwl_caretimp.h b/xfa/src/fwl/src/basewidget/include/fwl_caretimp.h
index 49a1e02613..867efe545c 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_caretimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_caretimp.h
@@ -40,10 +40,10 @@ class CFWL_CaretImp : public CFWL_WidgetImp {
const CFX_Matrix* pMatrix);
class CFWL_CaretTimer : public IFWL_Timer {
public:
- CFWL_CaretTimer(CFWL_CaretImp* m_pCaret);
+ explicit CFWL_CaretTimer(CFWL_CaretImp* pCaret);
~CFWL_CaretTimer() override {}
int32_t Run(FWL_HTIMER hTimer) override;
- CFWL_CaretImp* m_pCaret;
+ CFWL_CaretImp* const m_pCaret;
};
CFWL_CaretTimer* m_pTimer;
FWL_HTIMER m_hTimer;
diff --git a/xfa/src/fwl/src/lightwidget/listbox.cpp b/xfa/src/fwl/src/lightwidget/listbox.cpp
index eb212fadca..4e6f4b8a47 100644
--- a/xfa/src/fwl/src/lightwidget/listbox.cpp
+++ b/xfa/src/fwl/src/lightwidget/listbox.cpp
@@ -47,8 +47,6 @@ FX_BOOL CFWL_ListBox::DeleteString(FWL_HLISTITEM hItem) {
static_cast<size_t>(nIndex) >= m_ListBoxDP.m_ItemArray.size()) {
return FALSE;
}
- CFWL_ListItem* pDelItem =
- reinterpret_cast<CFWL_ListItem*>(m_ListBoxDP.GetItem(m_pIface, nIndex));
int32_t iCount = m_ListBoxDP.CountItems(m_pIface);
int32_t iSel = nIndex + 1;
if (iSel >= iCount) {