summaryrefslogtreecommitdiff
path: root/sw/source/filter/ww8/ww8par2.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-03-02 16:09:36 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-03-03 12:13:44 +0000
commit1cfedbc960d25ee322b0a0e7aae8dc73758b406e (patch)
tree1bcaac3e77e9693f9c3897d7c091acd603aff3fa /sw/source/filter/ww8/ww8par2.cxx
parentf1ea8c43a8ab6b8d158d4d8f3a0039b3a2ac2c37 (diff)
drop SvxNumType and rename SvxExtNumType->SvxNumType
Both of them are abstractions over the css::style::NumberingType constants. SvxNumType serves no useful purpose, since it's just a typedef to sal_Int16. At least SvxExtNumType wraps up the css::style::NumberingType constants in a nice enum. Change-Id: I7b3f97cd42b0aa23aff7a4db4930da86149d4f4e Reviewed-on: https://gerrit.libreoffice.org/34816 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/filter/ww8/ww8par2.cxx')
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 111684286fa6..f7ee7d273023 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -588,7 +588,7 @@ ApoTestResults SwWW8ImplReader::TestApo(int nCellLevel, bool bTableRowEnd,
static void SetBaseAnlv(SwNumFormat &rNum, WW8_ANLV const &rAV, sal_uInt8 nSwLevel )
{
- static const SvxExtNumType eNumA[8] = { SVX_NUM_ARABIC, SVX_NUM_ROMAN_UPPER, SVX_NUM_ROMAN_LOWER,
+ static const SvxNumType eNumA[8] = { SVX_NUM_ARABIC, SVX_NUM_ROMAN_UPPER, SVX_NUM_ROMAN_LOWER,
SVX_NUM_CHARS_UPPER_LETTER_N, SVX_NUM_CHARS_LOWER_LETTER_N, SVX_NUM_ARABIC,
SVX_NUM_ARABIC, SVX_NUM_ARABIC };
@@ -597,7 +597,7 @@ static void SetBaseAnlv(SwNumFormat &rNum, WW8_ANLV const &rAV, sal_uInt8 nSwLev
if (rAV.nfc < 8) {
rNum.SetNumberingType( eNumA[ rAV.nfc ] );
} else {
- SvxExtNumType nType = SVX_NUM_ARABIC;
+ SvxNumType nType = SVX_NUM_ARABIC;
switch( rAV.nfc ) {
case 14:
case 19:nType = SVX_NUM_FULL_WIDTH_ARABIC; break;