summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouis Possoz <louis.possoz@quelfutur.org>2022-04-30 06:39:38 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2022-06-01 19:04:08 +0200
commitb58c969f11a9ce5824ace49d21ead73afb776874 (patch)
tree783c16a37b7d7efc132dbbb9fbff63da00cf2bad
parenttdf#149198 Fix use of nullptr (diff)
downloadcore-b58c969f11a9ce5824ace49d21ead73afb776874.tar.gz
core-b58c969f11a9ce5824ace49d21ead73afb776874.zip
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.stahl@allotropia.de> Tested-by: Michael Stahl <michael.stahl@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 <xiscofauli@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
-rw-r--r--xmloff/source/text/XMLSectionFootnoteConfigImport.cxx4
1 files changed, 2 insertions, 2 deletions
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;