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 /extensions/source/propctrlr/formmetadata.cxx | |
| parent | 762dbbb4b11279cf087cc52c0dd4c3d38f3ca220 (diff) | |
| parent | e31e563d728078ea564a3d398b74d3467e0ba56a (diff) | |
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 'extensions/source/propctrlr/formmetadata.cxx')
| -rw-r--r-- | extensions/source/propctrlr/formmetadata.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index f87da51c4bd3..2c55aab65f32 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -134,6 +134,7 @@ namespace pcr DEF_INFO_3( LABEL, LABEL, LABEL, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ), DEF_INFO_2( CONTROLLABEL, LABELCONTROL, CONTROLLABEL, FORM_VISIBLE, COMPOSEABLE ), DEF_INFO_3( WRITING_MODE, WRITING_MODE, WRITING_MODE, FORM_VISIBLE, ENUM, COMPOSEABLE ), + DEF_INFO_3( GROUP_NAME, GROUP_NAME, GROUP_NAME, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ), DEF_INFO_2( TEXT, TEXT, TEXT, DIALOG_VISIBLE, COMPOSEABLE ), DEF_INFO_3( MAXTEXTLEN, MAXTEXTLEN, MAXTEXTLEN, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ), DEF_INFO_3( EDITMASK, EDITMASK, EDITMASK, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ), |