[Libreoffice-commits] core.git: sw/source
Michael Stahl (via logerrit)
logerrit at kemper.freedesktop.org
Tue Nov 17 21:19:46 UTC 2020
sw/source/core/crsr/crbm.cxx | 2 +-
sw/source/core/crsr/crsrsh.cxx | 8 ++++----
sw/source/core/crsr/swcrsr.cxx | 4 ++--
sw/source/core/doc/DocumentContentOperationsManager.cxx | 14 +++++++-------
sw/source/core/doc/DocumentOutlineNodesManager.cxx | 2 +-
sw/source/core/doc/docfmt.cxx | 4 ++--
sw/source/core/doc/docnum.cxx | 6 +++---
sw/source/core/doc/doctxm.cxx | 10 +++++-----
sw/source/core/docnode/ndsect.cxx | 2 +-
sw/source/core/docnode/ndtbl.cxx | 4 ++--
sw/source/core/docnode/node.cxx | 2 +-
sw/source/core/edit/edattr.cxx | 4 ++--
sw/source/core/edit/editsh.cxx | 2 +-
sw/source/core/fields/reffld.cxx | 2 +-
sw/source/core/layout/frmtool.cxx | 14 +++++++-------
sw/source/core/layout/ssfrm.cxx | 2 +-
sw/source/core/text/txtfrm.cxx | 6 +++---
sw/source/core/tox/ToxTextGenerator.cxx | 4 ++--
sw/source/core/tox/tox.cxx | 4 ++--
sw/source/core/tox/txmsrt.cxx | 2 +-
sw/source/core/txtnode/ndtxt.cxx | 12 ++++++------
sw/source/core/txtnode/thints.cxx | 2 +-
sw/source/core/undo/undel.cxx | 4 ++--
sw/source/filter/xml/wrtxml.cxx | 2 +-
24 files changed, 59 insertions(+), 59 deletions(-)
New commits:
commit 8d380d1fe9b6689c9b9b4e8fe95105e0b8831e8f
Author: Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Tue Nov 3 21:32:39 2020 +0100
Commit: Michael Stahl <michael.stahl at cib.de>
CommitDate: Tue Nov 17 22:18:58 2020 +0100
sw_fieldmarkhide: replace IsHideRedlines() with HasMergedParas()
... where obvious.
Change-Id: Id941d59feea5a3539da9006725ef376b14bc7d1c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105982
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl at cib.de>
diff --git a/sw/source/core/crsr/crbm.cxx b/sw/source/core/crsr/crbm.cxx
index 2311cf8d93f6..1b60a3f7e290 100644
--- a/sw/source/core/crsr/crbm.cxx
+++ b/sw/source/core/crsr/crbm.cxx
@@ -126,7 +126,7 @@ namespace sw {
bool IsMarkHidden(SwRootFrame const& rLayout, ::sw::mark::IMark const& rMark)
{
- if (!rLayout.IsHideRedlines())
+ if (!rLayout.HasMergedParas())
{
return false;
}
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index cdb72eec46e9..4e89e80d711b 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -1082,7 +1082,7 @@ bool SwCursorShell::IsSelOnePara() const
{
return true;
}
- if (GetLayout()->IsHideRedlines())
+ if (GetLayout()->HasMergedParas())
{
SwContentFrame const*const pFrame(GetCurrFrame(false));
auto const n(m_pCurrentCursor->GetMark()->nNode.GetIndex());
@@ -1093,7 +1093,7 @@ bool SwCursorShell::IsSelOnePara() const
bool SwCursorShell::IsSttPara() const
{
- if (GetLayout()->IsHideRedlines())
+ if (GetLayout()->HasMergedParas())
{
SwTextNode const*const pNode(m_pCurrentCursor->GetPoint()->nNode.GetNode().GetTextNode());
if (pNode)
@@ -1112,7 +1112,7 @@ bool SwCursorShell::IsSttPara() const
bool SwCursorShell::IsEndPara() const
{
- if (GetLayout()->IsHideRedlines())
+ if (GetLayout()->HasMergedParas())
{
SwTextNode const*const pNode(m_pCurrentCursor->GetPoint()->nNode.GetNode().GetTextNode());
if (pNode)
@@ -2530,7 +2530,7 @@ void SwCursorShell::CallChgLnk()
OUString SwCursorShell::GetSelText() const
{
OUString aText;
- if (GetLayout()->IsHideRedlines())
+ if (GetLayout()->HasMergedParas())
{
SwContentFrame const*const pFrame(GetCurrFrame(false));
if (FrameContainsNode(*pFrame, m_pCurrentCursor->GetMark()->nNode.GetIndex()))
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 4086ae11e899..78b85050a9e0 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -1165,7 +1165,7 @@ struct HideWrapper
, m_rpTextNode(rpTextNode)
, m_rPtPos(rPtPos)
{
- if (pLayout && pLayout->IsHideRedlines())
+ if (pLayout && pLayout->HasMergedParas())
{
m_pFrame = static_cast<SwTextFrame*>(rpTextNode->getLayoutFrame(pLayout));
m_pText = &m_pFrame->GetText();
@@ -1281,7 +1281,7 @@ bool SwCursor::IsStartEndSentence(bool bEnd, SwRootFrame const*const pLayout) co
GetContentNode() && GetPoint()->nContent == GetContentNode()->Len() :
GetPoint()->nContent.GetIndex() == 0;
- if ((pLayout != nullptr && pLayout->IsHideRedlines()) || !bRet)
+ if ((pLayout != nullptr && pLayout->HasMergedParas()) || !bRet)
{
SwCursor aCursor(*GetPoint(), nullptr);
SwPosition aOrigPos = *aCursor.GetPoint();
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 146095349261..1c848cb4d4b9 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -1149,7 +1149,7 @@ namespace //local functions originally from docfmt.cxx
bool ret(false);
SwTextNode *const pTNd = rNode.GetTextNode();
sw::MergedPara const* pMerged(nullptr);
- if (pLayout && pLayout->IsHideRedlines() && pTNd)
+ if (pLayout && pLayout->HasMergedParas() && pTNd)
{
SwTextFrame const*const pTextFrame(static_cast<SwTextFrame const*>(
pTNd->getLayoutFrame(pLayout)));
@@ -1191,7 +1191,7 @@ namespace //local functions originally from docfmt.cxx
}
// input cursor can't be on hidden node, and iteration skips them
- assert(!pLayout || !pLayout->IsHideRedlines()
+ assert(!pLayout || !pLayout->HasMergedParas()
|| rNode.GetRedlineMergeFlag() != SwNode::Merge::Hidden);
if (!pMerged)
@@ -1473,7 +1473,7 @@ namespace //local functions originally from docfmt.cxx
else
{
SwContentNode * pFirstNode(pNode);
- if (pLayout && pLayout->IsHideRedlines())
+ if (pLayout && pLayout->HasMergedParas())
{
pFirstNode = sw::GetFirstAndLastNode(*pLayout, pStt->nNode).first;
}
@@ -1774,7 +1774,7 @@ namespace //local functions originally from docfmt.cxx
if (!pTNd)
continue;
- if (pLayout && pLayout->IsHideRedlines()
+ if (pLayout && pLayout->HasMergedParas()
&& pTNd->GetRedlineMergeFlag() == SwNode::Merge::Hidden)
{ // not really sure what to do here, but applying to hidden
continue; // nodes doesn't make sense...
@@ -3486,7 +3486,7 @@ void DocumentContentOperationsManager::CopyWithFlyInFly(
SwIterator<SwTextFrame, SwTextNode, sw::IteratorMode::UnwrapMulti> aIter(*pEndNode);
for (SwTextFrame* pFrame = aIter.First(); pFrame; pFrame = aIter.Next())
{
- if (pFrame->getRootFrame()->IsHideRedlines())
+ if (pFrame->getRootFrame()->HasMergedParas())
{
frames.insert(pFrame);
}
@@ -3498,7 +3498,7 @@ void DocumentContentOperationsManager::CopyWithFlyInFly(
SwIterator<SwTextFrame, SwTextNode, sw::IteratorMode::UnwrapMulti> aIter(*pEndNode);
for (SwTextFrame* pFrame = aIter.First(); pFrame; pFrame = aIter.Next())
{
- if (pFrame->getRootFrame()->IsHideRedlines())
+ if (pFrame->getRootFrame()->HasMergedParas())
{
auto const it = frames.find(pFrame);
if (it != frames.end())
@@ -3863,7 +3863,7 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
bool DocumentContentOperationsManager::lcl_RstTextAttr( const SwNodePtr& rpNd, void* pArgs )
{
ParaRstFormat* pPara = static_cast<ParaRstFormat*>(pArgs);
- if (pPara->pLayout && pPara->pLayout->IsHideRedlines()
+ if (pPara->pLayout && pPara->pLayout->HasMergedParas()
&& rpNd->GetRedlineMergeFlag() == SwNode::Merge::Hidden)
{
return true; // skip hidden, since new items aren't applied
diff --git a/sw/source/core/doc/DocumentOutlineNodesManager.cxx b/sw/source/core/doc/DocumentOutlineNodesManager.cxx
index 25f3814767bb..cd9729fa2d8b 100644
--- a/sw/source/core/doc/DocumentOutlineNodesManager.cxx
+++ b/sw/source/core/doc/DocumentOutlineNodesManager.cxx
@@ -46,7 +46,7 @@ OUString GetExpandTextMerged(SwRootFrame const*const pLayout,
SwTextNode const& rNode, bool const bWithNumber,
bool const bWithSpacesForLevel, ExpandMode const i_mode)
{
- if (pLayout && pLayout->IsHideRedlines())
+ if (pLayout && pLayout->HasMergedParas())
{
SwTextFrame const*const pFrame(static_cast<SwTextFrame*>(rNode.getLayoutFrame(pLayout)));
if (pFrame)
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 805015216dd8..a27aad094ce2 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -95,7 +95,7 @@ static bool lcl_RstAttr( const SwNodePtr& rpNd, void* pArgs )
{
const sw::DocumentContentOperationsManager::ParaRstFormat* pPara = static_cast<sw::DocumentContentOperationsManager::ParaRstFormat*>(pArgs);
SwContentNode* pNode = rpNd->GetContentNode();
- if (pPara && pPara->pLayout && pPara->pLayout->IsHideRedlines()
+ if (pPara && pPara->pLayout && pPara->pLayout->HasMergedParas()
&& pNode && pNode->GetRedlineMergeFlag() == SwNode::Merge::Hidden)
{
return true;
@@ -998,7 +998,7 @@ static bool lcl_SetTextFormatColl( const SwNodePtr& rpNode, void* pArgs )
sw::DocumentContentOperationsManager::ParaRstFormat* pPara = static_cast<sw::DocumentContentOperationsManager::ParaRstFormat*>(pArgs);
- if (pPara->pLayout && pPara->pLayout->IsHideRedlines())
+ if (pPara->pLayout && pPara->pLayout->HasMergedParas())
{
if (pCNd->GetRedlineMergeFlag() == SwNode::Merge::Hidden)
{
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 35740d0127a6..d84574375112 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -1445,7 +1445,7 @@ namespace sw {
void
GotoPrevLayoutTextFrame(SwNodeIndex & rIndex, SwRootFrame const*const pLayout)
{
- if (pLayout && pLayout->IsHideRedlines())
+ if (pLayout && pLayout->HasMergedParas())
{
if (rIndex.GetNode().IsTextNode())
{
@@ -1473,7 +1473,7 @@ GotoPrevLayoutTextFrame(SwNodeIndex & rIndex, SwRootFrame const*const pLayout)
void
GotoNextLayoutTextFrame(SwNodeIndex & rIndex, SwRootFrame const*const pLayout)
{
- if (pLayout && pLayout->IsHideRedlines())
+ if (pLayout && pLayout->HasMergedParas())
{
if (rIndex.GetNode().IsTextNode())
{
@@ -1830,7 +1830,7 @@ bool SwDoc::MoveParagraph(SwPaM& rPam, tools::Long nOffset, bool const bIsOutlMv
SwRootFrame const* pLayout(nullptr);
for (SwRootFrame const*const pLay : GetAllLayouts())
{
- if (pLay->IsHideRedlines())
+ if (pLay->HasMergedParas())
{
pLayout = pLay;
}
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 8485a422b409..c221b87def1b 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -777,7 +777,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
if (nullptr == pSectNd ||
!pSectNd->GetNodes().IsDocNodes() ||
IsHiddenFlag() ||
- (pLayout->IsHideRedlines() && pSectNd->GetRedlineMergeFlag() == SwNode::Merge::Hidden))
+ (pLayout->HasMergedParas() && pSectNd->GetRedlineMergeFlag() == SwNode::Merge::Hidden))
{
return;
}
@@ -1248,7 +1248,7 @@ void SwTOXBaseSection::UpdateOutline( const SwTextNode* pOwnChapterNode,
pTextNd->getLayoutFrame(pLayout) &&
!pTextNd->IsHiddenByParaField() &&
!pTextNd->HasHiddenCharAttribute( true ) &&
- (!pLayout || !pLayout->IsHideRedlines()
+ (!pLayout || !pLayout->HasMergedParas()
|| static_cast<SwTextFrame*>(pTextNd->getLayoutFrame(pLayout))->GetTextNodeForParaProps() == pTextNd) &&
( !IsFromChapter() ||
::lcl_FindChapterNode(*pTextNd, pLayout) == pOwnChapterNode ))
@@ -1289,7 +1289,7 @@ void SwTOXBaseSection::UpdateTemplate(const SwTextNode* pOwnChapterNode,
if (pTextNd->GetText().getLength() &&
pTextNd->getLayoutFrame(pLayout) &&
pTextNd->GetNodes().IsDocNodes() &&
- (!pLayout || !pLayout->IsHideRedlines()
+ (!pLayout || !pLayout->HasMergedParas()
|| static_cast<SwTextFrame*>(pTextNd->getLayoutFrame(pLayout))->GetTextNodeForParaProps() == pTextNd) &&
(!IsFromChapter() || pOwnChapterNode ==
::lcl_FindChapterNode(*pTextNd, pLayout)))
@@ -1512,7 +1512,7 @@ void SwTOXBaseSection::UpdateContent( SwTOXElement eMyType,
}
if (pCNd->getLayoutFrame(pLayout)
- && (!pLayout || !pLayout->IsHideRedlines()
+ && (!pLayout || !pLayout->HasMergedParas()
|| pCNd->GetRedlineMergeFlag() != SwNode::Merge::Hidden)
&& ( !IsFromChapter() ||
::lcl_FindChapterNode(*pCNd, pLayout) == pOwnChapterNode ))
@@ -1555,7 +1555,7 @@ void SwTOXBaseSection::UpdateTable(const SwTextNode* pOwnChapterNode,
aContentIdx.GetIndex() < pTableNd->EndOfSectionIndex() )
{
if (pCNd->getLayoutFrame(pLayout)
- && (!pLayout || !pLayout->IsHideRedlines()
+ && (!pLayout || !pLayout->HasMergedParas()
|| pCNd->GetRedlineMergeFlag() != SwNode::Merge::Hidden)
&& (!IsFromChapter()
|| ::lcl_FindChapterNode(*pCNd, pLayout) == pOwnChapterNode))
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index cbbeb6d69961..23a7b7e0cc02 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -1072,7 +1072,7 @@ void SwSectionNode::MakeFramesForAdjacentContentNode(const SwNodeIndex & rIdx)
while( nullptr != (pFrame = aNode2Layout.NextFrame()) )
{
OSL_ENSURE( pFrame->IsSctFrame(), "Depend of Section not a Section." );
- if (pFrame->getRootFrame()->IsHideRedlines()
+ if (pFrame->getRootFrame()->HasMergedParas()
&& !rIdx.GetNode().IsCreateFrameWhenHidingRedlines())
{
continue;
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 88530cdb8c19..acca43916522 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -2375,7 +2375,7 @@ void SwTableNode::MakeFramesForAdjacentContentNode(const SwNodeIndex & rIdx)
while( nullptr != (pFrame = aNode2Layout.NextFrame()) )
{
- if (pFrame->getRootFrame()->IsHideRedlines()
+ if (pFrame->getRootFrame()->HasMergedParas()
&& !pNode->IsCreateFrameWhenHidingRedlines())
{
continue;
@@ -2407,7 +2407,7 @@ void SwTableNode::MakeOwnFrames(SwNodeIndex* pIdxBehind)
SwNode2Layout aNode2Layout( *pNd, GetIndex() );
while( nullptr != (pUpper = aNode2Layout.UpperFrame( pFrame, *this )) )
{
- if (pUpper->getRootFrame()->IsHideRedlines()
+ if (pUpper->getRootFrame()->HasMergedParas()
&& !IsCreateFrameWhenHidingRedlines())
{
continue;
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index a26109061725..7c4155f5badf 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -1373,7 +1373,7 @@ void SwContentNode::MakeFramesForAdjacentContentNode(SwContentNode& rNode)
while( nullptr != (pUpper = aNode2Layout.UpperFrame( pFrame, rNode )) )
{
- if (pUpper->getRootFrame()->IsHideRedlines()
+ if (pUpper->getRootFrame()->HasMergedParas()
&& !rNode.IsCreateFrameWhenHidingRedlines())
{
continue;
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index d0a3730e000b..58bb555c2e08 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -155,7 +155,7 @@ bool SwEditShell::GetPaMAttr( SwPaM* pPaM, SfxItemSet& rSet,
{
if( pSet != &rSet )
{
- if (!GetLayout()->IsHideRedlines()
+ if (!GetLayout()->HasMergedParas()
|| pNd->GetRedlineMergeFlag() != SwNode::Merge::Hidden)
{
rSet.MergeValues( aSet );
@@ -211,7 +211,7 @@ bool SwEditShell::GetPaMParAttr( SwPaM* pPaM, SfxItemSet& rSet ) const
// get the node
SwNode* pNd = GetDoc()->GetNodes()[ n ];
- if (GetLayout()->IsHideRedlines()
+ if (GetLayout()->HasMergedParas()
&& pNd->GetRedlineMergeFlag() == SwNode::Merge::Hidden)
{
continue;
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index cacb319b15da..85c065d60fed 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -859,7 +859,7 @@ sal_uInt16 SwEditShell::GetLineCount()
{
SwTextFrame *const pFrame(static_cast<SwTextFrame*>(pContentFrame));
nRet = nRet + pFrame->GetLineCount(TextFrameIndex(COMPLETE_STRING));
- if (GetLayout()->IsHideRedlines())
+ if (GetLayout()->HasMergedParas())
{
if (auto const*const pMerged = pFrame->GetMergedPara())
{
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index b7e75f405d6b..d9f9e361bc65 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -1113,7 +1113,7 @@ namespace sw {
bool IsMarkHintHidden(SwRootFrame const& rLayout,
SwTextNode const& rNode, SwTextAttrEnd const& rHint)
{
- if (!rLayout.IsHideRedlines())
+ if (!rLayout.HasMergedParas())
{
return false;
}
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 95029bbf90e9..fc70c019dfa2 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1382,7 +1382,7 @@ void RecreateStartTextFrames(SwTextNode & rNode)
SwIterator<SwTextFrame, SwTextNode, sw::IteratorMode::UnwrapMulti> aIter(rNode);
for (SwTextFrame* pFrame = aIter.First(); pFrame; pFrame = aIter.Next())
{
- if (pFrame->getRootFrame()->IsHideRedlines())
+ if (pFrame->getRootFrame()->HasMergedParas())
{
frames.push_back(pFrame);
}
@@ -1534,7 +1534,7 @@ void InsertCnt_( SwLayoutFrame *pLay, SwDoc *pDoc,
if ( pNd->IsContentNode() )
{
SwContentNode* pNode = static_cast<SwContentNode*>(pNd);
- if (pLayout->IsHideRedlines() && !pNd->IsCreateFrameWhenHidingRedlines())
+ if (pLayout->HasMergedParas() && !pNd->IsCreateFrameWhenHidingRedlines())
{
if (pNd->IsTextNode()
&& pNd->GetRedlineMergeFlag() == SwNode::Merge::NonFirst)
@@ -1612,7 +1612,7 @@ void InsertCnt_( SwLayoutFrame *pLay, SwDoc *pDoc,
continue;
}
}
- if (pLayout->IsHideRedlines() && !pNd->IsCreateFrameWhenHidingRedlines())
+ if (pLayout->HasMergedParas() && !pNd->IsCreateFrameWhenHidingRedlines())
{
assert(pNd->GetRedlineMergeFlag() == SwNode::Merge::Hidden);
nIndex = pTableNode->EndOfSectionIndex();
@@ -1675,7 +1675,7 @@ void InsertCnt_( SwLayoutFrame *pLay, SwDoc *pDoc,
}
else if ( pNd->IsSectionNode() )
{
- if (pLayout->IsHideRedlines() && !pNd->IsCreateFrameWhenHidingRedlines())
+ if (pLayout->HasMergedParas() && !pNd->IsCreateFrameWhenHidingRedlines())
{
assert(pNd->GetRedlineMergeFlag() == SwNode::Merge::Hidden);
continue; // skip it
@@ -1799,7 +1799,7 @@ void InsertCnt_( SwLayoutFrame *pLay, SwDoc *pDoc,
}
else if ( pNd->IsEndNode() && pNd->StartOfSectionNode()->IsSectionNode() )
{
- if (pLayout->IsHideRedlines() && !pNd->IsCreateFrameWhenHidingRedlines())
+ if (pLayout->HasMergedParas() && !pNd->IsCreateFrameWhenHidingRedlines())
{
assert(pNd->GetRedlineMergeFlag() == SwNode::Merge::Hidden);
continue; // skip it
@@ -1875,7 +1875,7 @@ void InsertCnt_( SwLayoutFrame *pLay, SwDoc *pDoc,
else if( pNd->IsStartNode() &&
SwFlyStartNode == static_cast<SwStartNode*>(pNd)->GetStartNodeType() )
{
- if (pLayout->IsHideRedlines() && !pNd->IsCreateFrameWhenHidingRedlines())
+ if (pLayout->HasMergedParas() && !pNd->IsCreateFrameWhenHidingRedlines())
{
assert(pNd->GetRedlineMergeFlag() == SwNode::Merge::Hidden);
assert(false); // actually a fly-section can't be deleted?
@@ -1890,7 +1890,7 @@ void InsertCnt_( SwLayoutFrame *pLay, SwDoc *pDoc,
}
else
{
- assert(!pLayout->IsHideRedlines()
+ assert(!pLayout->HasMergedParas()
|| pNd->GetRedlineMergeFlag() != SwNode::Merge::Hidden);
// Neither Content nor table nor section, so we are done.
break;
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index 6293b7b33f46..359711c5b4da 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -414,7 +414,7 @@ SwContentFrame::SwContentFrame( SwContentNode * const pContent, SwFrame* pSib )
SwFrame( pContent, pSib ),
SwFlowFrame( static_cast<SwFrame&>(*this) )
{
- assert(!getRootFrame()->IsHideRedlines() || pContent->IsCreateFrameWhenHidingRedlines());
+ assert(!getRootFrame()->HasMergedParas() || pContent->IsCreateFrameWhenHidingRedlines());
}
void SwContentFrame::DestroyImpl()
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index d1a5f9054462..4e2d8af0bcb9 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -306,7 +306,7 @@ namespace sw {
bool IsParaPropsNode(SwRootFrame const& rLayout, SwTextNode const& rNode)
{
- if (rLayout.IsHideRedlines())
+ if (rLayout.HasMergedParas())
{
if (SwTextFrame const*const pFrame = static_cast<SwTextFrame*>(rNode.getLayoutFrame(&rLayout)))
{
@@ -351,7 +351,7 @@ namespace sw {
GetFirstAndLastNode(SwRootFrame const& rLayout, SwNodeIndex const& rPos)
{
SwTextNode *const pTextNode(rPos.GetNode().GetTextNode());
- if (pTextNode && rLayout.IsHideRedlines())
+ if (pTextNode && rLayout.HasMergedParas())
{
if (SwTextFrame const*const pFrame = static_cast<SwTextFrame*>(pTextNode->getLayoutFrame(&rLayout)))
{
@@ -368,7 +368,7 @@ namespace sw {
SwTextNode const& rNode, SwRootFrame const*const pLayout)
{
rNode.SwContentNode::GetAttr(rFormatSet);
- if (pLayout && pLayout->IsHideRedlines())
+ if (pLayout && pLayout->HasMergedParas())
{
auto pFrame = static_cast<SwTextFrame*>(rNode.getLayoutFrame(pLayout));
if (sw::MergedPara const*const pMerged = pFrame ? pFrame->GetMergedPara() : nullptr)
diff --git a/sw/source/core/tox/ToxTextGenerator.cxx b/sw/source/core/tox/ToxTextGenerator.cxx
index 11ced0144d8f..0cd6babd20b1 100644
--- a/sw/source/core/tox/ToxTextGenerator.cxx
+++ b/sw/source/core/tox/ToxTextGenerator.cxx
@@ -80,7 +80,7 @@ ToxTextGenerator::GetNumStringOfFirstNode(const SwTOXSortTabBase& rBase,
if (!pNd) {
return sRet;
}
- if (pLayout && pLayout->IsHideRedlines())
+ if (pLayout && pLayout->HasMergedParas())
{ // note: pNd could be any node, since it could be Sequence etc.
pNd = sw::GetParaPropsNode(*pLayout, SwNodeIndex(*pNd));
}
@@ -366,7 +366,7 @@ ToxTextGenerator::HandleTextToken(const SwTOXSortTabBase& source,
sal_Int32 nOffset(0);
GetAttributesForNode(result, nOffset, *pSrc, stripper, pool, pLayout);
- if (pLayout && pLayout->IsHideRedlines())
+ if (pLayout && pLayout->HasMergedParas())
{
if (SwTextFrame const*const pFrame = static_cast<SwTextFrame*>(pSrc->getLayoutFrame(pLayout)))
{
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index caf5e3732b3f..f201578a84e0 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -176,8 +176,8 @@ void SwTOXMark::Notify(const SfxHint& rHint)
// Check for being hidden
if(rNode.IsHiddenByParaField() || SwScriptInfo::IsInHiddenRange(rNode, rTextMark.GetStart()))
return;
- // Xhwxk for being hidden by hidden redlines
- if(pLayout && pLayout->IsHideRedlines() && sw::IsMarkHintHidden(*pLayout, rNode, rTextMark))
+ // Check for being hidden by hidden redlines
+ if (pLayout && pLayout->HasMergedParas() && sw::IsMarkHintHidden(*pLayout, rNode, rTextMark))
return;
pCollectLayoutHint->m_rMarks.push_back(rTextMark);
}
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index f76dafd6a2a9..d69e57ba2c3b 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -599,7 +599,7 @@ void SwTOXPara::FillText( SwTextNode& rNd, const SwIndex& rInsPos, sal_uInt16,
// sw_redlinehide: this probably won't HideDeletions
pSrc->CopyExpandText( rNd, &rInsPos, 0, -1,
pLayout, false, false, true );
- if (pLayout && pLayout->IsHideRedlines())
+ if (pLayout && pLayout->HasMergedParas())
{
if (SwTextFrame const*const pFrame = static_cast<SwTextFrame*>(pSrc->getLayoutFrame(pLayout)))
{
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 3bd8b721574f..fdac201aa618 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -534,7 +534,7 @@ SwTextNode *SwTextNode::SplitContentNode(const SwPosition & rPos,
SwIterator<SwTextFrame, SwTextNode, sw::IteratorMode::UnwrapMulti> aIter(*this);
for (SwTextFrame* pFrame = aIter.First(); pFrame; pFrame = aIter.Next())
{
- if (pFrame->getRootFrame()->IsHideRedlines())
+ if (pFrame->getRootFrame()->HasMergedParas())
{
isHide = true;
}
@@ -635,7 +635,7 @@ SwTextNode *SwTextNode::SplitContentNode(const SwPosition & rPos,
for (SwTextFrame * pFrame = aIter.First(); pFrame; pFrame = aIter.Next())
{
frames.push_back(pFrame);
- if (pFrame->getRootFrame()->IsHideRedlines())
+ if (pFrame->getRootFrame()->HasMergedParas())
{
isHide = true;
}
@@ -805,7 +805,7 @@ void MoveDeletedPrevFrames(const SwTextNode & rDeletedPrev, SwTextNode & rNode)
SwIterator<SwTextFrame, SwTextNode, sw::IteratorMode::UnwrapMulti> aIter(rDeletedPrev);
for (SwTextFrame* pFrame = aIter.First(); pFrame; pFrame = aIter.Next())
{
- if (pFrame->getRootFrame()->IsHideRedlines())
+ if (pFrame->getRootFrame()->HasMergedParas())
{
frames.push_back(pFrame);
}
@@ -815,7 +815,7 @@ void MoveDeletedPrevFrames(const SwTextNode & rDeletedPrev, SwTextNode & rNode)
SwIterator<SwTextFrame, SwTextNode, sw::IteratorMode::UnwrapMulti> aIt(rNode);
for (SwTextFrame* pFrame = aIt.First(); pFrame; pFrame = aIt.Next())
{
- if (pFrame->getRootFrame()->IsHideRedlines())
+ if (pFrame->getRootFrame()->HasMergedParas())
{
auto const it(std::find(frames2.begin(), frames2.end(), pFrame));
assert(it != frames2.end());
@@ -868,7 +868,7 @@ void CheckResetRedlineMergeFlag(SwTextNode & rNode, Recreate const eRecreateMerg
SwIterator<SwTextFrame, SwTextNode, sw::IteratorMode::UnwrapMulti> aIter(*pMergeNode);
for (SwTextFrame* pFrame = aIter.First(); pFrame; pFrame = aIter.Next())
{
- if (pFrame->getRootFrame()->IsHideRedlines())
+ if (pFrame->getRootFrame()->HasMergedParas())
{
frames.push_back(pFrame);
}
@@ -902,7 +902,7 @@ void CheckResetRedlineMergeFlag(SwTextNode & rNode, Recreate const eRecreateMerg
}
break; // checking once is enough
}
- else if (pFrame->getRootFrame()->IsHideRedlines())
+ else if (pFrame->getRootFrame()->HasMergedParas())
{
rNode.SetRedlineMergeFlag(SwNode::Merge::None);
break; // checking once is enough
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index 297e847e05d9..af1f220fa448 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -2114,7 +2114,7 @@ bool SwTextNode::GetParaAttr(SfxItemSet& rSet, sal_Int32 nStt, sal_Int32 nEnd,
{
assert(!rSet.Count()); // handled inconsistently, typically an error?
- if (pLayout && pLayout->IsHideRedlines())
+ if (pLayout && pLayout->HasMergedParas())
{
if (GetRedlineMergeFlag() == SwNode::Merge::Hidden)
{
diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index 351883c2a557..df3b1caba424 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -127,7 +127,7 @@ static void DelFullParaMoveFrames(SwDoc & rDoc, SwUndRng const& rRange,
SwIterator<SwTextFrame, SwTextNode, sw::IteratorMode::UnwrapMulti> aIter(*pFirstMergedDeletedTextNode);
for (SwTextFrame* pFrame = aIter.First(); pFrame; pFrame = aIter.Next())
{
- if (pFrame->getRootFrame()->IsHideRedlines())
+ if (pFrame->getRootFrame()->HasMergedParas())
{
assert(pFrame->GetMergedPara());
assert(pFrame->GetMergedPara()->pFirstNode == pFirstMergedDeletedTextNode);
@@ -1079,7 +1079,7 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext & rContext)
SwIterator<SwTextFrame, SwTextNode, sw::IteratorMode::UnwrapMulti> aIter(*pNextNode);
for (SwTextFrame* pFrame = aIter.First(); pFrame; pFrame = aIter.Next())
{
- if (pFrame->getRootFrame()->IsHideRedlines())
+ if (pFrame->getRootFrame()->HasMergedParas())
{
frames.push_back(pFrame);
}
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index d8764612cc72..71445d932f4e 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -372,7 +372,7 @@ ErrCode SwXMLWriter::Write_( const uno::Reference < task::XStatusIndicator >& xS
if( m_pDoc->getIDocumentLayoutAccess().GetCurrentViewShell() && m_pDoc->getIDocumentStatistics().GetDocStat().nPage > 1 &&
!(m_bOrganizerMode || m_bBlock || bErr ||
// sw_redlinehide: disable layout cache for now
- m_pDoc->getIDocumentLayoutAccess().GetCurrentLayout()->IsHideRedlines()))
+ m_pDoc->getIDocumentLayoutAccess().GetCurrentLayout()->HasMergedParas()))
{
try
{
More information about the Libreoffice-commits
mailing list