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 );