[Libreoffice-commits] core.git: framework/source

[Takeshi Abe]

 framework/source/uielement/newmenucontroller.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9a5e2d01c589392a4415667667d9a226c19f25ed
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Mon Feb 6 11:51:14 2017 +0900

    framework: Retrieve shortcuts from document-specific configuration
    
    No known symptoms, but it seems like a typo when comparing with
    MenuBarManager::RetrieveShortcuts().
    
    Change-Id: I83f6e5766f5e0a0e01f5fd4863772ad1d99c70d2
    Reviewed-on: https://gerrit.libreoffice.org/33945
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index ce305fa..b371e26 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -245,7 +245,7 @@ void NewMenuController::setAccelerators( PopupMenu* pPopupMenu )
         if ( m_xModuleAcceleratorManager.is() )
             retrieveShortcutsFromConfiguration( xModuleAccelCfg, aSeq, aMenuShortCuts );
         if ( m_xDocAcceleratorManager.is() )
-            retrieveShortcutsFromConfiguration( xGlobalAccelCfg, aSeq, aMenuShortCuts );
+            retrieveShortcutsFromConfiguration( xDocAccelCfg, aSeq, aMenuShortCuts );
 
         const sal_uInt32 nCount2 = aIds.size();
         for ( sal_uInt32 i = 0; i < nCount2; i++ )