sw/inc/ndtxt.hxx | 3 --
sw/source/core/txtnode/ndtxt.cxx | 4 ++
sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx | 3 --
sw/source/uibase/docvw/edtwin.cxx | 3 --
sw/source/uibase/shells/basesh.cxx | 12 ++------
sw/source/uibase/wrtsh/wrtsh1.cxx | 23 ++++-------------
6 files changed, 15 insertions(+), 33 deletions(-)
New commits:
commit 026e52441be266a3cbe9e2e19d9ff0c4c568542b
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Fri Nov 22 13:11:08 2024 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Nov 22 15:19:42 2024 +0100
sw: no need to pass a bool as a reference
Change-Id: I62aabd66d368856959be032d866888b82b018dd9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177018
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 9b3736e69ac2..74dc4ef031cb 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -655,10 +655,9 @@ public:
/**
* @brief GetAttrOutlineContentVisible
- * @param bOutlineContentVisibleAttr the value stored in
RES_PARATR_GRABBAG for 'OutlineContentVisibleAttr'
* @return true if 'OutlineContentVisibleAttr' is found in
RES_PARATR_GRABBAG
*/
- void GetAttrOutlineContentVisible(bool& bOutlineContentVisibleAttr);
+ bool GetAttrOutlineContentVisible();
void SetAttrOutlineContentVisible(bool bVisible);
bool IsEmptyListStyleDueToSetOutlineLevelAttr() const { return
mbEmptyListStyleSetDueToSetOutlineLevelAttr;}
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 3c4c4fbd4561..16df75aec25a 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -4201,12 +4201,14 @@ void SwTextNode::SetAttrOutlineLevel(int nLevel)
}
}
-void SwTextNode::GetAttrOutlineContentVisible(bool& bOutlineContentVisibleAttr)
+bool SwTextNode::GetAttrOutlineContentVisible()
{
+ bool bOutlineContentVisibleAttr = true;
const SfxGrabBagItem & rGrabBagItem = GetAttr(RES_PARATR_GRABBAG);
auto it =
rGrabBagItem.GetGrabBag().find(u"OutlineContentVisibleAttr"_ustr);
if (it != rGrabBagItem.GetGrabBag().end())
it->second >>= bOutlineContentVisibleAttr;
+ return bOutlineContentVisibleAttr;
}
void SwTextNode::SetAttrOutlineContentVisible(bool bVisible)
diff --git a/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx
b/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx
index eebc0e905f14..9c7bf7d4b08e 100644
--- a/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx
+++ b/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx
@@ -115,8 +115,7 @@ void SwOutlineContentVisibilityWin::Set()
(void)rOutlineNodes.Seek_Entry(pTextNode, &m_nOutlinePos);
// set symbol displayed on button
- bool bVisible = true;
- const_cast<SwTextNode*>(pTextNode)->GetAttrOutlineContentVisible(bVisible);
+ bool bVisible =
const_cast<SwTextNode*>(pTextNode)->GetAttrOutlineContentVisible();
SetSymbol(bVisible ? ButtonSymbol::HIDE : ButtonSymbol::SHOW);
// set quick help
diff --git a/sw/source/uibase/docvw/edtwin.cxx
b/sw/source/uibase/docvw/edtwin.cxx
index 4736ef280a51..7680cc4ebb0e 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -7072,8 +7072,7 @@ void SwEditWin::ToggleOutlineContentVisibility(const
size_t nOutlinePos, const b
if (!bSubs || rSh.GetViewOptions()->IsTreatSubOutlineLevelsAsContent())
{
SwNode* pNode = rSh.GetNodes().GetOutLineNds()[nOutlinePos];
- bool bVisible = true;
- pNode->GetTextNode()->GetAttrOutlineContentVisible(bVisible);
+ bool bVisible = pNode->GetTextNode()->GetAttrOutlineContentVisible();
pNode->GetTextNode()->SetAttrOutlineContentVisible(!bVisible);
}
else if (bSubs)
diff --git a/sw/source/uibase/shells/basesh.cxx
b/sw/source/uibase/shells/basesh.cxx
index d5c0a4eac9f3..b7012e9274d7 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -221,16 +221,12 @@ void SwBaseShell::ExecDelete(SfxRequest &rReq)
SwNodeIndex aIdx(rSh.GetCursor()->GetPointNode());
if (aIdx.GetNode().IsTextNode())
{
- bool bVisible = true;
-
aIdx.GetNode().GetTextNode()->GetAttrOutlineContentVisible(bVisible);
- if (!bVisible)
+ if
(!aIdx.GetNode().GetTextNode()->GetAttrOutlineContentVisible())
break;
++aIdx;
if (aIdx.GetNode().IsTextNode())
{
- bVisible = true;
-
aIdx.GetNode().GetTextNode()->GetAttrOutlineContentVisible(bVisible);
- if (!bVisible)
+ if
(!aIdx.GetNode().GetTextNode()->GetAttrOutlineContentVisible())
break;
}
}
@@ -250,9 +246,7 @@ void SwBaseShell::ExecDelete(SfxRequest &rReq)
SwNodeIndex aIdx(rSh.GetCursor()->GetPointNode());
if (aIdx.GetNode().IsTextNode())
{
- bool bVisible = true;
-
aIdx.GetNode().GetTextNode()->GetAttrOutlineContentVisible(bVisible);
- if (!bVisible)
+ if
(!aIdx.GetNode().GetTextNode()->GetAttrOutlineContentVisible())
break;
--aIdx;
if (aIdx.GetNode().IsContentNode() &&
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx
b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 0e980c9f262d..c9651cec90f3 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -153,9 +153,7 @@ static bool lcl_IsAllowed(const SwWrtShell* rSh)
if (pTextNode && pTextNode->IsOutline())
{
// disallow if this is an outline node having folded content
- bool bVisible = true;
- pTextNode->GetAttrOutlineContentVisible(bVisible);
- if (!bVisible)
+ if (!pTextNode->GetAttrOutlineContentVisible())
return false;
}
}
@@ -1262,9 +1260,7 @@ static bool
lcl_FoldedOutlineNodeEndOfParaSplit(SwWrtShell *pThis)
SwTextNode* pTextNode = pThis->GetCursor()->GetPointNode().GetTextNode();
if (pTextNode && pTextNode->IsOutline())
{
- bool bVisible = true;
- pTextNode->GetAttrOutlineContentVisible(bVisible);
- if (!bVisible)
+ if (!pTextNode->GetAttrOutlineContentVisible())
{
const SwNodes& rNodes = pThis->GetNodes();
const SwOutlineNodes& rOutlineNodes = rNodes.GetOutLineNds();
@@ -2568,9 +2564,7 @@ void SwWrtShell::MakeOutlineContentVisible(const size_t
nPos, bool bMakeVisible,
if (pNd->IsTextNode() && pNd->GetTextNode()->IsOutline())
{
SwTextNode* pTextNd = pNd->GetTextNode();
- bool bOutlineContentVisibleAttr = true;
-
pTextNd->GetAttrOutlineContentVisible(bOutlineContentVisibleAttr);
- if (!bOutlineContentVisibleAttr)
+ if (!pTextNd->GetAttrOutlineContentVisible())
{
SwOutlineNodes::size_type iPos;
if (rOutlineNodes.Seek_Entry(pTextNd, &iPos))
@@ -2597,8 +2591,7 @@ void SwWrtShell::InvalidateOutlineContentVisibility()
for (SwOutlineNodes::size_type nPos = 0; nPos < rOutlineNds.size(); ++nPos)
{
bool bIsOutlineContentVisible = IsOutlineContentVisible(nPos);
- bool bOutlineContentVisibleAttr = true;
-
rOutlineNds[nPos]->GetTextNode()->GetAttrOutlineContentVisible(bOutlineContentVisibleAttr);
+ bool bOutlineContentVisibleAttr =
rOutlineNds[nPos]->GetTextNode()->GetAttrOutlineContentVisible();
if (!bIsOutlineContentVisible && bOutlineContentVisibleAttr)
MakeOutlineContentVisible(nPos);
else if (bIsOutlineContentVisible && !bOutlineContentVisibleAttr)
@@ -2622,9 +2615,7 @@ void SwWrtShell::MakeAllFoldedOutlineContentVisible(bool
bMakeVisible)
std::vector<SwNode*> aFoldedOutlineNodeArray;
for (SwNode* pNd: GetNodes().GetOutLineNds())
{
- bool bOutlineContentVisibleAttr = true;
-
pNd->GetTextNode()->GetAttrOutlineContentVisible(bOutlineContentVisibleAttr);
- if (!bOutlineContentVisibleAttr)
+ if (!pNd->GetTextNode()->GetAttrOutlineContentVisible())
{
aFoldedOutlineNodeArray.push_back(pNd);
pNd->GetTextNode()->SetAttrOutlineContentVisible(true);
@@ -2666,9 +2657,7 @@ void SwWrtShell::MakeAllFoldedOutlineContentVisible(bool
bMakeVisible)
bool SwWrtShell::GetAttrOutlineContentVisible(const size_t nPos) const
{
- bool bVisibleAttr = true;
-
GetNodes().GetOutLineNds()[nPos]->GetTextNode()->GetAttrOutlineContentVisible(bVisibleAttr);
- return bVisibleAttr;
+ return
GetNodes().GetOutLineNds()[nPos]->GetTextNode()->GetAttrOutlineContentVisible();
}
bool SwWrtShell::HasFoldedOutlineContentSelected() const
