diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-10-30 11:34:27 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-10-31 13:30:59 +0100 |
commit | e2aa85a6fbc039e8b1950f0e4b8484595d0b47eb (patch) | |
tree | 2658525d24372ee535be570d682c9f1ca75a178b /include/editeng | |
parent | 32c53b465bc2052c2756f12294699fabae754756 (diff) |
avoid intermediate vcl::Windows
Change-Id: Iac6bc83265e007a699a8993b89ac2efaa3739d95
Reviewed-on: https://gerrit.libreoffice.org/81761
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/editeng')
-rw-r--r-- | include/editeng/splwrap.hxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx index dbb6576fbbfd..69dfbbc6c780 100644 --- a/include/editeng/splwrap.hxx +++ b/include/editeng/splwrap.hxx @@ -24,7 +24,7 @@ #include <i18nlangtag/lang.h> #include <rtl/ustring.hxx> #include <com/sun/star/uno/Reference.hxx> -#include <vcl/vclptr.hxx> +#include <vcl/weld.hxx> // forward --------------------------------------------------------------- @@ -34,8 +34,6 @@ namespace com { namespace sun { namespace star { namespace linguistic2 { class XHyphenator; }}}} -namespace vcl { class Window; } - // misc functions --------------------------------------------------------------- void EDITENG_DLLPUBLIC SvxPrepareAutoCorrect( OUString &rOldText, const OUString &rNewText ); @@ -50,7 +48,8 @@ private: friend class SvxHyphenWordDialog; friend struct SvxHyphenWordDialog_Impl; - VclPtr<vcl::Window> pWin; + weld::Window* pWin; + std::unique_ptr<weld::WaitObject> xWait; css::uno::Reference< css::uno::XInterface > xLast; // result of last spelling/hyphenation attempt css::uno::Reference< @@ -71,9 +70,9 @@ private: void operator =(SvxSpellWrapper const &) = delete; public: - SvxSpellWrapper( vcl::Window* pWn, + SvxSpellWrapper( weld::Window* pWn, const bool bStart, const bool bIsAllRight ); - SvxSpellWrapper( vcl::Window* pWn, + SvxSpellWrapper( weld::Window* pWn, css::uno::Reference< css::linguistic2::XHyphenator > const &xHyphenator, const bool bStart, const bool bOther ); |