diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-08-14 16:49:18 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-08-14 16:49:18 +0100 |
| commit | 992fba98f4d0b6ff0d20c15b0ddff09edd37847c (patch) | |
| tree | 5562e553ebb12a569d88cd56ca64996ae7ee3ffa | |
| parent | 10290000117b562e3f179c3d1073774dd54cdfee (diff) | |
ubsan: 9 is not a valid value for type ´SvxNumType´
which was originally fixed by...
commit d29b75c402ea635b3865501e43c9f349885913af
Author: Miklos Vajna <vmiklos@collabora.co.uk>
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 d30a4298bdb5ba53cd1fe659f2b742f218a2e527
Author: Noel Grandin <noel@peralex.com>
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
| -rw-r--r-- | include/svx/pageitem.hxx | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx index 0e8105fc67e3..f31107848663 100644 --- a/include/svx/pageitem.hxx +++ b/include/svx/pageitem.hxx @@ -21,17 +21,20 @@ #include <svl/poolitem.hxx> #include <svx/svxdllapi.h> - +#include <com/sun/star/style/NumberingType.hpp> enum SvxNumType { - SVX_CHARS_UPPER_LETTER, - SVX_CHARS_LOWER_LETTER, - SVX_ROMAN_UPPER, - SVX_ROMAN_LOWER, - SVX_ARABIC, - SVX_NUMBER_NONE, - SVX_PAGEDESC, + SVX_CHARS_UPPER_LETTER = css::style::NumberingType::CHARS_UPPER_LETTER, + SVX_CHARS_LOWER_LETTER = css::style::NumberingType::CHARS_LOWER_LETTER, + SVX_ROMAN_UPPER = css::style::NumberingType::ROMAN_UPPER, + SVX_ROMAN_LOWER = css::style::NumberingType::ROMAN_LOWER, + SVX_ARABIC = css::style::NumberingType::ARABIC, + SVX_NUMBER_NONE = css::style::NumberingType::NUMBER_NONE, + SVX_CHAR_SPECIAL = css::style::NumberingType::CHAR_SPECIAL, + SVX_PAGEDESC = css::style::NumberingType::PAGE_DESCRIPTOR, + SVX_BITMAP = css::style::NumberingType::BITMAP, + SVX_CHARS_UPPER_LETTER_N = css::style::NumberingType::CHARS_UPPER_LETTER_N }; /*-------------------------------------------------------------------- |