diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-07-01 11:46:05 +0100 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-07-02 07:22:11 +0000 |
| commit | f3f510653424987591577693fe986e4d6f4b5080 (patch) | |
| tree | 0c7c747de88d0e21396db7f1933e1e905399a672 | |
| parent | 824709ee13269ab8406fc460d5a6a42fa0741fb2 (diff) | |
Resolves: fdo#66263 calc's protect records doesn't do anything, sid collision
(cherry picked from commit 257ba103fb9ffae87189eb5d435969961fe4e98c)
Conflicts:
include/sfx2/sfxsids.hrc
Change-Id: I50c9f0bd28f17e5d56c6d6948871042ba64650ef
Reviewed-on: https://gerrit.libreoffice.org/4652
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
| -rw-r--r-- | sc/inc/sc.hrc | 3 | ||||
| -rw-r--r-- | sfx2/inc/sfx2/sfxsids.hrc | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 9eaf61ffde1f..facc0204e6bf 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -120,6 +120,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) @@ -150,7 +151,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) diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc index 9a18100f5648..2a61097a887a 100644 --- a/sfx2/inc/sfx2/sfxsids.hrc +++ b/sfx2/inc/sfx2/sfxsids.hrc @@ -743,6 +743,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 ------------------------------------------------------------------------ |