diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-08-12 16:34:42 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-08-12 16:41:55 +0200 |
| commit | f91d4f156b4fdb6e6a8a755714fd384bfa275e3d (patch) | |
| tree | a41ef3630013ab19fc7ed63e610a5d7cfc5d0b2f /sfx2/source/inc/virtmenu.hxx | |
| parent | 45fcdca7b32be49db75bfdcb027e33a04cb04f87 (diff) | |
Unused pAutoDeactivate, is never non-null
...and was like that already in fd069bee7e57ad529c3c0974559fd2d84ec3151a
"initial import."
TODO: Menu::Highlight in vcl/source/window/menu.cxx makes it look like the now
almost empty IMPL_LINK_NOARG(SfxVirtualMenu,Highlight) returning sal_True makes
a difference compared to having no handler set (in which case aHighlightHdl.Call
returns 0), so I left it in; but that may just be overcautious and the handler
could really go for good.
Change-Id: I0cb28ddb1a5f747000b5749ed080502ae83c5575
Diffstat (limited to 'sfx2/source/inc/virtmenu.hxx')
| -rw-r--r-- | sfx2/source/inc/virtmenu.hxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx index 10e971d1472a..0bf4152d7927 100644 --- a/sfx2/source/inc/virtmenu.hxx +++ b/sfx2/source/inc/virtmenu.hxx @@ -24,7 +24,6 @@ #include <sfx2/mnuitem.hxx> class SfxBindings; -class Timer; class SfxMenuImageControl_Impl; typedef ::boost::ptr_vector<SfxMenuControl> SfxMenuCtrlArr_Impl; @@ -44,7 +43,6 @@ private: PopupMenu* pWindowMenu; PopupMenu* pPickMenu; PopupMenu* pAddonsMenu; - Timer* pAutoDeactivate; // Hack for QAP-Bug sal_uInt16 nVisibleItems; sal_uInt16 nId; sal_uInt16 nCount; @@ -71,7 +69,7 @@ protected: SfxBindings &rBind, sal_Bool bOLEServer=sal_False, sal_Bool bRes=sal_False, sal_Bool bIsAddonMenu=sal_False ); void CreateFromSVMenu(); - DECL_LINK( Highlight, Menu * ); + DECL_LINK( Highlight, void * ); DECL_LINK( Activate, Menu * ); DECL_LINK( Deactivate, Menu * ); DECL_LINK( SettingsChanged, void* ); |