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/source/ppt | |
| parent | b7006f3c2f8f71f4d4721c6e5cdc122628c756f0 (diff) | |
Replace struct EmbeddedWAVAudioFile with simple string.
Change-Id: I6659b6e1be865546f380a28e4803fbe593de0803
Diffstat (limited to 'oox/source/ppt')
| -rw-r--r-- | oox/source/ppt/soundactioncontext.cxx | 5 | ||||
| -rw-r--r-- | oox/source/ppt/timetargetelementcontext.cxx | 6 |
2 files changed, 2 insertions, 9 deletions
diff --git a/oox/source/ppt/soundactioncontext.cxx b/oox/source/ppt/soundactioncontext.cxx index 0996fdb3f947..9f1a4c0c69d3 100644 --- a/oox/source/ppt/soundactioncontext.cxx +++ b/oox/source/ppt/soundactioncontext.cxx @@ -74,10 +74,7 @@ namespace oox { namespace ppt { case PPT_TOKEN( snd ): if( mbHasStartSound ) { - drawingml::EmbeddedWAVAudioFile aAudio; - drawingml::getEmbeddedWAVAudioFile( getRelations(), rAttribs.getFastAttributeList(), aAudio); - - msSndName = ( aAudio.mbBuiltIn ? aAudio.msName : aAudio.msEmbed ); + msSndName = drawingml::getEmbeddedWAVAudioFile( getRelations(), rAttribs ); } return this; case PPT_TOKEN( endSnd ): diff --git a/oox/source/ppt/timetargetelementcontext.cxx b/oox/source/ppt/timetargetelementcontext.cxx index 230dd89558ed..225ca38de3bb 100644 --- a/oox/source/ppt/timetargetelementcontext.cxx +++ b/oox/source/ppt/timetargetelementcontext.cxx @@ -123,11 +123,7 @@ namespace oox { namespace ppt { case PPT_TOKEN( sndTgt ): { mpTarget->mnType = XML_sndTgt; - drawingml::EmbeddedWAVAudioFile aAudio; - drawingml::getEmbeddedWAVAudioFile( getRelations(), rAttribs.getFastAttributeList(), aAudio); - - OUString sSndName = ( aAudio.mbBuiltIn ? aAudio.msName : aAudio.msEmbed ); - mpTarget->msValue = sSndName; + mpTarget->msValue = drawingml::getEmbeddedWAVAudioFile( getRelations(), rAttribs ); break; } case PPT_TOKEN( spTgt ): |