diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-14 14:35:04 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-14 18:34:57 +0000 |
commit | 3223c551c37c6b10b5b7de23ffa4520d720338b6 (patch) | |
tree | b6f12badb8470a2ae8acb1c885f27a160d33734f /basctl | |
parent | d7afcb0e72aaa1c8f55b6a82fa40bebc6565c283 (diff) |
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>
Diffstat (limited to 'basctl')
-rw-r--r-- | basctl/source/basicide/baside2.cxx | 4 | ||||
-rw-r--r-- | basctl/source/basicide/baside2.hxx | 16 | ||||
-rw-r--r-- | basctl/source/basicide/baside2b.cxx | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index 7ece04118eb8..9d3f9cffe083 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -560,7 +560,7 @@ void ModulWindow::BasicToggleBreakPointEnabled() { AssertValidEditEngine(); - ExtTextView* pView = GetEditView(); + TextView* pView = GetEditView(); if ( pView ) { TextSelection aSel = pView->GetSelection(); @@ -1211,7 +1211,7 @@ sal_uInt16 ModulWindow::StartSearchAndReplace( const SvxSearchItem& rSearchItem, // one could also relinquish syntaxhighlighting/formatting instead of the stupid replace-everything... AssertValidEditEngine(); - ExtTextView* pView = GetEditView(); + TextView* pView = GetEditView(); TextSelection aSel; if ( bFromStart ) { diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index c8bf2e6a53ca..9a5156072e1e 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -26,9 +26,6 @@ #include "breakpoint.hxx" #include "linenumberwindow.hxx" -class ExtTextEngine; -class ExtTextView; -class SvxSearchItem; #include <svtools/svtabbx.hxx> #include <svtools/headbar.hxx> @@ -50,6 +47,9 @@ class SvxSearchItem; #include <comphelper/syntaxhighlight.hxx> #include <com/sun/star/reflection/XIdlReflection.hpp> +class ExtTextEngine; +class TextView; +class SvxSearchItem; namespace com { namespace sun { namespace star { namespace beans { class XMultiPropertySet; } } } } @@ -74,8 +74,8 @@ friend class CodeCompleteListBox; private: class ChangesListener; - std::unique_ptr<ExtTextView> pEditView; - std::unique_ptr<ExtTextEngine> pEditEngine; + std::unique_ptr<TextView> pEditView; + std::unique_ptr<ExtTextEngine> pEditEngine; ModulWindow& rModulWindow; rtl::Reference< ChangesListener > listener_; @@ -139,7 +139,7 @@ public: virtual void dispose() override; ExtTextEngine* GetEditEngine() const { return pEditEngine.get(); } - ExtTextView* GetEditView() const { return pEditView.get(); } + TextView* GetEditView() const { return pEditView.get(); } void CreateProgress( const OUString& rText, sal_uLong nRange ); void DestroyProgress(); @@ -389,7 +389,7 @@ public: LineNumberWindow& GetLineNumberWindow() { return m_aXEditorWindow->GetLineNumberWindow(); } ScrollBar& GetEditVScrollBar() { return m_aXEditorWindow->GetEWVScrollBar(); } ExtTextEngine* GetEditEngine() { return GetEditorWindow().GetEditEngine(); } - ExtTextView* GetEditView() { return GetEditorWindow().GetEditView(); } + TextView* GetEditView() { return GetEditorWindow().GetEditView(); } BreakPointList& GetBreakPoints() { return GetBreakPointWindow().GetBreakPoints(); } ModulWindowLayout& GetLayout () { return m_rLayout; } @@ -486,7 +486,7 @@ private: void SetMatchingEntries(); // sets the visible entries based on aFuncBuffer variable void HideAndRestoreFocus(); - ExtTextView* GetParentEditView(); + TextView* GetParentEditView(); public: explicit CodeCompleteListBox( CodeCompleteWindow* pPar ); diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index d02782e35e04..64003b6e3622 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -954,7 +954,7 @@ void EditorWindow::CreateEditEngine() return; pEditEngine.reset(new ExtTextEngine); - pEditView.reset(new ExtTextView(pEditEngine.get(), this)); + pEditView.reset(new TextView(pEditEngine.get(), this)); pEditView->SetAutoIndentMode(true); pEditEngine->SetUpdateMode(false); pEditEngine->InsertView(pEditView.get()); @@ -2632,7 +2632,7 @@ IMPL_LINK_NOARG(CodeCompleteListBox, ImplSelectHdl, ListBox&, void) pCodeCompleteWindow->pParent->GrabFocus(); } -ExtTextView* CodeCompleteListBox::GetParentEditView() +TextView* CodeCompleteListBox::GetParentEditView() { return pCodeCompleteWindow->pParent->GetEditView(); } |