diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-01-13 08:50:56 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-01-14 12:15:37 +0100 |
| commit | 1c6728a7b52439ed09ed1576517b8037479de1a6 (patch) | |
| tree | 25331b04320fb08e938804a0fb19d536f7c2a505 /include/svtools | |
| parent | rework SfxCharmapCtrl to be a PopupWindowController (diff) | |
| download | core-1c6728a7b52439ed09ed1576517b8037479de1a6.tar.gz core-1c6728a7b52439ed09ed1576517b8037479de1a6.zip | |
weld SfxCharmapCtrl
Change-Id: I36bb2d1b23fdb5afa4e5ab85e6989a95474e874e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86678
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/svtools')
| -rw-r--r-- | include/svtools/toolbarmenu.hxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx index d583482628ce..b11b89380774 100644 --- a/include/svtools/toolbarmenu.hxx +++ b/include/svtools/toolbarmenu.hxx @@ -178,12 +178,11 @@ public: // is activated, so ToolbarPopupContainer is that widget and the // contents of the on-demand created WeldToolbarPopup is placed // within the ToolbarPopupContainer -class SVT_DLLPUBLIC ToolbarPopupContainer +class SVT_DLLPUBLIC ToolbarPopupContainer final { private: DECL_LINK(FocusHdl, weld::Widget&, void); -protected: std::unique_ptr<weld::Builder> m_xBuilder; std::unique_ptr<weld::Container> m_xTopLevel; std::unique_ptr<weld::Container> m_xContainer; @@ -199,9 +198,9 @@ public: void unsetPopover(); }; -class SVT_DLLPUBLIC InterimToolbarPopup : public svtools::ToolbarPopup +class SVT_DLLPUBLIC InterimToolbarPopup final : public svtools::ToolbarPopup { -protected: +private: VclPtr<vcl::Window> m_xBox; std::unique_ptr<weld::Builder> m_xBuilder; std::unique_ptr<weld::Container> m_xContainer; |