loplugin:mergeclasses

Change-Id: I0ac98a6fafb48b2be00973ae9fd34f4bc756cd7f

3 files changed, 5 insertions, 24 deletions

diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx
index 44491edea3a6..3a28f1801d1c 100644
--- a/editeng/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -615,7 +615,7 @@ EditNodeIdx* EditNodeIdx::Clone() const
 EditPosition::EditPosition(EditEngine* pEE, EditSelection* pSel) :
     mpEditEngine(pEE), mpCurSel(pSel) {}
 
-SvxPosition* EditPosition::Clone() const
+EditPosition* EditPosition::Clone() const
 {
     return new EditPosition(mpEditEngine, mpCurSel);
 }
diff --git a/editeng/source/editeng/eertfpar.hxx b/editeng/source/editeng/eertfpar.hxx
index b0a577cff97d..bcbbf5d71dcd 100644
--- a/editeng/source/editeng/eertfpar.hxx
+++ b/editeng/source/editeng/eertfpar.hxx
@@ -26,26 +26,7 @@
 
 class EditEngine;
 
-class EditPosition : public SvxPosition
-{
-private:
-    EditEngine*     mpEditEngine;
-    EditSelection*  mpCurSel;
-
-public:
-    EditPosition(EditEngine* pIEE, EditSelection* pSel);
-
-    virtual sal_Int32   GetNodeIdx() const SAL_OVERRIDE;
-    virtual sal_Int32   GetCntIdx() const SAL_OVERRIDE;
-
-    // clone
-    virtual SvxPosition* Clone() const SAL_OVERRIDE;
-
-    // clone NodeIndex
-    virtual EditNodeIdx* MakeNodeIdx() const SAL_OVERRIDE;
-};
 
-#define ACTION_INSERTTEXT       1
 #define ACTION_INSERTPARABRK    2
 
 class EditRTFParser : public SvxRTFParser
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 1f8349cf0c10..653c44ced022 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -99,7 +99,7 @@ SvxRTFParser::~SvxRTFParser()
     delete pDfltColor;
 }
 
-void SvxRTFParser::SetInsPos( const SvxPosition& rNew )
+void SvxRTFParser::SetInsPos( const EditPosition& rNew )
 {
     delete pInsPos;
     pInsPos = rNew.Clone();
@@ -1137,7 +1137,7 @@ SvxRTFStyleType::SvxRTFStyleType( SfxItemPool& rPool, const sal_uInt16* pWhichRa
 
 SvxRTFItemStackType::SvxRTFItemStackType(
         SfxItemPool& rPool, const sal_uInt16* pWhichRange,
-        const SvxPosition& rPos )
+        const EditPosition& rPos )
     : aAttrSet( rPool, pWhichRange )
     , m_pChildList( nullptr )
     , nStyleNo( 0 )
@@ -1150,7 +1150,7 @@ SvxRTFItemStackType::SvxRTFItemStackType(
 
 SvxRTFItemStackType::SvxRTFItemStackType(
         const SvxRTFItemStackType& rCpy,
-        const SvxPosition& rPos,
+        const EditPosition& rPos,
         bool const bCopyAttr )
     : aAttrSet( *rCpy.aAttrSet.GetPool(), rCpy.aAttrSet.GetRanges() )
     , m_pChildList( nullptr )
@@ -1182,7 +1182,7 @@ void SvxRTFItemStackType::Add(std::unique_ptr<SvxRTFItemStackType> pIns)
     m_pChildList->push_back(std::move(pIns));
 }
 
-void SvxRTFItemStackType::SetStartPos( const SvxPosition& rPos )
+void SvxRTFItemStackType::SetStartPos( const EditPosition& rPos )
 {
     if (pSttNd != pEndNd)
         delete pEndNd;