Skip to content

Commit dbc515b

Browse files
committed
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 <[email protected]>
1 parent 6f3f923 commit dbc515b

File tree

4 files changed

+3
-3
lines changed

4 files changed

+3
-3
lines changed

cui/source/customize/SvxNotebookbarConfigPage.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ SvxNotebookbarConfigPage::SvxNotebookbarConfigPage(weld::Container* pPage,
106106
const SfxItemSet& rSet)
107107
: SvxConfigPage(pPage, pController, rSet)
108108
{
109+
m_xCommandCategoryListBox->set_visible(false);
109110
m_xDescriptionFieldLb->set_visible(false);
110111
m_xSearchEdit->set_visible(false);
111112
m_xDescriptionField->set_visible(false);
@@ -116,7 +117,6 @@ SvxNotebookbarConfigPage::SvxNotebookbarConfigPage(weld::Container* pPage,
116117
m_xLeftFunctionLabel->set_visible(false);
117118
m_xSearchLabel->set_visible(false);
118119
m_xCategoryLabel->set_visible(false);
119-
m_xCategoryListBox->set_visible(false);
120120
m_xInsertBtn->set_visible(false);
121121
m_xModifyBtn->set_visible(false);
122122
m_xResetBtn->set_visible(false);

cui/source/customize/cfg.cxx

-1
Original file line numberDiff line numberDiff line change
@@ -976,7 +976,6 @@ SvxConfigPage::SvxConfigPage(weld::Container* pPage, weld::DialogController* pCo
976976
, m_xCommandCategoryListBox(new CommandCategoryListBox(m_xBuilder->weld_combo_box("commandcategorylist")))
977977
, m_xFunctions(new CuiConfigFunctionListBox(m_xBuilder->weld_tree_view("functions")))
978978
, m_xCategoryLabel(m_xBuilder->weld_label("categorylabel"))
979-
, m_xCategoryListBox(m_xBuilder->weld_combo_box("commandcategorylist"))
980979
, m_xDescriptionFieldLb(m_xBuilder->weld_label("descriptionlabel"))
981980
, m_xDescriptionField(m_xBuilder->weld_text_view("desc"))
982981
, m_xLeftFunctionLabel(m_xBuilder->weld_label("leftfunctionlabel"))

cui/source/inc/CommandCategoryListBox.hxx

+2
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ public:
7373
const weld::TreeIter* parentEntry, const css::uno::Reference<com::sun::star::script::browse::XBrowseNode> &parentNode,
7474
CuiConfigFunctionListBox* pFunctionListBox, const OUString &filterTerm , SaveInData *pCurrentSaveInData,
7575
std::vector<std::unique_ptr<weld::TreeIter>> &rNodesToExpand);
76+
77+
void set_visible(bool bVisible) {m_xControl->set_visible(bVisible);}
7678
};
7779

7880
#endif // INCLUDED_CUI_SOURCE_INC_COMMANDCATEGORYLISTBOX_HXX

cui/source/inc/cfg.hxx

-1
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,6 @@ protected:
373373
std::unique_ptr<CuiConfigFunctionListBox> m_xFunctions;
374374

375375
std::unique_ptr<weld::Label> m_xCategoryLabel;
376-
std::unique_ptr<weld::ComboBox> m_xCategoryListBox;
377376
std::unique_ptr<weld::Label> m_xDescriptionFieldLb;
378377
std::unique_ptr<weld::TextView> m_xDescriptionField;
379378
std::unique_ptr<weld::Label> m_xLeftFunctionLabel;

0 commit comments

Comments
 (0)