diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-11-07 13:43:38 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-11-07 13:43:38 +0000 |
| commit | 380061a7235c4bd4150f6db4912997f4934251b9 (patch) | |
| tree | 74e24bdbf1d064d0e64dde1e6c8434b4b76ba497 /framework/inc/uielement/menubarmanager.hxx | |
| parent | 0fe78bb664755cec61f15e5a5c709d7fdf7a4bbb (diff) | |
INTEGRATION: CWS fwk55 (1.16.82); FILE MERGED
2006/10/20 13:27:31 cd 1.16.82.1: #i66236# Don't apply settings from item container, if menu has been opened by user
Diffstat (limited to 'framework/inc/uielement/menubarmanager.hxx')
| -rw-r--r-- | framework/inc/uielement/menubarmanager.hxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx index ae836ceae64e..cc1f532ef22d 100644 --- a/framework/inc/uielement/menubarmanager.hxx +++ b/framework/inc/uielement/menubarmanager.hxx @@ -4,9 +4,9 @@ * * $RCSfile: menubarmanager.hxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: hr $ $Date: 2006-06-19 11:04:58 $ + * last change: $Author: kz $ $Date: 2006-11-07 14:43:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -118,6 +118,9 @@ #ifndef _SV_ACCEL_HXX #include <vcl/accel.hxx> #endif +#ifndef _SV_TIMER_HXX +#include <vcl/timer.hxx> +#endif #ifndef _TOOLKIT_AWT_VCLXMENU_HXX_ #include <toolkit/awt/vclxmenu.hxx> #endif @@ -223,6 +226,7 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener DECL_LINK( Highlight, Menu * ); DECL_LINK( Activate, Menu * ); DECL_LINK( Deactivate, Menu * ); + DECL_LINK( AsyncSettingsHdl, Timer * ); void RemoveListener(); void RequestImages(); @@ -297,7 +301,9 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration > m_xGlobalAcceleratorManager; // #110897# ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxServiceFactory; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > m_xDeferedItemContainer; sal_Int16 m_nSymbolsStyle; + Timer m_aAsyncSettingsTimer; }; } // namespace |