sw/qa/extras/ooxmlexport/ooxmlexport15.cxx | 2 - sw/source/filter/ww8/docxattributeoutput.cxx | 28 +++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-)
New commits: commit 37d0b6934a461acb1336ceff45cf2547dca9e95d Author: Noel Grandin <[email protected]> AuthorDate: Wed Oct 29 15:38:29 2025 +0200 Commit: Miklos Vajna <[email protected]> CommitDate: Fri Oct 31 10:45:18 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]> diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx index 8b0f3114e7d0..d5fef5f800d6 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 582e52e54ca4..f62d168f2b38 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -6153,63 +6153,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:
