diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2013-05-25 22:11:58 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-24 11:25:34 +0100 |
| commit | a1748501d81425d26d09509eec2fd141f2f28f05 (patch) | |
| tree | ef1f7e42eb8d8afd660741229d6d628c7127667a /include/sfx2/mnuitem.hxx | |
| parent | a089ed2bf90fdb293c8502e4ab47cbbe027234f8 (diff) | |
Kill SfxAppToolBoxControl_Impl
(cherry picked from commit 273121f8d7e277e35c8e5a8aad46ef0c103ebc03)
Conflicts:
sfx2/inc/sfx2/mnuitem.hxx
sfx2/inc/sfx2/tbxctrl.hxx
sfx2/source/appl/appreg.cxx
sfx2/source/menu/mnuitem.cxx
sfx2/source/toolbox/tbxitem.cxx
Change-Id: I6d0750d89ad009f82c5552d971537b78e45426f2
Silence warning C4706
(cherry picked from commit 0b373b3e4c45d09c40a8949e9366adb9b991de4b)
Change-Id: Id497469eba8288565145c47c84b7938a1316c21a
Diffstat (limited to 'include/sfx2/mnuitem.hxx')
| -rw-r--r-- | include/sfx2/mnuitem.hxx | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/include/sfx2/mnuitem.hxx b/include/sfx2/mnuitem.hxx index e65220be2a13..557e8764dfce 100644 --- a/include/sfx2/mnuitem.hxx +++ b/include/sfx2/mnuitem.hxx @@ -33,6 +33,9 @@ struct SfxMenuCtrlFactory; #include <tools/string.hxx> #include <sfx2/ctrlitem.hxx> +#include <com/sun/star/frame/XDispatch.hpp> +#include <com/sun/star/util/URL.hpp> + class SFX2_DLLPUBLIC SfxMenuControl: public SfxControllerItem { String aTitle; @@ -116,6 +119,31 @@ inline SfxVirtualMenu* SfxMenuControl::GetPopupMenu() const void Class::RegisterControl(sal_uInt16 nSlotId, SfxModule *pMod) \ { SfxMenuControl::RegisterMenuControl( pMod, new SfxMenuCtrlFactory( \ Class::CreateImpl, TYPE(nItemClass), nSlotId ) ); } + +class SfxAppMenuControl_Impl : public SfxMenuControl +{ + PopupMenu* pMenu; + sal_uIntPtr m_nSymbolsStyle; + sal_Bool m_bShowMenuImages; + +protected: + DECL_LINK( Activate, Menu * ); // Needed to support high contrast images + +public: + SFX_DECL_MENU_CONTROL(); + SfxAppMenuControl_Impl( sal_uInt16 nPos, Menu& rMenu, SfxBindings& rBindings ); + ~SfxAppMenuControl_Impl(); + + struct ExecuteInfo + { + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch; + ::com::sun::star::util::URL aTargetURL; + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs; + }; + + DECL_STATIC_LINK( SfxAppMenuControl_Impl, ExecuteHdl_Impl, ExecuteInfo* ); +}; + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |