oox/source/export/vmlexport.cxx | 2 +- oox/source/vml/vmlshapecontext.cxx | 7 ++++++- sw/qa/extras/ooxmlexport/ooxmlexport11.cxx | 3 --- 3 files changed, 7 insertions(+), 5 deletions(-)
New commits: commit 4c0d1afaf614db7f88004cbdb899c1f68a7badb8 Author: Noel Grandin <[email protected]> AuthorDate: Thu Jan 15 16:03:07 2026 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Tue Jan 20 10:37:21 2026 +0100 officeotron: attribute signinginstructions should not have a namespace prefix we end up with <o:signatureline ... o:signinginstructions="Check the machines!" where the "o:" prefix on signinginstructions is incorrect. Just to be safe, when loading, try both the old and the new style. However, this does mean that creating such data on a new version of LO, and then sending it to someone with an old version of LO, this data will be lost. Change-Id: I3ec366a2de1ba4945aae1ff67656eda0868333e1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197427 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit bf5cc0ae565fb3a11c4cb6b081f99f6daea26dfb) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197562 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx index 0613426e6fe5..40fb4624fa5c 100644 --- a/oox/source/export/vmlexport.cxx +++ b/oox/source/export/vmlexport.cxx @@ -711,7 +711,7 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, const tools::Rectangle& { pAttrListSignatureLine->add(XML_signinginstructionsset, "t"); pAttrListSignatureLine->add( - FSNS(XML_o, XML_signinginstructions), + XML_signinginstructions, pSdrGrafObj->getSignatureLineSigningInstructions()); } pAttrListSignatureLine->add( diff --git a/oox/source/vml/vmlshapecontext.cxx b/oox/source/vml/vmlshapecontext.cxx index 5839fa511116..01e2054bb078 100644 --- a/oox/source/vml/vmlshapecontext.cxx +++ b/oox/source/vml/vmlshapecontext.cxx @@ -649,7 +649,12 @@ ContextHandlerRef ShapeContext::onCreateContext( sal_Int32 nElement, const Attri mrShapeModel.maSignatureLineSuggestedSignerEmail = rAttribs.getStringDefaulted(O_TOKEN(suggestedsigneremail)); mrShapeModel.maSignatureLineSigningInstructions - = rAttribs.getStringDefaulted(O_TOKEN(signinginstructions)); + = rAttribs.getStringDefaulted(XML_signinginstructions); + // we used to save this with an "o:" prefix, which is incorrect, so to support older + // data, try the older way if the correct way is empty. + if (mrShapeModel.maSignatureLineSigningInstructions.isEmpty()) + mrShapeModel.maSignatureLineSigningInstructions + = rAttribs.getStringDefaulted(O_TOKEN(signinginstructions)); mrShapeModel.mbSignatureLineShowSignDate = ConversionHelper::decodeBool( rAttribs.getString(XML_showsigndate, u"t"_ustr)); // default is true mrShapeModel.mbSignatureLineCanAddComment = ConversionHelper::decodeBool( diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx index 869fdb02eca1..18abf65f0303 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx @@ -389,9 +389,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf44832_testSectionWithDifferentHeader) DECLARE_OOXMLEXPORT_TEST(testSignatureLineShape, "signature-line-all-props-set.docx") { - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - uno::Reference<drawing::XShape> xSignatureLineShape = getShape(1); uno::Reference<beans::XPropertySet> xPropSet(xSignatureLineShape, uno::UNO_QUERY);
