[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sc/inc sfx2/inc

[Caolán McNamara]

 sc/inc/sc.hrc             |    3 ++-
 sfx2/inc/sfx2/sfxsids.hrc |    1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit f3f510653424987591577693fe986e4d6f4b5080
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jul 1 11:46:05 2013 +0100

    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 at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 9eaf61f..facc020 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 9a18100..2a61097 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 ------------------------------------------------------------------------