Kaydet (Commit) a0647dfd authored tarafından Samuel Mehrbrodt's avatar Samuel Mehrbrodt

Related tdf#113696 Write fallback graphic for fodf files also

Change-Id: I2db10b6a3bf14837160a56813681ba40fa253447
Reviewed-on: https://gerrit.libreoffice.org/45777Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
üst b360322c
......@@ -3050,7 +3050,7 @@ void XMLTextParagraphExport::_exportTextGraphic(
SvXMLElementExport aElem(GetExport(), XML_NAMESPACE_DRAW, XML_FRAME, false, true);
// replacement graphic for backwards compatibility, but
// only for SVG currently
// only for SVG and metafiles currently
OUString sReplacementOrigURL;
rPropSet->getPropertyValue( sReplacementGraphicURL ) >>= sReplacementOrigURL;
......@@ -3110,15 +3110,20 @@ void XMLTextParagraphExport::_exportTextGraphic(
GetExport().AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE);
GetExport().AddAttribute(XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED);
GetExport().AddAttribute(XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD);
}
// xlink:href for replacement, only written for Svg content
SvXMLElementExport aElement(GetExport(), XML_NAMESPACE_DRAW, XML_IMAGE, false, true);
uno::Reference<io::XInputStream> xInputStream(
GetExport().GetEmbeddedGraphicObjectStream(sReplacementOrigURL));
OUString aMimeType(
comphelper::GraphicMimeTypeHelper::GetMimeTypeForImageStream(xInputStream));
if (!aMimeType.isEmpty())
GetExport().AddAttribute(XML_NAMESPACE_LO_EXT, "mime-type", aMimeType);
// optional office:binary-data
GetExport().AddEmbeddedGraphicObjectAsBase64(sReplacementURL);
}
}
SvXMLElementExport aElement(GetExport(), XML_NAMESPACE_DRAW, XML_IMAGE, true, true);
// optional office:binary-data
GetExport().AddEmbeddedGraphicObjectAsBase64(sReplacementOrigURL);
}
// script:events
Reference<XEventsSupplier> xEventsSupp( rPropSet, UNO_QUERY );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment