diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-08-02 14:49:11 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-08-02 14:49:11 +0000 |
| commit | f1c79317b4f01092c5cdefe5c9a820a55e396ff4 (patch) | |
| tree | 972bec9755501a11cba60cc9b50b878291742155 /automation/source | |
| parent | 2aabfa888f0ac0f6bd610c218e2adc572c0e6c37 (diff) | |
INTEGRATION: CWS fixgh (1.7.6); FILE MERGED
2004/07/19 13:22:58 gh 1.7.6.2: #i31512#alow 3 levels mdeep access to menus
2004/07/19 10:00:21 gh 1.7.6.1: #i31227#,#i30548#,#112682# find toolboxentries shisted to menu / new command to catch (or not) gpfs / show menus in DisplayHID
Diffstat (limited to 'automation/source')
| -rw-r--r-- | automation/source/server/statemnt.hxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/automation/source/server/statemnt.hxx b/automation/source/server/statemnt.hxx index 74486c10dbfe..f3477a43fda5 100644 --- a/automation/source/server/statemnt.hxx +++ b/automation/source/server/statemnt.hxx @@ -2,9 +2,9 @@ * * $RCSfile: statemnt.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: obo $ $Date: 2004-07-06 12:06:57 $ + * last change: $Author: hr $ $Date: 2004-08-02 15:49:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -266,7 +266,8 @@ protected: Window* GetAnyActive( BOOL MaybeBase = TRUE ); ScrollBar* GetScrollBar( Window *pBase, USHORT nDirection, BOOL MaybeBase = TRUE ); Window* GetPopupFloatingWin( BOOL MaybeBase = TRUE ); - Window* GetWinByRT( Window *pBase, WindowType nRT, BOOL MaybeBase = TRUE, USHORT nSkip = 0 ); + Menu* GetMatchingMenu( Window* pWin, Menu* pBaseMenu = NULL ); + Window* GetWinByRT( Window *pBase, WindowType nRT, BOOL MaybeBase = TRUE, USHORT nSkip = 0, BOOL bSearchAll = FALSE ); USHORT CountWinByRT( Window *pBase, WindowType nRT, BOOL MaybeBase = TRUE ); Window* GetDocWin( USHORT nNr ); USHORT GetDocWinCount(); @@ -312,6 +313,7 @@ public: BOOL bWasExecuting; // Wurde bei einem MaybeResetSafeReschedule resettet, so wird der Zustand danach wiederhergestellt static SmartId aSubMenuId1; // Untermenüs bei PopupMenus static SmartId aSubMenuId2; // erstmal 2-Stufig + static SmartId aSubMenuId3; // and now even 3 levels #i31512# static SystemWindow *pMenuWindow; // when using MenuBar as base for MenuCommands static TTProperties *pTTProperties; // Hier stehen die SlotIDs aus dem SFX drin @@ -326,6 +328,7 @@ public: static MenuBar* GetDocFrameMenuBar( Window* pWin ); static USHORT GetDocFrameCount(); + static BOOL bCatchGPF; #if OSL_DEBUG_LEVEL > 1 static EditWindow *m_pDbgWin; #endif @@ -382,7 +385,8 @@ protected: void HandleMacroRecorder(); public: - StatementCommand (SCmdStream *pIn); + StatementCommand( SCmdStream *pIn ); + StatementCommand( StatementList *pAfterThis, USHORT MethodId, USHORT Params, USHORT Nr1 ); virtual BOOL Execute(); BOOL DisplayHID(); void Translate(); |