diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-02-15 11:52:37 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-02-15 16:59:42 +0100 |
| commit | 0880fb5e3e455cbe5279c6f9cdcd0772cff11312 (patch) | |
| tree | bc5656631d0e8306403baeb4540e15ec845d5bfa /include | |
| parent | d5670177aacde2d722cfba6fe8083544549533e0 (diff) | |
use GetPopupParent for editeng transient dialogs
Change-Id: Ie799643b68ea41b4c4d0d0493755d09d3983d9e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110934
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/editeng/edtdlg.hxx | 4 | ||||
| -rw-r--r-- | include/editeng/hangulhanja.hxx | 4 | ||||
| -rw-r--r-- | include/vcl/weld.hxx | 7 |
3 files changed, 8 insertions, 7 deletions
diff --git a/include/editeng/edtdlg.hxx b/include/editeng/edtdlg.hxx index 1cadb9978042..a9f616627aa3 100644 --- a/include/editeng/edtdlg.hxx +++ b/include/editeng/edtdlg.hxx @@ -93,7 +93,7 @@ class EDITENG_DLLPUBLIC EditAbstractDialogFactory : virtual public VclAbstractDi public: virtual ~EditAbstractDialogFactory() override; // needed for export of vtable static EditAbstractDialogFactory* Create(); - virtual VclPtr<AbstractThesaurusDialog> CreateThesaurusDialog(weld::Window*, + virtual VclPtr<AbstractThesaurusDialog> CreateThesaurusDialog(weld::Widget*, css::uno::Reference<css::linguistic2::XThesaurus> xThesaurus, const OUString &rWord, LanguageType nLanguage) = 0; @@ -101,7 +101,7 @@ public: const OUString &rWord, LanguageType nLang, css::uno::Reference< css::linguistic2::XHyphenator > &xHyphen, SvxSpellWrapper* pWrapper) = 0; - virtual VclPtr<AbstractHangulHanjaConversionDialog> CreateHangulHanjaConversionDialog(weld::Window* pParent) = 0; + virtual VclPtr<AbstractHangulHanjaConversionDialog> CreateHangulHanjaConversionDialog(weld::Widget* pParent) = 0; }; #endif diff --git a/include/editeng/hangulhanja.hxx b/include/editeng/hangulhanja.hxx index 202f44a1bb8e..25c7d0b1d354 100644 --- a/include/editeng/hangulhanja.hxx +++ b/include/editeng/hangulhanja.hxx @@ -27,7 +27,7 @@ namespace com::sun::star::lang { struct Locale; } namespace com::sun::star::uno { class XComponentContext; } namespace com::sun::star::uno { template <class E> class Sequence; } namespace vcl { class Font; } -namespace weld { class Window; } +namespace weld { class Widget; } namespace editeng @@ -108,7 +108,7 @@ namespace editeng public: HangulHanjaConversion( - weld::Window* pUIParent, + weld::Widget* pUIParent, const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::lang::Locale& _rSourceLocale, const css::lang::Locale& _rTargetLocale, diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx index 6f734be32b6d..2c0c5f6b5724 100644 --- a/include/vcl/weld.hxx +++ b/include/vcl/weld.hxx @@ -287,6 +287,8 @@ public: virtual void freeze() = 0; virtual void thaw() = 0; + virtual void set_busy_cursor(bool bBusy) = 0; + virtual std::unique_ptr<Container> weld_parent() const = 0; //iterate upwards through the hierarchy starting at this widgets parent, @@ -476,7 +478,6 @@ protected: public: virtual void set_title(const OUString& rTitle) = 0; virtual OUString get_title() const = 0; - virtual void set_busy_cursor(bool bBusy) = 0; virtual void window_move(int x, int y) = 0; virtual void set_modal(bool bModal) = 0; virtual bool get_modal() const = 0; @@ -523,10 +524,10 @@ public: class VCL_DLLPUBLIC WaitObject { private: - weld::Window* m_pWindow; + weld::Widget* m_pWindow; public: - WaitObject(weld::Window* pWindow) + WaitObject(weld::Widget* pWindow) : m_pWindow(pWindow) { if (m_pWindow) |