diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-02-16 09:16:43 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-02-16 09:16:43 +0100 |
| commit | 6083a8f188e2cd3fe6849e2112a6b06fbf8e1ad3 (patch) | |
| tree | fe15c1470e806b7eb4ef132221c47474b19dd35c /writerfilter/inc | |
| parent | tdf#97814 make "insert 3D model" dlg translatable (diff) | |
| download | core-6083a8f188e2cd3fe6849e2112a6b06fbf8e1ad3.tar.gz core-6083a8f188e2cd3fe6849e2112a6b06fbf8e1ad3.zip | |
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
Diffstat (limited to 'writerfilter/inc')
| -rw-r--r-- | writerfilter/inc/ooxml/OOXMLDocument.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx b/writerfilter/inc/ooxml/OOXMLDocument.hxx index 5ef9247011fa..9b2528ef8564 100644 --- a/writerfilter/inc/ooxml/OOXMLDocument.hxx +++ b/writerfilter/inc/ooxml/OOXMLDocument.hxx @@ -254,7 +254,7 @@ public: static OOXMLDocument * createDocument(OOXMLStream::Pointer_t pStream, const css::uno::Reference<css::task::XStatusIndicator>& xStatusIndicator, - bool bSkipImage, OUString const& rBaseURL); + bool bSkipImage, const css::uno::Sequence<css::beans::PropertyValue>& rDescriptor); }; |