diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2004-07-06 12:39:48 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2004-07-06 12:39:48 +0000 |
commit | c3c0c6bf3e3916f09210ff25be59adac9f3c1364 (patch) | |
tree | f25106bcc05cbd20195b03fd834b2f5c78d12114 /forms/source/inc/property.hrc | |
parent | INTEGRATION: CWS dba13 (1.5.20); FILE MERGED (diff) | |
download | core-c3c0c6bf3e3916f09210ff25be59adac9f3c1364.tar.gz core-c3c0c6bf3e3916f09210ff25be59adac9f3c1364.zip |
INTEGRATION: CWS dba13 (1.12.18); FILE MERGED
2004/06/16 07:55:58 fs 1.12.18.1: discovered during #i29468#: two properties had the same handle
Diffstat (limited to 'forms/source/inc/property.hrc')
-rw-r--r-- | forms/source/inc/property.hrc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/forms/source/inc/property.hrc b/forms/source/inc/property.hrc index ec7a4e93720e..a6e4af465cf1 100644 --- a/forms/source/inc/property.hrc +++ b/forms/source/inc/property.hrc @@ -2,9 +2,9 @@ * * $RCSfile: property.hrc,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: obo $ $Date: 2004-07-05 16:18:47 $ + * last change: $Author: rt $ $Date: 2004-07-06 13:39:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -292,14 +292,14 @@ 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 + 218 ) // float -#define PROPERTY_ID_FONT_KERNING ( PROPERTY_ID_START + 219 ) // sal_Bool -#define PROPERTY_ID_FONT_ORIENTATION ( PROPERTY_ID_START + 220 ) // float -#define PROPERTY_ID_FONT_PITCH ( PROPERTY_ID_START + 221 ) // sal_Int16 -#define PROPERTY_ID_FONT_TYPE ( PROPERTY_ID_START + 222 ) // sal_Int16 -#define PROPERTY_ID_FONT_WIDTH ( PROPERTY_ID_START + 223 ) // 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 + 224 ) // sal_Bool +#define PROPERTY_ID_RICH_TEXT ( PROPERTY_ID_START + 225 ) // sal_Bool #define PROPERTY_ID_DYNAMIC_CONTROL_BORDER ( PROPERTY_ID_START + 218 ) // sal_Bool #define PROPERTY_ID_CONTROL_BORDER_COLOR_FOCUS ( PROPERTY_ID_START + 219 ) // sal_Int32 |