diff options
| author | Noel Power <noel.power@novell.com> | 2010-10-13 09:48:44 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2010-10-13 10:01:42 +0100 |
| commit | be3ca836cb9a7f189759571d15ec8762cfb130fd (patch) | |
| tree | edd9751cdedea19453796cba3e5fbe38bc82b6ea /sc/inc/sc.hrc | |
| parent | 4b33c0d44fe85064d73ebe39eba4ea2d8ed018b9 (diff) | |
| parent | 6196c60c78c0a66e79d283450830e3df92f10bde (diff) | |
Merge branch 'vba' fix conflics, trailing ws & tab issues
additionally the following iz patches are rolled up with this commit i#113356, i#112998 i#113955 i#113358 i#113515 i#112531 i#112596 i#112530
Diffstat (limited to 'sc/inc/sc.hrc')
| -rw-r--r-- | sc/inc/sc.hrc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 5264651b3859..6d20ee3d9fb5 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -592,11 +592,9 @@ // #i59082# assign macro to shape #define SID_ASSIGNMACRO (SC_VIEW_START + 95) -#ifdef ISSUE66550_HLINK_FOR_SHAPES // #i66550# hyperlinks in shapes #define SID_DRAW_HLINK_EDIT (SC_VIEW_START + 96) #define SID_DRAW_HLINK_DELETE (SC_VIEW_START + 97) -#endif // "Zoom / Synchronize sheets" in options dialog #define SID_SC_OPT_SYNCZOOM (SC_VIEW_START + 98) @@ -1672,6 +1670,10 @@ // Insert current date and time to cell via command #define SID_INSERT_CURRENT_DATE (SC_OOO_BUILD_START + 4) #define SID_INSERT_CURRENT_TIME (SC_OOO_BUILD_START + 5) +// Data Form +#define SID_DATAFORM_NEW (SC_OOO_BUILD_START + 6) // message +#define SID_DATA_FORM (SC_OOO_BUILD_START + 7) // menu (in Data menu) +#define RID_SCDLG_DATAFORM (SC_OOO_BUILD_START + 8) // dialog #endif |