diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-10-13 19:01:12 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-10-13 19:23:41 +0200 |
| commit | 220a3686921847b71dc72b69ce98ba260b951610 (patch) | |
| tree | c10fc83c4abc99dd1685a7542f954ce9f6f3388c /oox/inc | |
| parent | 8b7f96d257724656ac4a4303b17285be2ed13886 (diff) | |
oox: refactor embedded media import
Currently the oox import creates a temp file and leaks it, and there is
no way to clean it up afterwards. Unfortunately it turns out that
SdrModel has no way to access the imported OOXML storage, so add a
really ugly hack to get the embedded media into the SdrMediaObj by
setting both MediaURL and PrivateStream properties (currently oox really
wants to set the properties in alphabetical order too...)
Change-Id: I5a235fbeb08e7bc17faf066de52b94867e9a79a2
Diffstat (limited to 'oox/inc')
| -rw-r--r-- | oox/inc/drawingml/graphicproperties.hxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/oox/inc/drawingml/graphicproperties.hxx b/oox/inc/drawingml/graphicproperties.hxx index 27644cd683d6..b89d3b95a80f 100644 --- a/oox/inc/drawingml/graphicproperties.hxx +++ b/oox/inc/drawingml/graphicproperties.hxx @@ -22,6 +22,8 @@ #include <sal/config.h> +#include <com/sun/star/io/XInputStream.hpp> + #include <oox/drawingml/fillproperties.hxx> #include <oox/helper/helper.hxx> @@ -36,7 +38,8 @@ namespace drawingml { struct GraphicProperties { BlipFillProperties maBlipProps; ///< Properties for the graphic. - OUString msMediaTempFile; ///< Audio/Video temporary file. + OUString m_sMediaPackageURL; ///< Audio/Video URL. + css::uno::Reference<css::io::XInputStream> m_xMediaStream; ///< Audio/Video input stream. /** Overwrites all members that are explicitly set in rSourceProps. */ void assignUsed( const GraphicProperties& rSourceProps ); |