loplugin:mergeclasses

Change-Id: Icf1731dfbd16d85decd2aaf80be4841ac37007fd

5 files changed, 33 insertions, 42 deletions

diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results
index e4d910d4ba3b..2f84a3da9eb9 100644
--- a/compilerplugins/clang/mergeclasses.results
+++ b/compilerplugins/clang/mergeclasses.results
@@ -75,7 +75,6 @@ merge SfxUndoListener with framework::UndoManagerHelper_Impl
 merge StarSymbolToMSMultiFont with StarSymbolToMSMultiFontImpl
 merge StgReader with WW8Reader
 merge SvListView with SvTreeListBox
-merge SvxNodeIdx with EditNodeIdx
 merge SvxPosition with EditPosition
 merge SvxShapeMaster with SdXShape
 merge SvxUnoDrawMSFactory with SvxFmMSFactory
diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx
index 1125257edf82..44491edea3a6 100644
--- a/editeng/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -274,7 +274,7 @@ void EditRTFParser::MovePos( bool const bForward )
             aCurSel.Max(), i18n::CharacterIteratorMode::SKIPCHARACTER);
 }
 
-void EditRTFParser::SetEndPrevPara( SvxNodeIdx*& rpNodePos,
+void EditRTFParser::SetEndPrevPara( EditNodeIdx*& rpNodePos,
                                     sal_Int32& rCntPos )
 {
     // The Intention is to: determine the current insert position of the
@@ -292,7 +292,7 @@ void EditRTFParser::SetEndPrevPara( SvxNodeIdx*& rpNodePos,
     rCntPos = pPrevNode->Len();
 }
 
-bool EditRTFParser::IsEndPara( SvxNodeIdx* pNd, sal_Int32 nCnt ) const
+bool EditRTFParser::IsEndPara( EditNodeIdx* pNd, sal_Int32 nCnt ) const
 {
     return nCnt == ( static_cast<EditNodeIdx*>(pNd)->GetNode()->Len());
 }
@@ -607,7 +607,7 @@ sal_Int32 EditNodeIdx::GetIdx() const
     return mpEditEngine->GetEditDoc().GetPos(mpNode);
 }
 
-SvxNodeIdx* EditNodeIdx::Clone() const
+EditNodeIdx* EditNodeIdx::Clone() const
 {
     return new EditNodeIdx(mpEditEngine, mpNode);
 }
@@ -620,7 +620,7 @@ SvxPosition* EditPosition::Clone() const
     return new EditPosition(mpEditEngine, mpCurSel);
 }
 
-SvxNodeIdx* EditPosition::MakeNodeIdx() const
+EditNodeIdx* EditPosition::MakeNodeIdx() const
 {
     return new EditNodeIdx(mpEditEngine, mpCurSel->Max().GetNode());
 }
diff --git a/editeng/source/editeng/eertfpar.hxx b/editeng/source/editeng/eertfpar.hxx
index 90f41e23a225..b0a577cff97d 100644
--- a/editeng/source/editeng/eertfpar.hxx
+++ b/editeng/source/editeng/eertfpar.hxx
@@ -26,20 +26,6 @@
 
 class EditEngine;
 
-class EditNodeIdx : public SvxNodeIdx
-{
-private:
-    EditEngine*   mpEditEngine;
-    ContentNode*  mpNode;
-
-public:
-    EditNodeIdx(EditEngine* pEE, ContentNode* pNd = NULL);
-
-    virtual sal_Int32   GetIdx() const SAL_OVERRIDE;
-    virtual SvxNodeIdx* Clone() const SAL_OVERRIDE;
-    ContentNode* GetNode() { return mpNode; }
-};
-
 class EditPosition : public SvxPosition
 {
 private:
@@ -56,7 +42,7 @@ public:
     virtual SvxPosition* Clone() const SAL_OVERRIDE;
 
     // clone NodeIndex
-    virtual SvxNodeIdx* MakeNodeIdx() const SAL_OVERRIDE;
+    virtual EditNodeIdx* MakeNodeIdx() const SAL_OVERRIDE;
 };
 
 #define ACTION_INSERTTEXT       1
@@ -80,13 +66,13 @@ protected:
     virtual void        InsertPara() SAL_OVERRIDE;
     virtual void        InsertText() SAL_OVERRIDE;
     virtual void        MovePos( bool bForward = true ) SAL_OVERRIDE;
-    virtual void        SetEndPrevPara( SvxNodeIdx*& rpNodePos,
-                                            sal_Int32& rCntPos ) SAL_OVERRIDE;
+    virtual void        SetEndPrevPara( EditNodeIdx*& rpNodePos,
+                                        sal_Int32& rCntPos ) SAL_OVERRIDE;
 
     virtual void        UnknownAttrToken( int nToken, SfxItemSet* pSet ) SAL_OVERRIDE;
     virtual void        NextToken( int nToken ) SAL_OVERRIDE;
     virtual void        SetAttrInDoc( SvxRTFItemStackType &rSet ) SAL_OVERRIDE;
-    virtual bool        IsEndPara( SvxNodeIdx* pNd, sal_Int32 nCnt ) const SAL_OVERRIDE;
+    virtual bool        IsEndPara( EditNodeIdx* pNd, sal_Int32 nCnt ) const SAL_OVERRIDE;
     virtual void        CalcValue() SAL_OVERRIDE;
     void                CreateStyleSheets();
     SfxStyleSheet*      CreateStyleSheet( SvxRTFStyleType* pRTFStyle );
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 7dbabb8edfe5..1f8349cf0c10 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -1192,8 +1192,8 @@ void SvxRTFItemStackType::SetStartPos( const SvxPosition& rPos )
     nSttCnt = rPos.GetCntIdx();
 }
 
