diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-07-01 11:46:05 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-07-01 12:57:39 +0000 |
| commit | d4d5c97b4eb0b0d28aac635482bca547d60b7cdc (patch) | |
| tree | 7ad4d7d5adac44fdbe2e17d71fe8da312ab43336 | |
| parent | c150dd7fdc593dd320f6bd67828d769312517e81 (diff) | |
Resolves: fdo#66263 calc's protect records doesn't do anything, sid collision
Change-Id: I50c9f0bd28f17e5d56c6d6948871042ba64650ef
(cherry picked from commit 257ba103fb9ffae87189eb5d435969961fe4e98c)
Reviewed-on: https://gerrit.libreoffice.org/4651
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
| -rw-r--r-- | include/sfx2/sfxsids.hrc | 1 | ||||
| -rw-r--r-- | sc/inc/sc.hrc | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index d1227e371e68..f17124ae195a 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -750,6 +750,7 @@ #define SC_VIEW_START (SID_SC_START) #endif #define FID_CHG_RECORD (EDIT_MENU_START + 18) +//see sc/inc/sc.hrc for the rest of the SC_VIEW_START entries #define SID_CHG_PROTECT (SC_VIEW_START + 84) // eof ------------------------------------------------------------------------ diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 6fbe3f0d3f7d..b688cdd372e5 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -123,6 +123,7 @@ #define SID_NUMBER_DECDEC (SC_VIEW_START + 58) // misc: +#define SID_COLLABORATION (SC_VIEW_START + 59) #define SID_LINKS (SC_VIEW_START + 60) #define SID_INSERT_SIMAGE (SC_VIEW_START + 61) #define SID_INSERT_SMATH (SC_VIEW_START + 63) @@ -153,7 +154,7 @@ #define SID_CHOOSE_DESIGN (SC_VIEW_START + 82) #define SID_EURO_CONVERTER (SC_VIEW_START + 83) -#define SID_COLLABORATION (SC_VIEW_START + 84) +//See include/sfx2/sfxsids.hrc for reserved usage of (SC_VIEW_START + 84) #define SID_EXTERNAL_SOURCE (SC_VIEW_START + 85) #define SID_SC_INPUT_TEXTWYSIWYG (SC_VIEW_START + 86) |