diff options
| author | Muhammet Kara <muhammet.kara@collabora.com> | 2019-11-08 21:11:28 +0300 |
|---|---|---|
| committer | Muhammet Kara <muhammet.kara@collabora.com> | 2019-11-08 20:07:48 +0100 |
| commit | dbc515b3e21162686d01d4c65f88d9c3bc6bbf0c (patch) | |
| tree | d0bbe93f3efbbf9297445662c260c8e3c0f0747b /cui/source | |
| parent | 6f3f923e037253e7632ff2656ed9a2ec60841735 (diff) | |
Fix tdf#128004: Customize: chosen category does not filter function list
Change-Id: I69b1defda33f22c38377aed559147c880b292ed8
Reviewed-on: https://gerrit.libreoffice.org/82319
Tested-by: Jenkins
Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
Diffstat (limited to 'cui/source')
| -rw-r--r-- | cui/source/customize/SvxNotebookbarConfigPage.cxx | 2 | ||||
| -rw-r--r-- | cui/source/customize/cfg.cxx | 1 | ||||
| -rw-r--r-- | cui/source/inc/CommandCategoryListBox.hxx | 2 | ||||
| -rw-r--r-- | cui/source/inc/cfg.hxx | 1 |
4 files changed, 3 insertions, 3 deletions
diff --git a/cui/source/customize/SvxNotebookbarConfigPage.cxx b/cui/source/customize/SvxNotebookbarConfigPage.cxx index 4ab507ed4824..26cebe8cd583 100644 --- a/cui/source/customize/SvxNotebookbarConfigPage.cxx +++ b/cui/source/customize/SvxNotebookbarConfigPage.cxx @@ -106,6 +106,7 @@ SvxNotebookbarConfigPage::SvxNotebookbarConfigPage(weld::Container* pPage, const SfxItemSet& rSet) : SvxConfigPage(pPage, pController, rSet) { + m_xCommandCategoryListBox->set_visible(false); m_xDescriptionFieldLb->set_visible(false); m_xSearchEdit->set_visible(false); m_xDescriptionField->set_visible(false); @@ -116,7 +117,6 @@ SvxNotebookbarConfigPage::SvxNotebookbarConfigPage(weld::Container* pPage, m_xLeftFunctionLabel->set_visible(false); m_xSearchLabel->set_visible(false); m_xCategoryLabel->set_visible(false); - m_xCategoryListBox->set_visible(false); m_xInsertBtn->set_visible(false); m_xModifyBtn->set_visible(false); m_xResetBtn->set_visible(false); diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index ae4d0da10834..2879d17b58ec 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -976,7 +976,6 @@ SvxConfigPage::SvxConfigPage(weld::Container* pPage, weld::DialogController* pCo , m_xCommandCategoryListBox(new CommandCategoryListBox(m_xBuilder->weld_combo_box("commandcategorylist"))) , m_xFunctions(new CuiConfigFunctionListBox(m_xBuilder->weld_tree_view("functions"))) , m_xCategoryLabel(m_xBuilder->weld_label("categorylabel")) - , m_xCategoryListBox(m_xBuilder->weld_combo_box("commandcategorylist")) , m_xDescriptionFieldLb(m_xBuilder->weld_label("descriptionlabel")) , m_xDescriptionField(m_xBuilder->weld_text_view("desc")) , m_xLeftFunctionLabel(m_xBuilder->weld_label("leftfunctionlabel")) diff --git a/cui/source/inc/CommandCategoryListBox.hxx b/cui/source/inc/CommandCategoryListBox.hxx index 209ae83ffd42..4075d1e22839 100644 --- a/cui/source/inc/CommandCategoryListBox.hxx +++ b/cui/source/inc/CommandCategoryListBox.hxx @@ -73,6 +73,8 @@ public: const weld::TreeIter* parentEntry, const css::uno::Reference<com::sun::star::script::browse::XBrowseNode> &parentNode, CuiConfigFunctionListBox* pFunctionListBox, const OUString &filterTerm , SaveInData *pCurrentSaveInData, std::vector<std::unique_ptr<weld::TreeIter>> &rNodesToExpand); + + void set_visible(bool bVisible) {m_xControl->set_visible(bVisible);} }; #endif // INCLUDED_CUI_SOURCE_INC_COMMANDCATEGORYLISTBOX_HXX diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 379655697a7a..71a36bdbf575 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -373,7 +373,6 @@ protected: std::unique_ptr<CuiConfigFunctionListBox> m_xFunctions; std::unique_ptr<weld::Label> m_xCategoryLabel; - std::unique_ptr<weld::ComboBox> m_xCategoryListBox; std::unique_ptr<weld::Label> m_xDescriptionFieldLb; std::unique_ptr<weld::TextView> m_xDescriptionField; std::unique_ptr<weld::Label> m_xLeftFunctionLabel; |