Group common code of SwCrsrShell::Goto(Prev|Next)Num

Change-Id: Iae3b6bc395530ac1d179fdd129239c32bf74d1e6

2 files changed, 44 insertions, 70 deletions

diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index adf33191645a..fd2fc160d357 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -236,6 +236,8 @@ private:
         sal_uInt16 eFlags = SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE,
         sal_Bool bIdleEnd = sal_False );
 
+    SAL_DLLPRIVATE void MoveCrsrToNum();
+
     SAL_DLLPRIVATE void _ParkPams( SwPaM* pDelRg, SwShellCrsr** ppDelRing );
 
     /** Mark a certain list level of a certain list
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index ed9556cef221..211e39bf0d98 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -67,83 +67,55 @@
 
 using namespace ::com::sun::star;
 
-/// go to next/previous point on the same level
-bool SwCrsrShell::GotoNextNum()
+void SwCrsrShell::MoveCrsrToNum()
 {
-    bool bRet = GetDoc()->GotoNextNum( *m_pCurCrsr->GetPoint() );
-    if( bRet )
+    SwCallLink aLk( *this ); // watch Crsr-Moves
+    SwCrsrSaveState aSaveState( *m_pCurCrsr );
+    if( ActionPend() )
+        return;
+    SET_CURR_SHELL( this );
+    // try to set cursor onto this position, at half of the char-
+    // SRectangle's height
+    Point aPt( m_pCurCrsr->GetPtPos() );
+    SwCntntFrm * pFrm = m_pCurCrsr->GetCntntNode()->getLayoutFrm( GetLayout(), &aPt,
+                                                m_pCurCrsr->GetPoint() );
+    pFrm->GetCharRect( m_aCharRect, *m_pCurCrsr->GetPoint() );
+    pFrm->Calc();
+    if( pFrm->IsVertical() )
     {
-        SwCallLink aLk( *this ); // watch Crsr-Moves
-        SwCrsrSaveState aSaveState( *m_pCurCrsr );
-        if( !ActionPend() )
-        {
-            SET_CURR_SHELL( this );
-            // try to set cursor onto this position, at half of the char-
-            // SRectangle's height
-            Point aPt( m_pCurCrsr->GetPtPos() );
-            SwCntntFrm * pFrm = m_pCurCrsr->GetCntntNode()->getLayoutFrm( GetLayout(), &aPt,
-                                                        m_pCurCrsr->GetPoint() );
-            pFrm->GetCharRect( m_aCharRect, *m_pCurCrsr->GetPoint() );
-            pFrm->Calc();
-            if( pFrm->IsVertical() )
-            {
-                aPt.setX(m_aCharRect.Center().getX());
-                aPt.setY(pFrm->Frm().Top() + m_nUpDownX);
-            }
-            else
-            {
-                aPt.setY(m_aCharRect.Center().getY());
-                aPt.setX(pFrm->Frm().Left() + m_nUpDownX);
-            }
-            pFrm->GetCrsrOfst( m_pCurCrsr->GetPoint(), aPt );
-            bRet = !m_pCurCrsr->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
-                                        nsSwCursorSelOverFlags::SELOVER_CHANGEPOS );
-            if( bRet )
-                UpdateCrsr(SwCrsrShell::UPDOWN |
-                        SwCrsrShell::SCROLLWIN | SwCrsrShell::CHKRANGE |
-                        SwCrsrShell::READONLY );
-        }
+        aPt.setX(m_aCharRect.Center().getX());
+        aPt.setY(pFrm->Frm().Top() + m_nUpDownX);
     }
-    return bRet;
+    else
+    {
+        aPt.setY(m_aCharRect.Center().getY());
+        aPt.setX(pFrm->Frm().Left() + m_nUpDownX);
+    }
+    pFrm->GetCrsrOfst( m_pCurCrsr->GetPoint(), aPt );
+    if ( !m_pCurCrsr->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
+                                nsSwCursorSelOverFlags::SELOVER_CHANGEPOS ))
+    {
+        UpdateCrsr(SwCrsrShell::UPDOWN |
+                SwCrsrShell::SCROLLWIN | SwCrsrShell::CHKRANGE |
+                SwCrsrShell::READONLY );
+    }
+}
+
+/// go to next/previous point on the same level
+bool SwCrsrShell::GotoNextNum()
+{
+    if (!GetDoc()->GotoNextNum( *m_pCurCrsr->GetPoint() ))
+        return false;
+    MoveCrsrToNum();
+    return true;
 }
 
 bool SwCrsrShell::GotoPrevNum()
 {
-    bool bRet = GetDoc()->GotoPrevNum( *m_pCurCrsr->GetPoint() );
-    if( bRet )
-    {
-        SwCallLink aLk( *this ); // watch Crsr-Moves
-        SwCrsrSaveState aSaveState( *m_pCurCrsr );
-        if( !ActionPend() )
-        {
-            SET_CURR_SHELL( this );
-            // try to set cursor onto this position, at half of the char-
-            // SRectangle's height
-            Point aPt( m_pCurCrsr->GetPtPos() );
-            SwCntntFrm * pFrm = m_pCurCrsr->GetCntntNode()->getLayoutFrm( GetLayout(), &aPt,
-                                                        m_pCurCrsr->GetPoint() );
-            pFrm->GetCharRect( m_aCharRect, *m_pCurCrsr->GetPoint() );
-            pFrm->Calc();
-            if( pFrm->IsVertical() )
-            {
-                aPt.setX(m_aCharRect.Center().getX());
-                aPt.setY(pFrm->Frm().Top() + m_nUpDownX);
-            }
-            else
-            {
-                aPt.setY(m_aCharRect.Center().getY());
-                aPt.setX(pFrm->Frm().Left() + m_nUpDownX);
-            }
-            pFrm->GetCrsrOfst( m_pCurCrsr->GetPoint(), aPt );
-            bRet = !m_pCurCrsr->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
-                                        nsSwCursorSelOverFlags::SELOVER_CHANGEPOS );
-            if( bRet )
-                UpdateCrsr(SwCrsrShell::UPDOWN |
-                        SwCrsrShell::SCROLLWIN | SwCrsrShell::CHKRANGE |
-                        SwCrsrShell::READONLY );
-        }
-    }
-    return bRet;
+    if (!GetDoc()->GotoPrevNum( *m_pCurCrsr->GetPoint() ))
+        return false;
+    MoveCrsrToNum();
+    return true;
 }
 
 /// jump from content to header