diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-04-11 13:08:46 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-04-11 13:08:46 +0000 |
| commit | 26ecc6c7ae1b8c8c681078b656cae90bf42cdc48 (patch) | |
| tree | ce36e24312826251a4f266867ed60c4045b603eb | |
| parent | ed668b7ece65bd975d60b439e3eefc0d20a8d26c (diff) | |
INTEGRATION: CWS notes3 (1.3.64); FILE MERGED
2008/03/21 10:17:25 mod 1.3.64.2: #i87316#
2008/03/17 14:26:58 mba 1.3.64.1: #i85834#: allow to change PopupMenu before execution
| -rw-r--r-- | sfx2/inc/sfx2/dispatch.hxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx index 068365dbd0c1..a96f97f20fe7 100644 --- a/sfx2/inc/sfx2/dispatch.hxx +++ b/sfx2/inc/sfx2/dispatch.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dispatch.hxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.5 $ * * This file is part of OpenOffice.org. * @@ -50,6 +50,7 @@ class SfxHintPoster; class SfxViewFrame; class SfxBindings; class SfxItemSet; +class SfxPopupMenuManager; struct SfxDispatcher_Impl; struct SfxPlugInInfo_Impl; @@ -112,7 +113,7 @@ class SFX2_DLLPUBLIC SfxDispatcher BOOL bFlushed; private: - // auf temporaer ausgewerteten Todos suchen + // auf temporaer ausgewerteten Todos suchen SAL_DLLPRIVATE BOOL CheckVirtualStack( const SfxShell& rShell, BOOL bDeep ); #ifndef _SFX_HXX @@ -202,6 +203,9 @@ public: SfxShell* GetShell(USHORT nIdx) const; SfxViewFrame* GetFrame() const; + // caller has to clean up the Manager on his own + static SfxPopupMenuManager* Popup( sal_uInt16 nConfigId,Window *pWin, const Point *pPos ); + void ExecutePopup( const ResId &rId, Window *pWin = 0, const Point *pPosPixel = 0 ); static void ExecutePopup( USHORT nConfigId = 0, |