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 /sd/source | |
| 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 'sd/source')
| -rw-r--r-- | sd/source/ui/dlg/diactrl.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/dlg/gluectrl.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/inc/diactrl.hxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/inc/gluectrl.hxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx index ffe04874eef0..a9155c1d66d7 100644 --- a/sd/source/ui/dlg/diactrl.cxx +++ b/sd/source/ui/dlg/diactrl.cxx @@ -176,7 +176,7 @@ void SdTbxCtlDiaPages::StateChanged( sal_uInt16, } } -VclPtr<vcl::Window> SdTbxCtlDiaPages::CreateItemWindow( vcl::Window* pParent ) +VclPtr<InterimItemWindow> SdTbxCtlDiaPages::CreateItemWindow( vcl::Window* pParent ) { VclPtr<SdPagesField> pWindow = VclPtr<SdPagesField>::Create(pParent, m_xFrame); pWindow->Show(); diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx index ee2e49a9d7bb..cb27432added 100644 --- a/sd/source/ui/dlg/gluectrl.cxx +++ b/sd/source/ui/dlg/gluectrl.cxx @@ -180,12 +180,12 @@ void SdTbxCtlGlueEscDir::StateChanged( sal_uInt16 nSId, SfxToolBoxControl::StateChanged( nSId, eState, pState ); } -VclPtr<vcl::Window> SdTbxCtlGlueEscDir::CreateItemWindow( vcl::Window *pParent ) +VclPtr<InterimItemWindow> SdTbxCtlGlueEscDir::CreateItemWindow( vcl::Window *pParent ) { if( GetSlotId() == SID_GLUE_ESCDIR ) return VclPtr<GlueEscDirLB>::Create( pParent, m_xFrame ).get(); - return VclPtr<vcl::Window>(); + return VclPtr<InterimItemWindow>(); } /** diff --git a/sd/source/ui/inc/diactrl.hxx b/sd/source/ui/inc/diactrl.hxx index 3aa9d11edde8..17dcad0ab9e0 100644 --- a/sd/source/ui/inc/diactrl.hxx +++ b/sd/source/ui/inc/diactrl.hxx @@ -57,7 +57,7 @@ class SdTbxCtlDiaPages : public SfxToolBoxControl public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; - virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent ) override; + virtual VclPtr<InterimItemWindow> CreateItemWindow( vcl::Window *pParent ) override; SFX_DECL_TOOLBOX_CONTROL(); diff --git a/sd/source/ui/inc/gluectrl.hxx b/sd/source/ui/inc/gluectrl.hxx index 650edc8d840a..ecf1acede60c 100644 --- a/sd/source/ui/inc/gluectrl.hxx +++ b/sd/source/ui/inc/gluectrl.hxx @@ -61,7 +61,7 @@ private: public: virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState ) override; - virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent ) override; + virtual VclPtr<InterimItemWindow> CreateItemWindow( vcl::Window *pParent ) override; SFX_DECL_TOOLBOX_CONTROL(); |