oox/source/export/vmlexport.cxx | 10 +++++++--- sw/source/filter/ww8/docxattributeoutput.cxx | 3 ++- 2 files changed, 9 insertions(+), 4 deletions(-)
New commits: commit 9676729d7c3f7c967de397e1aa21e9ea9d72fd76 Author: Noel Grandin <[email protected]> AuthorDate: Wed Oct 29 10:56:33 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Sat Nov 1 19:06:36 2025 +0100 mso-test: fix order of webHidden element When loading and then saving the document from forum-mso-en-11578.docx, the w:webHidden element under the w:rPr element is in the wrong order. Change-Id: I56bf4e989d4d0345bb79a7f95860371085bd49bf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193131 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> (cherry picked from commit 4f8e10e92d593019054f393467a6448aa478bfc8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193249 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 dc0363a759e7..dba1bb0037a0 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -3310,11 +3310,12 @@ void DocxAttributeOutput::StartRunProperties() m_pSerializer->startElementNS(XML_w, XML_rPr); + InitCollectedRunProperties(); + if(GetExport().m_bHideTabLeaderAndPageNumbers && m_pHyperlinkAttrList.is() ) { m_pSerializer->singleElementNS(XML_w, XML_webHidden); } - InitCollectedRunProperties(); assert( !m_oPostponedGraphic ); m_oPostponedGraphic.emplace(); commit b2933ab9df34f4413db365dc1d0913845c4a5bc9 Author: Noel Grandin <[email protected]> AuthorDate: Mon Oct 27 15:08:39 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Sat Nov 1 19:06:27 2025 +0100 mso-test: remove path attribute from v:rect shape when loading and then saving the document from tdf#135569, we add a path attribute, which is not a valie attribute for a rect element, which causes ms-office to think the document is corrupt Change-Id: I7705fa9d3ed86bc3aa916db4603d40cef35086af Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193038 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> (cherry picked from commit 7f0efca2ce1f02b7d9b8af57c6d70078a14f9b5f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193247 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx index fdb74b2c138a..01c3d578d1eb 100644 --- a/oox/source/export/vmlexport.cxx +++ b/oox/source/export/vmlexport.cxx @@ -650,9 +650,13 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, const tools::Rectangle& break; } } - OString pathString = aPath.makeStringAndClear(); - if ( !pathString.isEmpty() && pathString != "xe" ) - m_pShapeAttrList->add( XML_path, pathString ); + // path attribute not valid for v:rect + if ( m_nShapeType != ESCHER_ShpInst_Rectangle ) + { + OString pathString = aPath.makeStringAndClear(); + if ( !pathString.isEmpty() && pathString != "xe" ) + m_pShapeAttrList->add( XML_path, pathString ); + } } else SAL_WARN("oox.vml", "unhandled shape path, missing either pVertices or pSegmentInfo.");
