diff options
Diffstat (limited to 'vcl/source/window/menu.cxx')
| -rw-r--r-- | vcl/source/window/menu.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index baa40292afef..d218675f23aa 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -421,7 +421,7 @@ void Menu::InsertItem(sal_uInt16 nItemId, const OUString& rStr, SetItemImage( nItemId, rImage ); } -void Menu::InsertItem( const ResId& rResId, sal_uInt16 nPos ) +void Menu::InsertItem( const ResId& rResId ) { ResMgr* pMgr = rResId.GetResMgr(); if( ! pMgr ) @@ -456,16 +456,16 @@ void Menu::InsertItem( const ResId& rResId, sal_uInt16 nPos ) Bitmap aBmp( ResId( static_cast<RSHEADER_TYPE*>(GetClassRes()), *pMgr ) ); Image const aImg(aBmp); if ( !aText.isEmpty() ) - InsertItem( nItemId, aText, aImg, nStatus, OString(), nPos ); + InsertItem( nItemId, aText, aImg, nStatus, OString() ); else - InsertItem( nItemId, aImg, nStatus, OString(), nPos ); + InsertItem( nItemId, aImg, nStatus, OString() ); } IncrementRes( GetObjSizeRes( static_cast<RSHEADER_TYPE*>(GetClassRes()) ) ); } else if ( !bSep ) - InsertItem(nItemId, aText, nStatus, OString(), nPos); + InsertItem(nItemId, aText, nStatus, OString()); if ( bSep ) - InsertSeparator(OString(), nPos); + InsertSeparator(OString()); OUString aHelpText; if ( nObjMask & RSC_MENUITEM_HELPTEXT ) @@ -528,7 +528,7 @@ void Menu::InsertItem( const ResId& rResId, sal_uInt16 nPos ) } void Menu::InsertItem(const OUString& rCommand, const css::uno::Reference<css::frame::XFrame>& rFrame, - MenuItemBits nBits, const OString &rIdent, sal_uInt16 nPos) + MenuItemBits nBits, const OString &rIdent) { OUString aLabel(CommandInfoProvider::Instance().GetPopupLabelForCommand(rCommand, rFrame)); OUString aTooltip(CommandInfoProvider::Instance().GetTooltipForCommand(rCommand, rFrame)); @@ -536,7 +536,7 @@ void Menu::InsertItem(const OUString& rCommand, const css::uno::Reference<css::f sal_uInt16 nItemId = GetItemCount() + 1; - InsertItem(nItemId, aLabel, aImage, nBits, rIdent, nPos); + InsertItem(nItemId, aLabel, aImage, nBits, rIdent); SetItemCommand(nItemId, rCommand); SetHelpText(nItemId, aTooltip); } @@ -649,9 +649,9 @@ void ImplCopyItem( Menu* pThis, const Menu& rMenu, sal_uInt16 nPos, sal_uInt16 n } } -void Menu::CopyItem( const Menu& rMenu, sal_uInt16 nPos, sal_uInt16 nNewPos ) +void Menu::CopyItem( const Menu& rMenu, sal_uInt16 nPos ) { - ImplCopyItem( this, rMenu, nPos, nNewPos ); + ImplCopyItem( this, rMenu, nPos, MENU_APPEND ); } void Menu::Clear() @@ -2297,7 +2297,7 @@ void Menu::RemoveDisabledEntries( bool bCheckPopups, bool bRemoveEmptyPopups ) mpLayoutData = nullptr; } -bool Menu::HasValidEntries( bool bCheckPopups ) +bool Menu::HasValidEntries() { bool bValidEntries = false; sal_uInt16 nCount = GetItemCount(); @@ -2306,7 +2306,7 @@ bool Menu::HasValidEntries( bool bCheckPopups ) MenuItemData* pItem = pItemList->GetDataFromPos( n ); if ( pItem->bEnabled && ( pItem->eType != MenuItemType::SEPARATOR ) ) { - if ( bCheckPopups && pItem->pSubMenu ) + if ( pItem->pSubMenu ) bValidEntries = pItem->pSubMenu->HasValidEntries(); else bValidEntries = true; @@ -2849,10 +2849,10 @@ PopupMenu* PopupMenu::GetActivePopupMenu() return pSVData->maAppData.mpActivePopupMenu; } -void PopupMenu::EndExecute( sal_uInt16 nSelectId ) +void PopupMenu::EndExecute() { if ( ImplGetWindow() ) - ImplGetFloatingWindow()->EndExecute( nSelectId ); + ImplGetFloatingWindow()->EndExecute( 0 ); } void PopupMenu::SelectItem(sal_uInt16 nId) |