diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-09-12 16:57:53 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-09-14 11:29:31 +0200 |
| commit | 24dbe577e539798203d777802cc7027b2edd58c4 (patch) | |
| tree | 5f22ef1e1fda89acd31758063b2ff1735a56bab7 /oox/inc | |
| parent | b7006f3c2f8f71f4d4721c6e5cdc122628c756f0 (diff) | |
Replace struct EmbeddedWAVAudioFile with simple string.
Change-Id: I6659b6e1be865546f380a28e4803fbe593de0803
Diffstat (limited to 'oox/inc')
| -rw-r--r-- | oox/inc/drawingml/embeddedwavaudiofile.hxx | 18 | ||||
| -rw-r--r-- | oox/inc/drawingml/graphicproperties.hxx | 5 |
2 files changed, 5 insertions, 18 deletions
diff --git a/oox/inc/drawingml/embeddedwavaudiofile.hxx b/oox/inc/drawingml/embeddedwavaudiofile.hxx index c1b199243f87..d4676543a26d 100644 --- a/oox/inc/drawingml/embeddedwavaudiofile.hxx +++ b/oox/inc/drawingml/embeddedwavaudiofile.hxx @@ -21,27 +21,15 @@ #define INCLUDED_OOX_DRAWINGML_EMBEDDEDWAVAUDIOFILE_HXX #include <rtl/ustring.hxx> -#include <com/sun/star/xml/sax/XFastAttributeList.hpp> #include <oox/core/fragmenthandler.hxx> +#include <oox/helper/attributelist.hxx> namespace oox { namespace drawingml { - struct EmbeddedWAVAudioFile - { - EmbeddedWAVAudioFile() - : mbBuiltIn(false) - { - } - bool mbBuiltIn; - OUString msName; - OUString msEmbed; - }; - - void getEmbeddedWAVAudioFile( + OUString getEmbeddedWAVAudioFile( const ::oox::core::Relations& rRelations, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs, - EmbeddedWAVAudioFile & aAudio ); + const AttributeList& rAttribs ); } } diff --git a/oox/inc/drawingml/graphicproperties.hxx b/oox/inc/drawingml/graphicproperties.hxx index 626fe5f0f9b8..27644cd683d6 100644 --- a/oox/inc/drawingml/graphicproperties.hxx +++ b/oox/inc/drawingml/graphicproperties.hxx @@ -24,7 +24,6 @@ #include <oox/drawingml/fillproperties.hxx> #include <oox/helper/helper.hxx> -#include <drawingml/embeddedwavaudiofile.hxx> namespace oox { class GraphicHelper; @@ -36,8 +35,8 @@ namespace drawingml { struct GraphicProperties { - BlipFillProperties maBlipProps; /// Properties for the graphic. - EmbeddedWAVAudioFile maAudio; /// Audio file details + BlipFillProperties maBlipProps; ///< Properties for the graphic. + OUString msMediaTempFile; ///< Audio/Video temporary file. /** Overwrites all members that are explicitly set in rSourceProps. */ void assignUsed( const GraphicProperties& rSourceProps ); |