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 /sw | |
| 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 'sw')
| -rw-r--r-- | sw/source/uibase/inc/workctrl.hxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/ribbar/workctrl.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/uibase/inc/workctrl.hxx b/sw/source/uibase/inc/workctrl.hxx index dd359b63a30a..20949f728ecc 100644 --- a/sw/source/uibase/inc/workctrl.hxx +++ b/sw/source/uibase/inc/workctrl.hxx @@ -76,7 +76,7 @@ public: SfxItemState eState, const SfxPoolItem* pState ) override; - virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent ) override; + virtual VclPtr<InterimItemWindow> CreateItemWindow( vcl::Window *pParent ) override; }; class SwJumpToSpecificPageControl : public SfxToolBoxControl @@ -87,7 +87,7 @@ public: SwJumpToSpecificPageControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual ~SwJumpToSpecificPageControl() override; - virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent ) override; + virtual VclPtr<InterimItemWindow> CreateItemWindow( vcl::Window *pParent ) override; }; #endif diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index bdb3d18e7ab1..05b362287a25 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -482,7 +482,7 @@ void SwPreviewZoomControl::StateChanged( sal_uInt16 /*nSID*/, } } -VclPtr<vcl::Window> SwPreviewZoomControl::CreateItemWindow( vcl::Window *pParent ) +VclPtr<InterimItemWindow> SwPreviewZoomControl::CreateItemWindow( vcl::Window *pParent ) { VclPtrInstance<SwZoomBox_Impl> pRet( pParent, GetSlotId() ); return pRet.get(); @@ -558,7 +558,7 @@ SwJumpToSpecificPageControl::SwJumpToSpecificPageControl( SwJumpToSpecificPageControl::~SwJumpToSpecificPageControl() {} -VclPtr<vcl::Window> SwJumpToSpecificPageControl::CreateItemWindow( vcl::Window *pParent ) +VclPtr<InterimItemWindow> SwJumpToSpecificPageControl::CreateItemWindow( vcl::Window *pParent ) { VclPtrInstance<SwJumpToSpecificBox_Impl> pRet( pParent, GetSlotId() ); return pRet.get(); |