sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 2 +-
sw/source/writerfilter/dmapper/StyleSheetTable.cxx | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 475d84fd1b8cd4f6307011ed59b5bf4634d27aea
Author: Justin Luth <justin.l...@collabora.com>
AuthorDate: Wed Sep 11 13:37:13 2024 -0400
Commit: Justin Luth <jl...@mail.com>
CommitDate: Thu Sep 12 14:55:36 2024 +0200
tdf#162884 writerfilter: map to built-in footnote style name
This partial revert fixes a 24.2.4 regression from
commit 72ea1005b987159a6a59f9379e63321e0b0dd44f
Author: Michael Stahl on Mon May 6 15:58:36 2024 +0200
tdf#160402 writerfilter: extend StyleMap with all Word styles
Footnote anchor character formatting is controlled by
the character style set in Tools - Footnotes Settings.
The default name of that style is UI dependent,
so only the English UI was importing properly
when the localized name was used in the mapping.
"Footnote Symbol" is the internal name - both the internal name
and the localized name are find-able at the same time,
so the only things that will have a problem are things
that don't connect to the style, but just hold the string name.
The unit test change is also a revert from mstahl's commit.
make CppunitTest_sw_ooxmlexport9 \
CPPUNIT_TEST_NAME=testTdf109310_endnoteStyleForMSO
and is an indication of another problem that this fixes,
namely that a new Footnote Characters style is added
with each round-trip.
Bug 162884 was only reproducible with a non-English UI.
To reproduce, I compiled with autogen.input
--with-lang=de
Thus no unit test...
Change-Id: I63d37f13f435ff7ec41d6b22d74db83dc495150a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173141
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
(cherry picked from commit 3fddae6812f91e5c5f57dacf641f964cd995f2f5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173180
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
Reviewed-by: Justin Luth <jl...@mail.com>
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index e1b7712bfee9..d8a6d050a852 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -690,7 +690,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf109310_endnoteStyleForMSO)
xmlDocUniquePtr pXmlDoc = parseExport(u"word/endnotes.xml"_ustr);
// Check w:rStyle element has w:val attribute - note that w: is not
specified for attribute
assertXPath(pXmlDoc,
"/w:endnotes/w:endnote[@w:id='2']/w:p/w:r[1]/w:rPr/w:rStyle"_ostr, "val"_ostr,
- u"EndnoteCharacters1"_ustr);
+ u"EndnoteCharacters"_ustr);
}
CPPUNIT_TEST_FIXTURE(Test, testTdf103389)
diff --git a/sw/source/writerfilter/dmapper/StyleSheetTable.cxx
b/sw/source/writerfilter/dmapper/StyleSheetTable.cxx
index 5c259de5ff38..f0a4d919b886 100644
--- a/sw/source/writerfilter/dmapper/StyleSheetTable.cxx
+++ b/sw/source/writerfilter/dmapper/StyleSheetTable.cxx
@@ -1666,8 +1666,8 @@ StyleSheetTable::ConvertStyleName(const OUString& rWWName)
{ "envelope address", "Addressee" }, // RES_POOLCOLL_ENVELOPE_ADDRESS
{ "Envelope Return", "Sender" }, // RES_POOLCOLL_SEND_ADDRESS
{ "envelope return", "Sender" }, // RES_POOLCOLL_SEND_ADDRESS
- { "footnote reference", "Footnote Characters" }, //
RES_POOLCHR_FOOTNOTE; tdf#82173
- { "Footnote Reference", "Footnote Characters" }, //
RES_POOLCHR_FOOTNOTE; tdf#82173
+ { "footnote reference", "Footnote Symbol" }, // RES_POOLCHR_FOOTNOTE;
tdf#82173 tdf#162884
+ { "Footnote Reference", "Footnote Symbol" }, // RES_POOLCHR_FOOTNOTE;
tdf#82173 tdf#162884
{ "Annotation Reference", "" },
{ "annotation reference", "" },
{ "Line Number", "Line Numbering" }, // RES_POOLCHR_LINENUM
@@ -1675,8 +1675,8 @@ StyleSheetTable::ConvertStyleName(const OUString& rWWName)
{ "Page Number", "Page Number" }, // RES_POOLCHR_PAGENO
{ "page number", "Page Number" }, // RES_POOLCHR_PAGENO
{ "PageNumber", "Page Number" }, // RES_POOLCHR_PAGENO
- { "endnote reference", "Endnote Characters" }, // RES_POOLCHR_ENDNOTE;
tdf#82173
- { "Endnote Reference", "Endnote Characters" }, // RES_POOLCHR_ENDNOTE;
tdf#82173
+ { "endnote reference", "Endnote Symbol" }, // RES_POOLCHR_ENDNOTE;
tdf#82173 tdf#162884
+ { "Endnote Reference", "Endnote Symbol" }, // RES_POOLCHR_ENDNOTE;
tdf#82173 tdf#162884
{ "endnote text", "Endnote" }, // RES_POOLCOLL_ENDNOTE
{ "Endnote Text", "Endnote" }, // RES_POOLCOLL_ENDNOTE
{ "Table of Authorities", "Bibliography Heading" }, //
RES_POOLCOLL_TOX_AUTHORITIESH
