diff options
author | Michael Stahl <mstahl@redhat.com> | 2017-04-05 16:54:57 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2017-04-12 17:20:49 +0200 |
commit | c06ea846ec1f34022839944b5e176b2fd87be5f6 (patch) | |
tree | 0c65ea03e1ee703b584be37fc4d8a2d52ef124e6 /sw | |
parent | 1675f70c573e8ee5e837be92c68531153521222f (diff) |
rhbz#1438179 sw: fix toolbar "Next Track Change" / "Previous..."
There's some confusing workarounds in SwView::Execute() that aren't
needed if the SwCursorShell just calls NormalizePam() so it always
makes progress.
(cherry picked from commit 25eb0899227830cca7f28006376962d84f8e9c7a)
Reviewed-on: https://gerrit.libreoffice.org/36166
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 644aacd1e4b419f2f85b6c2e18026ca04206b378)
Change-Id: I3b014079b19925041234fcd858526148890f560c
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/crsr/crstrvl.cxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/uiview/view2.cxx | 25 |
2 files changed, 4 insertions, 25 deletions
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx index 6099b32aec51..c024e0eb7d69 100644 --- a/sw/source/core/crsr/crstrvl.cxx +++ b/sw/source/core/crsr/crstrvl.cxx @@ -1982,6 +1982,8 @@ const SwRangeRedline* SwCursorShell::SelNextRedline() SwCallLink aLk( *this ); // watch Cursor-Moves SwCursorSaveState aSaveState( *m_pCurrentCursor ); + // ensure point is at the end so alternating SelNext/SelPrev works + NormalizePam(false); pFnd = GetDoc()->getIDocumentRedlineAccess().SelNextRedline( *m_pCurrentCursor ); if( pFnd && !m_pCurrentCursor->IsInProtectTable() && !m_pCurrentCursor->IsSelOvr() ) UpdateCursor( SwCursorShell::SCROLLWIN|SwCursorShell::CHKRANGE|SwCursorShell::READONLY); @@ -2000,6 +2002,8 @@ const SwRangeRedline* SwCursorShell::SelPrevRedline() SwCallLink aLk( *this ); // watch Cursor-Moves SwCursorSaveState aSaveState( *m_pCurrentCursor ); + // ensure point is at the start so alternating SelNext/SelPrev works + NormalizePam(true); pFnd = GetDoc()->getIDocumentRedlineAccess().SelPrevRedline( *m_pCurrentCursor ); if( pFnd && !m_pCurrentCursor->IsInProtectTable() && !m_pCurrentCursor->IsSelOvr() ) UpdateCursor( SwCursorShell::SCROLLWIN|SwCursorShell::CHKRANGE|SwCursorShell::READONLY); diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index 1cdfea949cc3..c32e469a1951 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -731,22 +731,12 @@ void SwView::Execute(SfxRequest &rReq) } } - const SwRangeRedline *pCurrent = m_pWrtShell->GetCurrRedline(); const SwRangeRedline *pNext = nullptr; if (nRedline < rRedlineTable.size()) pNext = m_pWrtShell->GotoRedline(nRedline, true); else pNext = m_pWrtShell->SelNextRedline(); - // FN_REDLINE_PREV_CHANGE leaves the selection point at the start of the redline. - // In such cases, SelNextRedline (which starts searching from the selection point) - // immediately finds the current redline and advances the selection point to its end. - - // This behavior means that PREV_CHANGE followed by NEXT_CHANGE would not change - // the current redline, so we detect it and select the next redline again. - if (pCurrent && pCurrent == pNext && nRedline == USHRT_MAX) - pNext = m_pWrtShell->SelNextRedline(); - if (pNext) m_pWrtShell->SetInSelect(); } @@ -754,24 +744,9 @@ void SwView::Execute(SfxRequest &rReq) case FN_REDLINE_PREV_CHANGE: { - const SwPaM *pCursor = m_pWrtShell->GetCursor(); - const SwPosition initialCursorStart = *pCursor->Start(); const SwRangeRedline *pPrev = m_pWrtShell->SelPrevRedline(); if (pPrev) - { - // FN_REDLINE_NEXT_CHANGE leaves the selection point at the end of the redline. - // In such cases, SelPrevRedline (which starts searching from the selection point) - // immediately finds the current redline and advances the selection point to its - // start. - - // This behavior means that NEXT_CHANGE followed by PREV_CHANGE would not change - // the current redline, so we detect it and move to the previous redline again. - if (initialCursorStart == *pPrev->Start()) - pPrev = m_pWrtShell->SelPrevRedline(); - } - - if (pPrev) m_pWrtShell->SetInSelect(); } break; |