Kaydet (Commit) 1dc0e705 authored tarafından Rüdiger Timm's avatar Rüdiger Timm

INTEGRATION: CWS tbe22 (1.10.30); FILE MERGED

2005/05/04 14:20:11 tbe 1.10.30.1: #i48612# Opening a menu with GOK shows Tips instead of entries (fixed by CD)
üst c2af566b
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: menubarmanager.hxx,v $ * $RCSfile: menubarmanager.hxx,v $
* *
* $Revision: 1.10 $ * $Revision: 1.11 $
* *
* last change: $Author: rt $ $Date: 2005-03-29 15:48:16 $ * last change: $Author: rt $ $Date: 2005-05-13 07:29:39 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -253,7 +253,6 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener ...@@ -253,7 +253,6 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
void UpdateSpecialWindowMenu( Menu* pMenu ); void UpdateSpecialWindowMenu( Menu* pMenu );
void Destroy(); void Destroy();
struct MenuItemHandler struct MenuItemHandler
{ {
MenuItemHandler( USHORT aItemId, MenuItemHandler( USHORT aItemId,
...@@ -286,6 +285,7 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener ...@@ -286,6 +285,7 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
std::vector< MenuItemHandler* >& aMenuShortCuts ); std::vector< MenuItemHandler* >& aMenuShortCuts );
MenuItemHandler* GetMenuItemHandler( USHORT nItemId ); MenuItemHandler* GetMenuItemHandler( USHORT nItemId );
sal_Bool CreatePopupMenuController( MenuItemHandler* pMenuItemHandler );
sal_Bool m_bDisposed : 1, sal_Bool m_bDisposed : 1,
m_bInitialized : 1, m_bInitialized : 1,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment