SidebarPanelBase is always created with a PanelLayout

Change-Id: I825452fbd56435edcc0a2ffb7abe0f834bf10fb0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111976
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

25 files changed, 26 insertions, 30 deletions

diff --git a/svx/source/inc/DefaultShapesPanel.hxx b/svx/source/inc/DefaultShapesPanel.hxx
index 6067c05b5312..14f34aba22ad 100644
--- a/svx/source/inc/DefaultShapesPanel.hxx
+++ b/svx/source/inc/DefaultShapesPanel.hxx
@@ -40,7 +40,7 @@ public:
     DefaultShapesPanel (
         vcl::Window* pParent,
         const css::uno::Reference<css::frame::XFrame>& rxFrame);
-    static VclPtr<vcl::Window> Create(
+    static VclPtr<PanelLayout> Create(
         vcl::Window* pParent,
         const css::uno::Reference<css::frame::XFrame>& rxFrame);
     virtual ~DefaultShapesPanel() override;
diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx
index 1b93e207afda..2a9a586a438b 100644
--- a/svx/source/sidebar/PanelFactory.cxx
+++ b/svx/source/sidebar/PanelFactory.cxx
@@ -117,7 +117,7 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement (
             "PanelFactory::createUIElement called without SfxBindings",
             nullptr);
 
-    VclPtr<vcl::Window> pControl;
+    VclPtr<PanelLayout> pControl;
     ui::LayoutSize aLayoutSize (-1,-1,-1);
 
     if (rsResourceURL.endsWith("/TextPropertyPanel"))
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index f71754888d19..abe43abcd2c6 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx
@@ -72,7 +72,7 @@ void AreaPropertyPanel::dispose()
     AreaPropertyPanelBase::dispose();
 }
 
