INTEGRATION: CWS dba202d (1.19.42); FILE MERGED

2006/01/06 13:02:20 fs 1.19.42.1: #i60126# LineEndFormat re-used a foreign property id ...

1 files changed, 35 insertions, 35 deletions

diff --git a/forms/source/inc/property.hrc b/forms/source/inc/property.hrc
index ba70e545ef9b..0df5858afac8 100644
--- a/forms/source/inc/property.hrc
+++ b/forms/source/inc/property.hrc
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: property.hrc,v $
  *
- *  $Revision: 1.19 $
+ *  $Revision: 1.20 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 22:59:02 $
+ *  last change: $Author: kz $ $Date: 2006-01-31 18:36:51 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -266,50 +266,50 @@ namespace frm
 #define PROPERTY_ID_SPIN_VALUE                  ( PROPERTY_ID_START + 217 ) // sal_Int32
 #define PROPERTY_ID_ICONSIZE                    ( PROPERTY_ID_START + 218 ) // sal_Int16
 
-#define PROPERTY_ID_FONT_CHARWIDTH          ( PROPERTY_ID_START + 219 )      // float
-#define PROPERTY_ID_FONT_KERNING            ( PROPERTY_ID_START + 220 )      // sal_Bool
-#define PROPERTY_ID_FONT_ORIENTATION        ( PROPERTY_ID_START + 221 )      // float
-#define PROPERTY_ID_FONT_PITCH              ( PROPERTY_ID_START + 222 )      // sal_Int16
-#define PROPERTY_ID_FONT_TYPE               ( PROPERTY_ID_START + 223 )      // sal_Int16
-#define PROPERTY_ID_FONT_WIDTH              ( PROPERTY_ID_START + 224 )      // sal_Int16
-#define PROPERTY_ID_RICH_TEXT               ( PROPERTY_ID_START + 225 )      // sal_Bool
+#define PROPERTY_ID_FONT_CHARWIDTH              ( PROPERTY_ID_START + 219 ) // float
+#define PROPERTY_ID_FONT_KERNING                ( PROPERTY_ID_START + 220 ) // sal_Bool
+#define PROPERTY_ID_FONT_ORIENTATION            ( PROPERTY_ID_START + 221 ) // float
+#define PROPERTY_ID_FONT_PITCH                  ( PROPERTY_ID_START + 222 ) // sal_Int16
+#define PROPERTY_ID_FONT_TYPE                   ( PROPERTY_ID_START + 223 ) // sal_Int16
+#define PROPERTY_ID_FONT_WIDTH                  ( PROPERTY_ID_START + 224 ) // sal_Int16
+#define PROPERTY_ID_RICH_TEXT                   ( PROPERTY_ID_START + 225 ) // sal_Bool
 
-#define PROPERTY_ID_DYNAMIC_CONTROL_BORDER       ( PROPERTY_ID_START + 226 )    // sal_Bool
-#define PROPERTY_ID_CONTROL_BORDER_COLOR_FOCUS   ( PROPERTY_ID_START + 227 )    // sal_Int32
-#define PROPERTY_ID_CONTROL_BORDER_COLOR_MOUSE   ( PROPERTY_ID_START + 228 )    // sal_Int32
-#define PROPERTY_ID_CONTROL_BORDER_COLOR_INVALID ( PROPERTY_ID_START + 229 )    // sal_Int32
+#define PROPERTY_ID_DYNAMIC_CONTROL_BORDER      ( PROPERTY_ID_START + 226 ) // sal_Bool
+#define PROPERTY_ID_CONTROL_BORDER_COLOR_FOCUS  ( PROPERTY_ID_START + 227 ) // sal_Int32
+#define PROPERTY_ID_CONTROL_BORDER_COLOR_MOUSE  ( PROPERTY_ID_START + 228 ) // sal_Int32
+#define PROPERTY_ID_CONTROL_BORDER_COLOR_INVALID ( PROPERTY_ID_START + 229 ) // sal_Int32
 
