diff options
| author | Antonio Fernandez <antonio.fernandez@aentos.es> | 2012-07-18 17:04:55 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-11-14 13:52:38 +0100 |
| commit | 8dfd4a3a342dcd4ccc1cd8cdf874cf322422962f (patch) | |
| tree | bc4a2fa79b86690f3cdb2792b52cc5830e04df06 /framework/source/uielement/menubarmerger.cxx | |
| parent | 0cd1ae1f9b85261e6915471938c5f6c3e0ec9283 (diff) | |
Refactor of Menu classes from VCL module and Framework module.
Change-Id: I47aa65d3851692d38ee0741031d72fb02e9da785
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 544c52ad2668..213ad895ab46 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, - Menu* pMenu ) + AbstractMenu* pMenu ) { sal_uInt32 i( 0 ); const sal_uInt32 nCount( rReferencePath.size() ); @@ -108,7 +108,7 @@ ReferencePathInfo MenuBarMerger::FindReferencePath( return aResult; } - Menu* pCurrMenu( pMenu ); + AbstractMenu* 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, Menu* pCurrMenu ) +sal_uInt16 MenuBarMerger::FindMenuItem( const ::rtl::OUString& rCmd, AbstractMenu* pCurrMenu ) { for ( sal_uInt16 i = 0; i < pCurrMenu->GetItemCount(); i++ ) { @@ -173,7 +173,7 @@ sal_uInt16 MenuBarMerger::FindMenuItem( const ::rtl::OUString& rCmd, Menu* pCurr } bool MenuBarMerger::CreateSubMenu( - Menu* pSubMenu, + AbstractMenu* pSubMenu, sal_uInt16& nItemId, const ::rtl::OUString& rModuleIdentifier, const AddonMenuContainer& rAddonSubMenu ) @@ -211,7 +211,7 @@ bool MenuBarMerger::CreateSubMenu( } bool MenuBarMerger::MergeMenuItems( - Menu* pMenu, + AbstractMenu* pMenu, sal_uInt16 nPos, sal_uInt16 nModIndex, sal_uInt16& nItemId, @@ -253,7 +253,7 @@ bool MenuBarMerger::MergeMenuItems( } bool MenuBarMerger::ReplaceMenuItem( - Menu* pMenu, + AbstractMenu* pMenu, sal_uInt16 nPos, sal_uInt16& rItemId, const ::rtl::OUString& rModuleIdentifier, @@ -267,7 +267,7 @@ bool MenuBarMerger::ReplaceMenuItem( } bool MenuBarMerger::RemoveMenuItems( - Menu* pMenu, + AbstractMenu* pMenu, sal_uInt16 nPos, const ::rtl::OUString& rMergeCommandParameter ) { @@ -287,7 +287,7 @@ bool MenuBarMerger::RemoveMenuItems( } bool MenuBarMerger::ProcessMergeOperation( - Menu* pMenu, + AbstractMenu* 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 )) { - Menu* pCurrMenu( aRefPathInfo.pPopupMenu ); + AbstractMenu* pCurrMenu( aRefPathInfo.pPopupMenu ); sal_Int32 nLevel( aRefPathInfo.nLevel ); const sal_Int32 nSize( rReferencePath.size() ); bool bFirstLevel( true ); |