diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-11-25 11:21:28 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-11-26 13:51:46 +0100 |
| commit | 3b0d29f1461c97c0c812a500b3414b9a50d694ff (patch) | |
| tree | f29864f730ebc3d3ea31d0cc19481382e819e04f /cui | |
| parent | ec5e91d6c123bd52f312f96812c35ef03c91fcc6 (diff) | |
tdf#126043 fetch the command properties just once
Change-Id: Iaf343e9858be36ca8772d9c12eee772d93b4c394
Reviewed-on: https://gerrit.libreoffice.org/83668
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/customize/CommandCategoryListBox.cxx | 8 | ||||
| -rw-r--r-- | cui/source/customize/cfg.cxx | 8 | ||||
| -rw-r--r-- | cui/uiconfig/ui/optionsdialog.ui | 1 |
3 files changed, 11 insertions, 6 deletions
diff --git a/cui/source/customize/CommandCategoryListBox.cxx b/cui/source/customize/CommandCategoryListBox.cxx index 10758d0af47a..7576d0771edc 100644 --- a/cui/source/customize/CommandCategoryListBox.cxx +++ b/cui/source/customize/CommandCategoryListBox.cxx @@ -216,11 +216,13 @@ void CommandCategoryListBox::FillFunctionsList( for (const auto & rInfo : xCommands) { + auto aProperties = vcl::CommandInfoProvider::GetCommandProperties(rInfo.Command, m_sModuleLongName); + OUString sUIName = getCommandName(rInfo.Command); - OUString sLabel = vcl::CommandInfoProvider::GetLabelForCommand(rInfo.Command, m_sModuleLongName); - OUString sTooltipLabel = vcl::CommandInfoProvider::GetTooltipForCommand( rInfo.Command, m_xFrame); + OUString sLabel = vcl::CommandInfoProvider::GetLabelForCommand(aProperties); + OUString sTooltipLabel = vcl::CommandInfoProvider::GetTooltipForCommand(rInfo.Command, aProperties, m_xFrame); OUString sPopupLabel = - (vcl::CommandInfoProvider::GetPopupLabelForCommand(rInfo.Command, m_sModuleLongName)) + (vcl::CommandInfoProvider::GetPopupLabelForCommand(aProperties)) .replaceFirst("~", ""); // Apply the search filter diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 2ff9df40902d..d3a04baa1e7c 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1418,12 +1418,14 @@ int SvxConfigPage::AddFunction(int nTarget, bool bAllowDuplicates) OUString aDisplayName; OUString aModuleId = vcl::CommandInfoProvider::GetModuleIdentifier( m_xFrame ); + auto aProperties = vcl::CommandInfoProvider::GetCommandProperties(aURL, aModuleId); + if ( typeid(*pCurrentSaveInData) == typeid(ContextMenuSaveInData) ) - aDisplayName = vcl::CommandInfoProvider::GetPopupLabelForCommand( aURL, aModuleId ); + aDisplayName = vcl::CommandInfoProvider::GetPopupLabelForCommand(aProperties); else if ( typeid(*pCurrentSaveInData) == typeid(MenuSaveInData) ) - aDisplayName = vcl::CommandInfoProvider::GetMenuLabelForCommand( aURL, aModuleId ); + aDisplayName = vcl::CommandInfoProvider::GetMenuLabelForCommand(aProperties); else - aDisplayName = vcl::CommandInfoProvider::GetLabelForCommand( aURL, aModuleId ); + aDisplayName = vcl::CommandInfoProvider::GetLabelForCommand(aProperties); SvxConfigEntry* pNewEntryData = new SvxConfigEntry( aDisplayName, aURL, false, /*bParentData*/false ); diff --git a/cui/uiconfig/ui/optionsdialog.ui b/cui/uiconfig/ui/optionsdialog.ui index b96ec45a95ea..87381b2cee59 100644 --- a/cui/uiconfig/ui/optionsdialog.ui +++ b/cui/uiconfig/ui/optionsdialog.ui @@ -16,6 +16,7 @@ <property name="vexpand">True</property> <property name="border_width">6</property> <property name="title" translatable="yes" context="optionsdialog|OptionsDialog">Options</property> + <property name="modal">True</property> <property name="type_hint">dialog</property> <child> <placeholder/> |