diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-05-22 14:26:26 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-05-22 14:26:26 +0000 |
| commit | 6ac5960d2fe1bc37a69ed967c0be5f246e4241a7 (patch) | |
| tree | 182c313b79b91a5bd39993e760721d3e34c95dc4 /framework | |
| parent | 0936fdf81ce2db2bc40cfecee511b285162a4580 (diff) | |
INTEGRATION: CWS chart2mst3 (1.4.16); FILE MERGED
2006/10/27 07:25:05 cd 1.4.16.1: #i65734# Support menu merging with non-sfx based application modules using provided dispatch providers
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/xml/menuconfiguration.hxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/framework/inc/xml/menuconfiguration.hxx b/framework/inc/xml/menuconfiguration.hxx index 27d6cc890edb..9065dd0de8d5 100644 --- a/framework/inc/xml/menuconfiguration.hxx +++ b/framework/inc/xml/menuconfiguration.hxx @@ -4,9 +4,9 @@ * * $RCSfile: menuconfiguration.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-09 00:53:09 $ + * last change: $Author: vg $ $Date: 2007-05-22 15:26:26 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -61,11 +61,13 @@ #ifndef _COM_SUN_STAR_CONTAINER_XINDEXACCESS_HPP_ #include <com/sun/star/container/XIndexAccess.hpp> #endif +#include <com/sun/star/frame/XDispatchProvider.hpp> //_________________________________________________________________________________________________________________ // includes of other projects //_________________________________________________________________________________________________________________ +#include <cppuhelper/weak.hxx> #include <vcl/menu.hxx> #include <vcl/toolbox.hxx> @@ -95,11 +97,13 @@ class MenuConfiguration public: struct Attributes { + Attributes() {} Attributes( const ::rtl::OUString& aFrame, const ::rtl::OUString& aImageIdStr ) : aTargetFrame( aFrame ), aImageId( aImageIdStr ) {} ::rtl::OUString aTargetFrame; ::rtl::OUString aImageId; + ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XDispatchProvider > xDispatchProvider; }; MenuConfiguration( |