diff options
| author | Noel Power <noel.power@novell.com> | 2010-10-13 10:55:27 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2010-10-13 10:55:27 +0100 |
| commit | 8c6ba71655f67845e11c5a7566a45118151f55c9 (patch) | |
| tree | f0ad544c538f55e01dffb585994ae9afb8adcd44 /toolkit/inc/toolkit/awt/vclxmenu.hxx | |
| parent | 34ebfb2b61686999065015295dab9f623027e94d (diff) | |
| parent | 48e0d844280937f54d65aca7ad4ce911bf02b5c4 (diff) | |
Merge branch 'vba' fix conflics, trailing ws & tab issues
Conflicts:
unotools/source/config/fltrcfg.cxx
Diffstat (limited to 'toolkit/inc/toolkit/awt/vclxmenu.hxx')
| -rw-r--r-- | toolkit/inc/toolkit/awt/vclxmenu.hxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/toolkit/inc/toolkit/awt/vclxmenu.hxx b/toolkit/inc/toolkit/awt/vclxmenu.hxx index 26d93196bd9f..28056112bf7a 100644 --- a/toolkit/inc/toolkit/awt/vclxmenu.hxx +++ b/toolkit/inc/toolkit/awt/vclxmenu.hxx @@ -45,6 +45,7 @@ class Menu; class MenuBar; class VclSimpleEvent; +class PopupMenu; DECLARE_LIST( PopupMenuRefList, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >* ) @@ -181,6 +182,7 @@ class TOOLKIT_DLLPUBLIC VCLXPopupMenu : public VCLXMenu { public: VCLXPopupMenu(); + VCLXPopupMenu( PopupMenu* pPopMenu ); }; #endif // _TOOLKIT_AWT_VCLXMENU_HXX_ |