move troublesome SetMaster from SwContact down to SwDrawContact

Change-Id: I4fc0565175cda316e5b26c78fd0a05a4e27e527a
Reviewed-on: https://gerrit.libreoffice.org/34699
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>

1 files changed, 2 insertions, 5 deletions

diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index e7a34d129083..958e1a591245 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -114,7 +114,6 @@ public:
 
     virtual const SdrObject *GetMaster() const = 0;
     virtual SdrObject *GetMaster() = 0;
-    virtual void SetMaster( SdrObject* _pNewMaster ) = 0;
 
           SwFrameFormat  *GetFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); }
     const SwFrameFormat  *GetFormat() const
@@ -205,7 +204,6 @@ public:
 
     virtual const SdrObject* GetMaster() const override;
     virtual SdrObject* GetMaster() override;
-    virtual void SetMaster( SdrObject* _pNewMaster ) override;
 
     /** override methods to control Writer fly frames,
      which are linked, and to assure that all objects anchored at/inside the
@@ -311,7 +309,7 @@ bool CheckControlLayer( const SdrObject *pObj );
  in SwClient and the objects themselves in Drawing (SDrObjUserCall). */
 class NestedUserCallHdl;
 
-class SwDrawContact : public SwContact
+class SwDrawContact final : public SwContact
 {
     private:
         /** anchored drawing object instance for the
@@ -377,7 +375,6 @@ class SwDrawContact : public SwContact
         SwDrawContact( const SwDrawContact& ) = delete;
         SwDrawContact& operator=( const SwDrawContact& ) = delete;
 
-    protected:
         virtual void SwClientNotify(const SwModify&, const SfxHint& rHint) override;
 
     public:
@@ -390,7 +387,7 @@ class SwDrawContact : public SwContact
 
         virtual const SdrObject* GetMaster() const override;
         virtual SdrObject* GetMaster() override;
-        virtual void SetMaster( SdrObject* _pNewMaster ) override;
+        void SetMaster( SdrObject* _pNewMaster );
 
         const SwFrame* GetAnchorFrame( const SdrObject* _pDrawObj = nullptr ) const;
         SwFrame* GetAnchorFrame( SdrObject* _pDrawObj = nullptr );