loplugin:mergeclasses

Change-Id: Ia4c09c5b835e77eaa2d4c0d8c74f146feb0905be

4 files changed, 7 insertions, 22 deletions

diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results
index 2909f76725e0..6d669f132f98 100644
--- a/compilerplugins/clang/mergeclasses.results
+++ b/compilerplugins/clang/mergeclasses.results
@@ -119,7 +119,6 @@ merge dbmm::IMigrationProgress with dbmm::ProgressPage
 merge dbmm::IProgressConsumer with dbmm::ProgressDelegator
 merge dbp::OModuleResourceClient with dbp::OUnoAutoPilot
 merge dbtools::ISQLStatementHelper with connectivity::mysql::OTables
-merge formula::IStructHelper with formula::StructPage
 merge frm::IAttributeHandler with frm::AttributeHandler
 merge frm::ICommandDescriptionProvider with frm::DefaultCommandDescriptionProvider
 merge frm::ICommandImageProvider with frm::DocumentCommandImageProvider
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; }
 
diff --git a/include/formula/IFunctionDescription.hxx b/include/formula/IFunctionDescription.hxx
index 090054e9912e..78920babd827 100644
--- a/include/formula/IFunctionDescription.hxx
+++ b/include/formula/IFunctionDescription.hxx
@@ -109,19 +109,6 @@ namespace formula
         ~IFormulaToken() {}
     };
 
-    class SAL_NO_VTABLE IStructHelper
-    {
-    public:
-        IStructHelper(){}
-        virtual SvTreeListEntry*    InsertEntry(const OUString& rText, SvTreeListEntry* pParent,
-                                sal_uInt16 nFlag,sal_uLong nPos=0,IFormulaToken* pScToken=NULL) = 0;
-
-        virtual OUString        GetEntryText(SvTreeListEntry* pEntry) const = 0;
-
-    protected:
-        ~IStructHelper() {}
-    };
-
     class SAL_NO_VTABLE IFormulaEditorHelper
     {
     public: