diff options
| author | Noel Power <noel.power@novell.com> | 2010-10-13 10:17:11 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2010-10-13 10:17:11 +0100 |
| commit | 5a9064d007fb1268ef72073466c554f43f0b8439 (patch) | |
| tree | bbc57d9f7210e36f48d2b32ea6cd3c62a38af529 /forms/source/inc/property.hrc | |
| parent | #i112786# make ConfigManager a well-behaved singleton (diff) | |
| parent | initial commit for vba blob ( not including container_control stuff ) (diff) | |
| download | core-5a9064d007fb1268ef72073466c554f43f0b8439.tar.gz core-5a9064d007fb1268ef72073466c554f43f0b8439.zip | |
Merge branch 'vba' fix conflics ( below ), trailing ws and leading tabs
Conflicts:
forms/source/component/RadioButton.cxx
forms/source/inc/property.hrc
Diffstat (limited to 'forms/source/inc/property.hrc')
| -rw-r--r-- | forms/source/inc/property.hrc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/forms/source/inc/property.hrc b/forms/source/inc/property.hrc index 0582ce36c6ee..37070490d65c 100644 --- a/forms/source/inc/property.hrc +++ b/forms/source/inc/property.hrc @@ -62,6 +62,9 @@ namespace frm #define PROPERTY_ID_CONTEXT_WRITING_MODE (PROPERTY_ID_START + 21) #define PROPERTY_ID_VERTICAL_ALIGN (PROPERTY_ID_START + 22) #define PROPERTY_ID_GRAPHIC (PROPERTY_ID_START + 23) +#define PROPERTY_ID_GROUP_NAME (PROPERTY_ID_START + 24) +#define PROPERTY_ID_VERTICAL_ALIGN (PROPERTY_ID_START + 25) + // free // free // free // free |