[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sw/source

[Michael Stahl (via logerrit)]

 sw/source/uibase/lingu/olmenu.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 05d086e432644d80160723009a2b3eebf50417d2
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Wed Aug 19 18:55:27 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sun Aug 23 19:15:15 2020 +0200

    tdf#135721 sw: fix spell check context menu deleting flys
    
    Kind of similar to e1629c210ad78310e3d48c0756723134a27b89df
    but the problem is at a higher level: SwTextShell::Execute() with
    SID_SPELLCHECK_APPLY_SUGGESTION should not DelLeft() + Insert() but
    just Replace().
    
    (regression from 28b77c89dfcafae82cf2a6d85731b643ff9290e5)
    
    Change-Id: I78487c7841ba22ccc6751240a8e55e08a86fba32
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101014
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    (cherry picked from commit ec579354af954867b829e7d08e4d752518c83728)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101072
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101231
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx
index cb14cd26aca7..2ee4737abfb6 100644
--- a/sw/source/uibase/lingu/olmenu.cxx
+++ b/sw/source/uibase/lingu/olmenu.cxx
@@ -746,9 +746,8 @@ void SwSpellPopup::Execute( sal_uInt16 nId )
 
             m_pSh->StartUndo(SwUndoId::UI_REPLACE, &aRewriter);
             m_pSh->StartAction();
-            m_pSh->DelLeft();
 
-            m_pSh->Insert( aTmp );
+            m_pSh->Replace(aTmp, false);
 
             /* #102505# EndAction/EndUndo moved down since insertion
                of temporary auto correction is now undoable two and