summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2004-08-12 09:15:52 +0000
committerOliver Bolte <obo@openoffice.org>2004-08-12 09:15:52 +0000
commit6cdc120f78ca1215ce28676542b90d622a13b778 (patch)
tree561bc60a66e9a12ffb703f757d64ad789ad6deb0 /sw
parent420dd62a83e177a7e197d37558dde98138572784 (diff)
INTEGRATION: CWS jmf2 (1.21.8); FILE MERGED
2004/07/23 15:13:02 ka 1.21.8.1: #i3316#: support for media objects
Diffstat (limited to 'sw')
-rw-r--r--sw/source/ui/shells/slotadd.cxx9
1 files changed, 7 insertions, 2 deletions
diff --git a/sw/source/ui/shells/slotadd.cxx b/sw/source/ui/shells/slotadd.cxx
index 8a86dfbcf6fa..c448f70edcdd 100644
--- a/sw/source/ui/shells/slotadd.cxx
+++ b/sw/source/ui/shells/slotadd.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: slotadd.cxx,v $
*
- * $Revision: 1.21 $
+ * $Revision: 1.22 $
*
- * last change: $Author: obo $ $Date: 2004-07-06 11:33:52 $
+ * last change: $Author: obo $ $Date: 2004-08-12 10:15:52 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -325,13 +325,18 @@
#define ITEMID_GRADIENT_LIST SID_GRADIENT_LIST
#define ITEMID_HATCH_LIST SID_HATCH_LIST
#define ITEMID_BITMAP_LIST SID_BITMAP_LIST
+
#ifndef _SVX_DRAWITEM_HXX
#include <svx/drawitem.hxx>
#endif
+#ifndef _AVMEDIA_MEDIAITEM_HXX
+#include <avmedia/mediaitem.hxx>
+#endif
#define SvxDrawToolItem SfxAllEnumItem
#define SvxDrawAlignItem SfxAllEnumItem
#define SvxDrawBezierItem SfxAllEnumItem
+#define avmedia_MediaItem ::avmedia::MediaItem
#define SFX_TYPEMAP
#include "itemdef.hxx"