From a8c2b919f7adec510cbca49675ad4a0cd0d30fd9 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 22 Mar 2017 17:41:02 -0700 Subject: Remove dead CFX_Edit code and fix some typos. Change-Id: Ieaac36e06db3d1e2b857d999a7d3d9cd5c5a9506 Reviewed-on: https://pdfium-review.googlesource.com/3118 Commit-Queue: Lei Zhang Reviewed-by: Tom Sepez --- fpdfsdk/pdfwindow/PWL_EditCtrl.cpp | 96 +------------------------------------- fpdfsdk/pdfwindow/PWL_EditCtrl.h | 25 ---------- 2 files changed, 1 insertion(+), 120 deletions(-) (limited to 'fpdfsdk/pdfwindow') diff --git a/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp b/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp index e7371fd0e7..19daae1413 100644 --- a/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp +++ b/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp @@ -21,8 +21,7 @@ CPWL_EditCtrl::CPWL_EditCtrl() : m_pEdit(new CFX_Edit), m_pEditCaret(nullptr), m_bMouseDown(false), - m_nCharSet(FXFONT_DEFAULT_CHARSET), - m_nCodePage(0) {} + m_nCharSet(FXFONT_DEFAULT_CHARSET) {} CPWL_EditCtrl::~CPWL_EditCtrl() {} @@ -314,10 +313,6 @@ bool CPWL_EditCtrl::OnMouseMove(const CFX_PointF& point, uint32_t nFlag) { return true; } -CFX_FloatRect CPWL_EditCtrl::GetContentRect() const { - return m_pEdit->GetContentRect(); -} - void CPWL_EditCtrl::SetEditCaret(bool bVisible) { CFX_PointF ptHead; CFX_PointF ptFoot; @@ -378,26 +373,6 @@ void CPWL_EditCtrl::SelectAll() { m_pEdit->SelectAll(); } -void CPWL_EditCtrl::Paint() { - m_pEdit->Paint(); -} - -void CPWL_EditCtrl::EnableRefresh(bool bRefresh) { - m_pEdit->EnableRefresh(bRefresh); -} - -int32_t CPWL_EditCtrl::GetCaret() const { - return m_pEdit->GetCaret(); -} - -void CPWL_EditCtrl::SetCaret(int32_t nPos) { - m_pEdit->SetCaret(nPos); -} - -int32_t CPWL_EditCtrl::GetTotalWords() const { - return m_pEdit->GetTotalWords(); -} - void CPWL_EditCtrl::SetScrollPos(const CFX_PointF& point) { m_pEdit->SetScrollPos(point); } @@ -406,49 +381,6 @@ CFX_PointF CPWL_EditCtrl::GetScrollPos() const { return m_pEdit->GetScrollPos(); } -CPDF_Font* CPWL_EditCtrl::GetCaretFont() const { - int32_t nFontIndex = 0; - - CFX_Edit_Iterator* pIterator = m_pEdit->GetIterator(); - pIterator->SetAt(m_pEdit->GetCaret()); - CPVT_Word word; - CPVT_Section section; - if (pIterator->GetWord(word)) { - nFontIndex = word.nFontIndex; - } else if (HasFlag(PES_RICH)) { - if (pIterator->GetSection(section)) { - nFontIndex = section.WordProps.nFontIndex; - } - } - - if (IPVT_FontMap* pFontMap = GetFontMap()) - return pFontMap->GetPDFFont(nFontIndex); - - return nullptr; -} - -float CPWL_EditCtrl::GetCaretFontSize() const { - float fFontSize = GetFontSize(); - - CFX_Edit_Iterator* pIterator = m_pEdit->GetIterator(); - pIterator->SetAt(m_pEdit->GetCaret()); - CPVT_Word word; - CPVT_Section section; - if (pIterator->GetWord(word)) { - fFontSize = word.fFontSize; - } else if (HasFlag(PES_RICH)) { - if (pIterator->GetSection(section)) { - fFontSize = section.WordProps.fFontSize; - } - } - - return fFontSize; -} - -void CPWL_EditCtrl::SetText(const CFX_WideString& wsText) { - m_pEdit->SetText(wsText); -} - void CPWL_EditCtrl::CopyText() {} void CPWL_EditCtrl::PasteText() {} @@ -457,11 +389,6 @@ void CPWL_EditCtrl::CutText() {} void CPWL_EditCtrl::ShowVScrollBar(bool bShow) {} -void CPWL_EditCtrl::InsertText(const CFX_WideString& wsText) { - if (!IsReadOnly()) - m_pEdit->InsertText(wsText, FXFONT_DEFAULT_CHARSET); -} - void CPWL_EditCtrl::InsertWord(uint16_t word, int32_t nCharset) { if (!IsReadOnly()) m_pEdit->InsertWord(word, nCharset); @@ -540,11 +467,6 @@ void CPWL_EditCtrl::IOnSetCaret(bool bVisible, OnNotify(this, PNM_SETCARETINFO, (intptr_t)&cInfo, (intptr_t) nullptr); } -void CPWL_EditCtrl::IOnCaretChange(const CPVT_SecProps& secProps, - const CPVT_WordProps& wordProps) {} - -void CPWL_EditCtrl::IOnContentChange(const CFX_FloatRect& rcContent) {} - void CPWL_EditCtrl::IOnInvalidateRect(CFX_FloatRect* pRect) { InvalidateRect(pRect); } @@ -553,22 +475,6 @@ int32_t CPWL_EditCtrl::GetCharSet() const { return m_nCharSet < 0 ? FXFONT_DEFAULT_CHARSET : m_nCharSet; } -void CPWL_EditCtrl::GetTextRange(const CFX_FloatRect& rect, - int32_t& nStartChar, - int32_t& nEndChar) const { - nStartChar = m_pEdit->WordPlaceToWordIndex( - m_pEdit->SearchWordPlace(CFX_PointF(rect.left, rect.top))); - nEndChar = m_pEdit->WordPlaceToWordIndex( - m_pEdit->SearchWordPlace(CFX_PointF(rect.right, rect.bottom))); -} - -CFX_WideString CPWL_EditCtrl::GetText(int32_t& nStartChar, - int32_t& nEndChar) const { - CPVT_WordPlace wpStart = m_pEdit->WordIndexToWordPlace(nStartChar); - CPVT_WordPlace wpEnd = m_pEdit->WordIndexToWordPlace(nEndChar); - return m_pEdit->GetRangeText(CPVT_WordRange(wpStart, wpEnd)); -} - void CPWL_EditCtrl::SetReadyToInput() { if (m_bMouseDown) { ReleaseCapture(); diff --git a/fpdfsdk/pdfwindow/PWL_EditCtrl.h b/fpdfsdk/pdfwindow/PWL_EditCtrl.h index 6977673eac..0f2487bc26 100644 --- a/fpdfsdk/pdfwindow/PWL_EditCtrl.h +++ b/fpdfsdk/pdfwindow/PWL_EditCtrl.h @@ -33,37 +33,18 @@ class CPWL_EditCtrl : public CPWL_Wnd { CPWL_EditCtrl(); ~CPWL_EditCtrl() override; - CFX_FloatRect GetContentRect() const; - CFX_WideString GetText() const; void SetSel(int32_t nStartChar, int32_t nEndChar); void GetSel(int32_t& nStartChar, int32_t& nEndChar) const; - void GetTextRange(const CFX_FloatRect& rect, - int32_t& nStartChar, - int32_t& nEndChar) const; - CFX_WideString GetText(int32_t& nStartChar, int32_t& nEndChar) const; void Clear(); void SelectAll(); - int32_t GetCaret() const; - void SetCaret(int32_t nPos); - int32_t GetTotalWords() const; - - void Paint(); - - void EnableRefresh(bool bRefresh); CFX_PointF GetScrollPos() const; void SetScrollPos(const CFX_PointF& point); void SetCharSet(uint8_t nCharSet) { m_nCharSet = nCharSet; } int32_t GetCharSet() const; - void SetCodePage(int32_t nCodePage) { m_nCodePage = nCodePage; } - int32_t GetCodePage() const { return m_nCodePage; } - - CPDF_Font* GetCaretFont() const; - float GetCaretFontSize() const; - bool CanUndo() const; bool CanRedo() const; void Redo(); @@ -100,14 +81,9 @@ class CPWL_EditCtrl : public CPWL_Wnd { const CFX_PointF& ptHead, const CFX_PointF& ptFoot, const CPVT_WordPlace& place); - void IOnCaretChange(const CPVT_SecProps& secProps, - const CPVT_WordProps& wordProps); - void IOnContentChange(const CFX_FloatRect& rcContent); void IOnInvalidateRect(CFX_FloatRect* pRect); protected: - void InsertText(const CFX_WideString& wsText); - void SetText(const CFX_WideString& wsText); void CopyText(); void PasteText(); void CutText(); @@ -135,7 +111,6 @@ class CPWL_EditCtrl : public CPWL_Wnd { void CreateEditCaret(const PWL_CREATEPARAM& cp); int32_t m_nCharSet; - int32_t m_nCodePage; }; #endif // FPDFSDK_PDFWINDOW_PWL_EDITCTRL_H_ -- cgit v1.2.3