diff options
Diffstat (limited to 'framework/source/uielement/menubarmerger.cxx')
| -rw-r--r-- | framework/source/uielement/menubarmerger.cxx | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx index 51f87a400a9e..f82253345778 100644 --- a/framework/source/uielement/menubarmerger.cxx +++ b/framework/source/uielement/menubarmerger.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -204,7 +204,7 @@ bool MenuBarMerger::CreateSubMenu( return true; } -bool MenuBarMerger::MergeMenuItems( +bool MenuBarMerger::MergeMenuItems( Menu* pMenu, sal_uInt16 nPos, sal_uInt16 nModIndex, @@ -233,7 +233,7 @@ bool MenuBarMerger::MergeMenuItems( PopupMenu* pSubMenu = new PopupMenu(); pMenu->SetPopupMenu( nItemId, pSubMenu ); ++nItemId; - + CreateSubMenu( pSubMenu, nItemId, rModuleIdentifier, rMenuItem.aSubMenu ); } else @@ -246,11 +246,11 @@ bool MenuBarMerger::MergeMenuItems( return true; } -bool MenuBarMerger::ReplaceMenuItem( - Menu* pMenu, - sal_uInt16 nPos, - sal_uInt16& rItemId, - const ::rtl::OUString& rModuleIdentifier, +bool MenuBarMerger::ReplaceMenuItem( + Menu* pMenu, + sal_uInt16 nPos, + sal_uInt16& rItemId, + const ::rtl::OUString& rModuleIdentifier, const AddonMenuContainer& rAddonMenuItems ) { // There is no replace available. Therfore we first have to @@ -261,15 +261,15 @@ bool MenuBarMerger::ReplaceMenuItem( } bool MenuBarMerger::RemoveMenuItems( - Menu* pMenu, - sal_uInt16 nPos, + Menu* pMenu, + sal_uInt16 nPos, const ::rtl::OUString& rMergeCommandParameter ) { const sal_uInt16 nParam( sal_uInt16( rMergeCommandParameter.toInt32() )); sal_uInt16 nCount( 1 ); - + nCount = std::max( nParam, nCount ); - + sal_uInt16 i = 0; while (( nPos < pMenu->GetItemCount() ) && ( i < nCount )) { @@ -280,8 +280,8 @@ bool MenuBarMerger::RemoveMenuItems( return true; } -bool MenuBarMerger::ProcessMergeOperation( - Menu* pMenu, +bool MenuBarMerger::ProcessMergeOperation( + Menu* pMenu, sal_uInt16 nPos, sal_uInt16& nItemId, const ::rtl::OUString& rMergeCommand, @@ -334,7 +334,7 @@ bool MenuBarMerger::ProcessFallbackOperation( sal_Int32 nLevel( aRefPathInfo.nLevel ); const sal_Int32 nSize( rReferencePath.size() ); bool bFirstLevel( true ); - + while ( nLevel < nSize ) { if ( nLevel == nSize-1 ) @@ -359,10 +359,10 @@ bool MenuBarMerger::ProcessFallbackOperation( else { const ::rtl::OUString aCmd( rReferencePath[nLevel] ); - + sal_uInt16 nInsPos( MENU_APPEND ); PopupMenu* pPopupMenu( new PopupMenu ); - + if ( bFirstLevel && ( aRefPathInfo.eResult == RP_MENUITEM_INSTEAD_OF_POPUPMENU_FOUND )) { // special case: menu item without popup @@ -371,14 +371,14 @@ bool MenuBarMerger::ProcessFallbackOperation( pCurrMenu->SetItemCommand( nSetItemId, aCmd ); pCurrMenu->SetPopupMenu( nSetItemId, pPopupMenu ); } - else + else { // normal case: insert a new item with popup pCurrMenu->InsertItem( rItemId, ::rtl::OUString(), 0, MENU_APPEND ); pCurrMenu->SetItemCommand( rItemId, aCmd ); pCurrMenu->SetPopupMenu( rItemId, pPopupMenu ); } - + pCurrMenu = pPopupMenu; ++rItemId; bFirstLevel = false; @@ -391,13 +391,13 @@ bool MenuBarMerger::ProcessFallbackOperation( return false; } -void MenuBarMerger::GetMenuEntry( +void MenuBarMerger::GetMenuEntry( const uno::Sequence< beans::PropertyValue >& rAddonMenuEntry, AddonMenuItem& rAddonMenuItem ) { // Reset submenu member rAddonMenuItem.aSubMenu.clear(); - + for ( sal_Int32 i = 0; i < rAddonMenuEntry.getLength(); i++ ) { ::rtl::OUString aMenuEntryPropName = rAddonMenuEntry[i].Name; @@ -425,14 +425,14 @@ void MenuBarMerger::GetSubMenu( AddonMenuContainer& rSubMenu ) { rSubMenu.clear(); - + const sal_Int32 nCount = rSubMenuEntries.getLength(); rSubMenu.reserve(rSubMenu.size() + nCount); for ( sal_Int32 i = 0; i < nCount; i++ ) { const uno::Sequence< beans::PropertyValue >& rMenuEntry = rSubMenuEntries[ i ]; - AddonMenuItem aMenuItem; + AddonMenuItem aMenuItem; GetMenuEntry( rMenuEntry, aMenuItem ); rSubMenu.push_back( aMenuItem ); } |