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/inc | |
| 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 'extensions/inc')
| -rw-r--r-- | extensions/inc/propctrlr.hrc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/extensions/inc/propctrlr.hrc b/extensions/inc/propctrlr.hrc index 6961319f4dda..477f512797ec 100644 --- a/extensions/inc/propctrlr.hrc +++ b/extensions/inc/propctrlr.hrc @@ -326,9 +326,10 @@ #define HID_FM_PROPDLG_TAB_GENERAL ( HID_PROPC_START + 294) #define HID_FM_PROPDLG_TAB_DATA ( HID_PROPC_START + 295) #define HID_FM_PROPDLG_TAB_EVT ( HID_PROPC_START + 296) +#define HID_PROP_GROUP_NAME ( HID_PROPC_START + 297) // please adjust HID_LAST_PROPC_ID if you add new ids here! -#define HID_LAST_PROPC_ID HID_FM_PROPDLG_TAB_EVT +#define HID_LAST_PROPC_ID HID_PROP_GROUP_NAME #if HID_LAST_PROPC_ID > HID_PROPC_END #error help id overflow (PROPC) |