diff options
Diffstat (limited to 'chart2/source/controller/sidebar/ChartSeriesPanel.cxx')
-rw-r--r-- | chart2/source/controller/sidebar/ChartSeriesPanel.cxx | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx index 80153beaa80d..4ce23d66811c 100644 --- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx +++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx @@ -277,10 +277,9 @@ OUString getCID(const css::uno::Reference<css::frame::XModel>& xModel) } ChartSeriesPanel::ChartSeriesPanel( - vcl::Window* pParent, - const css::uno::Reference<css::frame::XFrame>& rxFrame, + weld::Widget* pParent, ChartController* pController) - : PanelLayout(pParent, "ChartSeriesPanel", "modules/schart/ui/sidebarseries.ui", rxFrame) + : PanelLayout(pParent, "ChartSeriesPanel", "modules/schart/ui/sidebarseries.ui") , mxCBLabel(m_xBuilder->weld_check_button("checkbutton_label")) , mxCBTrendline(m_xBuilder->weld_check_button("checkbutton_trendline")) , mxCBXError(m_xBuilder->weld_check_button("checkbutton_x_error")) @@ -297,17 +296,10 @@ ChartSeriesPanel::ChartSeriesPanel( , mbModelValid(true) { Initialize(); - - m_pInitialFocusWidget = mxCBLabel.get(); } ChartSeriesPanel::~ChartSeriesPanel() { - disposeOnce(); -} - -void ChartSeriesPanel::dispose() -{ css::uno::Reference<css::util::XModifyBroadcaster> xBroadcaster(mxModel, css::uno::UNO_QUERY_THROW); xBroadcaster->removeModifyListener(mxListener); css::uno::Reference<css::view::XSelectionSupplier> xSelectionSupplier(mxModel->getCurrentController(), css::uno::UNO_QUERY); @@ -327,8 +319,6 @@ void ChartSeriesPanel::dispose() mxFTSeriesName.reset(); mxFTSeriesTemplate.reset(); - - PanelLayout::dispose(); } void ChartSeriesPanel::Initialize() @@ -385,23 +375,19 @@ void ChartSeriesPanel::updateData() mxFTSeriesName->set_label(aFrameLabel); } -VclPtr<PanelLayout> ChartSeriesPanel::Create ( - vcl::Window* pParent, - const css::uno::Reference<css::frame::XFrame>& rxFrame, +std::unique_ptr<PanelLayout> ChartSeriesPanel::Create ( + weld::Widget* pParent, ChartController* pController) { if (pParent == nullptr) throw lang::IllegalArgumentException("no parent Window given to ChartSeriesPanel::Create", nullptr, 0); - if ( ! rxFrame.is()) - throw lang::IllegalArgumentException("no XFrame given to ChartSeriesPanel::Create", nullptr, 1); - return VclPtr<ChartSeriesPanel>::Create( - pParent, rxFrame, pController); + return std::make_unique<ChartSeriesPanel>(pParent, pController); } -void ChartSeriesPanel::DataChanged( - const DataChangedEvent& ) +void ChartSeriesPanel::DataChanged(const DataChangedEvent& rEvent) { + PanelLayout::DataChanged(rEvent); updateData(); } |