Skip to content

Commit 992fba9

Browse files
author
Caolán McNamara
committed
ubsan: 9 is not a valid value for type ´SvxNumType´
which was originally fixed by... commit d29b75c Author: Miklos Vajna <[email protected]> Date: Wed Mar 23 10:35:14 2016 +0100 svx: extend SvxNumType with BITMAP and CHARS_UPPER_LETTER_N but was lost again with... commit d30a429 Author: Noel Grandin <[email protected]> Date: Thu Aug 11 15:02:19 2016 +0200 loplugin:unusedenumconstants in package..svtools bring it back, but make it more obvious that the elements map to the othere sequence of numbers. Maybe we should just change this sal_Int16 and let it take the whole range ? Change-Id: Ibfa548c1d37aa078fc682530372727776e45f9cf
1 parent 1029000 commit 992fba9

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

include/svx/pageitem.hxx

+11-8
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,20 @@
2121

2222
#include <svl/poolitem.hxx>
2323
#include <svx/svxdllapi.h>
24-
24+
#include <com/sun/star/style/NumberingType.hpp>
2525

2626
enum SvxNumType
2727
{
28-
SVX_CHARS_UPPER_LETTER,
29-
SVX_CHARS_LOWER_LETTER,
30-
SVX_ROMAN_UPPER,
31-
SVX_ROMAN_LOWER,
32-
SVX_ARABIC,
33-
SVX_NUMBER_NONE,
34-
SVX_PAGEDESC,
28+
SVX_CHARS_UPPER_LETTER = css::style::NumberingType::CHARS_UPPER_LETTER,
29+
SVX_CHARS_LOWER_LETTER = css::style::NumberingType::CHARS_LOWER_LETTER,
30+
SVX_ROMAN_UPPER = css::style::NumberingType::ROMAN_UPPER,
31+
SVX_ROMAN_LOWER = css::style::NumberingType::ROMAN_LOWER,
32+
SVX_ARABIC = css::style::NumberingType::ARABIC,
33+
SVX_NUMBER_NONE = css::style::NumberingType::NUMBER_NONE,
34+
SVX_CHAR_SPECIAL = css::style::NumberingType::CHAR_SPECIAL,
35+
SVX_PAGEDESC = css::style::NumberingType::PAGE_DESCRIPTOR,
36+
SVX_BITMAP = css::style::NumberingType::BITMAP,
37+
SVX_CHARS_UPPER_LETTER_N = css::style::NumberingType::CHARS_UPPER_LETTER_N
3538
};
3639

3740
/*--------------------------------------------------------------------

0 commit comments

Comments
 (0)