sw/source/core/doc/number.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c315a8cc84551a7fa7c80fc4b5c046c62a246fe6
Author: Justin Luth <jl...@mail.com>
AuthorDate: Sat Jul 30 13:07:34 2022 -0400
Commit: Justin Luth <jl...@mail.com>
CommitDate: Mon Aug 1 13:24:54 2022 +0200
related tdf#150197 sw: NONE numbering still returns prefix/suffix
Missing this has surfaced repeatedly during the refactoring
of numbering. A code read suggests this is necesary here.
I'm not sure how to test this,
or how to trigger it.
A make check never hits this situation.
Change-Id: I1adc81968ebddbb36db9b4af551e5d3867016b53
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137635
Tested-by: Jenkins
Reviewed-by: Vasily Melenchuk <vasily.melenc...@cib.de>
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 91693cbd728d..74e039155307 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -672,7 +672,7 @@ OUString SwNumRule::MakeNumString( const
SwNumberTree::tNumberVector & rNumVecto
if (rMyNFormat.GetNumberingType() == SVX_NUM_NUMBER_NONE)
{
if (!rMyNFormat.HasListFormat())
- return OUString();
+ return bInclStrings ? rMyNFormat.GetPrefix() +
rMyNFormat.GetSuffix() : OUString();
// If numbering is disabled for this level we should emit just
prefix/suffix
// Remove everything between first %1% and last %n% (including markers)
