INTEGRATION: CWS aw019 (1.2.450); FILE MERGED

2004/09/28 15:53:11 aw 1.2.450.1: #i11190#

svx/source/sdr/properties/e3dextrudeproperties.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: e3dextrudeproperties.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2003-11-24 16:49:10 $
+ *  last change: $Author: pjunck $ $Date: 2004-11-03 10:49:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -63,6 +63,10 @@
 #include <svx/sdr/properties/e3dextrudeproperties.hxx>
 #endif
 
+#ifndef _SFXITEMSET_HXX
+#include <svtools/itemset.hxx>
+#endif
+
 #ifndef _E3D_EXTRUD3D_HXX
 #include <extrud3d.hxx>
 #endif

svx/source/sdr/properties/e3dlatheproperties.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: e3dlatheproperties.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2003-11-24 16:49:21 $
+ *  last change: $Author: pjunck $ $Date: 2004-11-03 10:49:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -63,6 +63,10 @@
 #include <svx/sdr/properties/e3dlatheproperties.hxx>
 #endif
 
+#ifndef _SFXITEMSET_HXX
+#include <svtools/itemset.hxx>
+#endif
+
 #ifndef _E3D_LATHE3D_HXX
 #include <lathe3d.hxx>
 #endif

svx/source/sdr/properties/e3dproperties.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: e3dproperties.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2003-11-24 16:49:33 $
+ *  last change: $Author: pjunck $ $Date: 2004-11-03 10:50:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -87,8 +87,8 @@ namespace sdr
             return *(new SfxItemSet(rPool,
 
                 // ranges from SdrAttrObj
-                SDRATTR_START, SDRATTRSET_SHADOW,
-                SDRATTRSET_OUTLINER, SDRATTRSET_MISC,
+                SDRATTR_START, SDRATTR_SHADOW_LAST,
+                SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST,
                 SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION,
 
                 // ranges from E3dObject, contains object and scene because of GetMergedItemSet()