[Libreoffice-commits] core.git: avmedia/source basctl/source include/avmedia include/sfx2 include/svx sc/inc sc/source sd/source sfx2/inc sfx2/source svx/source sw/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Sun Apr 26 13:34:24 UTC 2020
avmedia/source/framework/mediatoolbox.cxx | 5 +----
basctl/source/basicide/IDEComboBox.cxx | 4 ++--
basctl/source/inc/IDEComboBox.hxx | 4 ++--
include/avmedia/mediatoolbox.hxx | 2 +-
include/sfx2/tbxctrl.hxx | 3 ++-
include/svx/ParaSpacingControl.hxx | 14 +++++++-------
include/svx/fillctrl.hxx | 2 +-
include/svx/grafctrl.hxx | 4 ++--
include/svx/linectrl.hxx | 2 +-
sc/inc/NumberFormatControl.hxx | 2 +-
sc/source/ui/cctrl/tbzoomsliderctrl.cxx | 3 ++-
sc/source/ui/inc/tbzoomsliderctrl.hxx | 2 +-
sc/source/ui/sidebar/NumberFormatControl.cxx | 2 +-
sd/source/ui/dlg/diactrl.cxx | 2 +-
sd/source/ui/dlg/gluectrl.cxx | 4 ++--
sd/source/ui/inc/diactrl.hxx | 2 +-
sd/source/ui/inc/gluectrl.hxx | 2 +-
sfx2/inc/inettbc.hxx | 2 +-
sfx2/source/inet/inettbc.cxx | 2 +-
sfx2/source/toolbox/tbxitem.cxx | 5 +++--
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 +-
sw/source/uibase/inc/workctrl.hxx | 4 ++--
sw/source/uibase/ribbar/workctrl.cxx | 4 ++--
28 files changed, 56 insertions(+), 56 deletions(-)
New commits:
commit 61391c43f5808aadfa5fafb25a1bd7c2ae541b70
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Feb 12 16:16:59 2020 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Apr 26 15:33:47 2020 +0200
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 at redhat.com>
diff --git a/avmedia/source/framework/mediatoolbox.cxx b/avmedia/source/framework/mediatoolbox.cxx
index a291218da6c5..0eac2eff0378 100644
--- a/avmedia/source/framework/mediatoolbox.cxx
+++ b/avmedia/source/framework/mediatoolbox.cxx
@@ -105,19 +105,16 @@ void MediaToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const S
}
}
-
-VclPtr<vcl::Window> MediaToolBoxControl::CreateItemWindow( vcl::Window *pParent )
+VclPtr<InterimItemWindow> MediaToolBoxControl::CreateItemWindow( vcl::Window *pParent )
{
return ( pParent ? VclPtr<MediaToolBoxControl_Impl>::Create( *pParent, *this ) : nullptr );
}
-
void MediaToolBoxControl::implUpdateMediaControl()
{
updateStatus( ".uno:AVMediaToolBox" );
}
-
void MediaToolBoxControl::implExecuteMediaControl( const MediaItem& rItem )
{
MediaItem aExecItem( SID_AVMEDIA_TOOLBOX );
diff --git a/basctl/source/basicide/IDEComboBox.cxx b/basctl/source/basicide/IDEComboBox.cxx
index 621a60d97b0b..fc135cf1a3e4 100644
--- a/basctl/source/basicide/IDEComboBox.cxx
+++ b/basctl/source/basicide/IDEComboBox.cxx
@@ -81,7 +81,7 @@ void LibBoxControl::StateChanged(sal_uInt16, SfxItemState eState, const SfxPoolI
}
}
-VclPtr<vcl::Window> LibBoxControl::CreateItemWindow(vcl::Window* pParent)
+VclPtr<InterimItemWindow> LibBoxControl::CreateItemWindow(vcl::Window* pParent)
{
return VclPtr<LibBox>::Create(pParent);
}
@@ -376,7 +376,7 @@ void LanguageBoxControl::StateChanged(sal_uInt16, SfxItemState eState, const Sfx
}
}
-VclPtr<vcl::Window> LanguageBoxControl::CreateItemWindow(vcl::Window* pParent)
+VclPtr<InterimItemWindow> LanguageBoxControl::CreateItemWindow(vcl::Window* pParent)
{
return VclPtr<LanguageBox>::Create(pParent);
}
diff --git a/basctl/source/inc/IDEComboBox.hxx b/basctl/source/inc/IDEComboBox.hxx
index ff1023463edc..32b8bc43c576 100644
--- a/basctl/source/inc/IDEComboBox.hxx
+++ b/basctl/source/inc/IDEComboBox.hxx
@@ -70,7 +70,7 @@ public:
* @param pParent -- parent window
* @return ComboBox of macro and dialog Library
*/
- virtual VclPtr<vcl::Window> CreateItemWindow(vcl::Window* pParent) override;
+ virtual VclPtr<InterimItemWindow> CreateItemWindow(vcl::Window* pParent) override;
};
/*!
@@ -223,7 +223,7 @@ public:
* @param pParent
* @return LanguageBox ComboBox
*/
- virtual VclPtr<vcl::Window> CreateItemWindow(vcl::Window* pParent) override;
+ virtual VclPtr<InterimItemWindow> CreateItemWindow(vcl::Window* pParent) override;
};
/*!
diff --git a/include/avmedia/mediatoolbox.hxx b/include/avmedia/mediatoolbox.hxx
index 08f63b1cf035..23a766d7829c 100644
--- a/include/avmedia/mediatoolbox.hxx
+++ b/include/avmedia/mediatoolbox.hxx
@@ -40,7 +40,7 @@ public:
virtual ~MediaToolBoxControl() 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;
private:
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index d812aed6ee3e..4785c4de7c7d 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -31,6 +31,7 @@
namespace com::sun::star::frame { class XDispatchProvider; }
namespace com::sun::star::frame { class XFrame; }
+class InterimItemWindow;
class SfxToolBoxControl;
class SfxModule;
@@ -81,7 +82,7 @@ protected:
virtual void DoubleClick();
virtual void Click();
virtual void CreatePopupWindow();
- virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent );
+ virtual VclPtr<InterimItemWindow> CreateItemWindow(vcl::Window *pParent);
public:
// XComponent
diff --git a/include/svx/ParaSpacingControl.hxx b/include/svx/ParaSpacingControl.hxx
index a342f423c876..cd13bb7d582e 100644
--- a/include/svx/ParaSpacingControl.hxx
+++ b/include/svx/ParaSpacingControl.hxx
@@ -37,7 +37,7 @@ public:
virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState) override;
- virtual VclPtr<vcl::Window> CreateItemWindow(vcl::Window* pParent) override = 0;
+ virtual VclPtr<InterimItemWindow> CreateItemWindow(vcl::Window* pParent) override = 0;
};
class SVX_DLLPUBLIC ParaAboveSpacingControl final : public ParaULSpacingControl
@@ -46,7 +46,7 @@ public:
SFX_DECL_TOOLBOX_CONTROL();
ParaAboveSpacingControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx);
- virtual VclPtr<vcl::Window> CreateItemWindow(vcl::Window* pParent) override;
+ virtual VclPtr<InterimItemWindow> CreateItemWindow(vcl::Window* pParent) override;
};
class SVX_DLLPUBLIC ParaBelowSpacingControl final : public ParaULSpacingControl
@@ -55,7 +55,7 @@ public:
SFX_DECL_TOOLBOX_CONTROL();
ParaBelowSpacingControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx);
- virtual VclPtr<vcl::Window> CreateItemWindow(vcl::Window* pParent) override;
+ virtual VclPtr<InterimItemWindow> CreateItemWindow(vcl::Window* pParent) override;
};
class ParaLRSpacingControl : public SfxToolBoxControl,
@@ -69,7 +69,7 @@ public:
virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState) override;
- virtual VclPtr<vcl::Window> CreateItemWindow(vcl::Window* pParent) override = 0;
+ virtual VclPtr<InterimItemWindow> CreateItemWindow(vcl::Window* pParent) override = 0;
// XContextChangeEventListener
virtual void SAL_CALL notifyContextChangeEvent(const css::ui::ContextChangeEventObject& rEvent) override;
@@ -92,7 +92,7 @@ public:
SFX_DECL_TOOLBOX_CONTROL();
ParaLeftSpacingControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx);
- virtual VclPtr<vcl::Window> CreateItemWindow(vcl::Window* pParent) override;
+ virtual VclPtr<InterimItemWindow> CreateItemWindow(vcl::Window* pParent) override;
};
class SVX_DLLPUBLIC ParaRightSpacingControl final : public ParaLRSpacingControl
@@ -101,7 +101,7 @@ public:
SFX_DECL_TOOLBOX_CONTROL();
ParaRightSpacingControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx);
- virtual VclPtr<vcl::Window> CreateItemWindow(vcl::Window* pParent) override;
+ virtual VclPtr<InterimItemWindow> CreateItemWindow(vcl::Window* pParent) override;
};
class SVX_DLLPUBLIC ParaFirstLineSpacingControl final : public ParaLRSpacingControl
@@ -110,7 +110,7 @@ public:
SFX_DECL_TOOLBOX_CONTROL();
ParaFirstLineSpacingControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx);
- virtual VclPtr<vcl::Window> CreateItemWindow(vcl::Window* pParent) override;
+ virtual VclPtr<InterimItemWindow> CreateItemWindow(vcl::Window* pParent) override;
};
}
diff --git a/include/svx/fillctrl.hxx b/include/svx/fillctrl.hxx
index c6517f508d65..0001bca0c605 100644
--- a/include/svx/fillctrl.hxx
+++ b/include/svx/fillctrl.hxx
@@ -70,7 +70,7 @@ public:
virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) override;
void Update();
- virtual VclPtr<vcl::Window> CreateItemWindow(vcl::Window* pParent) override;
+ virtual VclPtr<InterimItemWindow> CreateItemWindow(vcl::Window* pParent) override;
};
class SAL_WARN_UNUSED FillControl final : public InterimItemWindow
diff --git a/include/svx/grafctrl.hxx b/include/svx/grafctrl.hxx
index f89a129ecd4e..b22b82392409 100644
--- a/include/svx/grafctrl.hxx
+++ b/include/svx/grafctrl.hxx
@@ -32,7 +32,7 @@ public:
virtual ~SvxGrafToolBoxControl() 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;
};
@@ -100,7 +100,7 @@ public:
virtual ~SvxGrafModeToolBoxControl() 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;
};
diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx
index cd75dbe99eed..657d0f7d9262 100644
--- a/include/svx/linectrl.hxx
+++ b/include/svx/linectrl.hxx
@@ -77,7 +77,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;
};
#endif
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();
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();
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: */
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<vcl::Window> SvxFmTbxCtlAbsRec::CreateItemWindow( vcl::Window* pParent )
+VclPtr<InterimItemWindow> SvxFmTbxCtlAbsRec::CreateItemWindow( vcl::Window* pParent )
{
return VclPtrInstance<SvxFmAbsRecWin>(pParent, this);
}
@@ -197,7 +197,7 @@ LabelItemWindow::~LabelItemWindow()
disposeOnce();
}
-VclPtr<vcl::Window> SvxFmTbxCtlRecText::CreateItemWindow( vcl::Window* pParent )
+VclPtr<InterimItemWindow> SvxFmTbxCtlRecText::CreateItemWindow( vcl::Window* pParent )
{
OUString aText(SvxResId(RID_STR_REC_TEXT));
VclPtrInstance<LabelItemWindow> xFixedText(pParent, aText);
@@ -219,7 +219,7 @@ SvxFmTbxCtlRecFromText::~SvxFmTbxCtlRecFromText()
{
}
-VclPtr<vcl::Window> SvxFmTbxCtlRecFromText::CreateItemWindow( vcl::Window* pParent )
+VclPtr<InterimItemWindow> SvxFmTbxCtlRecFromText::CreateItemWindow( vcl::Window* pParent )
{
OUString aText(SvxResId(RID_STR_REC_FROM_TEXT));
VclPtrInstance<LabelItemWindow> xFixedText(pParent, aText);
@@ -241,7 +241,7 @@ SvxFmTbxCtlRecTotal::~SvxFmTbxCtlRecTotal()
{
}
-VclPtr<vcl::Window> SvxFmTbxCtlRecTotal::CreateItemWindow( vcl::Window* pParent )
+VclPtr<InterimItemWindow> SvxFmTbxCtlRecTotal::CreateItemWindow( vcl::Window* pParent )
{
OUString const aSample("123456");
m_xFixedText.reset(VclPtr<LabelItemWindow>::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<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;
@@ -67,7 +67,7 @@ public:
SvxFmTbxCtlRecText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
virtual ~SvxFmTbxCtlRecText() override;
- virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window* pParent ) override;
+ virtual VclPtr<InterimItemWindow> 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<vcl::Window> CreateItemWindow( vcl::Window* pParent ) override;
+ virtual VclPtr<InterimItemWindow> 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<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/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<vcl::Window> ParaAboveSpacingControl::CreateItemWindow(vcl::Window* pParent)
+VclPtr<InterimItemWindow> ParaAboveSpacingControl::CreateItemWindow(vcl::Window* pParent)
{
VclPtr<ParaAboveSpacingWindow> pWindow = VclPtr<ParaAboveSpacingWindow>::Create(pParent);
pWindow->Show();
@@ -102,7 +102,7 @@ ParaBelowSpacingControl::ParaBelowSpacingControl(sal_uInt16 nSlotId, sal_uInt16
{
}
-VclPtr<vcl::Window> ParaBelowSpacingControl::CreateItemWindow(vcl::Window* pParent)
+VclPtr<InterimItemWindow> ParaBelowSpacingControl::CreateItemWindow(vcl::Window* pParent)
{
VclPtr<ParaBelowSpacingWindow> pWindow = VclPtr<ParaBelowSpacingWindow>::Create(pParent);
pWindow->Show();
@@ -216,7 +216,7 @@ ParaLeftSpacingControl::ParaLeftSpacingControl(sal_uInt16 nSlotId, sal_uInt16 nI
{
}
-VclPtr<vcl::Window> ParaLeftSpacingControl::CreateItemWindow(vcl::Window* pParent)
+VclPtr<InterimItemWindow> ParaLeftSpacingControl::CreateItemWindow(vcl::Window* pParent)
{
VclPtr<ParaLeftSpacingWindow> pWindow = VclPtr<ParaLeftSpacingWindow>::Create(pParent);
pWindow->Show();
@@ -231,7 +231,7 @@ ParaRightSpacingControl::ParaRightSpacingControl(sal_uInt16 nSlotId, sal_uInt16
{
}
-VclPtr<vcl::Window> ParaRightSpacingControl::CreateItemWindow(vcl::Window* pParent)
+VclPtr<InterimItemWindow> ParaRightSpacingControl::CreateItemWindow(vcl::Window* pParent)
{
VclPtr<ParaRightSpacingWindow> pWindow = VclPtr<ParaRightSpacingWindow>::Create(pParent);
pWindow->Show();
@@ -246,7 +246,7 @@ ParaFirstLineSpacingControl::ParaFirstLineSpacingControl(sal_uInt16 nSlotId, sal
{
}
-VclPtr<vcl::Window> ParaFirstLineSpacingControl::CreateItemWindow(vcl::Window* pParent)
+VclPtr<InterimItemWindow> ParaFirstLineSpacingControl::CreateItemWindow(vcl::Window* pParent)
{
VclPtr<ParaFirstLineSpacingWindow> pWindow = VclPtr<ParaFirstLineSpacingWindow>::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<vcl::Window> SvxFillToolBoxControl::CreateItemWindow(vcl::Window *pParent)
+VclPtr<InterimItemWindow> SvxFillToolBoxControl::CreateItemWindow(vcl::Window *pParent)
{
if(GetSlotId() == SID_ATTR_FILL_STYLE)
{
@@ -553,7 +553,7 @@ VclPtr<vcl::Window> SvxFillToolBoxControl::CreateItemWindow(vcl::Window *pParent
return mxFillControl;
}
- return VclPtr<vcl::Window>();
+ return VclPtr<InterimItemWindow>();
}
FillControl::FillControl(vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& 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<vcl::Window> SvxGrafToolBoxControl::CreateItemWindow( vcl::Window *pParent )
+VclPtr<InterimItemWindow> SvxGrafToolBoxControl::CreateItemWindow( vcl::Window *pParent )
{
return VclPtr<ImplGrafControl>::Create( pParent, m_aCommandURL, m_xFrame ).get();
}
@@ -504,7 +504,7 @@ void SvxGrafModeToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, c
}
}
-VclPtr<vcl::Window> SvxGrafModeToolBoxControl::CreateItemWindow( vcl::Window *pParent )
+VclPtr<InterimItemWindow> SvxGrafModeToolBoxControl::CreateItemWindow( vcl::Window *pParent )
{
return VclPtr<ImplGrafModeControl>::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<vcl::Window> SvxLineWidthToolBoxControl::CreateItemWindow(vcl::Window *pParent)
+VclPtr<InterimItemWindow> SvxLineWidthToolBoxControl::CreateItemWindow(vcl::Window *pParent)
{
VclPtr<SvxMetricField> pWindow = VclPtr<SvxMetricField>::Create(pParent, m_xFrame);
pWindow->Show();
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();
More information about the Libreoffice-commits
mailing list