-void SvxRTFItemStackType::MoveFullNode(const SvxNodeIdx &rOldNode,
-    const SvxNodeIdx &rNewNode)
+void SvxRTFItemStackType::MoveFullNode(const EditNodeIdx &rOldNode,
+    const EditNodeIdx &rNewNode)
 {
     bool bSameEndAsStart = (pSttNd == pEndNd);
 
@@ -1232,7 +1232,7 @@ void SvxRTFItemStackType::Compress( const SvxRTFParser& rParser )
         nSttCnt != pTmp->nSttCnt )
         return;
 
-    SvxNodeIdx* pLastNd = pTmp->pEndNd;
+    EditNodeIdx* pLastNd = pTmp->pEndNd;
     sal_Int32 nLastCnt = pTmp->nEndCnt;
 
     SfxItemSet aMrgSet( pTmp->aAttrSet );
diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index 1b795e280135..b0d257b3995d 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -54,13 +54,19 @@ namespace com { namespace sun { namespace star {
 //        Swg - NodePosition is a SwIndex, which is used internally
 // EditEngine - ULONG to list of paragraphs
 
-
-class SvxNodeIdx
+class EditEngine;
+class ContentNode;
+class EditNodeIdx
 {
 public:
-    virtual ~SvxNodeIdx() {}
-    virtual sal_Int32   GetIdx() const = 0;
-    virtual SvxNodeIdx* Clone() const = 0;  // Cloning itself
+    EditNodeIdx(EditEngine* pEE, ContentNode* pNd = NULL);
+    ~EditNodeIdx() {}
+    sal_Int32   GetIdx() const;
+    EditNodeIdx* Clone() const;  // Cloning itself
+    ContentNode* GetNode() { return mpNode; }
+private:
+    EditEngine*   mpEditEngine;
+    ContentNode*  mpNode;
 };
 
 class SvxPosition
@@ -72,7 +78,7 @@ public:
     virtual sal_Int32   GetCntIdx() const = 0;
 
     virtual SvxPosition* Clone() const = 0; // Cloning itself
-    virtual SvxNodeIdx* MakeNodeIdx() const = 0; // Cloning NodeIndex
+    virtual EditNodeIdx* MakeNodeIdx() const = 0; // Cloning NodeIndex
 };
 
 
@@ -266,7 +272,7 @@ protected:
 
     virtual void InsertText() = 0;
     virtual void MovePos( bool bForward = true ) = 0;
-    virtual void SetEndPrevPara( SvxNodeIdx*& rpNodePos,
+    virtual void SetEndPrevPara( EditNodeIdx*& rpNodePos,
                                  sal_Int32& rCntPos )=0;
     virtual void SetAttrInDoc( SvxRTFItemStackType &rSet );
     // for Tokens, which are not evaluated in ReadAttr
@@ -299,7 +305,7 @@ public:
     inline const Color& GetColor( size_t nId ) const;
     const vcl::Font& GetFont( sal_uInt16 nId );      // Changes the default Font
 
-    virtual bool IsEndPara( SvxNodeIdx* pNd, sal_Int32 nCnt ) const = 0;
+    virtual bool IsEndPara( EditNodeIdx* pNd, sal_Int32 nCnt ) const = 0;
 
     // to set a different attribute pool. May only be done prior to CallParser!
     // The maps are not generated anew!
@@ -324,11 +330,11 @@ class EDITENG_DLLPUBLIC SvxRTFItemStackType
 {
     friend class SvxRTFParser;
 
-    SfxItemSet  aAttrSet;
-    SvxNodeIdx  *pSttNd, *pEndNd;
-    sal_Int32 nSttCnt, nEndCnt;
+    SfxItemSet   aAttrSet;
+    EditNodeIdx  *pSttNd, *pEndNd;
+    sal_Int32    nSttCnt, nEndCnt;
     SvxRTFItemStackList* m_pChildList;
-    sal_uInt16 nStyleNo;
+    sal_uInt16   nStyleNo;
 
     SvxRTFItemStackType(SvxRTFItemStackType const&) = delete;
     void operator=(SvxRTFItemStackType const&) = delete;
@@ -348,14 +354,14 @@ public:
     //bad, consider this deprecated.
     void SetStartPos( const SvxPosition& rPos );
 
-    void MoveFullNode(const SvxNodeIdx &rOldNode,
-        const SvxNodeIdx &rNewNode);
+    void MoveFullNode(const EditNodeIdx &rOldNode,
+        const EditNodeIdx &rNewNode);
 
     sal_Int32 GetSttNodeIdx() const { return pSttNd->GetIdx(); }
     sal_Int32 GetEndNodeIdx() const { return pEndNd->GetIdx(); }
 
-    const SvxNodeIdx& GetSttNode() const { return *pSttNd; }
-    const SvxNodeIdx& GetEndNode() const { return *pEndNd; }
+    const EditNodeIdx& GetSttNode() const { return *pSttNd; }
+    const EditNodeIdx& GetEndNode() const { return *pEndNd; }
 
     sal_Int32 GetSttCnt() const { return nSttCnt; }
     sal_Int32 GetEndCnt() const { return nEndCnt; }