diff options
author | Jan Holesovsky <kendy@collabora.com> | 2017-09-06 10:36:10 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2017-09-07 07:01:27 +0200 |
commit | 4d1159136ae25b437d874e0fba7f0f13651049b6 (patch) | |
tree | d97689c67420eec30d31bf37f71b57abdfd0cc3a /include/oox | |
parent | cbcffbaee204e9dfbdc2125dda73e36d77e9b844 (diff) |
tdf#106867: Write also the extended markup to fully support embedded videos.
Change-Id: I33398bff32077a8a109e0addcebab039f734c1bb
Reviewed-on: https://gerrit.libreoffice.org/41981
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'include/oox')
-rw-r--r-- | include/oox/export/drawingml.hxx | 4 | ||||
-rw-r--r-- | include/oox/token/relationship.hxx | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx index 0e497f91a4a5..c33bb40f4306 100644 --- a/include/oox/export/drawingml.hxx +++ b/include/oox/export/drawingml.hxx @@ -136,8 +136,8 @@ protected: /// If bRelPathToMedia is true add "../" to image folder path while adding the image relationship OUString WriteImage( const OUString& rURL, bool bRelPathToMedia = false); - /// Copy a video from vnd.sun.star.Package: to the output and return RelId. - OUString WriteMedia(const css::uno::Reference<css::drawing::XShape>& xShape, bool bRelPathToMedia = false); + /// Output the media (including copying a video from vnd.sun.star.Package: to the output if necessary). + void WriteMediaNonVisualProperties(const css::uno::Reference<css::drawing::XShape>& xShape); void WriteStyleProperties( sal_Int32 nTokenId, const css::uno::Sequence< css::beans::PropertyValue >& aProperties ); diff --git a/include/oox/token/relationship.hxx b/include/oox/token/relationship.hxx index 329fe7407df1..18cca8523749 100644 --- a/include/oox/token/relationship.hxx +++ b/include/oox/token/relationship.hxx @@ -39,6 +39,7 @@ enum class Relationship HEADER, HYPERLINK, IMAGE, + MEDIA, NOTESMASTER, NOTESSLIDE, NUMBERING, |