diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-02-12 16:16:59 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-04-26 15:33:47 +0200 |
| commit | 61391c43f5808aadfa5fafb25a1bd7c2ae541b70 (patch) | |
| tree | acbf5580b38ff5f11c7c1eabb61a6b34b675db41 /sfx2 | |
| parent | d9938d4d585ba4493050464e58dc9c785a1ee3b9 (diff) | |
all ItemWindows are now welded
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 <caolanm@redhat.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/inc/inettbc.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/inet/inettbc.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/toolbox/tbxitem.cxx | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/sfx2/inc/inettbc.hxx b/sfx2/inc/inettbc.hxx index 6427565ceef9..9e0bbac8541e 100644 --- a/sfx2/inc/inettbc.hxx +++ b/sfx2/inc/inettbc.hxx @@ -55,7 +55,7 @@ public: SfxURLToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox ); virtual ~SfxURLToolBoxControl_Impl() override; - virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window* pParent ) override; + virtual VclPtr<InterimItemWindow> CreateItemWindow(vcl::Window* pParent) override; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; }; diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index add489118a87..18818b2f2596 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -190,7 +190,7 @@ IMPL_STATIC_LINK( SfxURLToolBoxControl_Impl, ExecuteHdl_Impl, void*, p, void ) delete pExecuteInfo; } -VclPtr<vcl::Window> SfxURLToolBoxControl_Impl::CreateItemWindow( vcl::Window* pParent ) +VclPtr<InterimItemWindow> SfxURLToolBoxControl_Impl::CreateItemWindow( vcl::Window* pParent ) { VclPtrInstance<URLBoxItemWindow> xURLBox(pParent); SvtURLBox* pURLBox = xURLBox->GetURLBox(); diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 723e28000089..a870f58f119f 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -49,6 +49,7 @@ #include <toolkit/helper/vclunohelper.hxx> #include <tools/globname.hxx> +#include <svtools/InterimItemWindow.hxx> #include <sfx2/tbxctrl.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/msg.hxx> @@ -560,9 +561,9 @@ void SfxToolBoxControl::CreatePopupWindow() { } -VclPtr<vcl::Window> SfxToolBoxControl::CreateItemWindow( vcl::Window * ) +VclPtr<InterimItemWindow> SfxToolBoxControl::CreateItemWindow(vcl::Window*) { - return VclPtr<vcl::Window>(); + return VclPtr<InterimItemWindow>(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |