From 702edb07b785e27cfaf45f4feee9e07d7b9402e7 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Tue, 6 Oct 2015 12:05:14 +0200 Subject: [PATCH 184/398] Disable spellcheck when LOK is active It's not useful when viewing, and for editing probably a dedicated overlay would be better (like the one we have for cursor/selections already). Disable for sw/sd explicitly, sc had it disabled implicitly already. Change-Id: I7134f5d1a1546787c22019e6b1abdc0dd887f888 (cherry picked from commit c92ebc850345924619a12327f36cc6ac9c0b09d1) --- sd/source/core/drawdoc.cxx | 4 +++- sw/source/uibase/config/viewopt.cxx | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index fcf678ec669f..f820fabaab81 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -97,6 +97,7 @@ #include #include +#include using namespace ::sd; using namespace ::com::sun::star; @@ -229,7 +230,8 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) SetLanguage( MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX), EE_CHAR_LANGUAGE_CTL ); - mbOnlineSpell = aOptions.bIsSpellAuto; + if (!comphelper::LibreOfficeKit::isActive()) + mbOnlineSpell = aOptions.bIsSpellAuto; } LanguageType eRealLanguage = MsLangId::getRealLanguage( meLanguage ); diff --git a/sw/source/uibase/config/viewopt.cxx b/sw/source/uibase/config/viewopt.cxx index c5080e84abd4..77c716af839d 100644 --- a/sw/source/uibase/config/viewopt.cxx +++ b/sw/source/uibase/config/viewopt.cxx @@ -314,6 +314,9 @@ bool SwViewOption::IsAutoCompleteWords() void SwViewOption::SetOnlineSpell(bool b) { + if (comphelper::LibreOfficeKit::isActive()) + return; + b ? (nCoreOptions |= VIEWOPT_1_ONLINESPELL ) : ( nCoreOptions &= ~VIEWOPT_1_ONLINESPELL); } -- 2.12.0