diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2020-02-28 11:16:14 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-02-28 15:00:57 +0100 |
| commit | 02ef89cf647065ae39fb4845259f084c9b7ac008 (patch) | |
| tree | a2d27a713901429076e770af1066dad4e069c545 | |
| parent | c4a40f6f072a0972f3257338c89ae5f995a0d547 (diff) | |
tdf#130917 Invalid document after odt->docx with signatureline
Change-Id: Idf80c41f1315e0690dabd5e8566b62fc64c3ee1a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89672
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Tested-by: Jenkins
| -rw-r--r-- | sw/qa/extras/odfexport/odfexport.cxx | 6 | ||||
| -rw-r--r-- | xmloff/source/draw/SignatureLineContext.cxx | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx index b407bdd3e820..134e5af3786d 100644 --- a/sw/qa/extras/odfexport/odfexport.cxx +++ b/sw/qa/extras/odfexport/odfexport.cxx @@ -2147,6 +2147,12 @@ DECLARE_ODFEXPORT_TEST(testSignatureLineProperties, "signatureline-properties.fo getProperty<OUString>(xShape, "SignatureLineSigningInstructions")); CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(xShape, "SignatureLineCanAddComment")); CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(xShape, "SignatureLineShowSignDate")); + + // tdf#130917 This needs to be always set when importing a doc, ooxml export expects it. + uno::Reference<graphic::XGraphic> xUnsignedGraphic; + uno::Reference<beans::XPropertySet> xProps(xShape, uno::UNO_QUERY); + xProps->getPropertyValue("SignatureLineUnsignedImage") >>= xUnsignedGraphic; + CPPUNIT_ASSERT_EQUAL(true, xUnsignedGraphic.is()); } DECLARE_ODFEXPORT_TEST(testQrCodeGenProperties, "qrcode-properties.odt") diff --git a/xmloff/source/draw/SignatureLineContext.cxx b/xmloff/source/draw/SignatureLineContext.cxx index 880d613e3f3f..bbc99277cc47 100644 --- a/xmloff/source/draw/SignatureLineContext.cxx +++ b/xmloff/source/draw/SignatureLineContext.cxx @@ -60,6 +60,12 @@ SignatureLineContext::SignatureLineContext(SvXMLImport& rImport, sal_uInt16 nPrf xPropSet->setPropertyValue("SignatureLineShowSignDate", Any(bShowSignDate)); xPropSet->setPropertyValue("SignatureLineCanAddComment", Any(bCanAddComment)); + // Save unsigned graphic (need it when exporting) + Reference<XGraphic> xUnsignedGraphic; + xPropSet->getPropertyValue("Graphic") >>= xUnsignedGraphic; + if (xUnsignedGraphic.is()) + xPropSet->setPropertyValue("SignatureLineUnsignedImage", Any(xUnsignedGraphic)); + Reference<XGraphic> xGraphic; bool bIsSigned(false); try @@ -107,12 +113,6 @@ SignatureLineContext::SignatureLineContext(SvXMLImport& rImport, sal_uInt16 nPrf xGraphic = pSignatureInfo->InvalidSignatureLineImage; } - // Save unsigned graphic - Reference<XGraphic> xUnsignedGraphic; - xPropSet->getPropertyValue("Graphic") >>= xUnsignedGraphic; - if (xUnsignedGraphic.is()) - xPropSet->setPropertyValue("SignatureLineUnsignedImage", Any(xUnsignedGraphic)); - xPropSet->setPropertyValue("Graphic", Any(xGraphic)); } xPropSet->setPropertyValue("SignatureLineIsSigned", Any(bIsSigned)); |