sw/qa/extras/ooxmlexport/ooxmlexport15.cxx | 2 - sw/source/filter/ww8/docxattributeoutput.cxx | 30 +++++++++++++-------------- 2 files changed, 16 insertions(+), 16 deletions(-)
New commits: commit 45ac04aa2ade09a373b9275895dc394fff084820 Author: Noel Grandin <[email protected]> AuthorDate: Wed Oct 29 15:38:29 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Sat Nov 1 19:07:12 2025 +0100 mso-test: fix line style names When converting to docx the document from tdf100844-1.doc, the line style names are slightly wrong, according to officeotron. Change-Id: I19c5dac42e34b54ab9a83e6ffe29c3844f8ef553 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193209 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> (cherry picked from commit 37d0b6934a461acb1336ceff45cf2547dca9e95d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193253 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx index 3142592b0fd5..0cf9cd9c666a 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx @@ -1062,7 +1062,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf135667) assertXPath(pXmlDocument, "/w:document/w:body/w:p[2]/w:r/w:object/v:shape", "strokeweight", u"4pt"); // line type - assertXPath(pXmlDocument, "/w:document/w:body/w:p[2]/w:r/w:object/v:shape/v:stroke", "linestyle", u"Single"); + assertXPath(pXmlDocument, "/w:document/w:body/w:p[2]/w:r/w:object/v:shape/v:stroke", "linestyle", u"single"); assertXPath(pXmlDocument, "/w:document/w:body/w:p[2]/w:r/w:object/v:shape/v:stroke", "dashstyle", u"Dash"); } diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 1cfd07e112b2..16d212b47ff8 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -6144,63 +6144,63 @@ void DocxAttributeOutput::WriteOLEShape(const SwFlyFrameFormat& rFrameFormat, co switch (rBox.GetLeft()->GetBorderLineStyle()) { case SvxBorderLineStyle::SOLID: - sLineType = "Single"_ostr; + sLineType = "single"_ostr; sDashType = "Solid"_ostr; break; case SvxBorderLineStyle::DASHED: - sLineType = "Single"_ostr; + sLineType = "single"_ostr; sDashType = "Dash"_ostr; break; case SvxBorderLineStyle::DASH_DOT: - sLineType = "Single"_ostr; + sLineType = "single"_ostr; sDashType = "DashDot"_ostr; break; case SvxBorderLineStyle::DASH_DOT_DOT: - sLineType = "Single"_ostr; + sLineType = "single"_ostr; sDashType = "ShortDashDotDot"_ostr; break; case SvxBorderLineStyle::DOTTED: - sLineType = "Single"_ostr; + sLineType = "single"_ostr; sDashType = "Dot"_ostr; break; case SvxBorderLineStyle::DOUBLE: - sLineType = "ThinThin"_ostr; + sLineType = "thinThin"_ostr; sDashType = "Solid"_ostr; break; case SvxBorderLineStyle::DOUBLE_THIN: - sLineType = "ThinThin"_ostr; + sLineType = "thinThin"_ostr; sDashType = "Solid"_ostr; break; case SvxBorderLineStyle::EMBOSSED: - sLineType = "Single"_ostr; + sLineType = "single"_ostr; sDashType = "Solid"_ostr; break; case SvxBorderLineStyle::ENGRAVED: - sLineType = "Single"_ostr; + sLineType = "single"_ostr; sDashType = "Solid"_ostr; break; case SvxBorderLineStyle::FINE_DASHED: - sLineType = "Single"_ostr; + sLineType = "single"_ostr; sDashType = "Dot"_ostr; break; case SvxBorderLineStyle::INSET: - sLineType = "Single"_ostr; + sLineType = "single"_ostr; sDashType = "Solid"_ostr; break; case SvxBorderLineStyle::OUTSET: - sLineType = "Single"_ostr; + sLineType = "single"_ostr; sDashType = "Solid"_ostr; break; case SvxBorderLineStyle::THICKTHIN_LARGEGAP: case SvxBorderLineStyle::THICKTHIN_MEDIUMGAP: case SvxBorderLineStyle::THICKTHIN_SMALLGAP: - sLineType = "ThickThin"_ostr; + sLineType = "thickThin"_ostr; sDashType = "Solid"_ostr; break; case SvxBorderLineStyle::THINTHICK_LARGEGAP: case SvxBorderLineStyle::THINTHICK_MEDIUMGAP: case SvxBorderLineStyle::THINTHICK_SMALLGAP: - sLineType = "ThinThick"_ostr; + sLineType = "thinThick"_ostr; sDashType = "Solid"_ostr; break; case SvxBorderLineStyle::NONE: commit 05f3ecbf1e1dac7f24b1dee80dd7054bf1557afe Author: Noel Grandin <[email protected]> AuthorDate: Wed Oct 29 13:40:30 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Sat Nov 1 19:07:03 2025 +0100 mso-test: fix duplicate w:rFonts elements under w:rPr When loading and then saving the document from forum-mso-de-56075.docx, we ended up with a duplicate rFonts element. The xml looked something like: <w:numbering ... <w:lvl w:ilvl="0"> ... <w:rPr> <w:rFonts w:ascii="Calibri" w:hAnsi="Calibri" w:cs="Calibri" w:hint="default"/> <w:rFonts w:eastAsiaTheme="minorEastAsia"/> </w:rPr> </w:lvl> Change-Id: I958023fb0c9e40af5aec31b07628bb72b25e730e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193146 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> (cherry picked from commit f6140a360dced4fc45816bd0605089110dd6835c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193252 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 480446f359cb..1cfd07e112b2 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -7937,7 +7937,7 @@ void DocxAttributeOutput::NumberingLevel( sal_uInt8 nLevel, { GetExport().GetId( *pFont ); // ensure font info is written to fontTable.xml OString aFamilyName( OUStringToOString( pFont->GetFamilyName(), RTL_TEXTENCODING_UTF8 ) ); - m_pSerializer->singleElementNS( XML_w, XML_rFonts, + AddToAttrList( m_pFontsAttrList, FSNS( XML_w, XML_ascii ), aFamilyName, FSNS( XML_w, XML_hAnsi ), aFamilyName, FSNS( XML_w, XML_cs ), aFamilyName,
