From 5e73afe96a1a1f5444683c210fa31e1c30826675 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sun, 3 Mar 2019 19:53:22 +0000 Subject: can rename CuiMacroEventListBox back to MacroEventListBox now MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I2f88488e7bb931238a31eb62f616c33c60c7ec2e Reviewed-on: https://gerrit.libreoffice.org/68650 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- cui/source/customize/macropg.cxx | 6 +----- cui/source/inc/headertablistbox.hxx | 5 ++--- cui/source/tabpages/macroass.cxx | 4 ++-- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index ec69a666e477..986909a84d85 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -60,17 +60,13 @@ SvxMacroTabPage_Impl::SvxMacroTabPage_Impl( const SfxItemSet& rAttrSet ) bIDEDialogMode = static_cast(pItem)->GetValue(); } -CuiMacroEventListBox::CuiMacroEventListBox(std::unique_ptr xTreeView) +MacroEventListBox::MacroEventListBox(std::unique_ptr xTreeView) : m_xTreeView(std::move(xTreeView)) { m_xTreeView->set_help_id(HID_MACRO_HEADERTABLISTBOX); m_xTreeView->set_size_request(m_xTreeView->get_approximate_digit_width() * 70, m_xTreeView->get_height_rows(9)); } -CuiMacroEventListBox::~CuiMacroEventListBox() -{ -} - // assign button ("Add Command") is enabled only if it is not read only // delete button ("Remove Command") is enabled if a current binding exists // and it is not read only diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx index 360bed4937f8..5793d511fb7e 100644 --- a/cui/source/inc/headertablistbox.hxx +++ b/cui/source/inc/headertablistbox.hxx @@ -23,15 +23,14 @@ #include #include -class CuiMacroEventListBox final +class MacroEventListBox final { private: std::unique_ptr m_xTreeView; public: - CuiMacroEventListBox(std::unique_ptr xTreeView); + MacroEventListBox(std::unique_ptr xTreeView); void set_sensitive(bool bSensitive) { m_xTreeView->set_sensitive(bSensitive); } void show() { m_xTreeView->show(); } - ~CuiMacroEventListBox(); weld::TreeView& GetListBox() { diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 8f64493e40dd..f40f1d33c895 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -46,7 +46,7 @@ public: OUString m_aStaticMacroLBLabel; std::unique_ptr m_xAssignPB; std::unique_ptr m_xDeletePB; - std::unique_ptr m_xEventLB; + std::unique_ptr m_xEventLB; std::unique_ptr m_xGroupFrame; std::unique_ptr m_xGroupLB; std::unique_ptr m_xMacroFrame; @@ -112,7 +112,7 @@ SfxMacroTabPage::SfxMacroTabPage(TabPageParent pParent, const Reference< XFrame mpImpl->m_aFillGroupIdle.SetPriority( TaskPriority::HIGHEST ); mpImpl->m_aFillGroupIdle.SetDebugName( "SfxMacroTabPage m_aFillGroupIdle" ); - mpImpl->m_xEventLB.reset(new CuiMacroEventListBox(m_xBuilder->weld_tree_view("assignments"))); + mpImpl->m_xEventLB.reset(new MacroEventListBox(m_xBuilder->weld_tree_view("assignments"))); mpImpl->m_xAssignPB = m_xBuilder->weld_button("assign"); mpImpl->m_xDeletePB = m_xBuilder->weld_button("delete"); mpImpl->m_xGroupFrame = m_xBuilder->weld_widget("groupframe"); -- cgit