[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - cui/source

[Caolán McNamara (via logerrit)]

 cui/source/customize/SvxMenuConfigPage.cxx    |    3 +--
 cui/source/customize/SvxToolbarConfigPage.cxx |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit a07f537b2b0e80021612451083338bd0e12da723
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Nov 25 12:25:12 2019 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Nov 27 11:17:21 2019 +0100

    tdf#126043 module identifier already known
    
    Change-Id: I710180ed125bbea250694cfb5f7d12cb1b07f782
    Reviewed-on: https://gerrit.libreoffice.org/83675
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>
    (cherry picked from commit 380b322b986720f155edac62b70b0d7aa40c16b7)
    Reviewed-on: https://gerrit.libreoffice.org/83866
    Tested-by: Jenkins

diff --git a/cui/source/customize/SvxMenuConfigPage.cxx 
b/cui/source/customize/SvxMenuConfigPage.cxx
index 2b6ef9e52469..218d087349ad 100644
--- a/cui/source/customize/SvxMenuConfigPage.cxx
+++ b/cui/source/customize/SvxMenuConfigPage.cxx
@@ -152,8 +152,7 @@ void SvxMenuConfigPage::Init()
 
     m_xCommandCategoryListBox->Init(
         comphelper::getProcessComponentContext(),
-        m_xFrame,
-        vcl::CommandInfoProvider::GetModuleIdentifier(m_xFrame));
+        m_xFrame, m_aModuleId);
     m_xCommandCategoryListBox->categorySelected(m_xFunctions.get(), 
OUString(), GetSaveInData());
 }
 
diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx 
b/cui/source/customize/SvxToolbarConfigPage.cxx
index aee4abf651a6..b8058df387f5 100644
--- a/cui/source/customize/SvxToolbarConfigPage.cxx
+++ b/cui/source/customize/SvxToolbarConfigPage.cxx
@@ -290,8 +290,7 @@ void SvxToolbarConfigPage::Init()
 
     m_xCommandCategoryListBox->Init(
         comphelper::getProcessComponentContext(),
-        m_xFrame,
-        vcl::CommandInfoProvider::GetModuleIdentifier(m_xFrame));
+        m_xFrame, m_aModuleId);
     m_xCommandCategoryListBox->categorySelected(m_xFunctions.get(), 
OUString(), GetSaveInData());
 }
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits