diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-06-05 10:57:25 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-06-05 20:33:28 +0200 |
commit | 68db2d42c1518fdb777faeff891155f350da538c (patch) | |
tree | 5a07696b7e09451541ae1215a96863ac14aadfc9 /sc/source/ui/miscdlgs | |
parent | 638f2642769cc73ad6dfa75d33145f03fa408d7f (diff) |
have just one way to set expander image
Change-Id: Ic07709a864620c6146616c8e0a1417343c0937de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95590
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source/ui/miscdlgs')
-rw-r--r-- | sc/source/ui/miscdlgs/acredlin.cxx | 12 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/conflictsdlg.cxx | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index f9e70deb9e4c..fecbd56db7f5 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -476,7 +476,7 @@ std::unique_ptr<weld::TreeIter> ScAcceptChgDlg::AppendChangeAction( std::unique_ptr<weld::TreeIter> xEntry(rTreeView.make_iterator()); OUString sString(aBuf.makeStringAndClear()); OUString sId(OUString::number(reinterpret_cast<sal_Int64>(pNewData.release()))); - rTreeView.insert(pParent, -1, &sString, &sId, nullptr, nullptr, nullptr, bCreateOnDemand, xEntry.get()); + rTreeView.insert(pParent, -1, &sString, &sId, nullptr, nullptr, bCreateOnDemand, xEntry.get()); if (!bFlag && bUseColor && !pParent) { rTreeView.set_font_color(*xEntry, COL_LIGHTBLUE); @@ -594,7 +594,7 @@ std::unique_ptr<weld::TreeIter> ScAcceptChgDlg::AppendFilteredAction( weld::TreeView& rTreeView = pTheView->GetWidget(); xEntry = rTreeView.make_iterator(); OUString sId(OUString::number(reinterpret_cast<sal_Int64>(pNewData.release()))); - rTreeView.insert(pParent, -1, &aActionString, &sId, nullptr, nullptr, nullptr, bCreateOnDemand, xEntry.get()); + rTreeView.insert(pParent, -1, &aActionString, &sId, nullptr, nullptr, bCreateOnDemand, xEntry.get()); OUString aRefStr; pScChangeAction->GetRefString(aRefStr, pDoc, true); @@ -723,7 +723,7 @@ std::unique_ptr<weld::TreeIter> ScAcceptChgDlg::InsertChangeActionContent(const weld::TreeView& rTreeView = pTheView->GetWidget(); std::unique_ptr<weld::TreeIter> xEntry(rTreeView.make_iterator()); OUString sId(OUString::number(reinterpret_cast<sal_Int64>(pNewData.release()))); - rTreeView.insert(&rParent, -1, &aString, &sId, nullptr, nullptr, nullptr, false, xEntry.get()); + rTreeView.insert(&rParent, -1, &aString, &sId, nullptr, nullptr, false, xEntry.get()); if (pTheView->IsValidComment(aComment) && bFlag) bHasFilterEntry=true; else @@ -806,9 +806,9 @@ void ScAcceptChgDlg::UpdateView() pTPView->EnableRejectAll(bTheFlag); if (nAcceptCount>0) - rTreeView.insert(nullptr, -1, &aStrAllAccepted, nullptr, nullptr, nullptr, nullptr, true, nullptr); + rTreeView.insert(nullptr, -1, &aStrAllAccepted, nullptr, nullptr, nullptr, true, nullptr); if (nRejectCount>0) - rTreeView.insert(nullptr, -1, &aStrAllRejected, nullptr, nullptr, nullptr, nullptr, true, nullptr); + rTreeView.insert(nullptr, -1, &aStrAllRejected, nullptr, nullptr, nullptr, true, nullptr); rTreeView.thaw(); m_xDialog->set_busy_cursor(false); std::unique_ptr<weld::TreeIter> xEntry(rTreeView.make_iterator()); @@ -1316,7 +1316,7 @@ IMPL_LINK(ScAcceptChgDlg, ExpandingHandle, const weld::TreeIter&, rEntry, bool) if (bTheTestFlag) { std::unique_ptr<weld::TreeIter> xEntry(rTreeView.make_iterator()); - rTreeView.insert(&rEntry, -1, &aStrNoEntry, nullptr, nullptr, nullptr, nullptr, false, xEntry.get()); + rTreeView.insert(&rEntry, -1, &aStrNoEntry, nullptr, nullptr, nullptr, false, xEntry.get()); rTreeView.set_font_color(*xEntry, COL_GRAY); } } diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index 7a524e3f32e1..f5b1d786443a 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -596,7 +596,7 @@ void ScConflictsDlg::UpdateView() OUString sId(OUString::number(reinterpret_cast<sal_Int64>(pRootUserData.release()))); std::unique_ptr<weld::TreeIter> xRootEntry(rTreeView.make_iterator()); std::unique_ptr<weld::TreeIter> xEntry(rTreeView.make_iterator()); - rTreeView.insert(nullptr, -1, &sString, &sId, nullptr, nullptr, nullptr, false, xRootEntry.get()); + rTreeView.insert(nullptr, -1, &sString, &sId, nullptr, nullptr, false, xRootEntry.get()); for ( const auto& aSharedAction : rConflictEntry.maSharedActions ) { @@ -613,7 +613,7 @@ void ScConflictsDlg::UpdateView() } } - rTreeView.insert(xRootEntry.get(), -1, nullptr, nullptr, nullptr, nullptr, nullptr, false, xEntry.get()); + rTreeView.insert(xRootEntry.get(), -1, nullptr, nullptr, nullptr, nullptr, false, xEntry.get()); SetActionString(pAction, mpSharedDoc, *xEntry); } } @@ -636,7 +636,7 @@ void ScConflictsDlg::UpdateView() std::unique_ptr<RedlinData> pUserData(new RedlinData()); pUserData->pData = static_cast< void* >( pAction ); OUString aId(OUString::number(reinterpret_cast<sal_Int64>(pUserData.release()))); - rTreeView.insert(xRootEntry.get(), -1, nullptr, &aId, nullptr, nullptr, nullptr, false, xEntry.get()); + rTreeView.insert(xRootEntry.get(), -1, nullptr, &aId, nullptr, nullptr, false, xEntry.get()); SetActionString(pAction, mpOwnDoc, *xEntry); } } |