mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always checking for Master document command labels makes no sense

Browse Source 
Change-Id: I33d04da63c5e30d166bd22f9fc7ffb5aa4da5c6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88343
Tested-by: Maxim Monastirsky <momonasmon@gmail.com>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
This commit is contained in:
Maxim Monastirsky
2020-02-09 17:33:30 +02:00
parent 37187ecf8c
commit d2dfda8aba
1 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cui/source/customize/SvxNotebookbarConfigPage.cxx
View File

@@ -221,15 +221,13 @@ void SvxConfigPage::InsertEntryIntoNotebookbarTabUI(const OUString& sClassId,
weld::TreeView& rTreeView,
weld::TreeIter& rIter, int nStartCol)
{
css::uno::Reference<css::container::XNameAccess> m_xCommandToLabelMap,
m_xGlobalCommandToLabelMap;
css::uno::Reference<css::container::XNameAccess> m_xCommandToLabelMap;
uno::Reference<uno::XComponentContext> xContext = ::comphelper::getProcessComponentContext();
uno::Reference<container::XNameAccess> xNameAccess(
css::frame::theUICommandDescription::get(xContext));
uno::Sequence<beans::PropertyValue> aPropSeq, aGlobalPropSeq;
uno::Sequence<beans::PropertyValue> aPropSeq;
xNameAccess->getByName("com.sun.star.text.GlobalDocument") >>= m_xGlobalCommandToLabelMap;
xNameAccess->getByName(getModuleId(m_sAppName)) >>= m_xCommandToLabelMap;
try
@@ -242,23 +240,10 @@ void SvxConfigPage::InsertEntryIntoNotebookbarTabUI(const OUString& sClassId,
{
}
try
{
uno::Any aGlobalVal = m_xGlobalCommandToLabelMap->getByName(sUIItemCommand);
aGlobalVal >>= aGlobalPropSeq;
}
catch (container::NoSuchElementException&)
{
}
OUString aLabel;
for (sal_Int32 i = 0; i < aPropSeq.getLength(); ++i)
if (aPropSeq[i].Name == "Name")
aPropSeq[i].Value >>= aLabel;
if (aLabel.isEmpty())
for (sal_Int32 i = 0; i < aGlobalPropSeq.getLength(); ++i)
if (aGlobalPropSeq[i].Name == "Name")
aGlobalPropSeq[i].Value >>= aLabel;
OUString aName = SvxConfigPageHelper::stripHotKey(aLabel);