loplugin:mergeclasses merge TextView with ExtTextView

Change-Id: If7e11dd8f6b2cb6dc19c6aa3f7e50e2e88861eac
Reviewed-on: https://gerrit.libreoffice.org/29828
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 15 insertions, 15 deletions

diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index cbb93621468c..105fab557a0c 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -1423,7 +1423,7 @@ void AddressMultiLineEdit::SetText( const OUString& rStr )
 void AddressMultiLineEdit::InsertNewEntry( const OUString& rStr )
 {
     // insert new entry after current selected one.
-    ExtTextView* pTextView = GetTextView();
+    TextView* pTextView = GetTextView();
     const TextSelection& rSelection = pTextView->GetSelection();
     const sal_uInt32 nPara = rSelection.GetStart().GetPara();
     sal_Int32 nIndex = rSelection.GetEnd().GetIndex();
@@ -1453,7 +1453,7 @@ void AddressMultiLineEdit::InsertNewEntryAtPosition( const OUString& rStr, sal_u
     SetText( GetAddress() );
     //select the newly inserted/moved element
     TextSelection aEntrySel(aInsertPos);
-    ExtTextView* pTextView = GetTextView();
+    TextView* pTextView = GetTextView();
     pTextView->SetSelection(aEntrySel);
     m_aSelectionLink.Call(*this);
 }
@@ -1461,7 +1461,7 @@ void AddressMultiLineEdit::InsertNewEntryAtPosition( const OUString& rStr, sal_u
 void AddressMultiLineEdit::RemoveCurrentEntry()
 {
     ExtTextEngine* pTextEngine = GetTextEngine();
-    ExtTextView* pTextView = GetTextView();
+    TextView* pTextView = GetTextView();
     const TextSelection& rSelection = pTextView->GetSelection();
     const TextCharAttrib* pBeginAttrib = pTextEngine->FindCharAttrib( rSelection.GetStart(), TEXTATTR_PROTECTED );
     if(pBeginAttrib &&
@@ -1480,7 +1480,7 @@ void AddressMultiLineEdit::RemoveCurrentEntry()
 void AddressMultiLineEdit::MoveCurrentItem(MoveItemFlags nMove)
 {
     ExtTextEngine* pTextEngine = GetTextEngine();
-    ExtTextView* pTextView = GetTextView();
+    TextView* pTextView = GetTextView();
     const TextSelection& rSelection = pTextView->GetSelection();
     const TextCharAttrib* pBeginAttrib = pTextEngine->FindCharAttrib( rSelection.GetStart(), TEXTATTR_PROTECTED );
     if(pBeginAttrib &&
@@ -1555,7 +1555,7 @@ MoveItemFlags  AddressMultiLineEdit::IsCurrentItemMoveable()
 {
     MoveItemFlags nRet = MoveItemFlags::NONE;
     ExtTextEngine* pTextEngine = GetTextEngine();
-    ExtTextView* pTextView = GetTextView();
+    TextView* pTextView = GetTextView();
     const TextSelection& rSelection = pTextView->GetSelection();
     const TextCharAttrib* pBeginAttrib = pTextEngine->FindCharAttrib( rSelection.GetStart(), TEXTATTR_PROTECTED );
     if(pBeginAttrib &&
@@ -1575,7 +1575,7 @@ MoveItemFlags  AddressMultiLineEdit::IsCurrentItemMoveable()
 bool AddressMultiLineEdit::HasCurrentItem()
 {
     ExtTextEngine* pTextEngine = GetTextEngine();
-    ExtTextView* pTextView = GetTextView();
+    TextView* pTextView = GetTextView();
     const TextSelection& rSelection = pTextView->GetSelection();
     const TextCharAttrib* pBeginAttrib = pTextEngine->FindCharAttrib( rSelection.GetStart(), TEXTATTR_PROTECTED );
     return (pBeginAttrib &&
@@ -1586,7 +1586,7 @@ bool AddressMultiLineEdit::HasCurrentItem()
 OUString AddressMultiLineEdit::GetCurrentItem()
 {
     ExtTextEngine* pTextEngine = GetTextEngine();
-    ExtTextView* pTextView = GetTextView();
+    TextView* pTextView = GetTextView();
     const TextSelection& rSelection = pTextView->GetSelection();
     const TextCharAttrib* pBeginAttrib = pTextEngine->FindCharAttrib( rSelection.GetStart(), TEXTATTR_PROTECTED );
     if(pBeginAttrib &&
@@ -1603,7 +1603,7 @@ OUString AddressMultiLineEdit::GetCurrentItem()
 void AddressMultiLineEdit::SelectCurrentItem()
 {
     ExtTextEngine* pTextEngine = GetTextEngine();
-    ExtTextView* pTextView = GetTextView();
+    TextView* pTextView = GetTextView();
     const TextSelection& rSelection = pTextView->GetSelection();
     const TextCharAttrib* pBeginAttrib = pTextEngine->FindCharAttrib( rSelection.GetStart(), TEXTATTR_PROTECTED );
     if(pBeginAttrib &&
diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx
index 95865fe04031..8f2e3bff6c09 100644
--- a/sw/source/uibase/docvw/srcedtw.cxx
+++ b/sw/source/uibase/docvw/srcedtw.cxx
@@ -519,7 +519,7 @@ void SwSrcEditWindow::CreateTextEngine()
     m_pVScrollbar->Show();
 
     m_pTextEngine = new ExtTextEngine;
-    m_pTextView = new ExtTextView( m_pTextEngine, m_pOutWin );
+    m_pTextView = new TextView( m_pTextEngine, m_pOutWin );
     m_pTextView->SetAutoIndentMode(true);
     m_pOutWin->SetTextView(m_pTextView);
 
diff --git a/sw/source/uibase/inc/srcedtw.hxx b/sw/source/uibase/inc/srcedtw.hxx
index c78199b89b4b..ca5aa38d1535 100644
--- a/sw/source/uibase/inc/srcedtw.hxx
+++ b/sw/source/uibase/inc/srcedtw.hxx
@@ -35,12 +35,12 @@ class ScrollBar;
 class SwSrcView;
 class SwSrcEditWindow;
 class TextEngine;
-class ExtTextView;
+class TextView;
 class DataChangedEvent;
 
 class TextViewOutWin : public vcl::Window
 {
-    ExtTextView*    pTextView;
+    TextView*    pTextView;
 
 protected:
     virtual void    Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) override;
@@ -55,7 +55,7 @@ public:
         TextViewOutWin(vcl::Window* pParent, WinBits nBits) :
             Window(pParent, nBits), pTextView(nullptr){}
 
-    void    SetTextView( ExtTextView* pView ) {pTextView = pView;}
+    void    SetTextView( TextView* pView ) {pTextView = pView;}
 
 };
 
@@ -64,7 +64,7 @@ class SwSrcEditWindow : public vcl::Window, public SfxListener
 private:
     class ChangesListener;
     friend class ChangesListener;
-    ExtTextView*    m_pTextView;
+    TextView*       m_pTextView;
     ExtTextEngine*  m_pTextEngine;
 
     VclPtr<TextViewOutWin> m_pOutWin;
@@ -121,7 +121,7 @@ public:
     void            Read(SvStream& rInput) { m_pTextEngine->Read(rInput); }
     void            Write(SvStream& rOutput) { m_pTextEngine->Write(rOutput); }
 
-    ExtTextView*    GetTextView()
+    TextView*       GetTextView()
                         {return m_pTextView;}
     TextEngine*     GetTextEngine()
                         {return m_pTextEngine;}
diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx
index 554645dbfb52..4967023159e6 100644
--- a/sw/source/uibase/uiview/srcview.cxx
+++ b/sw/source/uibase/uiview/srcview.cxx
@@ -570,7 +570,7 @@ void SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem,
                                                   bool bApi,
                                                   bool bRecursive)
 {
-    ExtTextView* pTextView = aEditWin->GetTextView();
+    TextView* pTextView = aEditWin->GetTextView();
     TextSelection aSel;
     TextPaM aPaM;