sw/source/filter/basflt/fltshell.cxx | 2 +-
sw/source/filter/inc/fltshell.hxx | 2 +-
sw/source/filter/ww8/ww8par6.cxx | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 2fddd7abe6c237ca8beabf51c159848d46c5d0ff
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sat Aug 20 09:21:13 2022 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Aug 20 12:25:41 2022 +0200
SwNodeIndex->SwNode in StealAttr
Change-Id: Ieb808380b7eeeca1568945765c80d12c5ae9fc0d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138570
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/source/filter/basflt/fltshell.cxx
b/sw/source/filter/basflt/fltshell.cxx
index 309a5289013a..0c4dde61b69f 100644
--- a/sw/source/filter/basflt/fltshell.cxx
+++ b/sw/source/filter/basflt/fltshell.cxx
@@ -287,7 +287,7 @@ void SwFltControlStack::DeleteAndDestroy(Entries::size_type
nCnt)
// type. This makes them disappear from the doc structure. Only
// attributes from the same paragraph as rPos are removed. Used for
// graphic apos -> images.
-void SwFltControlStack::StealAttr(const SwNodeIndex& rNode)
+void SwFltControlStack::StealAttr(const SwNode& rNode)
{
size_t nCnt = m_Entries.size();
diff --git a/sw/source/filter/inc/fltshell.hxx
b/sw/source/filter/inc/fltshell.hxx
index 2d3661e84b64..edf724f0a1f1 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -147,7 +147,7 @@ public:
virtual SwFltStackEntry* SetAttr(const SwPosition& rPos, sal_uInt16
nAttrId, bool bTstEnd=true, tools::Long nHand = LONG_MAX, bool
consumedByField=false);
- void StealAttr(const SwNodeIndex& rNode);
+ void StealAttr(const SwNode& rNode);
void MarkAllAttrsOld();
void KillUnlockedAttrs(const SwPosition& pPos);
SfxPoolItem* GetFormatStackAttr(sal_uInt16 nWhich, sal_uInt16 * pPos);
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 56c5fed93857..873d1d9b2bfc 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2559,7 +2559,7 @@ bool SwWW8ImplReader::JoinNode(SwPaM &rPam, bool
bStealAttr)
m_aSectionManager.JoinNode(*rPam.GetPoint(), aPref.GetNode());
rPam.GetPoint()->Assign(*pNode, pNode->GetText().getLength());
if (bStealAttr)
- m_xCtrlStck->StealAttr(rPam.GetPoint()->nNode);
+ m_xCtrlStck->StealAttr(rPam.GetPoint()->GetNode());
if (m_oLastAnchorPos || m_xPreviousNode || (m_xSFlyPara &&
m_xSFlyPara->xMainTextPos))
{
