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/source/uielement/menubarmerger.cxx | |
parent | c36c5b516168ea63767e8642c0958edcb4704a1d (diff) |
Removed AbstractMenu class and cleaned up useless code.
Change-Id: I4094302b83342fd42bccad4966b51624215d71ff
Diffstat (limited to 'framework/source/uielement/menubarmerger.cxx')
-rw-r--r-- | framework/source/uielement/menubarmerger.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx index 213ad895ab46..544c52ad2668 100644 --- a/framework/source/uielement/menubarmerger.cxx +++ b/framework/source/uielement/menubarmerger.cxx @@ -96,7 +96,7 @@ void MenuBarMerger::RetrieveReferencePath( ReferencePathInfo MenuBarMerger::FindReferencePath( const ::std::vector< ::rtl::OUString >& rReferencePath, - AbstractMenu* pMenu ) + Menu* pMenu ) { sal_uInt32 i( 0 ); const sal_uInt32 nCount( rReferencePath.size() ); @@ -108,7 +108,7 @@ ReferencePathInfo MenuBarMerger::FindReferencePath( return aResult; } - AbstractMenu* pCurrMenu( pMenu ); + Menu* pCurrMenu( pMenu ); RPResultInfo eResult( RP_OK ); sal_Int32 nLevel( - 1 ); @@ -157,7 +157,7 @@ ReferencePathInfo MenuBarMerger::FindReferencePath( return aResult; } -sal_uInt16 MenuBarMerger::FindMenuItem( const ::rtl::OUString& rCmd, AbstractMenu* pCurrMenu ) +sal_uInt16 MenuBarMerger::FindMenuItem( const ::rtl::OUString& rCmd, Menu* pCurrMenu ) { for ( sal_uInt16 i = 0; i < pCurrMenu->GetItemCount(); i++ ) { @@ -173,7 +173,7 @@ sal_uInt16 MenuBarMerger::FindMenuItem( const ::rtl::OUString& rCmd, AbstractMen } bool MenuBarMerger::CreateSubMenu( - AbstractMenu* pSubMenu, + Menu* pSubMenu, sal_uInt16& nItemId, const ::rtl::OUString& rModuleIdentifier, const AddonMenuContainer& rAddonSubMenu ) @@ -211,7 +211,7 @@ bool MenuBarMerger::CreateSubMenu( } bool MenuBarMerger::MergeMenuItems( - AbstractMenu* pMenu, + Menu* pMenu, sal_uInt16 nPos, sal_uInt16 nModIndex, sal_uInt16& nItemId, @@ -253,7 +253,7 @@ bool MenuBarMerger::MergeMenuItems( } bool MenuBarMerger::ReplaceMenuItem( - AbstractMenu* pMenu, + Menu* pMenu, sal_uInt16 nPos, sal_uInt16& rItemId, const ::rtl::OUString& rModuleIdentifier, @@ -267,7 +267,7 @@ bool MenuBarMerger::ReplaceMenuItem( } bool MenuBarMerger::RemoveMenuItems( - AbstractMenu* pMenu, + Menu* pMenu, sal_uInt16 nPos, const ::rtl::OUString& rMergeCommandParameter ) { @@ -287,7 +287,7 @@ bool MenuBarMerger::RemoveMenuItems( } bool MenuBarMerger::ProcessMergeOperation( - AbstractMenu* pMenu, + Menu* pMenu, sal_uInt16 nPos, sal_uInt16& nItemId, const ::rtl::OUString& rMergeCommand, @@ -336,7 +336,7 @@ bool MenuBarMerger::ProcessFallbackOperation( } else if ( rMergeFallback.equalsAsciiL( MERGEFALLBACK_ADDPATH, MERGEFALLBACK_ADDPATH_LEN )) { - AbstractMenu* pCurrMenu( aRefPathInfo.pPopupMenu ); + Menu* pCurrMenu( aRefPathInfo.pPopupMenu ); sal_Int32 nLevel( aRefPathInfo.nLevel ); const sal_Int32 nSize( rReferencePath.size() ); bool bFirstLevel( true ); |