[Libreoffice-commits] core.git: Branch 'feature/cib_contract57d' - cui/source

[Caolán McNamara (via logerrit)]

 cui/source/dialogs/SpellDialog.cxx |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit e27820f97d1c15d401cc05a07983d3f21f273b5e
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jul 29 11:09:46 2020 +0100
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Wed Jul 29 15:01:03 2020 +0200

    tdf#133958 only move the selection to the error if its not already there
    
    Change-Id: I3046c842cc6c8bcc867c79989a8978d382b08269
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99607
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    Tested-by: Jenkins
    (cherry picked from commit 03b462fb609c57cb098069f19b7076c57710906e)

diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 1bb15c934552..128ee804fe97 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1678,8 +1678,17 @@ void SentenceEditWindow_Impl::MoveErrorMarkTo(sal_Int32 nStart, sal_Int32 nEnd,
     aSet.Put(SvxWeightItem(WEIGHT_BOLD, EE_CHAR_WEIGHT_CTL));
 
     m_xEditEngine->QuickSetAttribs(aSet, ESelection(0, nStart, 0, nEnd));
-    // so the editview will autoscroll to make this visible
-    m_xEditView->SetSelection(ESelection(0, nStart));
+
+    // Set the selection so the editview will autoscroll to make this visible
+    // unless (tdf#133958) the selection already overlaps this range
+    ESelection aCurrentSelection = m_xEditView->GetSelection();
+    aCurrentSelection.Adjust();
+    bool bCurrentSelectionInRange = nStart <= aCurrentSelection.nEndPos && aCurrentSelection.nStartPos <= nEnd;
+    if (!bCurrentSelectionInRange)
+    {
+        m_xEditView->SetSelection(ESelection(0, nStart));
+    }
+
     Invalidate();
 
     m_nErrorStart = nStart;