[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - include/editeng include/sfx2 include/svx

[Caolán McNamara]

 include/editeng/editids.hrc |   15 ++++++++++-----
 include/sfx2/sfxsids.hrc    |    4 ++++
 include/svx/svxids.hrc      |    3 +++
 3 files changed, 17 insertions(+), 5 deletions(-)

New commits:
commit a4ebdfa1b656eba87d637371b18c2933f4b030e1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jun 24 14:40:07 2013 +0100

    colliding SID_SVX_START based ids
    
    Change-Id: I6eba0b0c2291a71ebe683b23a0af400010d5b5d8
    (cherry picked from commit 669ad519902e21e0cb3537fb7e203987f75a4077)
    Reviewed-on: https://gerrit.libreoffice.org/4547
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/include/editeng/editids.hrc b/include/editeng/editids.hrc
index 7dbaae8..e6c67c6 100644
--- a/include/editeng/editids.hrc
+++ b/include/editeng/editids.hrc
@@ -21,6 +21,12 @@
 
 #include <svl/solar.hrc>
 
+/*
+  These SID_SVX_START entries came from include/svx/svxids.hrc, avoid
+  accidentally colliding entries with include/svx/svxids.hrc and
+  include/sfx2/sfxsids.hrc. Only add new SID_SVX_START entries to
+  include/svx/svxids.hrc
+*/
 #define SID_ATTR_BRUSH                                  ( SID_SVX_START + 1 )
 #define SID_ATTR_TABSTOP                                ( SID_SVX_START + 2 )
 #define SID_ATTR_TABSTOP_DEFAULTS                       ( SID_SVX_START + 3 )
@@ -112,17 +118,16 @@
 #define SID_ATTR_CHAR_LATIN_LANGUAGE                    ( SID_SVX_START + 996 )
 #define SID_ATTR_CHAR_LATIN_POSTURE                     ( SID_SVX_START + 997 )
 #define SID_ATTR_CHAR_LATIN_WEIGHT                      ( SID_SVX_START + 998 )
-#define SID_ATTR_PARA_OUTLINE_LEVEL                     ( SID_SVX_START + 1121 )
-#define SID_ATTR_CHAR_PREVIEW_FONT                      ( SID_SVX_START + 1122 )
-#define SID_ATTR_CHAR_ENDPREVIEW_FONT                   ( SID_SVX_START + 1123 )
-
 
-// this ID didn't exist prior to the svx split
+// these ID didn't exist prior to the svx split, add new ids here
 #define SID_ATTR_CHAR_OVERLINE                          ( SID_EDIT_START + 68 )
 #define SID_ATTR_ALIGN_HOR_JUSTIFY_METHOD               ( SID_EDIT_START + 69 )
 #define SID_ATTR_ALIGN_VER_JUSTIFY_METHOD               ( SID_EDIT_START + 70 )
 #define SID_ATTR_ALIGN_HOR_JUSTIFY                      ( SID_EDIT_START + 71 )
 #define SID_ATTR_ALIGN_VER_JUSTIFY                      ( SID_EDIT_START + 72 )
+#define SID_ATTR_PARA_OUTLINE_LEVEL                     ( SID_EDIT_START + 73 )
+#define SID_ATTR_CHAR_PREVIEW_FONT                      ( SID_EDIT_START + 74 )
+#define SID_ATTR_CHAR_ENDPREVIEW_FONT                   ( SID_EDIT_START + 75 )
 
 /*
 // planned, but not doable: changing value of SIDs will break code that uses them for WhichRanges
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index fcfe4dd..d1227e3 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -583,6 +583,10 @@
 #define SID_HELP_STYLESHEET                 (SID_OPTIONS_START + 99)
 
 // slot IDs from SVX (svxids.hrc) ---------------------------------------------
+// These SID_SVX_START entries came from include/svx/svxids.hrc, avoid
+// accidentally colliding entries with include/svx/svxids.hrc and
+// include/editeng/editids.hrc. Only add new SID_SVX_START entries
+// to include/svx/svxids.hrc
 
 #define SID_ZOOM_TOOLBOX                    (SID_SVX_START +  96)
 #define SID_ZOOM_OUT                        (SID_SVX_START +  97)
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 27afc367..6f91c28 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -269,6 +269,9 @@
 
 // --------------------------------------------------------------------------
 // Svx-Id's
+// When adding new entries here, note that other SID_SVX_START entries exist in
+// include/editeng/editids.hrc and include/sfx2/sfxsids.hrc so don't use the
+// same id for two different attributes
 // --------------------------------------------------------------------------
 
 #define SID_ATTR_BORDER_INNER                           ( SID_SVX_START + 23 )