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

[Maxim Monastirsky]

 framework/source/uielement/menubarmanager.cxx |    8 ++++----
 sc/inc/sc.hrc                                 |    2 --
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit c37e66fac7d23989c1fb9c46372e2efe96036514
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Mon Jan 25 00:56:09 2016 +0200

    Drop unused defines
    
    Change-Id: I99b505fe59adc095bb55fc983dade23150fc5d75

diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 9dc55b9..dc049a5 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1037,8 +1037,6 @@
 #define RID_SCPAGE_CALC         (SC_DIALOGS_START + 56)
 #define RID_SCDLG_NAVIGATOR     (SC_DIALOGS_START + 57)
 
-#define RID_POPUP_ROWHEADER     (SC_DIALOGS_START + 60)
-#define RID_POPUP_COLHEADER     (SC_DIALOGS_START + 61)
 #define RID_SCDLG_HFEDIT_SHDR   (SC_DIALOGS_START + 62)
 #define RID_SCDLG_HFEDIT_SFTR   (SC_DIALOGS_START + 63)
 #define RID_SCDLG_HFEDIT_LEFTHEADER     (SC_DIALOGS_START + 64)
commit 954d7adb391e179e06d941eb31f8dcfe0bc4b298
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Mon Jan 25 00:55:23 2016 +0200

    MenuBarManager: Pass the module identifier to the factory
    
    Change-Id: I681054715e943791bddb4b33f01c903c78b717d7

diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index f9e94ba..a1ac05c 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -870,7 +870,7 @@ IMPL_LINK_TYPED( MenuBarManager, Activate, Menu *, pMenu, bool )
 
                             bool bPopupMenu( false );
                             if ( !pMenuItemHandler->xPopupMenuController.is() &&
-                                 m_xPopupMenuControllerFactory->hasController( aItemCommand, OUString() ))
+                                 m_xPopupMenuControllerFactory->hasController( aItemCommand, m_aModuleIdentifier ) )
                             {
                                 bPopupMenu = CreatePopupMenuController( pMenuItemHandler );
                             }
@@ -1220,7 +1220,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
 
             if ( m_xPopupMenuControllerFactory.is() &&
                  pPopup->GetItemCount() == 0 &&
-                 m_xPopupMenuControllerFactory->hasController( aItemCommand, OUString() )
+                 m_xPopupMenuControllerFactory->hasController( aItemCommand, m_aModuleIdentifier )
                   )
             {
                 // Check if we have to create a popup menu for a uno based popup menu controller.
@@ -1352,7 +1352,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
             pItemHandler->aMenuItemURL = aItemCommand;
 
             if ( m_xPopupMenuControllerFactory.is() &&
-                 m_xPopupMenuControllerFactory->hasController( aItemCommand, OUString() ))
+                 m_xPopupMenuControllerFactory->hasController( aItemCommand, m_aModuleIdentifier ) )
             {
                 // Check if we have to create a popup menu for a uno based popup menu controller.
                 // We have to set an empty popup menu into our menu structure so the controller also
@@ -1959,7 +1959,7 @@ void MenuBarManager::Init(const Reference< XFrame >& rFrame,Menu* pAddonMenu,boo
                     // We have to set an empty popup menu into our menu structure so the controller also
                     // works with inplace OLE.
                     if ( m_xPopupMenuControllerFactory.is() &&
-                        m_xPopupMenuControllerFactory->hasController( aItemCommand, OUString() ))
+                         m_xPopupMenuControllerFactory->hasController( aItemCommand, m_aModuleIdentifier ) )
                     {
                         VCLXPopupMenu* pVCLXPopupMenu = new VCLXPopupMenu;
                         PopupMenu* pCtlPopupMenu = static_cast<PopupMenu *>(pVCLXPopupMenu->GetMenu());