From 6083a8f188e2cd3fe6849e2112a6b06fbf8e1ad3 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Tue, 16 Feb 2016 09:16:43 +0100 Subject: Related: tdf#59699 DOCX import: fix linked graphics with relative URLs Because the writerfilter::ooxml::OOXMLFastContextHandlerShape constructor only sent the input stream (and not the full media descriptor) to oox::shape::ShapeContextHandler, it's startFastElement() tried to reconstruct a media descriptor from just the input stream. As a result, the base URL of the document got lost at the time the oox::drawingml::BlipContext constructor tried to call getAbsoluteUrl(), to convert the relative URL to an absolute one. Fix the problem by sending not only the input stream, but the full media descriptor to the shape importer. As a bonus that makes code simpler, too. Change-Id: I1f06c04d0745aa7e2e06d4848cf454790d5073ca --- offapi/com/sun/star/xml/sax/XFastShapeContextHandler.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'offapi/com/sun/star/xml') diff --git a/offapi/com/sun/star/xml/sax/XFastShapeContextHandler.idl b/offapi/com/sun/star/xml/sax/XFastShapeContextHandler.idl index a15ae8d3b58a..301971a2141d 100644 --- a/offapi/com/sun/star/xml/sax/XFastShapeContextHandler.idl +++ b/offapi/com/sun/star/xml/sax/XFastShapeContextHandler.idl @@ -40,11 +40,11 @@ interface XFastShapeContextHandler: com::sun::star::xml::sax::XFastContextHandle [attribute, readonly] com::sun::star::drawing::XShape Shape; [attribute] com::sun::star::drawing::XDrawPage DrawPage; [attribute] com::sun::star::frame::XModel Model; - [attribute] com::sun::star::io::XInputStream InputStream; [attribute] string RelationFragmentPath; [attribute] long StartToken; [attribute] com::sun::star::awt::Point Position; [attribute] com::sun::star::document::XDocumentProperties DocumentProperties; + [attribute] sequence< com::sun::star::beans::PropertyValue > MediaDescriptor; }; -- cgit