summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2017-04-05 16:54:57 +0200
committerMichael Stahl <mstahl@redhat.com>2017-04-05 17:19:13 +0200
commit25eb0899227830cca7f28006376962d84f8e9c7a (patch)
tree3bbb167aa040424a1bc439c336e0f526130afb0c
parentbd6ad1d498c7104ea18597678a763c0066b2a49f (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. Change-Id: I3b014079b19925041234fcd858526148890f560c
-rw-r--r--sw/source/core/crsr/crstrvl.cxx4
-rw-r--r--sw/source/uibase/uiview/view2.cxx25
2 files changed, 4 insertions, 25 deletions
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 7e48aaa7f704..f120dfcb9453 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1981,6 +1981,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);
@@ -1999,6 +2001,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 e730e1d49d08..09195d4d565f 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -729,22 +729,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 == SwRedlineTable::npos)
- pNext = m_pWrtShell->SelNextRedline();
-
if (pNext)
m_pWrtShell->SetInSelect();
}
@@ -752,24 +742,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;