diff options
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 ); |