From 7d2ca8f226e3566e7e097f2eba940d98c5b5089e Mon Sep 17 00:00:00 2001
From: Maxim Monastirsky <momonasmon@gmail.com>
Date: Wed, 17 May 2017 20:42:09 +0300
Subject: Remove the useless AddonMenu and AddonPopupMenu

Change-Id: I3022d609e813d90e52990b570aa471540c9e2c18
---
 include/framework/addonmenu.hxx | 39 ++-------------------------------------
 1 file changed, 2 insertions(+), 37 deletions(-)

(limited to 'include')

diff --git a/include/framework/addonmenu.hxx b/include/framework/addonmenu.hxx
index 9da7ec714a69..52f6cc79d7e8 100644
--- a/include/framework/addonmenu.hxx
+++ b/include/framework/addonmenu.hxx
@@ -34,51 +34,17 @@
 namespace framework
 {
 
-class FWE_DLLPUBLIC AddonMenu : public PopupMenu
-{
-    public:
-        AddonMenu();
-        virtual ~AddonMenu() override;
-};
-
-class AddonMenuManager;
-
-class FWE_DLLPUBLIC AddonPopupMenu : public AddonMenu
-{
-    public:
-        virtual ~AddonPopupMenu() override;
-
-        void               SetCommandURL( const OUString& aCmdURL ) { m_aCommandURL = aCmdURL; }
-
-    private:
-        AddonPopupMenu();
-
-        OUString               m_aCommandURL;
-
-    friend class AddonMenuManager;
-    friend class ::VclPtr<AddonPopupMenu>;
-};
-
 class FWE_DLLPUBLIC AddonMenuManager
 {
     public:
-        enum MenuType
-        {
-            ADDON_MENU,
-            ADDON_POPUPMENU
-        };
-
         static bool       HasAddonMenuElements();
 
         // Check if the context string matches the provided xModel context
         static bool IsCorrectContext(const OUString& rModuleIdentifier, const OUString& rContext);
 
-        // Factory method to create different Add-On menu types
-        static VclPtr<PopupMenu> CreatePopupMenuType( MenuType eMenuType );
-
         // Create the Add-Ons menu
-        static VclPtr<AddonMenu> CreateAddonMenu( const css::uno::Reference< css::frame::XFrame >& rFrame,
-                                           const css::uno::Reference< css::uno::XComponentContext >& rContext );
+        static VclPtr<PopupMenu> CreateAddonMenu( const css::uno::Reference< css::frame::XFrame >& rFrame,
+                                                  const css::uno::Reference< css::uno::XComponentContext >& rContext );
 
         // Merge the Add-Ons help menu items into the given menu bar at a defined pos
         static void       MergeAddonHelpMenu( const css::uno::Reference< css::frame::XFrame >& rFrame,
@@ -96,7 +62,6 @@ class FWE_DLLPUBLIC AddonMenuManager
 
         // Build up the menu item and sub menu into the provided pCurrentMenu. The sub menus should be of type nSubMenuType.
         static void       BuildMenu( PopupMenu*  pCurrentMenu,
-                                     MenuType    nSubMenuType,
                                      sal_uInt16      nInsPos,
                                      sal_uInt16&     nUniqueMenuId,
                                      const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& aAddonMenuDefinition,
-- 
cgit