core.git: Branch 'distro/collabora/co-24.04' - sw/source

[Justin Luth (via logerrit)]

 sw/source/ui/misc/outline.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 7cad29bde08beb7b943ac68ee13b1d661d13b40d
Author:     Justin Luth <justin.l...@collabora.com>
AuthorDate: Tue Mar 19 13:20:36 2024 -0400
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri Jan 17 10:43:53 2025 +0100

    related tdf#150197: ensure HasListFormat
    
    Steps to reproduce
    1.) tools - Heading numbering - set "Number" to non-NONE (e.g. 1, 2, 3)
    2.) set a paragraph to "Heading 1" style (to ensure we export style)
    3.) export to assert.docx
    
    hits commit 727c5ed30f68abc28bb04531b25a1df30810760f
    assert(false && "deprecated format still exists and is unhandled.
                     Inform Vasily or Justin");
    
    Not reproduced with "Bullets and numbering"
    
    Change-Id: I99395f8905075dc0ec6ae04a0fd7a28b64da06af
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165036
    Tested-by: Jenkins
    Reviewed-by: Justin Luth <jl...@mail.com>
    (cherry picked from commit f056f4d45080febc6c912bd623b5df8fa06f87a1)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180369
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Andras Timar <andras.ti...@collabora.com>

diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 6500bfdd6eca..c216289a0b10 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -623,6 +623,8 @@ IMPL_LINK_NOARG(SwOutlineSettingsTabPage, NumberSelect, 
weld::ComboBox&, void)
         {
             SwNumFormat aNumFormat(m_pNumRule->Get(i));
             aNumFormat.SetNumberingType(nNumberType);
+            // ensure that HasListFormat
+            aNumFormat.SetListFormat(aNumFormat.GetPrefix(), 
aNumFormat.GetSuffix(), i);
             m_pNumRule->Set(i, aNumFormat);
             CheckForStartValue_Impl(nNumberType);
         }