diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-11-05 20:28:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-11-07 21:04:50 +0000 |
| commit | 64a708cba9b954afe3331f63c58218eb53b3d0ce (patch) | |
| tree | ddc1bea3b63f32a1c6d377c1d1dd7aee0803fb70 /include/svx/svxids.hrc | |
| parent | f01c49c4a89ecad2376fd0023625186e5cac642e (diff) | |
Revert "Reverts a commit series that cripple windows ci."
with addition of...
- svxlo-SvxColorListBox
+ svxcorelo-SvxColorListBox
This reverts commit db380aab1063e8a5e40111c40ee9f7921aa82601.
Change-Id: I3af7aa0abb1a430bce64188244404fcbd480b128
Reviewed-on: https://gerrit.libreoffice.org/30598
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/svx/svxids.hrc')
| -rw-r--r-- | include/svx/svxids.hrc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index f2a301c63797..8a7f7c5fc4c5 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -750,7 +750,7 @@ #define SID_READONLY_MODE ( SID_SVX_START + 930 ) #define SID_ATTR_ALIGN_HYPHENATION ( SID_SVX_START + 931 ) #define SID_ATTR_NUMBERFORMAT_SOURCE ( SID_SVX_START + 932 ) -#define SID_ATTR_AUTO_COLOR_INVALID ( SID_SVX_START + 933 ) + #define SID_RULER_BORDER_DISTANCE ( SID_SVX_START + 935 ) #define SID_INSERT_DATEFIELD ( SID_SVX_START + 936 ) #define SID_INSERT_TIMEFIELD ( SID_SVX_START + 937 ) @@ -999,9 +999,11 @@ #define SID_LINE_ARROW_START ( SID_SVX_START + 1165 ) #define SID_LINE_ARROW_END ( SID_SVX_START + 1166 ) #define SID_DRAW_MEASURELINE ( SID_SVX_START + 1167 ) +#define SID_AUTHOR_COLOR ( SID_SVX_START + 1168 ) +#define SID_BMPMASK_COLOR ( SID_SVX_START + 1169 ) // IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id -#define SID_SVX_FIRSTFREE ( SID_DRAW_MEASURELINE + 1 ) +#define SID_SVX_FIRSTFREE ( SID_BMPMASK_COLOR + 1 ) // Overflow check for slot IDs |