diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-04-11 13:09:03 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-04-11 13:09:03 +0000 |
| commit | b60b65295e9857a7cdd3e16ff5ad9667740a9bab (patch) | |
| tree | 776f486b06c9c603fd85169438989dfdaf41a07d /sfx2 | |
| parent | 3ce7426f67fbf82d796864da1cce81f4b6180746 (diff) | |
INTEGRATION: CWS notes3 (1.2.264); FILE MERGED
2008/03/17 14:26:58 mba 1.2.264.1: #i85834#: allow to change PopupMenu before execution
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/inc/sfx2/mnumgr.hxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sfx2/inc/sfx2/mnumgr.hxx b/sfx2/inc/sfx2/mnumgr.hxx index 47a3be392647..d730d2949388 100644 --- a/sfx2/inc/sfx2/mnumgr.hxx +++ b/sfx2/inc/sfx2/mnumgr.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: mnumgr.hxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.4 $ * * This file is part of OpenOffice.org. * @@ -99,7 +99,7 @@ public: //-------------------------------------------------------------------- -class SfxPopupMenuManager : public SfxMenuManager +class SAL_DLLPUBLIC_EXPORT SfxPopupMenuManager : public SfxMenuManager { private: DECL_LINK( SelectHdl, void * ); @@ -108,7 +108,9 @@ private: public: SfxPopupMenuManager( const ResId&, SfxBindings& ); SfxPopupMenuManager( PopupMenu*, SfxBindings& ); + ~SfxPopupMenuManager(); static void ExecutePopup( const ResId&, SfxViewFrame* pViewFrame, const Point& rPoint, Window* pWindow ); + static SfxPopupMenuManager* Popup( const ResId& rResId, SfxViewFrame* pFrame,const Point& rPoint, Window* pWindow ); USHORT Execute( const Point& rPos, Window *pWindow ); USHORT Execute( const Point& rPoint, Window* pWindow, va_list pArgs, const SfxPoolItem *pArg1 ); @@ -123,6 +125,7 @@ public: void InsertSeparator( USHORT nPos = MENU_APPEND ); void RemoveDisabledEntries(); void AddClipboardFunctions(); + Menu* GetSVMenu(); }; #endif // #ifndef _SFXMNUMGR_HXX |