restructure WeldEditView for reuse in SwAnnotationWin

Change-Id: I9474553e595780fa61bac955d2d5ebf691408ede
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107437
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

3 files changed, 10 insertions, 10 deletions

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 17a7c8160285..6776662ac5a5 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -951,7 +951,7 @@ void ScInputBarGroup::MakeDialogEditView()
     mxTextWndGroup->MakeDialogEditView();
 }
 
-EditView* ScInputBarGroup::GetEditView()
+EditView* ScInputBarGroup::GetEditView() const
 {
     return mxTextWndGroup->GetEditView();
 }
@@ -1150,7 +1150,7 @@ void ScTextWndGroup::InsertAccessibleTextData(ScAccessibleEditLineTextData& rTex
     mxTextWnd->InsertAccessibleTextData(rTextData);
 }
 
-EditView* ScTextWndGroup::GetEditView()
+EditView* ScTextWndGroup::GetEditView() const
 {
     return mxTextWnd->GetEditView();
 }
@@ -1271,10 +1271,10 @@ void ScTextWnd::Paint( vcl::RenderContext& rRenderContext, const tools::Rectangl
     WeldEditView::Paint(rRenderContext, rRect);
 }
 
-EditView* ScTextWnd::GetEditView()
+EditView* ScTextWnd::GetEditView() const
 {
     if ( !m_xEditView )
-        InitEditEngine();
+        const_cast<ScTextWnd&>(*this).InitEditEngine();
     return m_xEditView.get();
 }
 
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index 318c3986f521..32717bf17cba 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -54,7 +54,7 @@ public:
     virtual const OUString& GetTextString() const = 0;
     virtual void            StartEditEngine() = 0;
     virtual void            StopEditEngine( bool bAll ) = 0;
-    virtual EditView*       GetEditView() = 0;
+    virtual EditView*       GetEditView() const = 0;
     virtual bool            HasEditView() const = 0;
     virtual void            MakeDialogEditView() = 0;
     virtual void            SetFormulaMode( bool bSet ) = 0;
@@ -76,7 +76,7 @@ public:
     virtual const OUString& GetTextString() const override;
 
     bool                    IsInputActive() override;
-    virtual EditView*       GetEditView() override;
+    virtual EditView*       GetEditView() const override;
     virtual bool            HasEditView() const override;
 
     const OutputDevice&     GetEditViewDevice() const;
@@ -205,7 +205,7 @@ public:
     virtual ~ScTextWndGroup() override;
 
     virtual void            InsertAccessibleTextData(ScAccessibleEditLineTextData& rTextData) override;
-    virtual EditView*       GetEditView() override;
+    virtual EditView*       GetEditView() const override;
     const OutputDevice&     GetEditViewDevice() const;
     Point                   GetCursorScreenPixelPos(bool bBelowLine);
     tools::Long             GetLastNumExpandedLines() const;
@@ -247,7 +247,7 @@ public:
     virtual void            RemoveAccessibleTextData(ScAccessibleEditLineTextData& rTextData) override;
     void                    SetTextString(const OUString& rString) override;
     void                    StartEditEngine() override;
-    virtual EditView*       GetEditView() override;
+    virtual EditView*       GetEditView() const override;
     virtual bool            HasEditView() const override;
     Point                   GetCursorScreenPixelPos(bool bBelowLine);
     virtual void            Resize() override;
diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx
index 7d5a9ca521a3..7d67a7500297 100644
--- a/sc/source/ui/inc/tphfedit.hxx
+++ b/sc/source/ui/inc/tphfedit.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SC_SOURCE_UI_INC_TPHFEDIT_HXX
 
 #include <scdllapi.h>
+#include <editutil.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <svx/weldeditview.hxx>
 #include <editeng/svxenum.hxx>
@@ -29,7 +30,6 @@
 
 namespace com::sun::star::accessibility { class XAccessible; }
 
-class ScHeaderEditEngine;
 class ScPatternAttr;
 class EditView;
 class EditTextObject;
@@ -62,7 +62,7 @@ public:
 
     virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
 
-    ScHeaderEditEngine* GetEditEngine() const;
+    ScHeaderEditEngine* GetEditEngine() const override;
     void SetObjectSelectHdl( const Link<ScEditWindow&,void>& aLink) { aObjectSelectLink = aLink; }
     void SetGetFocusHdl(const std::function<void (ScEditWindow&)>& rLink) { m_GetFocusLink = rLink; }