summaryrefslogtreecommitdiff
path: root/sw/source/filter
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@libreoffice.org>2020-11-05 00:55:00 +0100
committerBjoern Michaelsen <bjoern.michaelsen@libreoffice.org>2020-11-05 14:10:32 +0100
commitc44fa10aa2a04945196622c73272c775374be486 (patch)
tree0935924be251a34392b04818aef59673a5a0bf82 /sw/source/filter
parentc967a7f0130d804a73fa7073c4a1703fcd51bd75 (diff)
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>
Diffstat (limited to 'sw/source/filter')
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx2
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx4
-rw-r--r--sw/source/filter/ww8/wrtw8sty.cxx2
-rw-r--r--sw/source/filter/ww8/wrtww8.hxx4
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx2
5 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 97437d754923..fdfec6fde53a 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -1138,7 +1138,7 @@ void MSWord_SdrAttrIter::OutAttr( sal_Int32 nSwPos )
if (aTextAtrArr.empty())
return;
- const SwModify* pOldMod = m_rExport.m_pOutFormatNode;
+ const sw::BroadcastingModify* pOldMod = m_rExport.m_pOutFormatNode;
m_rExport.m_pOutFormatNode = nullptr;
const SfxItemPool* pSrcPool = pEditPool;
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 96d12e8afe43..a59a13fe4766 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -499,7 +499,7 @@ void SwWW8AttrIter::OutAttr( sal_Int32 nSwPos, bool bWriteCombChars)
if ( !aExportItems.empty() )
{
- const SwModify* pOldMod = m_rExport.m_pOutFormatNode;
+ const sw::BroadcastingModify* pOldMod = m_rExport.m_pOutFormatNode;
m_rExport.m_pOutFormatNode = &rNd;
m_rExport.m_aCurrentCharPropStarts.push( nSwPos );
@@ -3060,7 +3060,7 @@ void MSWordExportBase::OutputTextNode( SwTextNode& rNode )
{ // Para-Attrs
m_pStyAttr = &rNode.GetAnyFormatColl().GetAttrSet();
- const SwModify* pOldMod = m_pOutFormatNode;
+ const sw::BroadcastingModify* pOldMod = m_pOutFormatNode;
m_pOutFormatNode = &rNode;
// Pap-Attrs, so script is not necessary
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 3917f7ff2fa6..caae58fbb163 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -447,7 +447,7 @@ void WW8AttributeOutput::StartStyle( const OUString& rName, StyleType eType, sal
void MSWordStyles::SetStyleDefaults( const SwFormat& rFormat, bool bPap )
{
- const SwModify* pOldMod = m_rExport.m_pOutFormatNode;
+ const sw::BroadcastingModify* pOldMod = m_rExport.m_pOutFormatNode;
m_rExport.m_pOutFormatNode = &rFormat;
bool aFlags[ RES_FRMATR_END - RES_CHRATR_BEGIN ];
sal_uInt16 nStt, nEnd, n;
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index c7c1e3b14d05..3ad49714fac3 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -35,6 +35,7 @@
#include <msfilter.hxx>
#include <expfld.hxx>
#include "WW8TableInfo.hxx"
+#include <calbck.hxx>
#include <vcl/graph.hxx>
@@ -82,7 +83,6 @@ class SwFormatContent;
class SwFormatFootnote;
class SwFrameFormat;
class SwGrfNode;
-class SwModify;
class SwNumFormat;
class SwNumRule;
class SwNumRuleTable;
@@ -528,7 +528,7 @@ public:
// graphics inside tables
std::unique_ptr<SwWW8WrGrf> m_pGrf;
const SwAttrSet* m_pStyAttr; // StyleAttr for Tabs
- const SwModify* m_pOutFormatNode; // write Format or Node
+ const sw::BroadcastingModify* m_pOutFormatNode; // write Format or Node
const SwFormat *m_pCurrentStyle; // iff bStyDef=true, then this store the current style
MainTextPlcDrawObj *m_pSdrObjs; // Draw-/Fly-Objects
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 29bb0369ded2..cc66c44952c0 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -760,7 +760,7 @@ bool WW8Export::DisallowInheritingOutlineNumbering(const SwFormat &rFormat)
void MSWordExportBase::OutputFormat( const SwFormat& rFormat, bool bPapFormat, bool bChpFormat, bool bFlyFormat )
{
bool bCallOutSet = true;
- const SwModify* pOldMod = m_pOutFormatNode;
+ const sw::BroadcastingModify* pOldMod = m_pOutFormatNode;
m_pOutFormatNode = &rFormat;
switch( rFormat.Which() )