sw/source/uibase/uno/unotxdoc.cxx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
New commits: commit 646762e1ac37ce97f33106643be10ed20299c999 Author: Andras Timar <andras.ti...@collabora.com> Date: Mon Nov 7 19:51:52 2016 +0100 Tiled rendering: Show word autocompletion suggestions in selection Change-Id: I913fa0a3a91c9c575f89f41076193e27149fa553 diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 5e92ecb..b99f5dc 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -30,6 +30,8 @@ #include <toolkit/helper/vclunohelper.hxx> #include <toolkit/awt/vclxdevice.hxx> #include <LibreOfficeKit/LibreOfficeKitEnums.h> +#include <editeng/svxacorr.hxx> +#include <editeng/acorrcfg.hxx> #include <cmdid.h> #include <swtypes.hxx> #include <wdocsh.hxx> @@ -3277,6 +3279,9 @@ void SwXTextDocument::initializeForTiledRendering(const css::uno::Sequence<css:: // causing 'Save' being disabled; so let's always save to the original // format SvtSaveOptions().SetWarnAlienFormat(false); + + // show word auto completion suggestions in selection instead of tooltip + SvxAutoCorrCfg::Get().GetAutoCorrect()->GetSwFlags().bAutoCmpltShowAsTip = false; } void SwXTextDocument::postKeyEvent(int nType, int nCharCode, int nKeyCode) commit 709819833dd643bf95c2fedadabe615bff320991 Author: Andras Timar <andras.ti...@collabora.com> Date: Mon Nov 7 19:31:12 2016 +0100 Revert "Disable word completion for tiled rendering" This reverts commit 1e37e3d3d9056e32e60ec9ace56d42ff0c97220e. diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 09b584a..5e92ecb 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -151,7 +151,6 @@ #include <comphelper/processfactory.hxx> #include <comphelper/servicehelper.hxx> #include <memory> -#include <officecfg/Office/Writer.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::text; @@ -3278,12 +3277,6 @@ void SwXTextDocument::initializeForTiledRendering(const css::uno::Sequence<css:: // causing 'Save' being disabled; so let's always save to the original // format SvtSaveOptions().SetWarnAlienFormat(false); - - // Disable word completion - std::shared_ptr< comphelper::ConfigurationChanges > batch( - comphelper::ConfigurationChanges::create()); - officecfg::Office::Writer::AutoFunction::Completion::Enable::set(false, batch); - batch->commit(); } void SwXTextDocument::postKeyEvent(int nType, int nCharCode, int nKeyCode) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits