summaryrefslogtreecommitdiff
path: root/sfx2/source/menu
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2004-10-04 20:00:31 +0000
committerKurt Zenker <kz@openoffice.org>2004-10-04 20:00:31 +0000
commitc9f3328fa786a241601e15c0833bc52bf6bbcb62 (patch)
tree7d52a793d29fa91afeddc706758581e21c86a495 /sfx2/source/menu
parent8d2a44698b0824530fee508915a6b38ded5406c0 (diff)
INTEGRATION: CWS mav09 (1.37.2); FILE MERGED
2004/09/16 23:58:30 mav 1.37.2.2: RESYNC: (1.37-1.38); FILE MERGED 2004/04/14 11:48:38 mba 1.37.2.1: #i27773#: remove so3
Diffstat (limited to 'sfx2/source/menu')
-rw-r--r--sfx2/source/menu/virtmenu.cxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index a89690a55d58..8edf1971c892 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: virtmenu.cxx,v $
*
- * $Revision: 1.38 $
+ * $Revision: 1.39 $
*
- * last change: $Author: rt $ $Date: 2004-09-08 15:45:00 $
+ * last change: $Author: kz $ $Date: 2004-10-04 21:00:31 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -102,8 +102,8 @@
#include "sfxtypes.hxx"
#include "arrdecl.hxx"
#include "sfx.hrc"
-#include "ipfrm.hxx"
-#include "ipenv.hxx"
+//#include "ipfrm.hxx"
+//#include "ipenv.hxx"
#include "appdata.hxx"
#include "viewsh.hxx"
#include "imgmgr.hxx"
@@ -112,6 +112,8 @@
#include "sfxresid.hxx"
#include "menu.hrc"
#include "imagemgr.hxx"
+#include "viewfrm.hxx"
+#include "objsh.hxx"
#ifndef __FRAMEWORK_CLASSES_ADDONSOPTIONS_HXX_
#include <framework/addonsoptions.hxx>