diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2020-02-28 11:16:14 +0100 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2020-02-28 17:29:47 +0100 |
| commit | 531f078f3371e909b03b358bc5c9d70df083555f (patch) | |
| tree | 70abe99a50e0ac3ce06d7efe2738d14c740625f3 /xmloff | |
| parent | 325f5bb3a6367f25e5bb737d4b066108ae9fedad (diff) | |
tdf#130917 Invalid document after odt->docx with signatureline
Change-Id: Idf80c41f1315e0690dabd5e8566b62fc64c3ee1a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89692
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/draw/SignatureLineContext.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
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)); |