diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-01-14 17:17:35 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-01-14 21:27:41 +0100 |
| commit | e5701af7c4226341776ed12c4bc5b24469a2599d (patch) | |
| tree | 90c924cc2f8f393e39fdfaaf70639ff0fa02d850 /include/sfx2 | |
| parent | 22bf6e323465bd38b38fc026d801bb470e3f9d5c (diff) | |
rework SfxEmojiControl to be a PopupWindowController
Change-Id: Ia3262e5b54257d5556c500f440806ac2df9886cf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86794
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/sfx2')
| -rw-r--r-- | include/sfx2/charmapcontrol.hxx | 1 | ||||
| -rw-r--r-- | include/sfx2/emojicontrol.hxx | 8 | ||||
| -rw-r--r-- | include/sfx2/emojipopup.hxx | 18 |
3 files changed, 16 insertions, 11 deletions
diff --git a/include/sfx2/charmapcontrol.hxx b/include/sfx2/charmapcontrol.hxx index 83230a458af6..31a7ce5937e7 100644 --- a/include/sfx2/charmapcontrol.hxx +++ b/include/sfx2/charmapcontrol.hxx @@ -22,7 +22,6 @@ #include <sal/config.h> #include <sfx2/dllapi.h> -#include <sfx2/tbxctrl.hxx> #include <sfx2/charwin.hxx> #include <svtools/toolbarmenu.hxx> #include <deque> diff --git a/include/sfx2/emojicontrol.hxx b/include/sfx2/emojicontrol.hxx index 4026a31954ab..33d0e021bbe1 100644 --- a/include/sfx2/emojicontrol.hxx +++ b/include/sfx2/emojicontrol.hxx @@ -13,21 +13,21 @@ #include <sal/config.h> #include <sfx2/dllapi.h> #include <vcl/tabctrl.hxx> -#include <sfx2/tbxctrl.hxx> +#include <svtools/toolbarmenu.hxx> #define TAB_FONT_SIZE 15 namespace com::sun::star::frame { class XFrame; } +class EmojiPopup; class EmojiView; class ThumbnailViewItem; enum class FILTER_CATEGORY; -class SfxEmojiControl final : public SfxPopupWindow +class SfxEmojiControl final : public svtools::ToolbarPopup { public: - explicit SfxEmojiControl(sal_uInt16 nId, vcl::Window* pParent, - const css::uno::Reference< css::frame::XFrame >& rFrame); + explicit SfxEmojiControl(EmojiPopup* pControl, vcl::Window* pParent); virtual ~SfxEmojiControl() override; diff --git a/include/sfx2/emojipopup.hxx b/include/sfx2/emojipopup.hxx index ee98e12e93b8..a5a9b0934504 100644 --- a/include/sfx2/emojipopup.hxx +++ b/include/sfx2/emojipopup.hxx @@ -20,18 +20,24 @@ #ifndef INCLUDED_SFX2_INC_EMOJIPOPUP_HXX #define INCLUDED_SFX2_INC_EMOJIPOPUP_HXX -#include <sfx2/tbxctrl.hxx> +#include <svtools/popupwindowcontroller.hxx> #include <sfx2/dllapi.h> -class SFX2_DLLPUBLIC EmojiPopup final : public SfxToolBoxControl +class SFX2_DLLPUBLIC EmojiPopup final : public svt::PopupWindowController { public: - SFX_DECL_TOOLBOX_CONTROL(); - - EmojiPopup(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx); + EmojiPopup(const css::uno::Reference<css::uno::XComponentContext>& rContext); virtual ~EmojiPopup() override; - virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override; + using svt::ToolboxController::createPopupWindow; + virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override; + + // XServiceInfo + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; + + // XInitialization + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& rArguments ) override; }; #endif |