sw/source/uibase/sidebar/QuickFindPanel.cxx | 12 ++++++++++-- vcl/inc/jsdialog/jsdialogbuilder.hxx | 1 + vcl/jsdialog/jsdialogbuilder.cxx | 11 +++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-)
New commits: commit 5698d57449466e0f6219791f55898ac04d097f49 Author: NickWingate <[email protected]> AuthorDate: Fri Aug 22 16:09:10 2025 +0100 Commit: Szymon Kłos <[email protected]> CommitDate: Wed Nov 19 09:12:23 2025 +0100 Mark QuickFind page entries uniquely for online This way we can identify which entries are results and which are page dividers and style respectively. Signed-off-by: NickWingate <[email protected]> Change-Id: Ie38fc1599dc019d949b14b6b30e07b18a3e16b5a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190073 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Szymon Kłos <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194185 Tested-by: Jenkins diff --git a/sw/source/uibase/sidebar/QuickFindPanel.cxx b/sw/source/uibase/sidebar/QuickFindPanel.cxx index a6b5f5590cbe..a975c5e17cd0 100644 --- a/sw/source/uibase/sidebar/QuickFindPanel.cxx +++ b/sw/source/uibase/sidebar/QuickFindPanel.cxx @@ -653,8 +653,16 @@ void QuickFindPanel::FillSearchFindsList() if (xPaM->GetPageNum() != nPage) { nPage = xPaM->GetPageNum(); - OUString sPageEntry(u"-"_ustr + SwResId(ST_PGE) + u" "_ustr - + OUString::number(nPage)); + OUString sPageEntry; + if (comphelper::LibreOfficeKit::isActive()) + { + sPageEntry = u"-$#~"_ustr + SwResId(ST_PGE) + u" "_ustr + + OUString::number(nPage) + u"~#$-"_ustr; + } + else + { + sPageEntry = u"-"_ustr + SwResId(ST_PGE) + u" "_ustr + OUString::number(nPage); + } m_xSearchFindsList->append(sPageEntry, sPageEntry); } commit a7afdcde2c2fed76ad5e06cadda302e20266df6d Author: NickWingate <[email protected]> AuthorDate: Fri Sep 12 18:50:16 2025 +0100 Commit: Szymon Kłos <[email protected]> CommitDate: Wed Nov 19 09:12:14 2025 +0100 JSTreeView: send select actions to online Previously we just defaulted to `SalInstanceTreeView::select` which doesn't notify online of entries being selected. Signed-off-by: NickWingate <[email protected]> Change-Id: Ia7644b2dc1619cbd97f2e154658dabeb0ae966f3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190900 Reviewed-by: Szymon Kłos <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194184 Tested-by: Szymon Kłos <[email protected]> diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx b/vcl/inc/jsdialog/jsdialogbuilder.hxx index d0809d44fff5..1ac8f35e6026 100644 --- a/vcl/inc/jsdialog/jsdialogbuilder.hxx +++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx @@ -728,6 +728,7 @@ public: using SalInstanceTreeView::do_select; /// pos is used differently here, it defines how many steps of iterator we need to perform to take entry virtual void do_select(int pos) override; + virtual void do_select(const weld::TreeIter& rIter) override; virtual weld::TreeView* get_drag_source() const override; diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx index 35e61371c82f..0e78c925ba3b 100644 --- a/vcl/jsdialog/jsdialogbuilder.cxx +++ b/vcl/jsdialog/jsdialogbuilder.cxx @@ -1753,6 +1753,17 @@ void JSTreeView::do_select(int pos) sendAction(std::move(pMap)); } +void JSTreeView::do_select(const weld::TreeIter& rIter) +{ + SalInstanceTreeView::do_select(rIter); + + std::unique_ptr<jsdialog::ActionDataMap> pMap = std::make_unique<jsdialog::ActionDataMap>(); + const SalInstanceTreeIter& rVclIter = static_cast<const SalInstanceTreeIter&>(rIter); + (*pMap)[ACTION_TYPE ""_ostr] = "select"; + (*pMap)["position"_ostr] = OUString::number(m_xTreeView->GetEntryPos(rVclIter.iter)); + sendAction(std::move(pMap)); +} + weld::TreeView* JSTreeView::get_drag_source() const { return g_DragSource; } void JSTreeView::drag_start() { g_DragSource = this; }
