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 /sc | |
| 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 'sc')
| -rw-r--r-- | sc/inc/NumberFormatControl.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/cctrl/tbzoomsliderctrl.cxx | 3 | ||||
| -rw-r--r-- | sc/source/ui/inc/tbzoomsliderctrl.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/sidebar/NumberFormatControl.cxx | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/sc/inc/NumberFormatControl.hxx b/sc/inc/NumberFormatControl.hxx index 56ec8ed0e3cb..78be6f1a0dc7 100644 --- a/sc/inc/NumberFormatControl.hxx +++ b/sc/inc/NumberFormatControl.hxx @@ -35,7 +35,7 @@ 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; }; } // end of namespace sc diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index f74b4789dacf..49679131a18b 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include <tbzoomsliderctrl.hxx> +#include <svtools/InterimItemWindow.hxx> #include <vcl/event.hxx> #include <vcl/image.hxx> #include <vcl/toolbox.hxx> @@ -75,7 +76,7 @@ void ScZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState } } -VclPtr<vcl::Window> ScZoomSliderControl::CreateItemWindow( vcl::Window *pParent ) +VclPtr<InterimItemWindow> ScZoomSliderControl::CreateItemWindow( vcl::Window *pParent ) { // #i98000# Don't try to get a value via SfxViewFrame::Current here. // The view's value is always notified via StateChanged later. diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx index 17b9b5db94c3..cf380c11b37d 100644 --- a/sc/source/ui/inc/tbzoomsliderctrl.hxx +++ b/sc/source/ui/inc/tbzoomsliderctrl.hxx @@ -37,7 +37,7 @@ public: virtual ~ScZoomSliderControl() override; 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; }; class ScZoomSlider final : public weld::CustomWidgetController diff --git a/sc/source/ui/sidebar/NumberFormatControl.cxx b/sc/source/ui/sidebar/NumberFormatControl.cxx index dbfc7debf8b5..5f823f1b0b39 100644 --- a/sc/source/ui/sidebar/NumberFormatControl.cxx +++ b/sc/source/ui/sidebar/NumberFormatControl.cxx @@ -66,7 +66,7 @@ void ScNumberFormatControl::StateChanged(sal_uInt16, SfxItemState eState, } } -VclPtr<vcl::Window> ScNumberFormatControl::CreateItemWindow( vcl::Window *pParent ) +VclPtr<InterimItemWindow> ScNumberFormatControl::CreateItemWindow( vcl::Window *pParent ) { VclPtr<ScNumberFormat> pControl = VclPtr<ScNumberFormat>::Create(pParent); pControl->Show(); |