diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-08-10 13:43:56 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-08-14 12:03:26 +0200 |
| commit | edc5240a96f003b9aec8f8d2ce92db39ad603fd7 (patch) | |
| tree | da0faa62c787e15d7368a5dbf48e723c96652e2c /sw/source/filter/html | |
| parent | ab0d9af99b2dc69fa8e7463fb33ca28cbccf484d (diff) | |
rename SwPaM::GetContentNode to GetPointContentNode/GetMarkContentNode
Using a parameter to select point/mark makes the code much harder to
read
Change-Id: Ic24098a6045ff2262d4c808228ded7bf8206fe8b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138085
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/filter/html')
| -rw-r--r-- | sw/source/filter/html/htmlgrin.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/html/swhtml.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index fbc89f00475d..5a7174325166 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -1417,7 +1417,7 @@ void SwHTMLParser::StripTrailingPara() { bool bSetSmallFont = false; - SwContentNode* pCNd = m_pPam->GetContentNode(); + SwContentNode* pCNd = m_pPam->GetPointContentNode(); SwNodeOffset nNodeIdx = m_pPam->GetPoint()->GetNodeIndex(); if( !m_pPam->GetPoint()->GetContentIndex() ) { diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index dd3f4f78839b..a1eb92a17eae 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -813,7 +813,7 @@ void SwHTMLParser::Continue( HtmlTokenId nToken ) { if (!m_pPam->GetPoint()->GetContentIndex() && CanRemoveNode(nNodeIdx)) { - SwContentNode* pCNd = m_pPam->GetContentNode(); + SwContentNode* pCNd = m_pPam->GetPointContentNode(); if( pCNd && pCNd->StartOfSectionIndex()+2 < pCNd->EndOfSectionIndex() && !bHasFlysOrMarks ) { @@ -3032,7 +3032,7 @@ void SwHTMLParser::SetAttr_( bool bChkEnd, bool bBeforeTable, { pFrameFormat->DelFrames(); *aAttrPam.GetPoint() = *pFlyPos; - aAttrPam.GetPoint()->nContent.Assign( aAttrPam.GetContentNode(), + aAttrPam.GetPoint()->nContent.Assign( aAttrPam.GetPointContentNode(), m_aMoveFlyCnts[n] ); SwFormatAnchor aAnchor( rAnchor ); aAnchor.SetType( RndStdIds::FLY_AT_CHAR ); @@ -4612,7 +4612,7 @@ bool SwHTMLParser::HasCurrentParaFlys( bool bNoSurroundOnly, const SwFormatColl *SwHTMLParser::GetCurrFormatColl() const { - const SwContentNode* pCNd = m_pPam->GetContentNode(); + const SwContentNode* pCNd = m_pPam->GetPointContentNode(); return pCNd ? &pCNd->GetAnyFormatColl() : nullptr; } |