From 62a803dc46c1ffb5cba7f094868ce339feeecfda Mon Sep 17 00:00:00 2001
From: Antonio Fernandez <antonio.fernandez@aentos.es>
Date: Tue, 13 Nov 2012 16:38:09 +0000
Subject: Removed AbstractMenu class and cleaned up useless code.

Change-Id: I4094302b83342fd42bccad4966b51624215d71ff
---
 framework/inc/classes/menumanager.hxx | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'framework/inc/classes/menumanager.hxx')

diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx
index 8bdbb398b888..b26ee3fa6a34 100644
--- a/framework/inc/classes/menumanager.hxx
+++ b/framework/inc/classes/menumanager.hxx
@@ -72,7 +72,7 @@ class MenuManager : public ThreadHelpBase           ,
         MenuManager(
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
             REFERENCE< XFRAME >& rFrame,
-            AbstractMenu* pMenu,
+            Menu* pMenu,
             sal_Bool bDelete,
             sal_Bool bDeleteChildren );
 
@@ -84,33 +84,33 @@ class MenuManager : public ThreadHelpBase           ,
         // XEventListener
         virtual void SAL_CALL disposing( const EVENTOBJECT& Source ) throw ( RUNTIMEEXCEPTION );
 
-        DECL_LINK( Select, AbstractMenu * );
+        DECL_LINK( Select, Menu * );
 
-        AbstractMenu*   GetMenu() const { return m_pVCLMenu; }
+        Menu*   GetMenu() const { return m_pVCLMenu; }
 
         void    RemoveListener();
 
         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& getServiceFactory();
 
-        static void UpdateSpecialWindowMenu( AbstractMenu* pMenu ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,IMutex& _rMutex);
+        static void UpdateSpecialWindowMenu( Menu* pMenu ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,IMutex& _rMutex);
         static void FillMenuImages(
             ::com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& xFrame,
-            AbstractMenu* _pMenu,
+            Menu* _pMenu,
             sal_Bool bShowMenuImages
         );
 
     protected:
         DECL_LINK(Highlight, void *);
-        DECL_LINK( Activate, AbstractMenu * );
-        DECL_LINK( Deactivate, AbstractMenu * );
+        DECL_LINK( Activate, Menu * );
+        DECL_LINK( Deactivate, Menu * );
 
     private:
-        void UpdateSpecialFileMenu( AbstractMenu* pMenu );
-        void UpdateSpecialWindowMenu( AbstractMenu* pMenu );
+        void UpdateSpecialFileMenu( Menu* pMenu );
+        void UpdateSpecialWindowMenu( Menu* pMenu );
         void ClearMenuDispatch(const EVENTOBJECT& Source = EVENTOBJECT(),bool _bRemoveOnly = true);
         void SetHdl();
         void AddMenu(PopupMenu* _pPopupMenu,const ::rtl::OUString& _sItemCommand,sal_uInt16 _nItemId,sal_Bool _bDelete,sal_Bool _bDeleteChildren);
-        sal_uInt16 FillItemCommand(::rtl::OUString& _rItemCommand, AbstractMenu* _pMenu,sal_uInt16 _nIndex) const;
+        sal_uInt16 FillItemCommand(::rtl::OUString& _rItemCommand, Menu* _pMenu,sal_uInt16 _nIndex) const;
 
 
         struct MenuItemHandler
@@ -141,7 +141,7 @@ class MenuManager : public ThreadHelpBase           ,
         sal_Bool                            m_bIsBookmarkMenu;
         sal_Bool                            m_bShowMenuImages;
         ::rtl::OUString                     m_aMenuItemCommand;
-        AbstractMenu*                       m_pVCLMenu;
+        Menu*                               m_pVCLMenu;
         REFERENCE< XFRAME >                 m_xFrame;
         ::std::vector< MenuItemHandler* >   m_aMenuItemHandlerVector;
 
-- 
cgit