Revert "SOSAW080: Added first bunch of basic changes to helpers"

This reverts commit 6c14c27c75a03e2363f2b363ddf0a6f2f46cfa91.

4 files changed, 9 insertions, 14 deletions

diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index 2262eeac6036..87c18ff8dfa0 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -196,7 +196,7 @@ private:
 public:
 
     /// Creates DrawObject and registers it with the Model.
-    SwFlyDrawContact(SwFlyFrameFormat* pToRegisterIn, SdrModel& rTargetModel);
+    SwFlyDrawContact( SwFlyFrameFormat* pToRegisterIn );
     static SwVirtFlyDrawObj* CreateNewRef(SwFlyFrame* pFly, SwFlyFrameFormat* pFormat);
     virtual ~SwFlyDrawContact() override;
 
@@ -240,17 +240,15 @@ class SwDrawVirtObj : public SdrVirtObj
         virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() override;
 
     public:
-        SwDrawVirtObj(
-            SdrModel& rSdrModel,
-            SdrObject& _rNewObj,
-            SwDrawContact& _rDrawContact);
 
+        SwDrawVirtObj( SdrObject&       _rNewObj,
+                       SwDrawContact&   _rDrawContact );
         virtual ~SwDrawVirtObj() override;
 
         /// access to offset
         virtual const Point GetOffset() const override;
 
-        virtual SwDrawVirtObj* Clone(SdrModel* pTargetModel = nullptr) const override;
+        virtual SwDrawVirtObj* Clone() const override;
         SwDrawVirtObj& operator= (const SwDrawVirtObj& rObj);
 
         /// connection to writer layout
diff --git a/sw/inc/dpage.hxx b/sw/inc/dpage.hxx
index 7b3b50e4295d..f905f6834627 100644
--- a/sw/inc/dpage.hxx
+++ b/sw/inc/dpage.hxx
@@ -30,7 +30,6 @@ class SwDoc;
 class SwDPage final : public FmFormPage, public SdrObjUserCall
 {
     SwDPage &operator=(const SwDPage&) = delete;
-    SwDPage(const SwDPage&) = delete;
 
     std::unique_ptr<SdrPageGridFrameList>   pGridLst;
     SwDoc*                                  pDoc;
@@ -39,7 +38,8 @@ public:
     explicit SwDPage(SwDrawModel& rNewModel, bool bMasterPage);
     virtual ~SwDPage() override;
 
-    virtual SwDPage* Clone(SdrModel* pNewModel = nullptr) const override;
+    virtual SwDPage* Clone() const override;
+    virtual SwDPage* Clone(SdrModel* pNewModel) const override;
 
     // #i3694#
     // This GetOffset() method is not needed anymore, it even leads to errors.
@@ -54,7 +54,9 @@ public:
     virtual css::uno::Reference< css::uno::XInterface > createUnoPage() override;
 
 private:
-    void lateInit(const SwDPage& rSrcPage);
+    void lateInit(const SwDPage& rPage, SwDrawModel* pNewModel);
+
+    SwDPage(const SwDPage& rSrcPage);
 };
 
 #endif // INCLUDED_SW_INC_DPAGE_HXX
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index 01cf869b8e10..e90b808df8dd 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -38,8 +38,6 @@ class SwContact;
 class SdrObject;
 class SwRootFrame;
 class SwFlyDrawContact;
-class SdrModel;
-
 namespace sw
 {
     class DocumentLayoutManager;
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index eb0964f922c6..eebd5d27474f 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -200,9 +200,6 @@ private:
     using SfxBaseModel::removeEventListener;
 
 protected:
-    /** abstract SdrModel provider */
-    virtual SdrModel* getSdrModelFromUnoModel() const override;
-
     virtual ~SwXTextDocument() override;
 public:
     SwXTextDocument(SwDocShell* pShell);