strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS notes3 (1.40.200); FILE MERGED

Browse source 
2008/03/26 12:22:33 mod 1.40.200.2: end of line missing
2008/03/17 14:27:13 mba 1.40.200.1: #i85834#: allow to change PopupMenu before execution
This commit is contained in:
Rüdiger Timm 2008-04-11 13:10:16 +00:00
parent 2c45d05f8e
commit 97734fe493
1 changed files with 57 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
sfx2/source/menu/mnumgr.cxx
View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: mnumgr.cxx,v $
* $Revision: 1.41 $
* $Revision: 1.42 $
*
* This file is part of OpenOffice.org.
*
@ -168,6 +168,8 @@ void InsertVerbs_Impl( SfxBindings* pBindings, const com::sun::star::uno::Sequen
}
}
//--------------------------------------------------------------------
void SfxMenuManager::UseDefault()
@ -279,6 +281,10 @@ SfxPopupMenuManager::SfxPopupMenuManager(const ResId& rResId, SfxBindings &rBind
DBG_MEMTEST();
}
SfxPopupMenuManager::~SfxPopupMenuManager()
{
}
//-------------------------------------------------------------------------
void SfxPopupMenuManager::RemoveDisabledEntries()
@ -405,6 +411,51 @@ SfxPopupMenuManager::SfxPopupMenuManager( PopupMenu* pMenuArg, SfxBindings& rBin
{
}
SfxPopupMenuManager* SfxPopupMenuManager::Popup( const ResId& rResId, SfxViewFrame* pFrame,const Point& rPoint, Window* pWindow )
{
PopupMenu *pSVMenu = new PopupMenu( rResId );
USHORT n, nCount = pSVMenu->GetItemCount();
for ( n=0; n<nCount; n++ )
{
USHORT nId = pSVMenu->GetItemId( n );
if ( nId == SID_COPY || nId == SID_CUT || nId == SID_PASTE )
break;
}
if ( n == nCount )
{
PopupMenu aPop( SfxResId( MN_CLIPBOARDFUNCS ) );
nCount = aPop.GetItemCount();
pSVMenu->InsertSeparator();
for ( n=0; n<nCount; n++ )
{
USHORT nId = aPop.GetItemId( n );
pSVMenu->InsertItem( nId, aPop.GetItemText( nId ), aPop.GetItemBits( nId ) );
pSVMenu->SetHelpId( nId, aPop.GetHelpId( nId ));
}
}
InsertVerbs_Impl( &pFrame->GetBindings(), pFrame->GetViewShell()->GetVerbs(), pSVMenu );
Menu* pMenu = NULL;
::com::sun::star::ui::ContextMenuExecuteEvent aEvent;
aEvent.SourceWindow = VCLUnoHelper::GetInterface( pWindow );
aEvent.ExecutePosition.X = rPoint.X();
aEvent.ExecutePosition.Y = rPoint.Y();
if ( pFrame->GetViewShell()->TryContextMenuInterception( *pSVMenu, pMenu, aEvent ) )
{
if ( pMenu )
{
delete pSVMenu;
pSVMenu = (PopupMenu*) pMenu;
}
SfxPopupMenuManager* aMgr = new SfxPopupMenuManager( pSVMenu, pFrame->GetBindings());
aMgr->RemoveDisabledEntries();
return aMgr;
}
return 0;
}
void SfxPopupMenuManager::ExecutePopup( const ResId& rResId, SfxViewFrame* pFrame, const Point& rPoint, Window* pWindow )
{
PopupMenu *pSVMenu = new PopupMenu( rResId );
@ -448,3 +499,8 @@ void SfxPopupMenuManager::ExecutePopup( const ResId& rResId, SfxViewFrame* pFram
aPop.Execute( rPoint, pWindow );
}
}
Menu* SfxPopupMenuManager::GetSVMenu()
{
return (Menu*) GetMenu()->GetSVMenu();
}