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

[Szymon KÅ‚os (via logerrit)]

 sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit a50a2bf8e8c6084aeacb8d2db42e21f528410742
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Jan 24 11:22:22 2019 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Thu Jan 2 12:51:47 2020 +0100

    tdf#86731 Don't show 'start from beginning' when dictionary is missing
    
    Change-Id: I160e4b15e3c636be0e23dd5bbb2da62dfa6a42ef
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/82169
    Tested-by: Jenkins
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
index a518176926ab..2429b09484f9 100644
--- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
+++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
@@ -176,6 +176,8 @@ svx::SpellPortions SwSpellDialogChildWindow::GetNextWrongSentence(bool bRecheck)
     SwWrtShell* pWrtShell = GetWrtShell_Impl();
     if(pWrtShell)
     {
+        bool bNoDictionaryAvailable = pWrtShell->GetDoc()->IsDictionaryMissing();
+
         if (!bRecheck)
         {
             // first set continuation point for spell/grammar check to the
@@ -380,7 +382,7 @@ The code below would only be part of the solution.
             OSL_ENSURE(m_pSpellState->m_bDrawingsSpelled &&
                         m_pSpellState->m_bOtherSpelled && m_pSpellState->m_bBodySpelled,
                         "not all parts of the document are already spelled");
-            if(m_pSpellState->m_xStartRange.is())
+            if( m_pSpellState->m_xStartRange.is() && !bNoDictionaryAvailable )
             {
                 LockFocusNotification( true );
                 std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetController()->getDialog(),
@@ -406,8 +408,7 @@ The code below would only be part of the solution.
                     bCloseMessage = false; // no closing message if a wrap around has been denied
             }
         }
-        bool bNoDictionaryAvailable = pWrtShell->GetDoc()->IsDictionaryMissing();
-        if( aRet.empty() && bCloseMessage )
+        if( aRet.empty() && bCloseMessage && !bNoDictionaryAvailable )
         {
             LockFocusNotification( true );
             OUString sInfo( SwResId( bNoDictionaryAvailable ? STR_DICTIONARY_UNAVAILABLE : STR_SPELLING_COMPLETED ) );