Remove unused CFWL_Edit::ValidateNumberChar() and DrawTexBK() They are now dead code. In turn, |m_bSetRange| and |m_iMax| also become unused. Change-Id: I325c70da8a58000d69dac59668756e3a8725f7f2 Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/75850 Reviewed-by: Daniel Hosseinian <dhoss@chromium.org> Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/xfa/fwl/cfwl_edit.cpp b/xfa/fwl/cfwl_edit.cpp index 696be7e..9a44b6c 100644 --- a/xfa/fwl/cfwl_edit.cpp +++ b/xfa/fwl/cfwl_edit.cpp
@@ -322,37 +322,6 @@ m_fScrollOffsetY = fScrollOffset; } -void CFWL_Edit::DrawTextBk(CFGAS_GEGraphics* pGraphics, - const CFX_Matrix* pMatrix) { - CFWL_ThemeBackground param; - param.m_pWidget = this; - param.m_iPart = CFWL_Part::Background; - param.m_bStaticBackground = false; - param.m_dwStates = m_Properties.m_dwStyleExes & FWL_STYLEEXT_EDT_ReadOnly - ? CFWL_PartState_ReadOnly - : CFWL_PartState_Normal; - uint32_t dwStates = (m_Properties.m_dwStates & FWL_WGTSTATE_Disabled); - if (dwStates) - param.m_dwStates = CFWL_PartState_Disabled; - param.m_pGraphics = pGraphics; - param.m_matrix = *pMatrix; - param.m_PartRect = m_ClientRect; - GetThemeProvider()->DrawBackground(param); - - if (!IsShowScrollBar(true) || !IsShowScrollBar(false)) - return; - - CFX_RectF rtScroll = m_pHorzScrollBar->GetWidgetRect(); - - CFX_RectF rtStatic(m_ClientRect.right() - rtScroll.height, - m_ClientRect.bottom() - rtScroll.height, rtScroll.height, - rtScroll.height); - param.m_bStaticBackground = true; - param.m_bMaximize = true; - param.m_PartRect = rtStatic; - GetThemeProvider()->DrawBackground(param); -} - void CFWL_Edit::DrawContent(CFGAS_GEGraphics* pGraphics, const CFX_Matrix* pMatrix) { pGraphics->SaveGraphState(); @@ -909,26 +878,6 @@ pXFAWidget->DisplayCaret(false, pRect); } -bool CFWL_Edit::ValidateNumberChar(wchar_t cNum) { - if (!m_bSetRange) - return true; - - WideString wsText = m_pEditEngine->GetText(); - if (wsText.IsEmpty()) - return cNum != L'0'; - - if (HasSelection()) - return wsText.GetInteger() <= m_iMax; - if (cNum == L'0' && m_CursorPosition == 0) - return false; - - int32_t nLen = wsText.GetLength(); - WideString first = wsText.First(m_CursorPosition); - WideString last = wsText.Last(nLen - m_CursorPosition); - WideString wsNew = first + cNum + last; - return wsNew.GetInteger() <= m_iMax; -} - void CFWL_Edit::InitCaret() { if (m_pCaret) return;
diff --git a/xfa/fwl/cfwl_edit.h b/xfa/fwl/cfwl_edit.h index f6f6fec..51e5e47 100644 --- a/xfa/fwl/cfwl_edit.h +++ b/xfa/fwl/cfwl_edit.h
@@ -108,7 +108,6 @@ void RenderText(CFX_RenderDevice* pRenderDev, const CFX_RectF& clipRect, const CFX_Matrix& mt); - void DrawTextBk(CFGAS_GEGraphics* pGraphics, const CFX_Matrix* pMatrix); void DrawContent(CFGAS_GEGraphics* pGraphics, const CFX_Matrix* pMatrix); void UpdateEditEngine(); @@ -126,7 +125,6 @@ void InitHorizontalScrollBar(); void InitEngine(); void InitCaret(); - bool ValidateNumberChar(wchar_t cNum); bool IsShowScrollBar(bool bVert); bool IsContentHeightOverflow(); void SetCursorPosition(size_t position); @@ -149,9 +147,7 @@ CFX_RectF m_StaticRect; CFX_RectF m_CaretRect; bool m_bLButtonDown = false; - bool m_bSetRange = false; int32_t m_nLimit = -1; - int32_t m_iMax = 0xFFFFFFF; float m_fVAlignOffset = 0.0f; float m_fScrollOffsetX = 0.0f; float m_fScrollOffsetY = 0.0f;