summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2024-02-19 16:46:53 +0100
committerMichael Stahl <michael.stahl@allotropia.de>2024-02-22 13:01:57 +0100
commit0c7104bd1a66319a650530b964f4d90212df9cde (patch)
tree1963e19ddb6ed3df41ea6c91416bdfb5e498ae1e
parenttdf#158947 sw: Don't unrelatedly overwrite system clipboard on paste (diff)
downloadcore-0c7104bd1a66319a650530b964f4d90212df9cde.tar.gz
core-0c7104bd1a66319a650530b964f4d90212df9cde.zip
sw: fix crash in SwSpellDialogChildWindow::LockFocusNotification()
Crashreport signature: Fatal signal received: SIGSEGV code: 128 for address: 0x0 program/libswlo.so SwSpellDialogChildWindow::GetNextWrongSentence(bool) sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx:824 program/libcuilo.so svx::SpellDialog::GetNextSentence_Impl(std::unique_ptr<UndoChangeGroupGuard, std::default_delete<UndoChangeGroupGuard> >*, bool, bool) /opt/rh/devtoolset-10/root/usr/include/c++/10/bits/stl_vector.h:919 program/libcuilo.so svx::SpellDialog::SpellContinue_Impl(std::unique_ptr<UndoChangeGroupGuard, std::default_delete<UndoChangeGroupGuard> >*, bool, bool) cui/source/dialogs/SpellDialog.cxx:370 /opt/collaboraoffice/program/libcuilo.so svx::SpellDialog::InitHdl(void*) /opt/rh/devtoolset-10/root/usr/include/c++/10/bits/unique_ptr.h:173 Change-Id: I0ecae218beb30e5136f7a6f468e3eb9f6e6e5009 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163637 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit d505b8d2730b93cea8d2dcf2656af37c6c8cc580) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163615 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 866e411950645f0b5e8d473adbf6c3505119f9da) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163628 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
-rw-r--r--sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
index da1fd5377054..ec9a215a2ee6 100644
--- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
+++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
@@ -821,6 +821,11 @@ bool SwSpellDialogChildWindow::SpellDrawText_Impl(SwWrtShell& rSh, svx::SpellPor
void SwSpellDialogChildWindow::LockFocusNotification(bool bLock)
{
+ if (!m_pSpellState)
+ {
+ return;
+ }
+
OSL_ENSURE(m_pSpellState->m_bLockFocus != bLock, "invalid locking - no change of state");
m_pSpellState->m_bLockFocus = bLock;
}