diff options
| author | Thomas Lange [tl] <tl@openoffice.org> | 2010-01-11 14:46:35 +0100 |
|---|---|---|
| committer | Thomas Lange [tl] <tl@openoffice.org> | 2010-01-11 14:46:35 +0100 |
| commit | 1b030104d238985d6df1036f0e48eee5bb6d8bb5 (patch) | |
| tree | 382e0d03af2ded2c6ba15cf4789c33f9e6369f61 /svx/inc/helpid.hrc | |
| parent | cws tl74: wrong include (diff) | |
| download | core-1b030104d238985d6df1036f0e48eee5bb6d8bb5.tar.gz core-1b030104d238985d6df1036f0e48eee5bb6d8bb5.zip | |
cws tl74: merge errors
Diffstat (limited to 'svx/inc/helpid.hrc')
| -rw-r--r-- | svx/inc/helpid.hrc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc index bc36634e24c3..cc28189cc2f3 100644 --- a/svx/inc/helpid.hrc +++ b/svx/inc/helpid.hrc @@ -283,6 +283,7 @@ #define HID_SVX_SENDMENU_SIGNANDENCRYPT (HID_SVX_START + 245) #define HID_SVX_TP_APPEARANCE (HID_SVX_START + 246) #define HID_SVX_TP_DESKTOP (HID_SVX_START + 247) +#define HID_CT_THES_ALTERNATIVES (HID_SVX_START + 248) // please adjust ACT_SVX_HID_END2 below if you add entries here! @@ -290,7 +291,7 @@ // Overrun check --------------------------------------------------------- // ----------------------------------------------------------------------- -#define ACT_SVX_HID_END (HID_SVX_START+247) +#define ACT_SVX_HID_END (HID_SVX_START+248) #if ACT_SVX_HID_END > HID_SVX_END #error Resource-Ueberlauf in #line, #file #endif |