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

[Stephan Bergmann]

 sw/source/ui/inc/view.hxx        |    1 +
 sw/source/ui/ribbar/workctrl.cxx |    1 +
 sw/source/ui/uiview/viewmdi.cxx  |    5 +++++
 sw/source/ui/uiview/viewsrch.cxx |    2 ++
 4 files changed, 9 insertions(+)

New commits:
commit c6abb084ef6b1f86734395058bcafc61458727b4
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Dec 5 10:09:50 2013 +0100

    Partly revert "Appears SwView::SetMoveType no longer really does anything"
    
    This reverts most of commit a50a2111a31e4d9dd5e2659a146e9de8e292de75, where the
    -Werror,-Wunused-variable for SwView::SetMoveType's aColor (after
    3e8fe4d8e19be2ccd8f5bb898530e2f615a90321 "Remove the Navigator buttons below the
    scrollbar in Writer" had removed its use) had erroneously make me think that
    SwView::SetMoveType now effectively didn't do anything anymore, failing to note
    the
    
      m_nMoveType = nSet;
    
    part that was still relevant.
    
    Change-Id: I5e43886806533e80e238fef8d836e09e28209b6d

diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
index 5974689..af14592 100644
--- a/sw/source/ui/inc/view.hxx
+++ b/sw/source/ui/inc/view.hxx
@@ -486,6 +486,7 @@ public:
     static Dialog* GetSearchDialog();
 
     static sal_uInt16   GetMoveType();
+    static void     SetMoveType(sal_uInt16 nSet);
     DECL_STATIC_LINK( SwView, MoveNavigationHdl, bool* ); // #i75416#
     static void     SetActMark(sal_Int32 nSet);
 
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index 95d2cad..fe7f141 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/workctrl.cxx
@@ -553,6 +553,7 @@ IMPL_LINK(SwScrollNaviPopup, SelectHdl, ToolBox*, pSet)
     sal_uInt16 nSet = pSet->GetCurItemId();
     if( nSet != NID_PREV && nSet != NID_NEXT )
     {
+        SwView::SetMoveType(nSet);
         aToolBox.SetItemText(NID_NEXT, sQuickHelp[nSet - NID_START]);
         aToolBox.SetItemText(NID_PREV, sQuickHelp[nSet - NID_START + NID_COUNT]);
         aInfoField.SetText(aToolBox.GetItemText(nSet));
diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx
index 5934bc3..2a73898 100644
--- a/sw/source/ui/uiview/viewmdi.cxx
+++ b/sw/source/ui/uiview/viewmdi.cxx
@@ -560,6 +560,11 @@ sal_uInt16 SwView::GetMoveType()
     return m_nMoveType;
 }
 
+void SwView::SetMoveType(sal_uInt16 nSet)
+{
+    m_nMoveType = nSet;
+}
+
 void SwView::SetActMark(sal_Int32 nSet)
 {
     m_nActMark = nSet;
diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
index dd5f127..4436f73 100644
--- a/sw/source/ui/uiview/viewsrch.cxx
+++ b/sw/source/ui/uiview/viewsrch.cxx
@@ -165,6 +165,8 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool bNoMessage)
         case FID_SEARCH_NOW:
         {
             {
+                if(FID_SEARCH_NOW == nSlot && !rReq.IsAPI())
+                    SwView::SetMoveType(NID_SRCH_REP);
                 if ( pWrp )
                 {
                     m_pSrchDlg = static_cast <SvxSearchDialog*> (pWrp->getDialog ());