diff options
Diffstat (limited to 'include/svx/colorwindow.hxx')
-rw-r--r-- | include/svx/colorwindow.hxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx index 136d7621c0e7..784f273e87a7 100644 --- a/include/svx/colorwindow.hxx +++ b/include/svx/colorwindow.hxx @@ -26,6 +26,8 @@ #include <svx/Palette.hxx> #include <vcl/toolbox.hxx> +typedef std::function<weld::Window*()> TopLevelParentFunction; + namespace com::sun::star::frame { class XFrame; } class PaletteManager; @@ -81,11 +83,11 @@ class SVXCORE_DLLPUBLIC ColorWindow final : public WeldToolbarPopup private: const sal_uInt16 theSlotId; OUString maCommand; - weld::Window* mpParentWindow; MenuOrToolMenuButton maMenuButton; std::shared_ptr<PaletteManager> mxPaletteManager; - ColorStatus& mrColorStatus; - ColorSelectFunction maColorSelectFunction; + ColorStatus& mrColorStatus; + TopLevelParentFunction maTopLevelParentFunction; + ColorSelectFunction maColorSelectFunction; std::unique_ptr<SvxColorValueSet> mxColorSet; std::unique_ptr<SvxColorValueSet> mxRecentColorSet; @@ -113,8 +115,9 @@ public: std::shared_ptr<PaletteManager> const & rPaletteManager, ColorStatus& rColorStatus, sal_uInt16 nSlotId, - const css::uno::Reference< css::frame::XFrame >& rFrame, - weld::Window* pParentWindow, const MenuOrToolMenuButton &rMenuButton, + const css::uno::Reference<css::frame::XFrame>& rFrame, + const MenuOrToolMenuButton &rMenuButton, + TopLevelParentFunction const& rTopLevelParentFunction, ColorSelectFunction const& rColorSelectFunction); virtual ~ColorWindow() override; void ShowNoneButton(); |