Avoid unnecessary bad downcasts from PopupMenu to AddonPopupMenu

Change-Id: I87e03eaac0fe4e078d8fee09bf2ffca374bff6d8

2 files changed, 11 insertions, 37 deletions

diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index 3f3e362fca0f..f985b3601688 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -81,17 +81,10 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,
             const ::com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
             const ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >& _xURLTransformer,
-            AddonMenu*          pAddonMenu,
+            Menu*           pAddonMenu,
             bool            bDelete,
-            bool            bDeleteChildren );
-
-        MenuBarManager(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,
-            const ::com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >& _xURLTransformer,
-            AddonPopupMenu*     pAddonMenu,
-            bool            bDelete,
-            bool            bDeleteChildren );
+            bool            bDeleteChildren,
+            bool popup);
 
     public:
         MenuBarManager(
@@ -211,7 +204,7 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
         bool         CreatePopupMenuController( MenuItemHandler* pMenuItemHandler );
         void             AddMenu(MenuBarManager* pSubMenuManager,const OUString& _sItemCommand,sal_uInt16 _nItemId);
         sal_uInt16           FillItemCommand(OUString& _rItemCommand, Menu* _pMenu,sal_uInt16 _nIndex) const;
-        void             Init(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,AddonMenu* pAddonMenu,bool bDelete,bool bDeleteChildren,bool _bHandlePopUp = false);
+        void             Init(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,Menu* pAddonMenu,bool bDelete,bool bDeleteChildren,bool _bHandlePopUp);
         void             SetHdl();
 
         bool                                                                               m_bDisposed : 1,
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index de1b06b5fe12..8cfe80c5ce45 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -153,9 +153,10 @@ MenuBarManager::MenuBarManager(
     const Reference< XComponentContext >& rxContext,
     const Reference< XFrame >& rFrame,
     const Reference< XURLTransformer >& _xURLTransformer,
-    AddonMenu* pAddonMenu,
+    Menu* pAddonMenu,
     bool bDelete,
-    bool bDeleteChildren ):
+    bool bDeleteChildren,
+    bool popup):
     OWeakObject()
     , m_bDisposed( false )
     , m_bRetrieveImages( true )
@@ -166,27 +167,7 @@ MenuBarManager::MenuBarManager(
     , m_xURLTransformer(_xURLTransformer)
     , m_sIconTheme( SvtMiscOptions().GetIconTheme() )
 {
-    Init(rFrame,pAddonMenu,bDelete,bDeleteChildren);
-}
-
-MenuBarManager::MenuBarManager(
-    const Reference< XComponentContext >& rxContext,
-    const Reference< XFrame >& rFrame,
-    const Reference< XURLTransformer >& _xURLTransformer,
-    AddonPopupMenu* pAddonPopupMenu,
-    bool bDelete,
-    bool bDeleteChildren ):
-    OWeakObject()
-    , m_bDisposed( false )
-    , m_bRetrieveImages( true )
-    , m_bAcceleratorCfg( false )
-    , m_bModuleIdentified( false )
-    , m_aListenerContainer( m_mutex )
-    , m_xContext(rxContext)
-    , m_xURLTransformer(_xURLTransformer)
-    , m_sIconTheme( SvtMiscOptions().GetIconTheme() )
-{
-    Init(rFrame,pAddonPopupMenu,bDelete,bDeleteChildren,true);
+    Init(rFrame,pAddonMenu,bDelete,bDeleteChildren, popup);
 }
 
 Any SAL_CALL MenuBarManager::queryInterface( const Type & rType ) throw ( RuntimeException, std::exception )
@@ -1247,7 +1228,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
             {
                 // A special addon popup menu, must be created with a different ctor
                 MenuBarManager* pSubMenuManager = new MenuBarManager( m_xContext, m_xFrame, m_xURLTransformer,
-                                                          static_cast<AddonPopupMenu *>(pPopup), bDeleteChildren, bDeleteChildren );
+                                                          pPopup, bDeleteChildren, bDeleteChildren, true );
                 AddMenu(pSubMenuManager,aItemCommand,nItemId);
             }
             else
@@ -1294,7 +1275,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
                     AddonMenu* pSubMenu = dynamic_cast< AddonMenu* >( pPopup );
                     if ( pSubMenu )
                     {
-                        MenuBarManager* pSubMenuManager = new MenuBarManager( m_xContext, m_xFrame, m_xURLTransformer,pSubMenu, true, false );
+                        MenuBarManager* pSubMenuManager = new MenuBarManager( m_xContext, m_xFrame, m_xURLTransformer,pSubMenu, true, false, false );
                         AddMenu(pSubMenuManager,aItemCommand,nItemId);
                         (pSubMenuManager->m_aMenuItemCommand).clear();
 
@@ -1899,7 +1880,7 @@ sal_uInt16 MenuBarManager::FillItemCommand(OUString& _rItemCommand, Menu* _pMenu
     }
     return nItemId;
 }
-void MenuBarManager::Init(const Reference< XFrame >& rFrame,AddonMenu* pAddonMenu,bool bDelete,bool bDeleteChildren,bool _bHandlePopUp)
+void MenuBarManager::Init(const Reference< XFrame >& rFrame,Menu* pAddonMenu,bool bDelete,bool bDeleteChildren,bool _bHandlePopUp)
 {
     m_bActive           = false;
     m_bDeleteMenu       = bDelete;