From 5261417cbb3051b812164838d19c0f748573df45 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 14 Jun 2019 21:56:44 +0100 Subject: weld SpellDialog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit a) use EditEngine instead of TextEngine as the former can be hosted in a foreign widget b) use a SfxGrabBagItem to hold the custom spellchecking info inside the EditEngine c) in longer paragraphs the current word is now auto-scrolled into view d) rename Invalidate to InvalidateDialog Change-Id: Ic6db019c32cdfd5f354c58ee7394fdaa040b86e1 Reviewed-on: https://gerrit.libreoffice.org/74119 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- cui/source/factory/dlgfact.hxx | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'cui/source/factory/dlgfact.hxx') diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index ca07530a4f94..2f83409d2644 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -236,10 +236,16 @@ public: namespace svx{ class SpellDialog;} class AbstractSpellDialog_Impl : public AbstractSpellDialog { - public: - DECL_ABSTDLG_BASE(AbstractSpellDialog_Impl, svx::SpellDialog) - virtual void Invalidate() override; - virtual vcl::Window* GetWindow() override; + std::shared_ptr m_xDlg; +public: + explicit AbstractSpellDialog_Impl(std::unique_ptr p) + : m_xDlg(std::move(p)) + { + } + virtual short Execute() override; + virtual bool StartExecuteAsync(AsyncContext &rCtx) override; + virtual void InvalidateDialog() override; + virtual std::shared_ptr GetController() override; virtual SfxBindings& GetBindings() override; }; @@ -750,7 +756,7 @@ public: const SdrView* pSdrView, bool bSizeTabPage) override; virtual VclPtr CreateSvxSpellDialog( - vcl::Window* pParent, + weld::Window* pParent, SfxBindings* pBindings, svx::SpellDialogChildWindow* pSpellChildWindow ) override; -- cgit v1.2.3