sc/source/filter/excel/xeescher.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 39869d2a038aae60a90c432c6243d342f7d02863 Author: Noel Grandin <[email protected]> AuthorDate: Wed Nov 5 12:31:29 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Thu Nov 6 10:18:01 2025 +0100 mso-test: escape text of vml element This is using the test document from ooo91342-1.xls. When importing and exporting to XLSX, we end up with an unescaped "&" character. Change-Id: Ieb578c42adf1eed2b29ef96af973c15d22b40e3e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193454 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit 8df99b53bdf1d21076d008a2e4915b80cd6e2a61) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193510 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index 740760d29f89..7b9225cc491e 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -1147,7 +1147,7 @@ void VmlFormControlExporter::EndShape(sal_Int32 nShapeElement) pVmlDrawing->startElement(FSNS(XML_v, XML_textbox)); pVmlDrawing->startElement(XML_div); pVmlDrawing->startElement(XML_font); - pVmlDrawing->write(m_aLabel); + pVmlDrawing->writeEscaped(m_aLabel); pVmlDrawing->endElement(XML_font); pVmlDrawing->endElement(XML_div); pVmlDrawing->endElement(FSNS(XML_v, XML_textbox)); commit 196b3fe18948b1c6b6afe78d171a62513bc21980 Author: Noel Grandin <[email protected]> AuthorDate: Wed Nov 5 10:58:49 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Thu Nov 6 10:17:51 2025 +0100 mso-test: escape text of a:t element This is using the test document from tdf 111408-1.odt. When importing and exporting to XLSX, we end up with an unescaped "&" character. Change-Id: I25e8952049cc0f9665030b46e7d29d2397d9f9bb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193448 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> (cherry picked from commit 47e2188d4bab1509d059c4df53df7f49324bea2d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193509 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index ede251e562b8..740760d29f89 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -1370,7 +1370,7 @@ void XclExpTbxControlObj::SaveXml( XclExpXmlStream& rStrm ) pDrawing->startElementNS(XML_a, XML_p); pDrawing->startElementNS(XML_a, XML_r); pDrawing->startElementNS(XML_a, XML_t); - pDrawing->write(msLabel); + pDrawing->writeEscaped(msLabel); pDrawing->endElementNS(XML_a, XML_t); pDrawing->endElementNS(XML_a, XML_r); pDrawing->endElementNS(XML_a, XML_p);
