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 --- svx/source/form/tbxform.cxx | 8 ++++---- svx/source/inc/tbxform.hxx | 8 ++++---- svx/source/sidebar/paragraph/ParaSpacingControl.cxx | 10 +++++----- svx/source/tbxctrls/fillctrl.cxx | 4 ++-- svx/source/tbxctrls/grafctrl.cxx | 4 ++-- svx/source/tbxctrls/linewidthctrl.cxx | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) (limited to 'svx') diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index 292030cb4793..035dfca802bf 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -140,7 +140,7 @@ void SvxFmTbxCtlAbsRec::StateChanged( sal_uInt16 nSID, SfxItemState eState, cons SfxToolBoxControl::StateChanged( nSID, eState,pState ); } -VclPtr SvxFmTbxCtlAbsRec::CreateItemWindow( vcl::Window* pParent ) +VclPtr SvxFmTbxCtlAbsRec::CreateItemWindow( vcl::Window* pParent ) { return VclPtrInstance(pParent, this); } @@ -197,7 +197,7 @@ LabelItemWindow::~LabelItemWindow() disposeOnce(); } -VclPtr SvxFmTbxCtlRecText::CreateItemWindow( vcl::Window* pParent ) +VclPtr SvxFmTbxCtlRecText::CreateItemWindow( vcl::Window* pParent ) { OUString aText(SvxResId(RID_STR_REC_TEXT)); VclPtrInstance xFixedText(pParent, aText); @@ -219,7 +219,7 @@ SvxFmTbxCtlRecFromText::~SvxFmTbxCtlRecFromText() { } -VclPtr SvxFmTbxCtlRecFromText::CreateItemWindow( vcl::Window* pParent ) +VclPtr SvxFmTbxCtlRecFromText::CreateItemWindow( vcl::Window* pParent ) { OUString aText(SvxResId(RID_STR_REC_FROM_TEXT)); VclPtrInstance xFixedText(pParent, aText); @@ -241,7 +241,7 @@ SvxFmTbxCtlRecTotal::~SvxFmTbxCtlRecTotal() { } -VclPtr SvxFmTbxCtlRecTotal::CreateItemWindow( vcl::Window* pParent ) +VclPtr SvxFmTbxCtlRecTotal::CreateItemWindow( vcl::Window* pParent ) { OUString const aSample("123456"); m_xFixedText.reset(VclPtr::Create(pParent, aSample)); diff --git a/svx/source/inc/tbxform.hxx b/svx/source/inc/tbxform.hxx index 394bf22a2547..4b0d1534076c 100644 --- a/svx/source/inc/tbxform.hxx +++ b/svx/source/inc/tbxform.hxx @@ -53,7 +53,7 @@ public: SvxFmTbxCtlAbsRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual ~SvxFmTbxCtlAbsRec() override; - virtual VclPtr CreateItemWindow( vcl::Window* pParent ) override; + virtual VclPtr CreateItemWindow( vcl::Window* pParent ) override; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; @@ -67,7 +67,7 @@ public: SvxFmTbxCtlRecText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual ~SvxFmTbxCtlRecText() override; - virtual VclPtr CreateItemWindow( vcl::Window* pParent ) override; + virtual VclPtr CreateItemWindow( vcl::Window* pParent ) override; }; class SvxFmTbxCtlRecFromText : public SfxToolBoxControl @@ -78,7 +78,7 @@ public: SvxFmTbxCtlRecFromText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual ~SvxFmTbxCtlRecFromText() override; - virtual VclPtr CreateItemWindow( vcl::Window* pParent ) override; + virtual VclPtr CreateItemWindow( vcl::Window* pParent ) override; }; class LabelItemWindow; @@ -93,7 +93,7 @@ public: SvxFmTbxCtlRecTotal( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual ~SvxFmTbxCtlRecTotal() override; - virtual VclPtr CreateItemWindow( vcl::Window* pParent ) override; + virtual VclPtr CreateItemWindow( vcl::Window* pParent ) override; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; }; diff --git a/svx/source/sidebar/paragraph/ParaSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaSpacingControl.cxx index d7c0b3538dd0..118d1401083f 100644 --- a/svx/source/sidebar/paragraph/ParaSpacingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaSpacingControl.cxx @@ -87,7 +87,7 @@ ParaAboveSpacingControl::ParaAboveSpacingControl(sal_uInt16 nSlotId, sal_uInt16 { } -VclPtr ParaAboveSpacingControl::CreateItemWindow(vcl::Window* pParent) +VclPtr ParaAboveSpacingControl::CreateItemWindow(vcl::Window* pParent) { VclPtr pWindow = VclPtr::Create(pParent); pWindow->Show(); @@ -102,7 +102,7 @@ ParaBelowSpacingControl::ParaBelowSpacingControl(sal_uInt16 nSlotId, sal_uInt16 { } -VclPtr ParaBelowSpacingControl::CreateItemWindow(vcl::Window* pParent) +VclPtr ParaBelowSpacingControl::CreateItemWindow(vcl::Window* pParent) { VclPtr pWindow = VclPtr::Create(pParent); pWindow->Show(); @@ -216,7 +216,7 @@ ParaLeftSpacingControl::ParaLeftSpacingControl(sal_uInt16 nSlotId, sal_uInt16 nI { } -VclPtr ParaLeftSpacingControl::CreateItemWindow(vcl::Window* pParent) +VclPtr ParaLeftSpacingControl::CreateItemWindow(vcl::Window* pParent) { VclPtr pWindow = VclPtr::Create(pParent); pWindow->Show(); @@ -231,7 +231,7 @@ ParaRightSpacingControl::ParaRightSpacingControl(sal_uInt16 nSlotId, sal_uInt16 { } -VclPtr ParaRightSpacingControl::CreateItemWindow(vcl::Window* pParent) +VclPtr ParaRightSpacingControl::CreateItemWindow(vcl::Window* pParent) { VclPtr pWindow = VclPtr::Create(pParent); pWindow->Show(); @@ -246,7 +246,7 @@ ParaFirstLineSpacingControl::ParaFirstLineSpacingControl(sal_uInt16 nSlotId, sal { } -VclPtr ParaFirstLineSpacingControl::CreateItemWindow(vcl::Window* pParent) +VclPtr ParaFirstLineSpacingControl::CreateItemWindow(vcl::Window* pParent) { VclPtr pWindow = VclPtr::Create(pParent); pWindow->Show(); diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 8b1339ad3e7b..588e77f07439 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -537,7 +537,7 @@ void SvxFillToolBoxControl::Update() } -VclPtr SvxFillToolBoxControl::CreateItemWindow(vcl::Window *pParent) +VclPtr SvxFillToolBoxControl::CreateItemWindow(vcl::Window *pParent) { if(GetSlotId() == SID_ATTR_FILL_STYLE) { @@ -553,7 +553,7 @@ VclPtr SvxFillToolBoxControl::CreateItemWindow(vcl::Window *pParent return mxFillControl; } - return VclPtr(); + return VclPtr(); } FillControl::FillControl(vcl::Window* pParent, const css::uno::Reference& rFrame) diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index e073dcf60028..8f81f01ede64 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -417,7 +417,7 @@ void SvxGrafToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const } } -VclPtr SvxGrafToolBoxControl::CreateItemWindow( vcl::Window *pParent ) +VclPtr SvxGrafToolBoxControl::CreateItemWindow( vcl::Window *pParent ) { return VclPtr::Create( pParent, m_aCommandURL, m_xFrame ).get(); } @@ -504,7 +504,7 @@ void SvxGrafModeToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, c } } -VclPtr SvxGrafModeToolBoxControl::CreateItemWindow( vcl::Window *pParent ) +VclPtr SvxGrafModeToolBoxControl::CreateItemWindow( vcl::Window *pParent ) { return VclPtr::Create( pParent, m_xFrame ).get(); } diff --git a/svx/source/tbxctrls/linewidthctrl.cxx b/svx/source/tbxctrls/linewidthctrl.cxx index fb20d71ce2f7..90d2b1299917 100644 --- a/svx/source/tbxctrls/linewidthctrl.cxx +++ b/svx/source/tbxctrls/linewidthctrl.cxx @@ -84,7 +84,7 @@ void SvxLineWidthToolBoxControl::StateChanged( } } -VclPtr SvxLineWidthToolBoxControl::CreateItemWindow(vcl::Window *pParent) +VclPtr SvxLineWidthToolBoxControl::CreateItemWindow(vcl::Window *pParent) { VclPtr pWindow = VclPtr::Create(pParent, m_xFrame); pWindow->Show(); -- cgit