[Libreoffice-commits] core.git: sc/source

Ashod Nakashian (via logerrit) logerrit at kemper.freedesktop.org
Sun Dec 22 15:24:52 UTC 2019


 sc/source/ui/view/spelldialog.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 778327126025a14243e2bdf6d2e6adc29943cd64
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Sat Jul 27 20:35:14 2019 -0400
Commit:     Ashod Nakashian <ashnakash at gmail.com>
CommitDate: Sun Dec 22 16:24:05 2019 +0100

    sc: spelldialog: lock before resetting the editview
    
    Painting also resets the view and that can happen
    asynchronously. When the spelldialog gets focus
    it resets the editview if it detects it has changed,
    which happens when, for example, another view is created.
    
    (cherry picked from commit d91d940ad0319e0cc6e0080a903ac0a7e9f6ba88)
    Reviewed-on: https://gerrit.libreoffice.org/85003
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    (cherry picked from commit 550c0a666e119c911b311c96f9185c11d8465dcb)
    
    Change-Id: Ib23e332e4ba069e05787d1cc03ae23fe657b12c8
    Reviewed-on: https://gerrit.libreoffice.org/85679
    Tested-by: Jenkins
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/sc/source/ui/view/spelldialog.cxx b/sc/source/ui/view/spelldialog.cxx
index 21a459259f66..d9780959a5c3 100644
--- a/sc/source/ui/view/spelldialog.cxx
+++ b/sc/source/ui/view/spelldialog.cxx
@@ -34,6 +34,7 @@
 #include <undoblk.hxx>
 #include <gridwin.hxx>
 #include <refupdatecontext.hxx>
+#include <vcl/svapp.hxx>
 
 SFX_IMPL_CHILDWINDOW_WITHID( ScSpellDialogChildWindow, SID_SPELL_DIALOG )
 
@@ -96,6 +97,8 @@ void ScSpellDialogChildWindow::ApplyChangedSentence( const svx::SpellPortions& r
 
 void ScSpellDialogChildWindow::GetFocus()
 {
+    SolarMutexGuard aGuard;
+
     if( IsSelectionChanged() )
     {
         Reset();


More information about the Libreoffice-commits mailing list