diff options
| author | Carsten Driesner <cd@openoffice.org> | 2001-08-10 04:45:38 +0000 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2001-08-10 04:45:38 +0000 |
| commit | a891644bbafa9c1547e1bb4ec09a1f9139dcc2a2 (patch) | |
| tree | 3ed45f62a091e32073fefd9651a48f214e6d2153 /sfx2/source | |
| parent | ac97c8a7bce34f4eb9d63f6c6f8b7c8186ae1540 (diff) | |
#89254# use new picklist implementation for menu pickllist
Diffstat (limited to 'sfx2/source')
| -rw-r--r-- | sfx2/source/menu/virtmenu.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index bafda2be851b..8d37238c3005 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -2,9 +2,9 @@ * * $RCSfile: virtmenu.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: mba $ $Date: 2001-07-20 18:49:33 $ + * last change: $Author: cd $ $Date: 2001-08-10 05:45:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -87,9 +87,10 @@ #include "ipfrm.hxx" #include "ipenv.hxx" #include "appdata.hxx" -#include "picklist.hxx" +//#include "picklist.hxx" #include "viewsh.hxx" #include "imgmgr.hxx" +#include "sfxpicklist.hxx" //========================================================================= @@ -628,7 +629,8 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu ) // ggf. Pick-Menu erzeugen if ( pParent && pSVMenu == pParent->pPickMenu ) { - SfxPickList_Impl::Get()->SetPickMenu( pParent->pPickMenu ); + SfxPickList::Get()->CreateMenuEntries( pParent->pPickMenu ); +// SfxPickList_Impl::Get()->SetPickMenu( pParent->pPickMenu ); } else pPickMenu = pSVMenu->GetPopupMenu(SID_PICKLIST); @@ -774,7 +776,8 @@ IMPL_LINK( SfxVirtualMenu, Select, Menu *, pMenu ) } else if ( nId >= START_ITEMID_PICKLIST && nId <= END_ITEMID_PICKLIST ) { - SfxPickList_Impl::Get()->ExecuteMenuEntry( nId ); + SfxPickList::Get()->ExecuteMenuEntry( nId ); +// SfxPickList_Impl::Get()->ExecuteMenuEntry( nId ); return sal_True; } |