editeng: change EditEngine getter to ref in {Imp}EditView

{Imp}EditView always needs to have EditEngine set (or it would
crash otherwise), so we can change the getter to return a referece
instead of a pointer. This simplifies things a bit because we get
rid of all the nullptr checks and makes the interface more clear.

Also change direct access to mpEditEngine in {Imp}EditView to use
getEditEngine() and getImpEditEngine() (returning a reference)
instead.

Change-Id: Ib8f9c565b8364144bb9c35c3093c4975af1970c7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162333
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>

2 files changed, 8 insertions, 8 deletions

diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index bf0b5bb34951..c49a46517fe3 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -159,6 +159,8 @@ public:
         const OUString& rBaseURL, const EditPaM& rPaM, bool bUseSpecial,
         SotClipboardFormatId format = SotClipboardFormatId::NONE);
 
+    EDITENG_DLLPRIVATE ImpEditEngine& getImpl();
+
 private:
     std::unique_ptr<ImpEditEngine>  pImpEditEngine;
 
diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx
index 01a0e426c09a..09a0429fdd7e 100644
--- a/include/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
@@ -159,13 +159,14 @@ class EDITENG_DLLPUBLIC EditView final
 public:
     typedef std::vector<VclPtr<vcl::Window>> OutWindowSet;
 
-public: // Needed for Undo
-    ImpEditView*    GetImpEditView() const      { return pImpEditView.get(); }
-    ImpEditEngine*  GetImpEditEngine() const;
+    ImpEditView* GetImpEditView() const { return pImpEditView.get(); }
+    ImpEditEngine& getImpEditEngine() const;
+
+    void setEditEngine(EditEngine* pEditEngine);
+    EditEngine& getEditEngine() const;
 
 private:
-    std::unique_ptr<ImpEditView>
-                    pImpEditView;
+    std::unique_ptr<ImpEditView> pImpEditView;
     OUString        aDicNameSingle;
 
                     EditView( const EditView& ) = delete;
@@ -183,9 +184,6 @@ public:
     void setEditViewCallbacks(EditViewCallbacks* pEditViewCallbacks);
     EditViewCallbacks* getEditViewCallbacks() const;
 
-    void            SetEditEngine( EditEngine* pEditEngine );
-    EditEngine*     GetEditEngine() const;
-
     void            SetWindow( vcl::Window* pWin );
     vcl::Window*    GetWindow() const;
     OutputDevice&   GetOutputDevice() const;