tdf#132366 Writer enhancement that highlights search results

This enhancement selects outline headings in the Writer Navigator
content tree according to 'Find All' search results. It does this when
the content navigation view is set to show headings content only.

Change-Id: I77dabcdd38c8877b7f8a177689da094638d5fe00
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92886
Tested-by: Jenkins
Reviewed-by: Jim Raykowski <raykowj@gmail.com>

5 files changed, 78 insertions, 3 deletions

diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 78b32299ff31..d6888bcac2cb 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -610,7 +610,7 @@ public:
     // to the next/previous or the given OutlineNode
     void GotoOutline( SwOutlineNodes::size_type nIdx );
     // find the "outline position" in the nodes array of the current chapter
-    SwOutlineNodes::size_type GetOutlinePos( sal_uInt8 nLevel = UCHAR_MAX );
+    SwOutlineNodes::size_type GetOutlinePos(sal_uInt8 nLevel = UCHAR_MAX, SwPaM* pPaM = nullptr);
     // select the given range of OutlineNodes. Optionally including the children
     // the sal_uInt16s are the positions in OutlineNodes-Array (EditShell)
     bool MakeOutlineSel(SwOutlineNodes::size_type nSttPos, SwOutlineNodes::size_type nEndPos,
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 11589b8e4181..38676f772659 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1132,9 +1132,9 @@ bool SwCursorShell::GotoPrevOutline()
 }
 
 /// search "outline position" before previous outline node at given level
-SwOutlineNodes::size_type SwCursorShell::GetOutlinePos( sal_uInt8 nLevel )
+SwOutlineNodes::size_type SwCursorShell::GetOutlinePos(sal_uInt8 nLevel, SwPaM* pPaM)
 {
-    SwPaM* pCursor = getShellCursor( true );
+    SwPaM* pCursor = pPaM ? pPaM : getShellCursor(true);
     const SwNodes& rNds = GetDoc()->GetNodes();
 
     SwNode* pNd = &(pCursor->GetNode());
diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx
index 282a714d5634..80b9d8d69bbe 100644
--- a/sw/source/uibase/inc/conttree.hxx
+++ b/sw/source/uibase/inc/conttree.hxx
@@ -225,6 +225,8 @@ public:
 
     void Select();
 
+    void SelectOutlinesWithSelection();
+
     // return true if it has any children
     bool RequestingChildren(const weld::TreeIter& rParent);
 
diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx
index bc4ac9b353ff..de7f0be5b369 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -235,6 +235,8 @@ void SwView::ExecSearch(SfxRequest& rReq)
                         lcl_emitSearchResultCallbacks(s_pSrchItem, m_pWrtShell.get(), /* bHighlightAll = */ false);
                 }
                 rReq.SetReturnValue(SfxBoolItem(nSlot, bRet));
+
+                m_pEditWin->GrabFocus();
             }
             break;
             case SvxSearchCmd::FIND_ALL:
@@ -244,6 +246,9 @@ void SwView::ExecSearch(SfxRequest& rReq)
                 bool bRet = SearchAll();
                 m_pWrtShell->GetSfxViewShell()->setTiledSearching(false);
 
+                GetDocShell()->Broadcast(
+                            SfxHint(SfxHintId::SwNavigatorSelectOutlinesWithSelections));
+
                 if( !bRet )
                 {
 #if HAVE_FEATURE_DESKTOP
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 36cf1449881c..97dc04351d26 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -2700,6 +2700,20 @@ void SwContentTree::Notify(SfxBroadcaster & rBC, SfxHint const& rHint)
     }
     switch (rHint.GetId())
     {
+        case SfxHintId::SwNavigatorSelectOutlinesWithSelections:
+        {
+            if (m_nRootType == ContentTypeId::OUTLINE)
+            {
+                SelectOutlinesWithSelection();
+                // make first selected entry visible
+                std::unique_ptr<weld::TreeIter> xEntry(m_xTreeView->make_iterator());
+                if (xEntry && m_xTreeView->get_selected(xEntry.get()))
+                    m_xTreeView->scroll_to_row(*xEntry);
+            }
+            else if (m_nRootType == ContentTypeId::UNKNOWN)
+                m_xTreeView->unselect_all();
+            break;
+        }
         case SfxHintId::DocChanged:
             if (!m_bIgnoreViewChange)
             {
@@ -3160,6 +3174,60 @@ IMPL_LINK_NOARG(SwContentTree, TimerUpdate, Timer *, void)
     }
 }
 
+void SwContentTree::SelectOutlinesWithSelection()
+{
+    SwCursor* pFirstCursor = m_pActiveShell->GetSwCursor();
+    SwCursor* pCursor = pFirstCursor;
+    std::vector<SwOutlineNodes::size_type> aOutlinePositions;
+    do
+    {
+        if (pCursor)
+        {
+            if (pCursor->HasMark())
+            {
+                aOutlinePositions.push_back(m_pActiveShell->GetOutlinePos(UCHAR_MAX, pCursor));
+            }
+            pCursor = pCursor->GetNext();
+        }
+    } while (pCursor && pCursor != pFirstCursor);
+
+    if (!aOutlinePositions.empty())
+    {
+        // remove duplicates before selecting
+        aOutlinePositions.erase(std::unique(aOutlinePositions.begin(), aOutlinePositions.end()),
+                                aOutlinePositions.end());
+
+        m_xTreeView->unselect_all();
+
+        for (auto nOutlinePosition : aOutlinePositions)
+        {
+            m_xTreeView->all_foreach([this, nOutlinePosition](const weld::TreeIter& rEntry){
+                if (lcl_IsContent(rEntry, *m_xTreeView) &&
+                        reinterpret_cast<SwContent*>(
+                        m_xTreeView->get_id(rEntry).toInt64())->GetParent()->GetType() ==
+                        ContentTypeId::OUTLINE)
+                {
+                    if (reinterpret_cast<SwOutlineContent*>(
+                            m_xTreeView->get_id(rEntry).toInt64())->GetOutlinePos() ==
+                            nOutlinePosition)
+                    {
+                        std::unique_ptr<weld::TreeIter> xParent =
+                                m_xTreeView->make_iterator(&rEntry);
+                        if (m_xTreeView->iter_parent(*xParent) &&
+                                !m_xTreeView->get_row_expanded(*xParent))
+                            m_xTreeView->expand_row(*xParent);
+                        m_xTreeView->select(rEntry);
+                        return true;
+                    }
+                }
+                return false;
+            });
+        }
+
+        Select();
+    }
+}
+
 void SwContentTree::MoveOutline(SwOutlineNodes::size_type nTargetPos)
 {
     SwWrtShell *const pShell = GetWrtShell();