From 61391c43f5808aadfa5fafb25a1bd7c2ae541b70 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 12 Feb 2020 16:16:59 +0000 Subject: all ItemWindows are now welded MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit where native widgetery is hostable in a vcl toolbar or a native one Change-Id: I942ada335bb4bd6ced0f3352f632e25787f68597 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88598 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- include/avmedia/mediatoolbox.hxx | 2 +- include/sfx2/tbxctrl.hxx | 3 ++- include/svx/ParaSpacingControl.hxx | 14 +++++++------- include/svx/fillctrl.hxx | 2 +- include/svx/grafctrl.hxx | 4 ++-- include/svx/linectrl.hxx | 2 +- 6 files changed, 14 insertions(+), 13 deletions(-) (limited to 'include') diff --git a/include/avmedia/mediatoolbox.hxx b/include/avmedia/mediatoolbox.hxx index 08f63b1cf035..23a766d7829c 100644 --- a/include/avmedia/mediatoolbox.hxx +++ b/include/avmedia/mediatoolbox.hxx @@ -40,7 +40,7 @@ public: virtual ~MediaToolBoxControl() override; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; - virtual VclPtr CreateItemWindow( vcl::Window* pParent ) override; + virtual VclPtr CreateItemWindow( vcl::Window* pParent ) override; private: diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index d812aed6ee3e..4785c4de7c7d 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -31,6 +31,7 @@ namespace com::sun::star::frame { class XDispatchProvider; } namespace com::sun::star::frame { class XFrame; } +class InterimItemWindow; class SfxToolBoxControl; class SfxModule; @@ -81,7 +82,7 @@ protected: virtual void DoubleClick(); virtual void Click(); virtual void CreatePopupWindow(); - virtual VclPtr CreateItemWindow( vcl::Window *pParent ); + virtual VclPtr CreateItemWindow(vcl::Window *pParent); public: // XComponent diff --git a/include/svx/ParaSpacingControl.hxx b/include/svx/ParaSpacingControl.hxx index a342f423c876..cd13bb7d582e 100644 --- a/include/svx/ParaSpacingControl.hxx +++ b/include/svx/ParaSpacingControl.hxx @@ -37,7 +37,7 @@ public: virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) override; - virtual VclPtr CreateItemWindow(vcl::Window* pParent) override = 0; + virtual VclPtr CreateItemWindow(vcl::Window* pParent) override = 0; }; class SVX_DLLPUBLIC ParaAboveSpacingControl final : public ParaULSpacingControl @@ -46,7 +46,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); ParaAboveSpacingControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx); - virtual VclPtr CreateItemWindow(vcl::Window* pParent) override; + virtual VclPtr CreateItemWindow(vcl::Window* pParent) override; }; class SVX_DLLPUBLIC ParaBelowSpacingControl final : public ParaULSpacingControl @@ -55,7 +55,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); ParaBelowSpacingControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx); - virtual VclPtr CreateItemWindow(vcl::Window* pParent) override; + virtual VclPtr CreateItemWindow(vcl::Window* pParent) override; }; class ParaLRSpacingControl : public SfxToolBoxControl, @@ -69,7 +69,7 @@ public: virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) override; - virtual VclPtr CreateItemWindow(vcl::Window* pParent) override = 0; + virtual VclPtr CreateItemWindow(vcl::Window* pParent) override = 0; // XContextChangeEventListener virtual void SAL_CALL notifyContextChangeEvent(const css::ui::ContextChangeEventObject& rEvent) override; @@ -92,7 +92,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); ParaLeftSpacingControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx); - virtual VclPtr CreateItemWindow(vcl::Window* pParent) override; + virtual VclPtr CreateItemWindow(vcl::Window* pParent) override; }; class SVX_DLLPUBLIC ParaRightSpacingControl final : public ParaLRSpacingControl @@ -101,7 +101,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); ParaRightSpacingControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx); - virtual VclPtr CreateItemWindow(vcl::Window* pParent) override; + virtual VclPtr CreateItemWindow(vcl::Window* pParent) override; }; class SVX_DLLPUBLIC ParaFirstLineSpacingControl final : public ParaLRSpacingControl @@ -110,7 +110,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); ParaFirstLineSpacingControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx); - virtual VclPtr CreateItemWindow(vcl::Window* pParent) override; + virtual VclPtr CreateItemWindow(vcl::Window* pParent) override; }; } diff --git a/include/svx/fillctrl.hxx b/include/svx/fillctrl.hxx index c6517f508d65..0001bca0c605 100644 --- a/include/svx/fillctrl.hxx +++ b/include/svx/fillctrl.hxx @@ -70,7 +70,7 @@ public: virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) override; void Update(); - virtual VclPtr CreateItemWindow(vcl::Window* pParent) override; + virtual VclPtr CreateItemWindow(vcl::Window* pParent) override; }; class SAL_WARN_UNUSED FillControl final : public InterimItemWindow diff --git a/include/svx/grafctrl.hxx b/include/svx/grafctrl.hxx index f89a129ecd4e..b22b82392409 100644 --- a/include/svx/grafctrl.hxx +++ b/include/svx/grafctrl.hxx @@ -32,7 +32,7 @@ public: virtual ~SvxGrafToolBoxControl() override; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; - virtual VclPtr CreateItemWindow( vcl::Window *pParent ) override; + virtual VclPtr CreateItemWindow( vcl::Window *pParent ) override; }; @@ -100,7 +100,7 @@ public: virtual ~SvxGrafModeToolBoxControl() override; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; - virtual VclPtr CreateItemWindow( vcl::Window *pParent ) override; + virtual VclPtr CreateItemWindow( vcl::Window *pParent ) override; }; diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx index cd75dbe99eed..657d0f7d9262 100644 --- a/include/svx/linectrl.hxx +++ b/include/svx/linectrl.hxx @@ -77,7 +77,7 @@ public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; - virtual VclPtr CreateItemWindow( vcl::Window *pParent ) override; + virtual VclPtr CreateItemWindow( vcl::Window *pParent ) override; }; #endif -- cgit