diff options
author | Caolán McNamara <caolanm@redhat.com> | 2021-03-04 17:22:14 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2021-03-11 17:42:22 +0100 |
commit | 1653bb9bffaa84a40b7d81a8277e887ea28df4e4 (patch) | |
tree | 5e56142b7b63ab66fb1dcc781ffeb3ae5afda2ad /svx/source/sidebar/line/LinePropertyPanel.cxx | |
parent | 40c58f6039fb02cff74e442f6adc5ba38adcff1d (diff) |
remove intermediate containers in sidebars
tested extension sidebars of:
a) Wollmux extension sidebars
b) Analog Clock Extension demo
https://wiki.openoffice.org/wiki/Sidebar_for_Developers#Example:_Analog_Clock_Extension
Change-Id: If9729e20526681928137989f01a8ae733a9b0cb5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112035
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx/source/sidebar/line/LinePropertyPanel.cxx')
-rw-r--r-- | svx/source/sidebar/line/LinePropertyPanel.cxx | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx index e813ea099346..acd75820f58d 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.cxx +++ b/svx/source/sidebar/line/LinePropertyPanel.cxx @@ -33,7 +33,7 @@ using namespace css::uno; namespace svx::sidebar { LinePropertyPanel::LinePropertyPanel( - vcl::Window* pParent, + weld::Widget* pParent, const uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings) : LinePropertyPanelBase(pParent, rxFrame), @@ -51,23 +51,16 @@ LinePropertyPanel::LinePropertyPanel( LinePropertyPanel::~LinePropertyPanel() { - disposeOnce(); -} - -void LinePropertyPanel::dispose() -{ maStyleControl.dispose(); maDashControl.dispose(); maWidthControl.dispose(); maTransControl.dispose(); maEdgeStyle.dispose(); maCapStyle.dispose(); - - LinePropertyPanelBase::dispose(); } -VclPtr<PanelLayout> LinePropertyPanel::Create ( - vcl::Window* pParent, +std::unique_ptr<PanelLayout> LinePropertyPanel::Create ( + weld::Widget* pParent, const uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings) { @@ -78,7 +71,7 @@ VclPtr<PanelLayout> LinePropertyPanel::Create ( if (pBindings == nullptr) throw lang::IllegalArgumentException("no SfxBindings given to LinePropertyPanel::Create", nullptr, 2); - return VclPtr<LinePropertyPanel>::Create(pParent, rxFrame, pBindings); + return std::make_unique<LinePropertyPanel>(pParent, rxFrame, pBindings); } void LinePropertyPanel::NotifyItemUpdate( |