retire most of SwModify

only remaining uses are:
- in calbck.{c,h}xx
- in uwriter unittests
- as a parameter of SwClientNotify

all other uses have been replaced with sw::BroadcastingModify, which
contains sw::BroadcastingMixin functionality. Existing code should then
be moved to sw::BroadcastingMixin (only) as soon as possible.

Change-Id: Ief7895597633c2fcb97e1cbc182905d75feb1567
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105320
Tested-by: Jenkins
Reviewed-by: Bjoern Michaelsen <bjoern.michaelsen@libreoffice.org>

5 files changed, 12 insertions, 10 deletions

diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 1c099696c504..2a053eacd94f 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -457,10 +457,12 @@ protected:
 
     /// use these so we can grep for SwFrame's GetRegisteredIn accesses
     /// beware that SwTextFrame may return sw::WriterMultiListener
-    SwModify        *GetDep()       { return GetRegisteredInNonConst(); }
-    const SwModify  *GetDep() const { return GetRegisteredIn(); }
+    sw::BroadcastingModify* GetDep()
+            { return static_cast<sw::BroadcastingModify*>(GetRegisteredInNonConst()); }
+    const sw::BroadcastingModify* GetDep() const
+            { return static_cast<const sw::BroadcastingModify*>(GetRegisteredIn()); }
 
-    SwFrame( SwModify*, SwFrame* );
+    SwFrame( sw::BroadcastingModify*, SwFrame* );
 
     void CheckDir( SvxFrameDirection nDir, bool bVert, bool bOnlyBiDi, bool bBrowse );
 
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index 9e4565f508cf..c525f59be56e 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -206,7 +206,7 @@ const SwFrame * FindPage( const SwRect &rRect, const SwFrame *pPage );
       with care!
  */
 SwFrame* GetFrameOfModify( const SwRootFrame* pLayout,
-                       SwModify const&,
+                       sw::BroadcastingModify const&,
                        SwFrameType const nFrameType,
                        const SwPosition *pPos = nullptr,
                        std::pair<Point, bool> const* pViewPosAndCalcFrame = nullptr);
@@ -377,7 +377,7 @@ class SwBorderAttrs : public SwCacheObj
     void CalcLineSpacing_();
 
 public:
-    SwBorderAttrs( const SwModify *pOwner, const SwFrame *pConstructor );
+    SwBorderAttrs( const sw::BroadcastingModify *pOwner, const SwFrame *pConstructor );
     virtual ~SwBorderAttrs() override;
 
     const SwAttrSet      &GetAttrSet() const { return m_rAttrSet;  }
@@ -595,7 +595,7 @@ class SwDeletionChecker
 {
 private:
     const SwFrame* mpFrame;
-    const SwModify* mpRegIn;
+    const sw::BroadcastingModify* mpRegIn;
 
 public:
     SwDeletionChecker(const SwFrame* pFrame);
diff --git a/sw/source/core/inc/node2lay.hxx b/sw/source/core/inc/node2lay.hxx
index 56073cd89bde..4475e3a03296 100644
--- a/sw/source/core/inc/node2lay.hxx
+++ b/sw/source/core/inc/node2lay.hxx
@@ -33,7 +33,7 @@
  * assigned to a SectionFrame or to multiple ones due to nesting.
  *
  * This class is an interface between the method and a SwClientIter: it
- * chooses the right SwModify depending on the task, creates a SwClientIter
+ * chooses the right sw::BroadcastingModify depending on the task, creates a SwClientIter
  * and filters its iterations depending on the task.
  * The task is determined by the choice of class.
  *
diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx
index c0506fdf91e6..a67f0ea692e4 100644
--- a/sw/source/core/inc/rolbck.hxx
+++ b/sw/source/core/inc/rolbck.hxx
@@ -421,7 +421,7 @@ private:
 public:
     SwRegHistory( SwHistory* pHst );
     SwRegHistory( const SwNode& rNd, SwHistory* pHst );
-    SwRegHistory( SwModify* pRegIn, const SwNode& rNd, SwHistory* pHst );
+    SwRegHistory( sw::BroadcastingModify* pRegIn, const SwNode& rNd, SwHistory* pHst );
     virtual void SwClientNotify(const SwModify&, const SfxHint& rHint) override;
 
     /// @return true if at least 1 item was inserted
@@ -432,7 +432,7 @@ public:
 
     void AddHint( SwTextAttr* pHt, const bool bNew );
 
-    void RegisterInModify( SwModify* pRegIn, const SwNode& rNd );
+    void RegisterInModify( sw::BroadcastingModify* pRegIn, const SwNode& rNd );
     void ChangeNodeIndex( sal_uLong nNew ) { m_nNodeIndex = nNew; }
 };
 
diff --git a/sw/source/core/inc/unoparaframeenum.hxx b/sw/source/core/inc/unoparaframeenum.hxx
index e3712cf28b8b..4fc8d98f1e63 100644
--- a/sw/source/core/inc/unoparaframeenum.hxx
+++ b/sw/source/core/inc/unoparaframeenum.hxx
@@ -34,7 +34,7 @@ namespace sw
 {
     struct FrameClient : public SwClient
     {
-        FrameClient(SwModify* pModify) : SwClient(pModify) {};
+        FrameClient(sw::BroadcastingModify* pModify) : SwClient(pModify) {};
     };
 }
 struct FrameClientSortListEntry