sw/source/filter/ww8/ww8par.hxx | 2 +- sw/source/filter/ww8/ww8par5.cxx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit be9644c5b6aeecdb363d4fc9ba4a113c6280ae80 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Wed Aug 24 09:47:53 2022 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Wed Aug 24 11:38:27 2022 +0200 use SwNode instead of SwNodeIndex in WillHavePageDescHere method part of the process of hiding the internals of SwPosition Change-Id: Ib671c8a0588e7e53567b2ed02ff6169226d7c2e1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138752 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 5b9d40230699..e40d0e8d6b33 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -880,7 +880,7 @@ public: bool CurrentSectionIsProtected() const; void PrependedInlineNode(const SwPosition &rPos, const SwNode &rNode); sal_uInt16 CurrentSectionColCount() const; - bool WillHavePageDescHere(const SwNodeIndex& rIdx) const; + bool WillHavePageDescHere(const SwNode&) const; void CreateSep(const tools::Long nTextPos); void InsertSegments(); void JoinNode(const SwPosition &rPos, const SwNode &rNode); diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index bd17737753ef..12b940b96a9d 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -2970,13 +2970,13 @@ sal_uInt16 wwSectionManager::CurrentSectionColCount() const //Will there be a new pagebreak at this position (don't know what type //until later) -bool wwSectionManager::WillHavePageDescHere(const SwNodeIndex& rIdx) const +bool wwSectionManager::WillHavePageDescHere(const SwNode& rNd) const { bool bRet = false; if (!maSegments.empty()) { if (!maSegments.back().IsContinuous() && - maSegments.back().maStart == rIdx) + maSegments.back().maStart == rNd) { bRet = true; } @@ -3469,7 +3469,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, OUString& rStr ) //Will there be a new pagebreak at this position (don't know what type //until later) - if (m_aSectionManager.WillHavePageDescHere(pPos->nNode)) + if (m_aSectionManager.WillHavePageDescHere(pPos->GetNode())) aFltTOX.SetHadPageDescItem(true); // Set start in stack