[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sw/source

Michael Stahl (via logerrit) logerrit at kemper.freedesktop.org
Thu Aug 20 16:23:39 UTC 2020


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

New commits:
commit a8ff48c342c4c883319f17cb652cdbf23ed36dfc
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Thu Aug 20 14:00:04 2020 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Aug 20 18:23:03 2020 +0200

    tdf#135721 sw: fix SwSpellPopup::Execute() deleting flys
    
    Follow-up to ec579354af954867b829e7d08e4d752518c83728 :
    in 6.4, this is the location of the spell check menu code; not sure
    how to call this but it has the same bug...
    
    (regression from 28b77c89dfcafae82cf2a6d85731b643ff9290e5)
    
    Change-Id: I0e6ce9c97d810f7c92dff320d403c986a947c266
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101073
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    (cherry picked from commit a58fe88b5b406749f6e47c14f56d7490a7958bda)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101060
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx
index 813cfae970af..27d4b19fffc1 100644
--- a/sw/source/uibase/lingu/olmenu.cxx
+++ b/sw/source/uibase/lingu/olmenu.cxx
@@ -722,9 +722,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


More information about the Libreoffice-commits mailing list