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

[Caolán McNamara (via logerrit)]

 cui/source/customize/cfg.cxx |   12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

New commits:
commit 5eab437c406a2e445baf174bf2c2ad21e663ef2e
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Nov 25 12:10:01 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Nov 26 21:11:29 2019 +0100

    tdf#126043 use CommandInfoProvider::GetModuleIdentifier
    
    which probably already has a cached ModuleManager
    
    Change-Id: Id653e57ecf40061ace086881344a85d7413a5afc
    Reviewed-on: https://gerrit.libreoffice.org/83671
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 9426162a3b24732167e4fa7aa2fa6ee19d33e7e9)
    Reviewed-on: https://gerrit.libreoffice.org/83788

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index acb447b1f4f7..277ce523867a 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1267,17 +1267,7 @@ OUString SvxConfigPage::GetFrameWithDefaultAndIdentify( uno::Reference< frame::X
             return sModuleID;
         }
 
-        uno::Reference< css::frame::XModuleManager2 > xModuleManager(
-                css::frame::ModuleManager::create( xContext ) );
-
-        try
-        {
-            sModuleID = xModuleManager->identify( _inout_rxFrame );
-        }
-        catch ( const frame::UnknownModuleException& )
-        {
-        }
-
+        sModuleID = vcl::CommandInfoProvider::GetModuleIdentifier(_inout_rxFrame);
     }
     catch( const uno::Exception& )
     {