summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2016-03-23 10:35:14 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-03-23 10:37:43 +0100
commitd29b75c402ea635b3865501e43c9f349885913af (patch)
treef867ed06c5f95487d5619bf126d06f825159c6ab
parent16611ad233292c838085cb8ee8dad04f6bf5b64d (diff)
svx: extend SvxNumType with BITMAP and CHARS_UPPER_LETTER_N
With abaf6bde4ee91c628bd55a7ec2e876a5d0ecff6e (tdf#65642 RTF filter: import \pgnrestart and \pgnucltr, 2016-03-22), CppunitTest_sw_rtfimport causes an SvxPageItem::eNumType (of type enum SvxNumType, with values 0--7) to contain a value 9 (which suspiciously is css.style.NumberingType.CHARS_UPPER_LETTER_N), which is undefined behavior. Extend the internal enum (which is supposed to be a prefix ot the UNO API one) to contain two more items. Should fix the problem pointed out at <http://ci.libreoffice.org/job/lo_ubsan/212/console>. Change-Id: I91b8c38de357ceee9e8691e15f885cdfbc0ef7ca
-rw-r--r--include/svx/pageitem.hxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx
index 388d49b9e139..7d7d9c4d6f74 100644
--- a/include/svx/pageitem.hxx
+++ b/include/svx/pageitem.hxx
@@ -32,7 +32,9 @@ enum SvxNumType
SVX_ARABIC,
SVX_NUMBER_NONE,
SVX_CHAR_SPECIAL,
- SVX_PAGEDESC
+ SVX_PAGEDESC,
+ SVX_BITMAP,
+ SVX_CHARS_UPPER_LETTER_N
};
/*--------------------------------------------------------------------