INTEGRATION: CWS impressodf12 (1.3.12); FILE MERGED

2008/04/28 11:25:15 cl 1.3.12.3: fixed linux compiler warnings
2008/04/25 08:57:34 cl 1.3.12.2: RESYNC: (1.3-1.4); FILE MERGED
2008/04/24 15:22:20 cl 1.3.12.1: #i35937# removed property HasLevels

svx/inc/svx/unoshprp.hxx

@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: unoshprp.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -166,7 +166,7 @@
 #define OWN_ATTR_PAGE_NUMBER                    (OWN_ATTR_VALUE_START+65)
 #define OWN_ATTR_THUMBNAIL                      (OWN_ATTR_VALUE_START+66)
 #define OWN_ATTR_PERSISTNAME                    (OWN_ATTR_VALUE_START+67)
-#define OWN_ATTR_HASLEVELS                      (OWN_ATTR_VALUE_START+68)
+//#define OWN_ATTR_HASLEVELS                        (OWN_ATTR_VALUE_START+68)
 #define OWN_ATTR_MEDIA_URL                      (OWN_ATTR_VALUE_START+69)
 #define OWN_ATTR_MEDIA_PREFERREDSIZE            (OWN_ATTR_VALUE_START+70)
 #define OWN_ATTR_MEDIA_LOOP                     (OWN_ATTR_VALUE_START+71)
@@ -305,10 +305,11 @@
     SVX_UNOEDIT_PARA_PROPERTIES,
 
 #define TEXT_PROPERTIES \
-    { MAP_CHAR_LEN("HasLevels"),                    OWN_ATTR_HASLEVELS,             &::getBooleanCppuType(), ::com::sun::star::beans::PropertyAttribute::READONLY,      0},\
     SVX_UNOEDIT_NUMBERING_PROPERTIE, \
     TEXT_PROPERTIES_DEFAULTS
 
+//  { MAP_CHAR_LEN("HasLevels"),                    OWN_ATTR_HASLEVELS,             &::getBooleanCppuType(), ::com::sun::star::beans::PropertyAttribute::READONLY,      0},
+
 #define MISC_OBJ_PROPERTIES_NO_SHEAR \
     { MAP_CHAR_LEN("Transformation"),                   OWN_ATTR_TRANSFORMATION,    &::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 }, \
     { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_ZORDER),           OWN_ATTR_ZORDER,            &::getCppuType((const sal_Int32*)0),        0,      0}, \