-#define PROPERTY_ID_XSD_PATTERN             ( PROPERTY_ID_START + 230 )
-#define PROPERTY_ID_XSD_WHITESPACE          ( PROPERTY_ID_START + 231 )
-#define PROPERTY_ID_XSD_LENGTH              ( PROPERTY_ID_START + 232 )
-#define PROPERTY_ID_XSD_MIN_LENGTH          ( PROPERTY_ID_START + 233 )
-#define PROPERTY_ID_XSD_MAX_LENGTH          ( PROPERTY_ID_START + 234 )
-#define PROPERTY_ID_XSD_TOTAL_DIGITS        ( PROPERTY_ID_START + 235 )
-#define PROPERTY_ID_XSD_FRACTION_DIGITS     ( PROPERTY_ID_START + 236 )
-#define PROPERTY_ID_XSD_MAX_INCLUSIVE_INT   ( PROPERTY_ID_START + 237 )
-#define PROPERTY_ID_XSD_MAX_EXCLUSIVE_INT   ( PROPERTY_ID_START + 238 )
-#define PROPERTY_ID_XSD_MIN_INCLUSIVE_INT   ( PROPERTY_ID_START + 239 )
-#define PROPERTY_ID_XSD_MIN_EXCLUSIVE_INT   ( PROPERTY_ID_START + 240 )
+#define PROPERTY_ID_XSD_PATTERN                 ( PROPERTY_ID_START + 230 )
+#define PROPERTY_ID_XSD_WHITESPACE              ( PROPERTY_ID_START + 231 )
+#define PROPERTY_ID_XSD_LENGTH                  ( PROPERTY_ID_START + 232 )
+#define PROPERTY_ID_XSD_MIN_LENGTH              ( PROPERTY_ID_START + 233 )
+#define PROPERTY_ID_XSD_MAX_LENGTH              ( PROPERTY_ID_START + 234 )
+#define PROPERTY_ID_XSD_TOTAL_DIGITS            ( PROPERTY_ID_START + 235 )
+#define PROPERTY_ID_XSD_FRACTION_DIGITS         ( PROPERTY_ID_START + 236 )
+#define PROPERTY_ID_XSD_MAX_INCLUSIVE_INT       ( PROPERTY_ID_START + 237 )
+#define PROPERTY_ID_XSD_MAX_EXCLUSIVE_INT       ( PROPERTY_ID_START + 238 )
+#define PROPERTY_ID_XSD_MIN_INCLUSIVE_INT       ( PROPERTY_ID_START + 239 )
+#define PROPERTY_ID_XSD_MIN_EXCLUSIVE_INT       ( PROPERTY_ID_START + 240 )
 #define PROPERTY_ID_XSD_MAX_INCLUSIVE_DOUBLE    ( PROPERTY_ID_START + 241 )
 #define PROPERTY_ID_XSD_MAX_EXCLUSIVE_DOUBLE    ( PROPERTY_ID_START + 242 )
 #define PROPERTY_ID_XSD_MIN_INCLUSIVE_DOUBLE    ( PROPERTY_ID_START + 243 )
 #define PROPERTY_ID_XSD_MIN_EXCLUSIVE_DOUBLE    ( PROPERTY_ID_START + 244 )
-#define PROPERTY_ID_XSD_MAX_INCLUSIVE_DATE  ( PROPERTY_ID_START + 245 )
-#define PROPERTY_ID_XSD_MAX_EXCLUSIVE_DATE  ( PROPERTY_ID_START + 246 )
-#define PROPERTY_ID_XSD_MIN_INCLUSIVE_DATE  ( PROPERTY_ID_START + 247 )
-#define PROPERTY_ID_XSD_MIN_EXCLUSIVE_DATE  ( PROPERTY_ID_START + 248 )
-#define PROPERTY_ID_XSD_MAX_INCLUSIVE_TIME  ( PROPERTY_ID_START + 249 )
-#define PROPERTY_ID_XSD_MAX_EXCLUSIVE_TIME  ( PROPERTY_ID_START + 250 )
-#define PROPERTY_ID_XSD_MIN_INCLUSIVE_TIME  ( PROPERTY_ID_START + 251 )
-#define PROPERTY_ID_XSD_MIN_EXCLUSIVE_TIME  ( PROPERTY_ID_START + 252 )
+#define PROPERTY_ID_XSD_MAX_INCLUSIVE_DATE      ( PROPERTY_ID_START + 245 )
+#define PROPERTY_ID_XSD_MAX_EXCLUSIVE_DATE      ( PROPERTY_ID_START + 246 )
+#define PROPERTY_ID_XSD_MIN_INCLUSIVE_DATE      ( PROPERTY_ID_START + 247 )
+#define PROPERTY_ID_XSD_MIN_EXCLUSIVE_DATE      ( PROPERTY_ID_START + 248 )
+#define PROPERTY_ID_XSD_MAX_INCLUSIVE_TIME      ( PROPERTY_ID_START + 249 )
+#define PROPERTY_ID_XSD_MAX_EXCLUSIVE_TIME      ( PROPERTY_ID_START + 250 )
+#define PROPERTY_ID_XSD_MIN_INCLUSIVE_TIME      ( PROPERTY_ID_START + 251 )
+#define PROPERTY_ID_XSD_MIN_EXCLUSIVE_TIME      ( PROPERTY_ID_START + 252 )
 #define PROPERTY_ID_XSD_MAX_INCLUSIVE_DATE_TIME ( PROPERTY_ID_START + 253 )
 #define PROPERTY_ID_XSD_MAX_EXCLUSIVE_DATE_TIME ( PROPERTY_ID_START + 254 )
 #define PROPERTY_ID_XSD_MIN_INCLUSIVE_DATE_TIME ( PROPERTY_ID_START + 255 )
 #define PROPERTY_ID_XSD_MIN_EXCLUSIVE_DATE_TIME ( PROPERTY_ID_START + 256 )
-#define PROPERTY_ID_XSD_IS_BASIC            ( PROPERTY_ID_START + 257 )
-#define PROPERTY_ID_XSD_TYPE_CLASS          ( PROPERTY_ID_START + 258 )
+#define PROPERTY_ID_XSD_IS_BASIC                ( PROPERTY_ID_START + 257 )
+#define PROPERTY_ID_XSD_TYPE_CLASS              ( PROPERTY_ID_START + 258 )
 
-#define PROPERTY_ID_LINEEND_FORMAT              ( PROPERTY_ID_START + 221 ) // css.awt.LineEndFormat
+#define PROPERTY_ID_LINEEND_FORMAT              ( PROPERTY_ID_START + 259 ) // css.awt.LineEndFormat
 
 // start ID fuer aggregierte Properties
 #define PROPERTY_ID_AGGREGATE_ID        (PROPERTY_ID_START + 10000)