diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-06-24 14:40:07 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-06-26 18:18:38 +0000 |
| commit | a4ebdfa1b656eba87d637371b18c2933f4b030e1 (patch) | |
| tree | e4a7788ffb41753729fdf0e2fbc204be9c71ffc3 /include/editeng/editids.hrc | |
| parent | prevent cairo from using -flto with clang, cairo uses it incorrectly (diff) | |
| download | core-a4ebdfa1b656eba87d637371b18c2933f4b030e1.tar.gz core-a4ebdfa1b656eba87d637371b18c2933f4b030e1.zip | |
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@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'include/editeng/editids.hrc')
| -rw-r--r-- | include/editeng/editids.hrc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/include/editeng/editids.hrc b/include/editeng/editids.hrc index 7dbaae890a51..e6c67c62f8bc 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 |