diff options
| author | Antonio Fernandez <antonio.fernandez@aentos.es> | 2012-11-13 16:38:09 +0000 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-11-14 13:53:01 +0100 |
| commit | 62a803dc46c1ffb5cba7f094868ce339feeecfda (patch) | |
| tree | fba6d247bf16ebe8c4d0150252349b462b8ed3a1 /framework/inc/uielement/menubarmerger.hxx | |
| parent | c36c5b516168ea63767e8642c0958edcb4704a1d (diff) | |
Removed AbstractMenu class and cleaned up useless code.
Change-Id: I4094302b83342fd42bccad4966b51624215d71ff
Diffstat (limited to 'framework/inc/uielement/menubarmerger.hxx')
| -rw-r--r-- | framework/inc/uielement/menubarmerger.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/framework/inc/uielement/menubarmerger.hxx b/framework/inc/uielement/menubarmerger.hxx index f44c91d21f4c..57586e71c763 100644 --- a/framework/inc/uielement/menubarmerger.hxx +++ b/framework/inc/uielement/menubarmerger.hxx @@ -51,7 +51,7 @@ enum RPResultInfo struct ReferencePathInfo { - AbstractMenu* pPopupMenu; + Menu* pPopupMenu; sal_uInt16 nPos; sal_Int32 nLevel; RPResultInfo eResult; @@ -64,14 +64,14 @@ class MenuBarMerger static void RetrieveReferencePath( const ::rtl::OUString&, std::vector< ::rtl::OUString >& aReferencePath ); - static ReferencePathInfo FindReferencePath( const std::vector< ::rtl::OUString >& aReferencePath, AbstractMenu* pMenu ); + static ReferencePathInfo FindReferencePath( const std::vector< ::rtl::OUString >& aReferencePath, Menu* pMenu ); static sal_uInt16 FindMenuItem( const ::rtl::OUString& rCmd, - AbstractMenu* pMenu ); + Menu* pMenu ); static void GetMenuEntry( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rAddonMenuEntry, AddonMenuItem& aAddonMenu ); static void GetSubMenu( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& rSubMenuEntries, AddonMenuContainer& rSubMenu ); - static bool ProcessMergeOperation( AbstractMenu* pMenu, + static bool ProcessMergeOperation( Menu* pMenu, sal_uInt16 nPos, sal_uInt16& rItemId, const ::rtl::OUString& rMergeCommand, @@ -86,21 +86,21 @@ class MenuBarMerger const ::rtl::OUString& rModuleIdentifier, const AddonMenuContainer& rAddonMenuItems ); static bool ProcessFallbackOperation(); - static bool MergeMenuItems( AbstractMenu* pMenu, + static bool MergeMenuItems( Menu* pMenu, sal_uInt16 nPos, sal_uInt16 nModIndex, sal_uInt16& rItemId, const ::rtl::OUString& rModuleIdentifier, const AddonMenuContainer& rAddonMenuItems ); - static bool ReplaceMenuItem( AbstractMenu* pMenu, + static bool ReplaceMenuItem( Menu* pMenu, sal_uInt16 nPos, sal_uInt16& rItemId, const ::rtl::OUString& rModuleIdentifier, const AddonMenuContainer& rAddonMenuItems ); - static bool RemoveMenuItems( AbstractMenu* pMenu, + static bool RemoveMenuItems( Menu* pMenu, sal_uInt16 nPos, const ::rtl::OUString& rMergeCommandParameter ); - static bool CreateSubMenu( AbstractMenu* pSubMenu, + static bool CreateSubMenu( Menu* pSubMenu, sal_uInt16& nItemId, const ::rtl::OUString& rModuleIdentifier, const AddonMenuContainer& rAddonSubMenu ); |