diff options
Diffstat (limited to 'svx/source/sidebar/paragraph/ParaPropertyPanel.cxx')
-rw-r--r-- | svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index d65f34d3f257..2e54af0a8485 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -44,8 +44,8 @@ namespace svx::sidebar { #define MAX_SC_SD 116220200 #define NEGA_MAXVALUE -10000000 -VclPtr<PanelLayout> ParaPropertyPanel::Create ( - vcl::Window* pParent, +std::unique_ptr<PanelLayout> ParaPropertyPanel::Create ( + weld::Widget* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const css::uno::Reference<css::ui::XSidebar>& rxSidebar) @@ -57,11 +57,7 @@ VclPtr<PanelLayout> ParaPropertyPanel::Create ( if (pBindings == nullptr) throw lang::IllegalArgumentException("no SfxBindings given to ParaPropertyPanel::Create", nullptr, 2); - return VclPtr<ParaPropertyPanel>::Create( - pParent, - rxFrame, - pBindings, - rxSidebar); + return std::make_unique<ParaPropertyPanel>(pParent, rxFrame, pBindings, rxSidebar); } void ParaPropertyPanel::HandleContextChange ( @@ -129,8 +125,6 @@ void ParaPropertyPanel::HandleContextChange ( } } -void ParaPropertyPanel::DataChanged (const DataChangedEvent&) {} - void ParaPropertyPanel::ReSize() { if (mxSidebar.is()) @@ -397,11 +391,11 @@ FieldUnit ParaPropertyPanel::GetCurrentUnit( SfxItemState eState, const SfxPoolI return eUnit; } -ParaPropertyPanel::ParaPropertyPanel(vcl::Window* pParent, +ParaPropertyPanel::ParaPropertyPanel(weld::Widget* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const css::uno::Reference<css::ui::XSidebar>& rxSidebar) - : PanelLayout(pParent, "ParaPropertyPanel", "svx/ui/sidebarparagraph.ui", rxFrame), + : PanelLayout(pParent, "ParaPropertyPanel", "svx/ui/sidebarparagraph.ui"), //Alignment mxTBxHorzAlign(m_xBuilder->weld_toolbar("horizontalalignment")), mxHorzAlignDispatch(new ToolbarUnoDispatcher(*mxTBxHorzAlign, *m_xBuilder, rxFrame)), @@ -449,7 +443,6 @@ ParaPropertyPanel::ParaPropertyPanel(vcl::Window* pParent, initial(); m_aMetricCtl.RequestUpdate(); - m_pInitialFocusWidget = mxTBxHorzAlign.get(); } void ParaPropertyPanel::limitMetricWidths() @@ -463,11 +456,6 @@ void ParaPropertyPanel::limitMetricWidths() ParaPropertyPanel::~ParaPropertyPanel() { - disposeOnce(); -} - -void ParaPropertyPanel::dispose() -{ mxHorzAlignDispatch.reset(); mxTBxHorzAlign.reset(); @@ -501,8 +489,6 @@ void ParaPropertyPanel::dispose() maLRSpaceControl.dispose(); maULSpaceControl.dispose(); m_aMetricCtl.dispose(); - - PanelLayout::dispose(); } } // end of namespace svx::sidebar |