diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-09 12:23:51 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-10-12 09:13:33 +0200 |
| commit | 523eaf4888fa7888d66739fb62f4af473dbc9704 (patch) | |
| tree | 1d3f7eb79b24e590ea8094f611948f126a64621c /formula/source | |
| parent | 48532dfa60da3a0a897a26a9ff9cf97e7bf195fd (diff) | |
loplugin:mergeclasses
Change-Id: Ia4c09c5b835e77eaa2d4c0d8c74f146feb0905be
Diffstat (limited to 'formula/source')
| -rw-r--r-- | formula/source/ui/dlg/formula.cxx | 8 | ||||
| -rw-r--r-- | formula/source/ui/dlg/structpg.hxx | 7 |
2 files changed, 7 insertions, 8 deletions
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 2744e87c0cde..2e1f4959cf66 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -85,8 +85,8 @@ public: sal_Int32 GetFunctionPos(sal_Int32 nPos); void ClearAllParas(); - void MakeTree(IStructHelper* _pTree,SvTreeListEntry* pParent,FormulaToken* _pToken,long Count); - void fillTree(IStructHelper* _pTree); + void MakeTree(StructPage* _pTree,SvTreeListEntry* pParent,FormulaToken* _pToken,long Count); + void fillTree(StructPage* _pTree); void UpdateTokenArray( const OUString& rStrExp); OUString RepairFormula(const OUString& aFormula); void FillDialog(bool bFlag=true); @@ -654,7 +654,7 @@ bool FormulaDlg_Impl::CalcStruct( const OUString& rStrExp) } -void FormulaDlg_Impl::MakeTree(IStructHelper* _pTree,SvTreeListEntry* pParent,FormulaToken* _pToken,long Count) +void FormulaDlg_Impl::MakeTree(StructPage* _pTree,SvTreeListEntry* pParent,FormulaToken* _pToken,long Count) { if( _pToken != NULL && Count > 0 ) { @@ -767,7 +767,7 @@ void FormulaDlg_Impl::MakeTree(IStructHelper* _pTree,SvTreeListEntry* pParent,Fo } } -void FormulaDlg_Impl::fillTree(IStructHelper* _pTree) +void FormulaDlg_Impl::fillTree(StructPage* _pTree) { GetFormulaOpCodeMapper(); FormulaToken* pToken = m_pTokenArray->LastRPN(); diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx index de84f7b4b34a..186908e5aa85 100644 --- a/formula/source/ui/dlg/structpg.hxx +++ b/formula/source/ui/dlg/structpg.hxx @@ -67,7 +67,6 @@ public: class StructPage : public TabPage - , public IStructHelper { private: OModuleClient m_aModuleClient; @@ -94,10 +93,10 @@ public: virtual void dispose() SAL_OVERRIDE; void ClearStruct(); - virtual SvTreeListEntry* InsertEntry(const OUString& rText, SvTreeListEntry* pParent, - sal_uInt16 nFlag,sal_uLong nPos=0,IFormulaToken* pScToken=NULL) SAL_OVERRIDE; + SvTreeListEntry* InsertEntry(const OUString& rText, SvTreeListEntry* pParent, + sal_uInt16 nFlag,sal_uLong nPos=0,IFormulaToken* pScToken=NULL); - virtual OUString GetEntryText(SvTreeListEntry* pEntry) const SAL_OVERRIDE; + OUString GetEntryText(SvTreeListEntry* pEntry) const; void SetSelectionHdl( const Link<StructPage&,void>& rLink ) { aSelLink = rLink; } |