-VclPtr<vcl::Window> AreaPropertyPanel::Create (
+VclPtr<PanelLayout> AreaPropertyPanel::Create (
     vcl::Window* pParent,
     const css::uno::Reference<css::frame::XFrame>& rxFrame,
     SfxBindings* pBindings)
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx
index fb97c00b3691..581ac37224df 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.hxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx
@@ -45,7 +45,7 @@ class AreaPropertyPanel : public AreaPropertyPanelBase
 public:
     virtual void dispose() override;
 
-    static VclPtr<vcl::Window> Create(
+    static VclPtr<PanelLayout> Create(
         vcl::Window* pParent,
         const css::uno::Reference<css::frame::XFrame>& rxFrame,
         SfxBindings* pBindings);
diff --git a/svx/source/sidebar/effect/EffectPropertyPanel.cxx b/svx/source/sidebar/effect/EffectPropertyPanel.cxx
index 58d027b0cfd6..d6fde80e7911 100644
--- a/svx/source/sidebar/effect/EffectPropertyPanel.cxx
+++ b/svx/source/sidebar/effect/EffectPropertyPanel.cxx
@@ -167,7 +167,7 @@ void EffectPropertyPanel::NotifyItemUpdate(sal_uInt16 nSID, SfxItemState eState,
     UpdateControls();
 }
 
-VclPtr<vcl::Window>
+VclPtr<PanelLayout>
 EffectPropertyPanel::Create(vcl::Window* pParent,
                             const css::uno::Reference<css::frame::XFrame>& rxFrame,
                             SfxBindings* pBindings)
diff --git a/svx/source/sidebar/effect/EffectPropertyPanel.hxx b/svx/source/sidebar/effect/EffectPropertyPanel.hxx
index 771c642f99a2..294abd46b8bd 100644
--- a/svx/source/sidebar/effect/EffectPropertyPanel.hxx
+++ b/svx/source/sidebar/effect/EffectPropertyPanel.hxx
@@ -27,7 +27,7 @@ public:
     virtual ~EffectPropertyPanel() override;
     virtual void dispose() override;
 
-    static VclPtr<vcl::Window> Create(vcl::Window* pParent,
+    static VclPtr<PanelLayout> Create(vcl::Window* pParent,
                                       const css::uno::Reference<css::frame::XFrame>& rxFrame,
                                       SfxBindings* pBindings);
 
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
index b42509639ffd..e355a47bcca3 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
@@ -130,8 +130,7 @@ IMPL_LINK_NOARG( GraphicPropertyPanel, ClickColorModeHdl, weld::ComboBox&, void
             SfxCallMode::RECORD, { &aTransItem });
 }
 
-
-VclPtr<vcl::Window> GraphicPropertyPanel::Create (
+VclPtr<PanelLayout> GraphicPropertyPanel::Create (
     vcl::Window* pParent,
     const css::uno::Reference<css::frame::XFrame>& rxFrame,
     SfxBindings* pBindings)
@@ -149,7 +148,6 @@ VclPtr<vcl::Window> GraphicPropertyPanel::Create (
                 pBindings);
 }
 
-
 void GraphicPropertyPanel::DataChanged(
     const DataChangedEvent& /*rEvent*/)
 {
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
index d62f000ec34f..3554c01a6266 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
@@ -33,7 +33,7 @@ public:
     virtual ~GraphicPropertyPanel() override;
     virtual void dispose() override;
 
-    static VclPtr<vcl::Window> Create(
+    static VclPtr<PanelLayout> Create(
         vcl::Window* pParent,
         const css::uno::Reference<css::frame::XFrame>& rxFrame,
         SfxBindings* pBindings);
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index 2e5f0eed9070..e813ea099346 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -66,7 +66,7 @@ void LinePropertyPanel::dispose()
     LinePropertyPanelBase::dispose();
 }
 
-VclPtr<vcl::Window> LinePropertyPanel::Create (
+VclPtr<PanelLayout> LinePropertyPanel::Create (
     vcl::Window* pParent,
     const uno::Reference<css::frame::XFrame>& rxFrame,
     SfxBindings* pBindings)
diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx b/svx/source/sidebar/line/LinePropertyPanel.hxx
index cdd4cf29406c..190de5915e1a 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.hxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.hxx
@@ -44,7 +44,7 @@ public:
     virtual ~LinePropertyPanel() override;
     virtual void dispose() override;
 
-    static VclPtr<vcl::Window> Create(
+    static VclPtr<PanelLayout> Create(
         vcl::Window* pParent,
         const css::uno::Reference<css::frame::XFrame>& rxFrame,
         SfxBindings* pBindings);
diff --git a/svx/source/sidebar/lists/ListsPropertyPanel.cxx b/svx/source/sidebar/lists/ListsPropertyPanel.cxx
index a28cbf777a09..86df5830cf75 100644
--- a/svx/source/sidebar/lists/ListsPropertyPanel.cxx
+++ b/svx/source/sidebar/lists/ListsPropertyPanel.cxx
@@ -24,7 +24,7 @@ using namespace css::uno;
 
 namespace svx::sidebar
 {
-VclPtr<vcl::Window>
+VclPtr<PanelLayout>
 ListsPropertyPanel::Create(vcl::Window* pParent,
                            const css::uno::Reference<css::frame::XFrame>& rxFrame)
 {
diff --git a/svx/source/sidebar/lists/ListsPropertyPanel.hxx b/svx/source/sidebar/lists/ListsPropertyPanel.hxx
index 2a1c3dd9b4ef..9c2c71f385c6 100644
--- a/svx/source/sidebar/lists/ListsPropertyPanel.hxx
+++ b/svx/source/sidebar/lists/ListsPropertyPanel.hxx
@@ -31,7 +31,7 @@ public:
     virtual ~ListsPropertyPanel() override;
     virtual void dispose() override;
 
-    static VclPtr<vcl::Window> Create(vcl::Window* pParent,
+    static VclPtr<PanelLayout> Create(vcl::Window* pParent,
                                       const css::uno::Reference<css::frame::XFrame>& rxFrame);
 
     ListsPropertyPanel(vcl::Window* pParent,
diff --git a/svx/source/sidebar/media/MediaPlaybackPanel.cxx b/svx/source/sidebar/media/MediaPlaybackPanel.cxx
index 78a56e4405e5..cfb1f75662e6 100644
--- a/svx/source/sidebar/media/MediaPlaybackPanel.cxx
+++ b/svx/source/sidebar/media/MediaPlaybackPanel.cxx
@@ -50,7 +50,7 @@ MediaPlaybackPanel::MediaPlaybackPanel (
     m_pInitialFocusWidget = mxTimeEdit.get();
 }
 
-VclPtr< vcl::Window > MediaPlaybackPanel::Create(
+VclPtr<PanelLayout> MediaPlaybackPanel::Create(
     vcl::Window* pParent,
     const Reference< XFrame >& rxFrame,
     SfxBindings* pBindings)
diff --git a/svx/source/sidebar/media/MediaPlaybackPanel.hxx b/svx/source/sidebar/media/MediaPlaybackPanel.hxx
index a71a18a5e38e..415b6d597948 100644
--- a/svx/source/sidebar/media/MediaPlaybackPanel.hxx
+++ b/svx/source/sidebar/media/MediaPlaybackPanel.hxx
@@ -45,7 +45,7 @@ public:
         vcl::Window* pParent,
         const css::uno::Reference<css::frame::XFrame>& rxFrame,
         SfxBindings* pBindings);
-    static VclPtr<vcl::Window> Create(
+    static VclPtr<PanelLayout> Create(
         vcl::Window* pParent,
         const css::uno::Reference<css::frame::XFrame>& rxFrame,
         SfxBindings* pBindings);
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index ab97dc60c8c0..d65f34d3f257 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -44,7 +44,7 @@ namespace svx::sidebar {
 #define MAX_SC_SD               116220200
 #define NEGA_MAXVALUE          -10000000
 
-VclPtr<vcl::Window> ParaPropertyPanel::Create (
+VclPtr<PanelLayout> ParaPropertyPanel::Create (
     vcl::Window* pParent,
     const css::uno::Reference<css::frame::XFrame>& rxFrame,
     SfxBindings* pBindings,
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
index da5e1a8f5a6c..9900dce714c7 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
@@ -43,7 +43,7 @@ public:
     virtual ~ParaPropertyPanel() override;
     virtual void dispose() override;
 
-    static VclPtr<vcl::Window> Create (
+    static VclPtr<PanelLayout> Create (
         vcl::Window* pParent,
         const css::uno::Reference<css::frame::XFrame>& rxFrame,
         SfxBindings* pBindings,
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index a91f39741dee..32995f267f5a 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -254,7 +254,7 @@ void PosSizePropertyPanel::Initialize()
     mePoolUnit = maTransfWidthControl.GetCoreMetric();
 }
 
-VclPtr<vcl::Window> PosSizePropertyPanel::Create (
+VclPtr<PanelLayout> PosSizePropertyPanel::Create (
     vcl::Window* pParent,
     const css::uno::Reference<css::frame::XFrame>& rxFrame,
     SfxBindings* pBindings,
@@ -274,7 +274,6 @@ VclPtr<vcl::Window> PosSizePropertyPanel::Create (
                         rxSidebar);
 }
 
-
 void PosSizePropertyPanel::DataChanged(
     const DataChangedEvent& /*rEvent*/)
 {
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
index 79f40f02f99c..a67a05ac035c 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
@@ -49,7 +49,7 @@ public:
     virtual ~PosSizePropertyPanel() override;
     virtual void dispose() override;
 
-    static VclPtr<vcl::Window> Create(
+    static VclPtr<PanelLayout> Create(
         vcl::Window* pParent,
         const css::uno::Reference<css::frame::XFrame>& rxFrame,
         SfxBindings* pBindings,
diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
index 0f4446633d3b..62e4c5471a29 100644
--- a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
+++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
@@ -362,7 +362,7 @@ void ShadowPropertyPanel::NotifyItemUpdate(
     UpdateControls();
 }
 
-VclPtr<vcl::Window> ShadowPropertyPanel::Create (
+VclPtr<PanelLayout> ShadowPropertyPanel::Create (
     vcl::Window* pParent,
     const uno::Reference<css::frame::XFrame>& rxFrame,
     SfxBindings* pBindings)
diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
index f7ee8bb4188e..6c2041092a2a 100644
--- a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
+++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
@@ -25,7 +25,7 @@ public:
     virtual ~ShadowPropertyPanel() override;
     virtual void dispose() override;
 
-    static VclPtr<vcl::Window> Create(
+    static VclPtr<PanelLayout> Create(
     vcl::Window* pParent,
     const css::uno::Reference<css::frame::XFrame>& rxFrame,
     SfxBindings* pBindings);
diff --git a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx
index 3d52ae23fb0d..f754bd011a16 100644
--- a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx
+++ b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx
@@ -57,7 +57,7 @@ DefaultShapesPanel::DefaultShapesPanel (
     m_pInitialFocusWidget = mxLineArrowSet->GetDrawingArea();
 }
 
-VclPtr< vcl::Window > DefaultShapesPanel::Create(
+VclPtr<PanelLayout> DefaultShapesPanel::Create(
     vcl::Window* pParent,
     const Reference< XFrame >& rxFrame)
 {
diff --git a/svx/source/sidebar/styles/StylesPropertyPanel.cxx b/svx/source/sidebar/styles/StylesPropertyPanel.cxx
index e976e9b25985..bbfa86190b8c 100644
--- a/svx/source/sidebar/styles/StylesPropertyPanel.cxx
+++ b/svx/source/sidebar/styles/StylesPropertyPanel.cxx
@@ -17,7 +17,7 @@ using namespace css::uno;
 
 namespace svx::sidebar {
 
-VclPtr<vcl::Window> StylesPropertyPanel::Create (
+VclPtr<PanelLayout> StylesPropertyPanel::Create (
     vcl::Window* pParent,
     const css::uno::Reference<css::frame::XFrame>& rxFrame)
 {
diff --git a/svx/source/sidebar/styles/StylesPropertyPanel.hxx b/svx/source/sidebar/styles/StylesPropertyPanel.hxx
index 3dd5fb5c3725..0d32a38e3f88 100644
--- a/svx/source/sidebar/styles/StylesPropertyPanel.hxx
+++ b/svx/source/sidebar/styles/StylesPropertyPanel.hxx
@@ -13,8 +13,7 @@
 
 namespace svx::sidebar{
 
-class StylesPropertyPanel:
-    public PanelLayout
+class StylesPropertyPanel : public PanelLayout
 {
 private:
     std::unique_ptr<weld::Toolbar> m_xFontStyle;
@@ -26,7 +25,7 @@ private:
 public:
     virtual ~StylesPropertyPanel() override;
 
-    static VclPtr<vcl::Window> Create (
+    static VclPtr<PanelLayout> Create (
         vcl::Window* pParent,
         const css::uno::Reference<css::frame::XFrame>& rxFrame);
 
diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx
index ac93e6c70e2c..48542ac7476a 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -27,7 +27,7 @@ using namespace css;
 
 namespace svx::sidebar {
 
-VclPtr<vcl::Window> TextPropertyPanel::Create (
+VclPtr<PanelLayout> TextPropertyPanel::Create (
     vcl::Window* pParent,
     const css::uno::Reference<css::frame::XFrame>& rxFrame)
 {
diff --git a/svx/source/sidebar/text/TextPropertyPanel.hxx b/svx/source/sidebar/text/TextPropertyPanel.hxx
index 437596145584..5a99da71dc0e 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.hxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.hxx
@@ -34,7 +34,7 @@ public:
     virtual ~TextPropertyPanel() override;
     virtual void dispose() override;
 
-    static VclPtr<vcl::Window> Create (
+    static VclPtr<PanelLayout> Create (
         vcl::Window* pParent,
         const css::uno::Reference<css::frame::XFrame>& rxFrame);