diff options
| author | Justin Luth <jluth@mail.com> | 2022-08-02 13:30:31 -0400 |
|---|---|---|
| committer | Justin Luth <jluth@mail.com> | 2022-08-11 16:13:02 +0200 |
| commit | 727c5ed30f68abc28bb04531b25a1df30810760f (patch) | |
| tree | 22784bd4ca0bd0cd7c0360b6e359458ee9e22cc1 /sw/source/filter/ww8 | |
| parent | b42496a3944dce181c9c2034518e009230f3fc0e (diff) | |
related tdf#150197: use SetListFormat instead of SetPrefix/Suffix
Commits prior to this handled all the instances that were caught
by a make check. I found a few more by temporarily setting an additional
boolean parameter on SetPrefix/SetSuffix which let me catch these.
This means we don't have unit tests related to these.
Change-Id: I1b3bb1e6eec7878e43ccf546f6df7cb38ac5299e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138072
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>
Diffstat (limited to 'sw/source/filter/ww8')
| -rw-r--r-- | sw/source/filter/ww8/wrtw8num.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par2.cxx | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx index 846a1eb48c70..09667048b769 100644 --- a/sw/source/filter/ww8/wrtw8num.cxx +++ b/sw/source/filter/ww8/wrtw8num.cxx @@ -489,6 +489,8 @@ void MSWordExportBase::NumberingLevel( } } } + else if (rFormat.GetNumberingType() != SVX_NUM_NUMBER_NONE) + assert(false && "depricated format still exists and is unhandled. Inform Vasily or Justin"); } if (SVX_NUM_CHAR_SPECIAL == rFormat.GetNumberingType() || diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index e7321122d0a9..9bdd867ad9eb 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -590,7 +590,7 @@ static void SetBaseAnlv(SwNumFormat &rNum, WW8_ANLV const &rAV, sal_uInt8 nSwLev if( rAV.nfc == 5 || rAV.nfc == 7 ) { OUString sP = "." + rNum.GetSuffix(); - rNum.SetSuffix( sP ); // ordinal number + rNum.SetListFormat("", sP, nSwLevel); // ordinal number } } |