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

[Jim Raykowski]

 sw/source/uibase/uiview/viewmdi.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit d69cf130ffeaa342780425572ab6a3510f8eed79
Author: Jim Raykowski <raykowj at gmail.com>
Date:   Sun Feb 25 16:14:02 2018 -0900

    tdf#115666 Behavior change of Navigate By when in Comment
    
    Change-Id: I254e6a252cf96374613cc8a6fb8f139ee6d7418e
    Reviewed-on: https://gerrit.libreoffice.org/50551
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx
index 1abdd08429ad..f56ac21dda99 100644
--- a/sw/source/uibase/uiview/viewmdi.cxx
+++ b/sw/source/uibase/uiview/viewmdi.cxx
@@ -50,6 +50,7 @@
 
 #include <IDocumentSettingAccess.hxx>
 #include <PostItMgr.hxx>
+#include <AnnotationWin.hxx>
 
 sal_uInt16  SwView::m_nMoveType = NID_PGE;
 sal_Int32 SwView::m_nActMark = 0;
@@ -316,6 +317,12 @@ IMPL_LINK( SwView, MoveNavigationHdl, void*, p, void )
         if ( IsDrawMode() )
             LeaveDrawCreate();
     }
+    if ( NID_POSTIT != m_nMoveType && m_pPostItMgr )
+    {
+        sw::annotation::SwAnnotationWin* pActiveSidebarWin = m_pPostItMgr->GetActiveSidebarWin();
+        if (pActiveSidebarWin)
+            pActiveSidebarWin->SwitchToFieldPos();
+    }
     switch( m_nMoveType )
     {
         case NID_PGE: