From 8bfdd84ffcffe19aa6c495a0772e1a5fcb9a5124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Fri, 25 Sep 2020 11:22:03 +0100 Subject: [PATCH] rhbz#1882616 move cursor one step at a time in the desired direction MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit until we get to the target position. The break iterator operates in graphemes so we can't just move Left/Right the amount of utf-16 we want to move. Change-Id: I25d4e9285deae374f85dcaadbf4601bc213a89de Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103380 Tested-by: Jenkins Reviewed-by: Caolán McNamara (cherry picked from commit bf858622e543163a23db766912ea6b121f447e6d) --- sw/source/core/edit/editsh.cxx | 40 +++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx index 8f84ce42ed75..872d92d7afcc 100644 --- a/sw/source/core/edit/editsh.cxx +++ b/sw/source/core/edit/editsh.cxx @@ -988,7 +988,8 @@ OUString SwEditShell::DeleteExtTextInput( bool bInsText ) void SwEditShell::SetExtTextInputData( const CommandExtTextInputData& rData ) { - const SwPosition& rPos = *GetCursor()->GetPoint(); + SwPaM* pCurrentCursor = GetCursor(); + const SwPosition& rPos = *pCurrentCursor->GetPoint(); SwExtTextInput* pInput = GetDoc()->GetExtTextInput( rPos.nNode.GetNode() ); if( !pInput ) return; @@ -1005,10 +1006,39 @@ void SwEditShell::SetExtTextInputData( const CommandExtTextInputData& rData ) // ugly but works ShowCursor(); const sal_Int32 nDiff = nNewCursorPos - rPos.nContent.GetIndex(); - if( 0 > nDiff ) - Left( -nDiff, CRSR_SKIP_CHARS ); - else if( 0 < nDiff ) - Right( nDiff, CRSR_SKIP_CHARS ); + if( nDiff != 0) + { + bool bLeft = nDiff < 0; + sal_Int32 nMaxGuard = std::abs(nDiff); + while (true) + { + auto nOldPos = pCurrentCursor->GetPoint()->nContent.GetIndex(); + if (bLeft) + Left(1, CRSR_SKIP_CHARS); + else + Right(1, CRSR_SKIP_CHARS); + auto nNewPos = pCurrentCursor->GetPoint()->nContent.GetIndex(); + + // expected success + if (nNewPos == nNewCursorPos) + break; + + if (nNewPos == nOldPos) + { + // if there was no movement, we have failed for some reason + SAL_WARN("sw.core", "IM cursor move failed"); + break; + } + + if (--nMaxGuard == 0) + { + // if it takes more cursor moves than there are utf-16 chars to move past + // something has probably gone wrong + SAL_WARN("sw.core", "IM abandoning cursor positioning"); + break; + } + } + } SetOverwriteCursor( rData.IsCursorOverwrite() ); -- 2.29.2