[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sw/source

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Fri Mar 12 09:49:05 UTC 2021


 sw/source/uibase/config/StoredChapterNumbering.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit db05fd646fce8f41a1056761ccf6bc716cda3b77
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Tue Mar 9 18:59:16 2021 +0200
Commit:     Michael Stahl <michael.stahl at allotropia.de>
CommitDate: Fri Mar 12 10:48:29 2021 +0100

    tdf#140590 Crash in Save-As dialog in Tools>Chapter Numbering
    
    This would only affect assert builds. The assert condition
    here did not match the condition in createFastChildContext
    several lines below.
    
    Bug since this code was introduced in
        commit 1535f39388223de53e4b923c6f7bb71ee32c1858
        Date:   Fri Nov 7 19:11:11 2014 +0100
        sw: store Outline Numbering as ODF fragment instead of SfxPoolItems
    
    Change-Id: I3f6a0b91e3c17f4ca358a75116481fc38c01e94e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112233
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit 677a18c2e16c5c1ae6be8d30e1a967f41fbf67a0)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112303
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/sw/source/uibase/config/StoredChapterNumbering.cxx b/sw/source/uibase/config/StoredChapterNumbering.cxx
index eb97b1cbcee9..07e68841ed93 100644
--- a/sw/source/uibase/config/StoredChapterNumbering.cxx
+++ b/sw/source/uibase/config/StoredChapterNumbering.cxx
@@ -320,7 +320,7 @@ public:
 
     virtual void SAL_CALL endFastElement(sal_Int32 /*Element*/) override
     {
-        assert(m_Contexts.size() < SwChapterNumRules::nMaxRules);
+        assert(m_Contexts.size() <= SwChapterNumRules::nMaxRules);
         for (auto iter = m_Contexts.begin(); iter != m_Contexts.end(); ++iter)
         {
             uno::Reference<container::XIndexReplace> const xRule(


More information about the Libreoffice-commits mailing list