[Libreoffice-commits] core.git: Branch 'libreoffice-7-3-4' - xmloff/source

[Louis Possoz (via logerrit)]

 xmloff/source/text/XMLSectionFootnoteConfigImport.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b58c969f11a9ce5824ace49d21ead73afb776874
Author:     Louis Possoz <louis.pos...@quelfutur.org>
AuthorDate: Sat Apr 30 06:39:38 2022 +0100
Commit:     Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Wed Jun 1 19:04:08 2022 +0200

    tdf#145178 Formats in section Foot/Endnotes not read from saved files
    
    Imported, 'num-suffix' & 'num-format' properties generate debug warnings:
    
    warn:xmloff:10220:10220:xmloff/source/text/
       XMLSectionFootnoteConfigImport.cxx:123: unknown attribute urn:oasis
       :names:tc:opendocument:xmlns:style:1.0 style:num-suffix value=]]
    warn:xmloff:10220:10220:xmloff/source/text/
       XMLSectionFootnoteConfigImport.cxx:123: unknown attribute urn:oasis
       :names:tc:opendocument:xmlns:style:1.0 style:num-format value=One
    
    The faulty code is within XMLSectionFootnoteConfigImport::startFastElement()
    
    The namespace for these two properties must be set to 'STYLE'
       (it is wrongly set to 'TEXT')
    
    Change-Id: I923f12e19ed15779c67b2159d88d80a2ccb04e17
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133605
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    Tested-by: Michael Stahl <michael.st...@allotropia.de>
    (cherry picked from commit bbec710bd25fc5da27636cde73fe4ab23c76904f)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135054
    Tested-by: Jenkins
    (cherry picked from commit aa8aab0a753d6ee79cb371b2a4f141070715449a)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135057
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>
    Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
    Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>

diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx 
b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
index ed20985e52d1..0f4f51e1b4e3 100644
--- a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
+++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
@@ -101,13 +101,13 @@ void XMLSectionFootnoteConfigImport::startFastElement(
                 bNumOwn = true;
                 break;
             }
-            case XML_ELEMENT(TEXT, XML_NUM_SUFFIX):
+            case XML_ELEMENT(STYLE, XML_NUM_SUFFIX):
             {
                 sNumSuffix = aIter.toString();
                 bNumOwn = true;
                 break;
             }
-            case XML_ELEMENT(TEXT, XML_NUM_FORMAT):
+            case XML_ELEMENT(STYLE, XML_NUM_FORMAT):
             {
                 sNumFormat = aIter.toString();
                 bNumOwn = true;