[Libreoffice-commits] core.git: sw/inc sw/source

[Marco Cecchetti]

 sw/inc/view.hxx                      |    3 +++
 sw/source/uibase/uiview/viewsrch.cxx |   12 ++++++++++++
 2 files changed, 15 insertions(+)

New commits:
commit 7f1ccaf62e42a26d48d324bcc6758100c6ec682b
Author: Marco Cecchetti <marco.cecchetti at collabora.com>
Date:   Sun Feb 7 12:09:36 2016 +0100

    sw - single search after find all selects the 2nd occurrence - fixed
    
    Now, after a search all action we place the cursor at the beginning of
    the document so that the single search selects the first matching
    occurrence in the document instead of the second.
    
    Change-Id: I8c295bcd316c6197154c68ae97eb424ee6cc9904
    Reviewed-on: https://gerrit.libreoffice.org/22175
    Reviewed-by: Marco Cecchetti <mrcekets at gmail.com>
    Tested-by: Marco Cecchetti <mrcekets at gmail.com>

diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index 7081637..b271c6d 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -79,6 +79,7 @@ class GraphicFilter;
 class SwPostItMgr;
 enum class SotExchangeDest;
 class SwCursorShell;
+enum class SvxSearchCmd;
 
 namespace com{ namespace sun { namespace star {
     namespace view{ class XSelectionSupplier; }
@@ -226,6 +227,8 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
     sal_uInt16          m_nLeftBorderDistance;
     sal_uInt16          m_nRightBorderDistance;
 
+    SvxSearchCmd        m_eLastSearchCommand;
+
     bool m_bWheelScrollInProgress;
 
     bool            m_bCenterCursor : 1,
diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx
index f3f216f..bc92249 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -441,6 +441,7 @@ void SwView::ExecSearch(SfxRequest& rReq, bool bNoMessage)
                 rReq.AppendItem(SfxBoolItem(SID_SEARCH_QUIET, true));
 
             rReq.Done();
+            m_eLastSearchCommand = m_pSrchItem->GetCommand();
         }
         break;
         case FID_SEARCH_SEARCHSET:
@@ -532,6 +533,17 @@ bool SwView::SearchAndWrap(bool bApi)
     m_pWrtShell->StartAllAction();
     m_pWrtShell->Push();
 
+    // After a search all action we place the cursor at the beginning of
+    // the document so that the single search selects the first matching
+    // occurrence in the document instead of the second.
+    if( m_eLastSearchCommand == SvxSearchCmd::FIND_ALL )
+    {
+        if( DOCPOS_START == aOpts.eEnd )
+            m_pWrtShell->EndDoc();
+        else
+            m_pWrtShell->SttDoc();
+    }
+
     // fdo#65014 : Ensure that the point of the cursor is at the extremity of the
     // selection closest to the end being searched to as to exclude the selected
     // region from the search. (This doesn't work in the case of multiple