chart2/source/controller/sidebar/Chart2PanelFactory.cxx | 2 -
chart2/source/controller/sidebar/ChartAreaPanel.cxx | 2 -
chart2/source/controller/sidebar/ChartAreaPanel.hxx | 2 -
chart2/source/controller/sidebar/ChartAxisPanel.cxx | 2 -
chart2/source/controller/sidebar/ChartAxisPanel.hxx | 2 -
chart2/source/controller/sidebar/ChartElementsPanel.cxx | 2 -
chart2/source/controller/sidebar/ChartElementsPanel.hxx | 2 -
chart2/source/controller/sidebar/ChartErrorBarPanel.cxx | 2 -
chart2/source/controller/sidebar/ChartErrorBarPanel.hxx | 2 -
chart2/source/controller/sidebar/ChartLinePanel.cxx | 2 -
chart2/source/controller/sidebar/ChartLinePanel.hxx | 2 -
chart2/source/controller/sidebar/ChartSeriesPanel.cxx | 2 -
chart2/source/controller/sidebar/ChartSeriesPanel.hxx | 2 -
include/sfx2/sidebar/SidebarPanelBase.hxx | 9 +++----
sc/source/ui/sidebar/AlignmentPropertyPanel.cxx | 2 -
sc/source/ui/sidebar/AlignmentPropertyPanel.hxx | 2 -
sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx | 2 -
sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx | 2 -
sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx | 2 -
sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx | 2 -
sc/source/ui/sidebar/ScPanelFactory.cxx | 2 -
sd/source/ui/sidebar/AllMasterPagesSelector.cxx | 2 -
sd/source/ui/sidebar/AllMasterPagesSelector.hxx | 2 -
sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx | 2 -
sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx | 2 -
sd/source/ui/sidebar/PanelFactory.cxx | 2 -
sd/source/ui/sidebar/RecentMasterPagesSelector.cxx | 2 -
sd/source/ui/sidebar/RecentMasterPagesSelector.hxx | 2 -
sfx2/source/sidebar/SidebarPanelBase.cxx | 5 ++--
svx/source/inc/DefaultShapesPanel.hxx | 2 -
svx/source/sidebar/PanelFactory.cxx | 2 -
svx/source/sidebar/area/AreaPropertyPanel.cxx | 2 -
svx/source/sidebar/area/AreaPropertyPanel.hxx | 2 -
svx/source/sidebar/effect/EffectPropertyPanel.cxx | 2 -
svx/source/sidebar/effect/EffectPropertyPanel.hxx | 2 -
svx/source/sidebar/graphic/GraphicPropertyPanel.cxx | 4 ---
svx/source/sidebar/graphic/GraphicPropertyPanel.hxx | 2 -
svx/source/sidebar/line/LinePropertyPanel.cxx | 2 -
svx/source/sidebar/line/LinePropertyPanel.hxx | 2 -
svx/source/sidebar/lists/ListsPropertyPanel.cxx | 2 -
svx/source/sidebar/lists/ListsPropertyPanel.hxx | 2 -
svx/source/sidebar/media/MediaPlaybackPanel.cxx | 2 -
svx/source/sidebar/media/MediaPlaybackPanel.hxx | 2 -
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 2 -
svx/source/sidebar/paragraph/ParaPropertyPanel.hxx | 2 -
svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 3 --
svx/source/sidebar/possize/PosSizePropertyPanel.hxx | 2 -
svx/source/sidebar/shadow/ShadowPropertyPanel.cxx | 2 -
svx/source/sidebar/shadow/ShadowPropertyPanel.hxx | 2 -
svx/source/sidebar/shapes/DefaultShapesPanel.cxx | 2 -
svx/source/sidebar/styles/StylesPropertyPanel.cxx | 2 -
svx/source/sidebar/styles/StylesPropertyPanel.hxx | 5 +---
svx/source/sidebar/text/TextPropertyPanel.cxx | 2 -
svx/source/sidebar/text/TextPropertyPanel.hxx | 2 -
sw/source/uibase/inc/navipi.hxx | 2 -
sw/source/uibase/sidebar/PageFooterPanel.cxx | 2 -
sw/source/uibase/sidebar/PageFooterPanel.hxx | 2 -
sw/source/uibase/sidebar/PageFormatPanel.cxx | 2 -
sw/source/uibase/sidebar/PageFormatPanel.hxx | 2 -
sw/source/uibase/sidebar/PageHeaderPanel.cxx | 2 -
sw/source/uibase/sidebar/PageHeaderPanel.hxx | 2 -
sw/source/uibase/sidebar/PageStylesPanel.cxx | 2 -
sw/source/uibase/sidebar/PageStylesPanel.hxx | 2 -
sw/source/uibase/sidebar/StylePresetsPanel.cxx | 2 -
sw/source/uibase/sidebar/StylePresetsPanel.hxx | 2 -
sw/source/uibase/sidebar/SwPanelFactory.cxx | 20 ++++++++--------
sw/source/uibase/sidebar/TableEditPanel.cxx | 2 -
sw/source/uibase/sidebar/TableEditPanel.hxx | 2 -
sw/source/uibase/sidebar/ThemePanel.cxx | 2 -
sw/source/uibase/sidebar/ThemePanel.hxx | 2 -
sw/source/uibase/sidebar/WrapPropertyPanel.cxx | 2 -
sw/source/uibase/sidebar/WrapPropertyPanel.hxx | 2 -
sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx | 2 -
sw/source/uibase/sidebar/WriterInspectorTextPanel.hxx | 2 -
sw/source/uibase/utlui/navipi.cxx | 2 -
75 files changed, 90 insertions(+), 94 deletions(-)
New commits:
commit c7c99f89eeb119ae6062053eb37f5a9a51073a37
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Mar 4 16:34:18 2021 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Mar 4 20:59:06 2021 +0100
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 <caol...@redhat.com>
diff --git a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx
b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx
index 3ae73588075c..62d1ab65753f 100644
--- a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx
+++ b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx
@@ -82,7 +82,7 @@ Reference<css::ui::XUIElement> SAL_CALL
ChartPanelFactory::createUIElement (
"ChartPanelFactory::createUIElement called without valid
ChartController",
nullptr);
- VclPtr<vcl::Window> pPanel;
+ VclPtr<PanelLayout> pPanel;
if (rsResourceURL.endsWith("/ElementsPanel"))
pPanel = ChartElementsPanel::Create( pParentWindow, xFrame,
pController );
else if (rsResourceURL.endsWith("/TypePanel"))
diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx
b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
index 313943eb3d92..6d25025d460f 100644
--- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
@@ -256,7 +256,7 @@ private:
}
-VclPtr<vcl::Window> ChartAreaPanel::Create(
+VclPtr<PanelLayout> ChartAreaPanel::Create(
vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
ChartController* pController)
diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.hxx
b/chart2/source/controller/sidebar/ChartAreaPanel.hxx
index fb9a80e15342..c7d171f20e38 100644
--- a/chart2/source/controller/sidebar/ChartAreaPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartAreaPanel.hxx
@@ -37,7 +37,7 @@ class ChartAreaPanel : public
svx::sidebar::AreaPropertyPanelBase,
public ChartSidebarSelectionListenerParent
{
public:
- static VclPtr<vcl::Window> Create(
+ static VclPtr<PanelLayout> Create(
vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
ChartController* pController);
diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.cxx
b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
index aca063e84575..bf84d253961d 100644
--- a/chart2/source/controller/sidebar/ChartAxisPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
@@ -288,7 +288,7 @@ void ChartAxisPanel::updateData()
mxNFRotation->set_value(getAxisRotation(mxModel, aCID), FieldUnit::DEGREE);
}
-VclPtr<vcl::Window> ChartAxisPanel::Create (
+VclPtr<PanelLayout> ChartAxisPanel::Create (
vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
ChartController* pController)
diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.hxx
b/chart2/source/controller/sidebar/ChartAxisPanel.hxx
index 0f5170f3cc0c..f662c9f27cf5 100644
--- a/chart2/source/controller/sidebar/ChartAxisPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartAxisPanel.hxx
@@ -35,7 +35,7 @@ class ChartAxisPanel : public PanelLayout,
public ChartSidebarSelectionListenerParent
{
public:
- static VclPtr<vcl::Window> Create(
+ static VclPtr<PanelLayout> Create(
vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
ChartController* pController);
diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx
b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
index 5212186da371..f740fa7319ac 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
@@ -540,7 +540,7 @@ void ChartElementsPanel::updateData()
mxLBLegendPosition->set_active(getLegendPos(mxModel));
}
-VclPtr<vcl::Window> ChartElementsPanel::Create (
+VclPtr<PanelLayout> ChartElementsPanel::Create (
vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
ChartController* pController)
diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.hxx
b/chart2/source/controller/sidebar/ChartElementsPanel.hxx
index 059e7c4fe122..75ad788d7319 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.hxx
@@ -39,7 +39,7 @@ class ChartElementsPanel : public PanelLayout,
public ChartSidebarModifyListenerParent
{
public:
- static VclPtr<vcl::Window> Create(
+ static VclPtr<PanelLayout> Create(
vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
ChartController* pController);
diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
index b435520c5968..6799a147339d 100644
--- a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
@@ -349,7 +349,7 @@ void ChartErrorBarPanel::updateData()
}
}
-VclPtr<vcl::Window> ChartErrorBarPanel::Create (
+VclPtr<PanelLayout> ChartErrorBarPanel::Create (
vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
ChartController* pController)
diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx
b/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx
index 7111ce83717c..df8d0b621317 100644
--- a/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx
@@ -32,7 +32,7 @@ class ChartErrorBarPanel : public PanelLayout,
public ChartSidebarModifyListenerParent
{
public:
- static VclPtr<vcl::Window> Create(
+ static VclPtr<PanelLayout> Create(
vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
ChartController* pController);
diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx
b/chart2/source/controller/sidebar/ChartLinePanel.cxx
index 3853c8c2aa69..58280f19fcdb 100644
--- a/chart2/source/controller/sidebar/ChartLinePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx
@@ -107,7 +107,7 @@ private:
}
-VclPtr<vcl::Window> ChartLinePanel::Create(
+VclPtr<PanelLayout> ChartLinePanel::Create(
vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
ChartController* pController)
diff --git a/chart2/source/controller/sidebar/ChartLinePanel.hxx
b/chart2/source/controller/sidebar/ChartLinePanel.hxx
index ef174a5ee3a9..b30775353b08 100644
--- a/chart2/source/controller/sidebar/ChartLinePanel.hxx
+++ b/chart2/source/controller/sidebar/ChartLinePanel.hxx
@@ -37,7 +37,7 @@ class ChartLinePanel : public
svx::sidebar::LinePropertyPanelBase,
public ChartSidebarSelectionListenerParent
{
public:
- static VclPtr<vcl::Window> Create(
+ static VclPtr<PanelLayout> Create(
vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
ChartController* pController);
diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
index 70693fe27d5e..80153beaa80d 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
@@ -385,7 +385,7 @@ void ChartSeriesPanel::updateData()
mxFTSeriesName->set_label(aFrameLabel);
}
-VclPtr<vcl::Window> ChartSeriesPanel::Create (
+VclPtr<PanelLayout> ChartSeriesPanel::Create (
vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
ChartController* pController)
diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx
b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx
index 72be7b208b9b..485b46fe68d6 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx
@@ -43,7 +43,7 @@ class ChartSeriesPanel : public PanelLayout,
public ChartSidebarSelectionListenerParent
{
public:
- static VclPtr<vcl::Window> Create(
+ static VclPtr<PanelLayout> Create(
vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
ChartController* pController);
diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx
b/include/sfx2/sidebar/SidebarPanelBase.hxx
index 015406771c4f..a12727cfafad 100644
--- a/include/sfx2/sidebar/SidebarPanelBase.hxx
+++ b/include/sfx2/sidebar/SidebarPanelBase.hxx
@@ -31,8 +31,7 @@
#include <vcl/vclptr.hxx>
-
-namespace vcl { class Window; }
+class PanelLayout;
namespace sfx2::sidebar {
@@ -52,7 +51,7 @@ class SFX2_DLLPUBLIC SidebarPanelBase final : private
::cppu::BaseMutex,
public:
static css::uno::Reference<css::ui::XUIElement> Create(const OUString&
rsResourceURL,
const
css::uno::Reference<css::frame::XFrame>& rxFrame,
- vcl::Window*
pControl,
+ PanelLayout*
pControl,
const
css::ui::LayoutSize& rLayoutSize);
// XContextChangeEventListener
@@ -81,7 +80,7 @@ public:
private:
SidebarPanelBase(const OUString& rsResourceURL, const
css::uno::Reference<css::frame::XFrame>& rxFrame,
- vcl::Window* pWindow, const css::ui::LayoutSize&
rLayoutSize);
+ PanelLayout* pWindow, const css::ui::LayoutSize&
rLayoutSize);
virtual ~SidebarPanelBase() override;
SidebarPanelBase(const SidebarPanelBase&) = delete;
SidebarPanelBase& operator=( const SidebarPanelBase& ) = delete;
@@ -89,7 +88,7 @@ private:
virtual void SAL_CALL disposing() override;
css::uno::Reference<css::frame::XFrame> mxFrame;
- VclPtr<vcl::Window> mpControl;
+ VclPtr<PanelLayout> mpControl;
const OUString msResourceURL;
const css::ui::LayoutSize maLayoutSize;
};
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
index 702845cb6593..135772d669d9 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
@@ -199,7 +199,7 @@ IMPL_LINK_NOARG(AlignmentPropertyPanel, CBOXWrapTextClkHdl,
weld::ToggleButton&,
SfxCallMode::RECORD, { &aItem });
}
-VclPtr<vcl::Window> AlignmentPropertyPanel::Create (
+VclPtr<PanelLayout> AlignmentPropertyPanel::Create (
vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings)
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
index 3a1b8eb8201b..f6f09c11e992 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
@@ -33,7 +33,7 @@ class AlignmentPropertyPanel
public ::sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface
{
public:
- 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/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index 55cf60cb08c1..15b1ffad6396 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -184,7 +184,7 @@ IMPL_LINK_NOARG(CellAppearancePropertyPanel,
TbxLineStyleMenuHdl, const OString&
pPopup->GrabFocus();
}
-VclPtr<vcl::Window> CellAppearancePropertyPanel::Create (
+VclPtr<PanelLayout> CellAppearancePropertyPanel::Create (
vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings)
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
index ae42b47fc51b..d90e57b0bc35 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
@@ -40,7 +40,7 @@ private:
friend class CellBorderStylePopup;
public:
- 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/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
index bd7069e34d26..e3e95e50a710 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
@@ -151,7 +151,7 @@ IMPL_LINK_NOARG( NumberFormatPropertyPanel,
NumFormatValueHdl, weld::SpinButton&
SfxCallMode::RECORD, { &aItem });
}
-VclPtr<vcl::Window> NumberFormatPropertyPanel::Create (
+VclPtr<PanelLayout> NumberFormatPropertyPanel::Create (
vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings)
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
index 685a02ac23d2..7d67d630dfdf 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
@@ -34,7 +34,7 @@ class NumberFormatPropertyPanel
{
public:
public:
- 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/sc/source/ui/sidebar/ScPanelFactory.cxx
b/sc/source/ui/sidebar/ScPanelFactory.cxx
index 9bd54bf774bf..9459178886b3 100644
--- a/sc/source/ui/sidebar/ScPanelFactory.cxx
+++ b/sc/source/ui/sidebar/ScPanelFactory.cxx
@@ -76,7 +76,7 @@ Reference<ui::XUIElement> SAL_CALL
ScPanelFactory::createUIElement (
nullptr);
sal_Int32 nMinimumSize = -1;
- VclPtr<vcl::Window> pPanel;
+ VclPtr<PanelLayout> pPanel;
if (rsResourceURL.endsWith("/AlignmentPropertyPanel"))
pPanel = AlignmentPropertyPanel::Create( pParentWindow, xFrame,
pBindings );
else if (rsResourceURL.endsWith("/CellAppearancePropertyPanel"))
diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx
b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx
index aa8a82167de1..07284b20961a 100644
--- a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx
@@ -74,7 +74,7 @@ public:
SortedMasterPageDescriptorList() {}
};
-VclPtr<vcl::Window> AllMasterPagesSelector::Create (
+VclPtr<PanelLayout> AllMasterPagesSelector::Create (
vcl::Window* pParent,
ViewShellBase& rViewShellBase,
const css::uno::Reference<css::ui::XSidebar>& rxSidebar)
diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx
b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx
index ff94edddf0b1..c4ca96437a32 100644
--- a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx
@@ -34,7 +34,7 @@ class AllMasterPagesSelector
{
friend class VclPtrInstance<AllMasterPagesSelector>;
public:
- static VclPtr<vcl::Window> Create (
+ static VclPtr<PanelLayout> Create (
vcl::Window* pParent,
ViewShellBase& rViewShellBase,
const css::uno::Reference<css::ui::XSidebar>& rxSidebar);
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
index 93fb071b8080..d729afa273ae 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
@@ -37,7 +37,7 @@ using namespace ::com::sun::star;
namespace sd::sidebar {
-VclPtr<vcl::Window> CurrentMasterPagesSelector::Create (
+VclPtr<PanelLayout> CurrentMasterPagesSelector::Create (
vcl::Window* pParent,
ViewShellBase& rViewShellBase,
const css::uno::Reference<css::ui::XSidebar>& rxSidebar)
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
index 889996f7160a..f371d7cbc030 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
@@ -36,7 +36,7 @@ class CurrentMasterPagesSelector
{
friend class VclPtrInstance<CurrentMasterPagesSelector>;
public:
- static VclPtr<vcl::Window> Create (
+ static VclPtr<PanelLayout> Create (
vcl::Window* pParent,
ViewShellBase& rViewShellBase,
const css::uno::Reference<css::ui::XSidebar>& rxSidebar);
diff --git a/sd/source/ui/sidebar/PanelFactory.cxx
b/sd/source/ui/sidebar/PanelFactory.cxx
index 4fd154ef974f..22fea9773e7f 100644
--- a/sd/source/ui/sidebar/PanelFactory.cxx
+++ b/sd/source/ui/sidebar/PanelFactory.cxx
@@ -93,7 +93,7 @@ Reference<ui::XUIElement> SAL_CALL
PanelFactory::createUIElement (
SfxBindings* pBindings = reinterpret_cast<SfxBindings*>(nBindingsValue);
// Create a framework view.
- VclPtr<vcl::Window> pControl;
+ VclPtr<PanelLayout> pControl;
css::ui::LayoutSize aLayoutSize (-1,-1,-1);
/** Note that these names have to be identical to (the tail of)
diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
index db5d92d0f6f7..7c80beea09dc 100644
--- a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
@@ -28,7 +28,7 @@
namespace sd::sidebar {
-VclPtr<vcl::Window> RecentMasterPagesSelector::Create (
+VclPtr<PanelLayout> RecentMasterPagesSelector::Create (
vcl::Window* pParent,
ViewShellBase& rViewShellBase,
const css::uno::Reference<css::ui::XSidebar>& rxSidebar)
diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
index 4040d1d13ff8..0d1ac5f4b2c5 100644
--- a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
@@ -31,7 +31,7 @@ class RecentMasterPagesSelector final
{
friend class VclPtrInstance<RecentMasterPagesSelector>;
public:
- static VclPtr<vcl::Window> Create (
+ static VclPtr<PanelLayout> Create (
vcl::Window* pParent,
ViewShellBase& rViewShellBase,
const css::uno::Reference<css::ui::XSidebar>& rxSidebar);
diff --git a/sfx2/source/sidebar/SidebarPanelBase.cxx
b/sfx2/source/sidebar/SidebarPanelBase.cxx
index 6865047df252..0ed57e2f66c2 100644
--- a/sfx2/source/sidebar/SidebarPanelBase.cxx
+++ b/sfx2/source/sidebar/SidebarPanelBase.cxx
@@ -20,6 +20,7 @@
#include <sfx2/sidebar/Theme.hxx>
#include <sfx2/sidebar/ILayoutableWindow.hxx>
#include <sfx2/sidebar/IContextChangeReceiver.hxx>
+#include <sfx2/sidebar/PanelLayout.hxx>
#include <sfx2/sidebar/SidebarModelUpdate.hxx>
#include <vcl/layout.hxx>
#include <comphelper/processfactory.hxx>
@@ -35,7 +36,7 @@ namespace sfx2::sidebar {
Reference<ui::XUIElement> SidebarPanelBase::Create (
const OUString& rsResourceURL,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
- vcl::Window* pWindow,
+ PanelLayout* pWindow,
const css::ui::LayoutSize& rLayoutSize)
{
Reference<ui::XUIElement> xUIElement (
@@ -50,7 +51,7 @@ Reference<ui::XUIElement> SidebarPanelBase::Create (
SidebarPanelBase::SidebarPanelBase (
const OUString& rsResourceURL,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
- vcl::Window* pWindow,
+ PanelLayout* pWindow,
const css::ui::LayoutSize& rLayoutSize)
: SidebarPanelBaseInterfaceBase(m_aMutex),
mxFrame(rxFrame),
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);
diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx
index 960624531cb0..10044d45ed51 100644
--- a/sw/source/uibase/inc/navipi.hxx
+++ b/sw/source/uibase/inc/navipi.hxx
@@ -120,7 +120,7 @@ protected:
public:
- static VclPtr<vcl::Window> Create(vcl::Window* pParent,
+ static VclPtr<PanelLayout> Create(vcl::Window* pParent,
const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XFrame >& rxFrame,
SfxBindings* pBindings);
SwNavigationPI(vcl::Window* pParent,
diff --git a/sw/source/uibase/sidebar/PageFooterPanel.cxx
b/sw/source/uibase/sidebar/PageFooterPanel.cxx
index 4ecd03f65883..d4a909cbd88d 100644
--- a/sw/source/uibase/sidebar/PageFooterPanel.cxx
+++ b/sw/source/uibase/sidebar/PageFooterPanel.cxx
@@ -33,7 +33,7 @@
namespace sw::sidebar{
-VclPtr<vcl::Window> PageFooterPanel::Create(
+VclPtr<PanelLayout> PageFooterPanel::Create(
vcl::Window* pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >&
rxFrame,
SfxBindings* pBindings)
diff --git a/sw/source/uibase/sidebar/PageFooterPanel.hxx
b/sw/source/uibase/sidebar/PageFooterPanel.hxx
index 507431b9f3b7..6c4750441950 100644
--- a/sw/source/uibase/sidebar/PageFooterPanel.hxx
+++ b/sw/source/uibase/sidebar/PageFooterPanel.hxx
@@ -39,7 +39,7 @@ class PageFooterPanel:
public ::sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface
{
public:
- static VclPtr<vcl::Window> Create(
+ static VclPtr<PanelLayout> Create(
vcl::Window* pParent,
const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XFrame >& rxFrame,
SfxBindings* pBindings);
diff --git a/sw/source/uibase/sidebar/PageFormatPanel.cxx
b/sw/source/uibase/sidebar/PageFormatPanel.cxx
index 31d556ca15ee..442faf4d2ac6 100644
--- a/sw/source/uibase/sidebar/PageFormatPanel.cxx
+++ b/sw/source/uibase/sidebar/PageFormatPanel.cxx
@@ -43,7 +43,7 @@
namespace sw::sidebar{
-VclPtr<vcl::Window> PageFormatPanel::Create(
+VclPtr<PanelLayout> PageFormatPanel::Create(
vcl::Window* pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >&
rxFrame,
SfxBindings* pBindings)
diff --git a/sw/source/uibase/sidebar/PageFormatPanel.hxx
b/sw/source/uibase/sidebar/PageFormatPanel.hxx
index c88078d436f2..fcf60030868c 100644
--- a/sw/source/uibase/sidebar/PageFormatPanel.hxx
+++ b/sw/source/uibase/sidebar/PageFormatPanel.hxx
@@ -41,7 +41,7 @@ class PageFormatPanel:
public ::sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface
{
public:
- static VclPtr<vcl::Window> Create(
+ static VclPtr<PanelLayout> Create(
vcl::Window* pParent,
const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XFrame >& rxFrame,
SfxBindings* pBindings);
diff --git a/sw/source/uibase/sidebar/PageHeaderPanel.cxx
b/sw/source/uibase/sidebar/PageHeaderPanel.cxx
index 70e3f03c97c3..ae3f4680d9a4 100644
--- a/sw/source/uibase/sidebar/PageHeaderPanel.cxx
+++ b/sw/source/uibase/sidebar/PageHeaderPanel.cxx
@@ -33,7 +33,7 @@
namespace sw::sidebar{
-VclPtr<vcl::Window> PageHeaderPanel::Create(
+VclPtr<PanelLayout> PageHeaderPanel::Create(
vcl::Window* pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >&
rxFrame,
SfxBindings* pBindings)
diff --git a/sw/source/uibase/sidebar/PageHeaderPanel.hxx
b/sw/source/uibase/sidebar/PageHeaderPanel.hxx
index 53ccfba67d06..f695fc675ed8 100644
--- a/sw/source/uibase/sidebar/PageHeaderPanel.hxx
+++ b/sw/source/uibase/sidebar/PageHeaderPanel.hxx
@@ -39,7 +39,7 @@ class PageHeaderPanel:
public ::sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface
{
public:
- static VclPtr<vcl::Window> Create(
+ static VclPtr<PanelLayout> Create(
vcl::Window* pParent,
const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XFrame >& rxFrame,
SfxBindings* pBindings);
diff --git a/sw/source/uibase/sidebar/PageStylesPanel.cxx
b/sw/source/uibase/sidebar/PageStylesPanel.cxx
index 9744cf6553db..071d56f2fbdd 100644
--- a/sw/source/uibase/sidebar/PageStylesPanel.cxx
+++ b/sw/source/uibase/sidebar/PageStylesPanel.cxx
@@ -76,7 +76,7 @@ static SvxPageUsage PosToPageUsage_Impl( sal_uInt16 nPos )
return aArr[nPos];
}
-VclPtr<vcl::Window> PageStylesPanel::Create(
+VclPtr<PanelLayout> PageStylesPanel::Create(
vcl::Window* pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >&
rxFrame,
SfxBindings* pBindings)
diff --git a/sw/source/uibase/sidebar/PageStylesPanel.hxx
b/sw/source/uibase/sidebar/PageStylesPanel.hxx
index d2912b8e61f3..77d2ed462813 100644
--- a/sw/source/uibase/sidebar/PageStylesPanel.hxx
+++ b/sw/source/uibase/sidebar/PageStylesPanel.hxx
@@ -45,7 +45,7 @@ class PageStylesPanel:
public ::sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface
{
public:
- static VclPtr<vcl::Window> Create(
+ static VclPtr<PanelLayout> Create(
vcl::Window* pParent,
const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XFrame >& rxFrame,
SfxBindings* pBindings);
diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.cxx
b/sw/source/uibase/sidebar/StylePresetsPanel.cxx
index 417b0792de37..4851bff5f09e 100644
--- a/sw/source/uibase/sidebar/StylePresetsPanel.cxx
+++ b/sw/source/uibase/sidebar/StylePresetsPanel.cxx
@@ -130,7 +130,7 @@ BitmapEx CreatePreview(OUString const & aUrl, OUString
const & aName)
}
-VclPtr<vcl::Window> StylePresetsPanel::Create (vcl::Window* pParent,
+VclPtr<PanelLayout> StylePresetsPanel::Create (vcl::Window* pParent,
const
css::uno::Reference<css::frame::XFrame>& rxFrame)
{
if (pParent == nullptr)
diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.hxx
b/sw/source/uibase/sidebar/StylePresetsPanel.hxx
index 36b272a08754..1de8af74db71 100644
--- a/sw/source/uibase/sidebar/StylePresetsPanel.hxx
+++ b/sw/source/uibase/sidebar/StylePresetsPanel.hxx
@@ -26,7 +26,7 @@ class StylePresetsPanel : public PanelLayout,
{
friend class VclPtr<StylePresetsPanel>;
public:
- static VclPtr<vcl::Window> Create(vcl::Window* pParent,
+ static VclPtr<PanelLayout> Create(vcl::Window* pParent,
const
css::uno::Reference<css::frame::XFrame>& rxFrame);
virtual void NotifyItemUpdate(const sal_uInt16 nSId,
diff --git a/sw/source/uibase/sidebar/SwPanelFactory.cxx
b/sw/source/uibase/sidebar/SwPanelFactory.cxx
index fcf297dc3100..cc34ba5b3fdb 100644
--- a/sw/source/uibase/sidebar/SwPanelFactory.cxx
+++ b/sw/source/uibase/sidebar/SwPanelFactory.cxx
@@ -110,7 +110,7 @@ Reference<ui::XUIElement> SAL_CALL
SwPanelFactory::createUIElement (
if(rsResourceURL.endsWith("/PageStylesPanel"))
{
- VclPtr<vcl::Window> pPanel = sw::sidebar::PageStylesPanel::Create(
pParentWindow, xFrame, pBindings );
+ VclPtr<PanelLayout> pPanel = sw::sidebar::PageStylesPanel::Create(
pParentWindow, xFrame, pBindings );
xElement = sfx2::sidebar::SidebarPanelBase::Create(
rsResourceURL,
xFrame,
@@ -119,7 +119,7 @@ Reference<ui::XUIElement> SAL_CALL
SwPanelFactory::createUIElement (
}
else if(rsResourceURL.endsWith("/PageFormatPanel"))
{
- VclPtr<vcl::Window> pPanel = sw::sidebar::PageFormatPanel::Create(
pParentWindow, xFrame, pBindings );
+ VclPtr<PanelLayout> pPanel = sw::sidebar::PageFormatPanel::Create(
pParentWindow, xFrame, pBindings );
xElement = sfx2::sidebar::SidebarPanelBase::Create(
rsResourceURL,
xFrame,
@@ -128,7 +128,7 @@ Reference<ui::XUIElement> SAL_CALL
SwPanelFactory::createUIElement (
}
else if(rsResourceURL.endsWith("/PageHeaderPanel"))
{
- VclPtr<vcl::Window> pPanel = sw::sidebar::PageHeaderPanel::Create(
pParentWindow, xFrame, pBindings );
+ VclPtr<PanelLayout> pPanel = sw::sidebar::PageHeaderPanel::Create(
pParentWindow, xFrame, pBindings );
xElement = sfx2::sidebar::SidebarPanelBase::Create(
rsResourceURL,
xFrame,
@@ -137,7 +137,7 @@ Reference<ui::XUIElement> SAL_CALL
SwPanelFactory::createUIElement (
}
else if(rsResourceURL.endsWith("/PageFooterPanel"))
{
- VclPtr<vcl::Window> pPanel = sw::sidebar::PageFooterPanel::Create(
pParentWindow, xFrame, pBindings );
+ VclPtr<PanelLayout> pPanel = sw::sidebar::PageFooterPanel::Create(
pParentWindow, xFrame, pBindings );
xElement = sfx2::sidebar::SidebarPanelBase::Create(
rsResourceURL,
xFrame,
@@ -146,7 +146,7 @@ Reference<ui::XUIElement> SAL_CALL
SwPanelFactory::createUIElement (
}
else if (rsResourceURL.endsWith("/WrapPropertyPanel"))
{
- VclPtr<vcl::Window> pPanel = sw::sidebar::WrapPropertyPanel::Create(
pParentWindow, xFrame, pBindings );
+ VclPtr<PanelLayout> pPanel = sw::sidebar::WrapPropertyPanel::Create(
pParentWindow, xFrame, pBindings );
xElement = sfx2::sidebar::SidebarPanelBase::Create(
rsResourceURL,
xFrame,
@@ -155,7 +155,7 @@ Reference<ui::XUIElement> SAL_CALL
SwPanelFactory::createUIElement (
}
else if (rsResourceURL.endsWith("/NavigatorPanel"))
{
- VclPtr<vcl::Window> pPanel = SwNavigationPI::Create( pParentWindow,
xFrame, pBindings );
+ VclPtr<PanelLayout> pPanel = SwNavigationPI::Create( pParentWindow,
xFrame, pBindings );
xElement = sfx2::sidebar::SidebarPanelBase::Create(
rsResourceURL,
xFrame,
@@ -173,7 +173,7 @@ Reference<ui::XUIElement> SAL_CALL
SwPanelFactory::createUIElement (
}
else if (rsResourceURL.endsWith("/WriterInspectorTextPanel"))
{
- VclPtr<vcl::Window> pPanel =
sw::sidebar::WriterInspectorTextPanel::Create( pParentWindow, xFrame);
+ VclPtr<PanelLayout> pPanel =
sw::sidebar::WriterInspectorTextPanel::Create( pParentWindow, xFrame);
xElement = sfx2::sidebar::SidebarPanelBase::Create(
rsResourceURL,
xFrame,
@@ -182,19 +182,19 @@ Reference<ui::XUIElement> SAL_CALL
SwPanelFactory::createUIElement (
}
else if (rsResourceURL.endsWith("/StylePresetsPanel"))
{
- VclPtr<vcl::Window> pPanel =
sw::sidebar::StylePresetsPanel::Create(pParentWindow, xFrame);
+ VclPtr<PanelLayout> pPanel =
sw::sidebar::StylePresetsPanel::Create(pParentWindow, xFrame);
xElement = sfx2::sidebar::SidebarPanelBase::Create(
rsResourceURL, xFrame, pPanel,
ui::LayoutSize(-1,-1,-1));
}
else if (rsResourceURL.endsWith("/ThemePanel"))
{
- VclPtr<vcl::Window> pPanel =
sw::sidebar::ThemePanel::Create(pParentWindow, xFrame);
+ VclPtr<PanelLayout> pPanel =
sw::sidebar::ThemePanel::Create(pParentWindow, xFrame);
xElement = sfx2::sidebar::SidebarPanelBase::Create(
rsResourceURL, xFrame, pPanel,
ui::LayoutSize(-1,-1,-1));
}
else if (rsResourceURL.endsWith("/TableEditPanel"))
{
- VclPtr<vcl::Window> pPanel =
sw::sidebar::TableEditPanel::Create(pParentWindow, xFrame, pBindings );
+ VclPtr<PanelLayout> pPanel =
sw::sidebar::TableEditPanel::Create(pParentWindow, xFrame, pBindings );
xElement = sfx2::sidebar::SidebarPanelBase::Create(
rsResourceURL, xFrame, pPanel,
ui::LayoutSize(-1,-1,-1));
}
diff --git a/sw/source/uibase/sidebar/TableEditPanel.cxx
b/sw/source/uibase/sidebar/TableEditPanel.cxx
index d1840f8e95e7..3b7262e6e673 100644
--- a/sw/source/uibase/sidebar/TableEditPanel.cxx
+++ b/sw/source/uibase/sidebar/TableEditPanel.cxx
@@ -24,7 +24,7 @@
namespace sw::sidebar
{
-VclPtr<vcl::Window> TableEditPanel::Create(vcl::Window* pParent,
+VclPtr<PanelLayout> TableEditPanel::Create(vcl::Window* pParent,
const
css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings)
{
diff --git a/sw/source/uibase/sidebar/TableEditPanel.hxx
b/sw/source/uibase/sidebar/TableEditPanel.hxx
index 113455060484..cb8097aaf4cb 100644
--- a/sw/source/uibase/sidebar/TableEditPanel.hxx
+++ b/sw/source/uibase/sidebar/TableEditPanel.hxx
@@ -24,7 +24,7 @@ class TableEditPanel : public PanelLayout,
friend class VclPtr<TableEditPanel>;
public:
- 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/sw/source/uibase/sidebar/ThemePanel.cxx
b/sw/source/uibase/sidebar/ThemePanel.cxx
index 25eac48e1174..93ee7b557a84 100644
--- a/sw/source/uibase/sidebar/ThemePanel.cxx
+++ b/sw/source/uibase/sidebar/ThemePanel.cxx
@@ -397,7 +397,7 @@ BitmapEx GenerateColorPreview(const svx::ColorSet&
rColorSet)
namespace sw::sidebar {
-VclPtr<vcl::Window> ThemePanel::Create (vcl::Window* pParent,
+VclPtr<PanelLayout> ThemePanel::Create (vcl::Window* pParent,
const
css::uno::Reference<css::frame::XFrame>& rxFrame)
{
if (pParent == nullptr)
diff --git a/sw/source/uibase/sidebar/ThemePanel.hxx
b/sw/source/uibase/sidebar/ThemePanel.hxx
index b2b1c503790f..34a982bb2d29 100644
--- a/sw/source/uibase/sidebar/ThemePanel.hxx
+++ b/sw/source/uibase/sidebar/ThemePanel.hxx
@@ -23,7 +23,7 @@ class ThemePanel : public PanelLayout,
{
friend class VclPtr<ThemePanel>;
public:
- static VclPtr<vcl::Window> Create(vcl::Window* pParent,
+ static VclPtr<PanelLayout> Create(vcl::Window* pParent,
const
css::uno::Reference<css::frame::XFrame>& rxFrame);
virtual void NotifyItemUpdate(const sal_uInt16 nSId,
diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
index 985bd34ffcc3..33fd16da7764 100644
--- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
@@ -33,7 +33,7 @@
namespace sw::sidebar {
-VclPtr<vcl::Window> WrapPropertyPanel::Create (
+VclPtr<PanelLayout> WrapPropertyPanel::Create (
vcl::Window* pParent,
const css::uno::Reference< css::frame::XFrame >& rxFrame,
SfxBindings* pBindings)
diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx
b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx
index 1f4d16d80595..7a07ff3be9d7 100644
--- a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx
+++ b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx
@@ -32,7 +32,7 @@ namespace sw::sidebar {
, public ::sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface
{
public:
- 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/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
b/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
index 05a1cff79097..83546dec8fc7 100644
--- a/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
+++ b/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
@@ -44,7 +44,7 @@ namespace sw::sidebar
{
static void UpdateTree(SwDocShell* pDocSh,
std::vector<svx::sidebar::TreeNode>& aStore);
-VclPtr<vcl::Window> WriterInspectorTextPanel::Create(vcl::Window* pParent,
+VclPtr<PanelLayout> WriterInspectorTextPanel::Create(vcl::Window* pParent,
const
uno::Reference<frame::XFrame>& rxFrame)
{
if (pParent == nullptr)
diff --git a/sw/source/uibase/sidebar/WriterInspectorTextPanel.hxx
b/sw/source/uibase/sidebar/WriterInspectorTextPanel.hxx
index ac42fe3bf762..56137399c679 100644
--- a/sw/source/uibase/sidebar/WriterInspectorTextPanel.hxx
+++ b/sw/source/uibase/sidebar/WriterInspectorTextPanel.hxx
@@ -27,7 +27,7 @@ namespace sw::sidebar
class WriterInspectorTextPanel final : public svx::sidebar::InspectorTextPanel
{
public:
- static VclPtr<vcl::Window> Create(vcl::Window* pParent,
+ static VclPtr<PanelLayout> Create(vcl::Window* pParent,
const
css::uno::Reference<css::frame::XFrame>& rxFrame);
WriterInspectorTextPanel(vcl::Window* pParent,
diff --git a/sw/source/uibase/utlui/navipi.cxx
b/sw/source/uibase/utlui/navipi.cxx
index 662ae43ebbe2..1eace5034153 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -486,7 +486,7 @@ enum StatusIndex
}
-VclPtr<vcl::Window> SwNavigationPI::Create(vcl::Window* pParent,
+VclPtr<PanelLayout> SwNavigationPI::Create(vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
