formula/inc/formula/formula.hxx | 17 --------- formula/source/ui/dlg/formula.cxx | 70 -------------------------------------- unusedcode.easy | 14 ------- 3 files changed, 101 deletions(-)
New commits: commit 9f562a82c6ed56824365825a6bc0acf313ebcf28 Author: Felix Zhang <fezh...@suse.com> Date: Thu Oct 20 15:51:38 2011 +0800 remove unused methods from formula::FormulaModalDialog diff --git a/formula/inc/formula/formula.hxx b/formula/inc/formula/formula.hxx index 32643b5..e846ae8 100644 --- a/formula/inc/formula/formula.hxx +++ b/formula/inc/formula/formula.hxx @@ -74,34 +74,17 @@ private: SAL_WNODEPRECATED_DECLARATIONS_POP protected: - void disableOk(); - -protected: virtual long PreNotify( NotifyEvent& rNEvt ); ::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputDoneAfter( sal_Bool bForced = sal_False ); - rtl::OString FindFocusWin(Window *pWin); void SetFocusWin(Window *pWin,const rtl::OString& nUniqueId); - void HighlightFunctionParas(const String& aFormula); void SetMeText(const String& _sText); - FormulaDlgMode SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,sal_Bool bMatrix,sal_Bool _bSelect,sal_Bool _bUpdate); void Update(); sal_Bool CheckMatrix(String& aFormula /*IN/OUT*/); - String GetMeText() const; void Update(const String& _sExp); - void CheckMatrix(); - void DoEnter(sal_Bool _bOk); - sal_Bool isUserMatrix() const; - const IFunctionDescription* getCurrentFunctionDescription() const; - sal_Bool UpdateParaWin(Selection& _rSelection); - void UpdateParaWin(const Selection& _rSelection,const String& _sRefStr); - RefEdit* GetActiveEdit(); - void SetEdSelection(); - - const FormulaHelper& GetFormulaHelper() const; }; class FORMULA_DLLPUBLIC FormulaDlg : public SfxModelessDialog diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index f82ee9b..97ef663 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -1823,44 +1823,15 @@ void FormulaModalDialog::SetMeText(const String& _sText) } // ----------------------------------------------------------------------------- -FormulaDlgMode FormulaModalDialog::SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,sal_Bool bMatrix,sal_Bool _bSelect,sal_Bool _bUpdate) -{ - return m_pImpl->SetMeText(_sText,PrivStart, PrivEnd,bMatrix,_bSelect,_bUpdate); -} -// ----------------------------------------------------------------------------- -void FormulaModalDialog::CheckMatrix() -{ - m_pImpl->aBtnMatrix.Check(); -} -// ----------------------------------------------------------------------------- sal_Bool FormulaModalDialog::CheckMatrix(String& aFormula) { return m_pImpl->CheckMatrix(aFormula); } // ----------------------------------------------------------------------------- -String FormulaModalDialog::GetMeText() const -{ - return m_pImpl->pMEdit->GetText(); -} -// ----------------------------------------------------------------------------- void FormulaModalDialog::Update() { m_pImpl->Update(); } -// ----------------------------------------------------------------------------- -const FormulaHelper& FormulaModalDialog::GetFormulaHelper() const -{ - return m_pImpl->GetFormulaHelper(); -} -// ----------------------------------------------------------------------------- -sal_Bool FormulaModalDialog::isUserMatrix() const -{ - return m_pImpl->bUserMatrixFlag; -} -void FormulaModalDialog::DoEnter(sal_Bool _bOk) -{ - m_pImpl->DoEnter(_bOk); -} ::std::pair<RefButton*,RefEdit*> FormulaModalDialog::RefInputStartBefore( RefEdit* pEdit, RefButton* pButton ) { return m_pImpl->RefInputStartBefore( pEdit, pButton ); @@ -1874,11 +1845,6 @@ void FormulaModalDialog::RefInputDoneAfter( sal_Bool bForced ) m_pImpl->RefInputDoneAfter( bForced ); } -rtl::OString FormulaModalDialog::FindFocusWin(Window *pWin) -{ - return m_pImpl->FindFocusWin( pWin ); -} - void FormulaModalDialog::SetFocusWin(Window *pWin,const rtl::OString& nUniqueId) { if(pWin->GetUniqueId()==nUniqueId) @@ -1897,7 +1863,6 @@ void FormulaModalDialog::SetFocusWin(Window *pWin,const rtl::OString& nUniqueId) } } - long FormulaModalDialog::PreNotify( NotifyEvent& rNEvt ) { m_pImpl->PreNotify( rNEvt ); @@ -1905,41 +1870,6 @@ long FormulaModalDialog::PreNotify( NotifyEvent& rNEvt ) return ModalDialog::PreNotify(rNEvt); } -void FormulaModalDialog::HighlightFunctionParas(const String& aFormula) -{ - m_pImpl->m_pHelper->showReference(aFormula); -} - -void FormulaModalDialog::disableOk() -{ - m_pImpl->aBtnEnd.Disable(); -} -// ----------------------------------------------------------------------------- -const IFunctionDescription* FormulaModalDialog::getCurrentFunctionDescription() const -{ - OSL_VERIFY(!m_pImpl->pFuncDesc || m_pImpl->pFuncDesc->getSuppressedArgumentCount() == m_pImpl->nArgs); - return m_pImpl->pFuncDesc; -} -// ----------------------------------------------------------------------------- -void FormulaModalDialog::UpdateParaWin(const Selection& _rSelection,const String& _sRefStr) -{ - m_pImpl->UpdateParaWin(_rSelection,_sRefStr); -} -sal_Bool FormulaModalDialog::UpdateParaWin(Selection& _rSelection) -{ - return m_pImpl->UpdateParaWin(_rSelection); -} -// ----------------------------------------------------------------------------- -RefEdit* FormulaModalDialog::GetActiveEdit() -{ - return m_pImpl->pParaWin->GetActiveEdit(); -} -// ----------------------------------------------------------------------------- -void FormulaModalDialog::SetEdSelection() -{ - m_pImpl->SetEdSelection(); -} - // -------------------------------------------------------------------------- // Initialisation / General functions for Dialog // -------------------------------------------------------------------------- diff --git a/unusedcode.easy b/unusedcode.easy index 734a352..f7f28f0 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -2147,20 +2147,6 @@ formula::FormulaDlg::HighlightFunctionParas(String const&) formula::FormulaDlg_Impl::EditFuncParas(unsigned short) formula::FormulaDlg_Impl::UpdateFunctionDesc() formula::FormulaListBox::FormulaListBox(Window*, long) -formula::FormulaModalDialog::CheckMatrix() -formula::FormulaModalDialog::DoEnter(unsigned char) -formula::FormulaModalDialog::FindFocusWin(Window*) -formula::FormulaModalDialog::GetActiveEdit() -formula::FormulaModalDialog::GetFormulaHelper() const -formula::FormulaModalDialog::GetMeText() const -formula::FormulaModalDialog::HighlightFunctionParas(String const&) -formula::FormulaModalDialog::SetEdSelection() -formula::FormulaModalDialog::SetMeText(String const&, unsigned short, unsigned short, unsigned char, unsigned char, unsigned char) -formula::FormulaModalDialog::UpdateParaWin(Selection const&, String const&) -formula::FormulaModalDialog::UpdateParaWin(Selection&) -formula::FormulaModalDialog::disableOk() -formula::FormulaModalDialog::getCurrentFunctionDescription() const -formula::FormulaModalDialog::isUserMatrix() const formula::FormulaSubroutineToken::GetTokenArray() const formula::FormulaToken::IsMatrixFunction() const formula::FormulaTokenArray::AddName(unsigned short) _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits