Kaydet (Commit) 14eea8a7 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Fix build without HAVE_FEATURE_AVMEDIA (iOS at least)

Change-Id: I72d7c7478eba13db93cb88b86e911163c38b312b
üst 204c5d17
...@@ -17,6 +17,8 @@ ...@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <config_features.h>
#include <oox/ppt/soundactioncontext.hxx> #include <oox/ppt/soundactioncontext.hxx>
#include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/exc_hlp.hxx>
...@@ -56,6 +58,7 @@ namespace oox { namespace ppt { ...@@ -56,6 +58,7 @@ namespace oox { namespace ppt {
if( mbHasStartSound ) if( mbHasStartSound )
{ {
OUString url; OUString url;
#if HAVE_FEATURE_AVMEDIA
if ( !msSndName.isEmpty() ) if ( !msSndName.isEmpty() )
{ {
Reference<css::io::XInputStream> Reference<css::io::XInputStream>
...@@ -66,6 +69,7 @@ namespace oox { namespace ppt { ...@@ -66,6 +69,7 @@ namespace oox { namespace ppt {
xInputStream->closeInput(); xInputStream->closeInput();
} }
} }
#endif
if ( !url.isEmpty() ) if ( !url.isEmpty() )
{ {
maSlideProperties.setProperty( PROP_Sound, url); maSlideProperties.setProperty( PROP_Sound, url);
......
...@@ -17,6 +17,8 @@ ...@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <config_features.h>
#include "timetargetelementcontext.hxx" #include "timetargetelementcontext.hxx"
#include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/exc_hlp.hxx>
...@@ -125,8 +127,10 @@ namespace oox { namespace ppt { ...@@ -125,8 +127,10 @@ namespace oox { namespace ppt {
return this; return this;
case PPT_TOKEN( sndTgt ): case PPT_TOKEN( sndTgt ):
{ {
OUString srcFile = drawingml::getEmbeddedWAVAudioFile(getRelations(), rAttribs);
mpTarget->mnType = XML_sndTgt; mpTarget->mnType = XML_sndTgt;
#if HAVE_FEATURE_AVMEDIA
OUString srcFile = drawingml::getEmbeddedWAVAudioFile(getRelations(), rAttribs);
Reference<css::io::XInputStream> Reference<css::io::XInputStream>
xInputStream = getFilter().openInputStream(srcFile); xInputStream = getFilter().openInputStream(srcFile);
...@@ -135,6 +139,7 @@ namespace oox { namespace ppt { ...@@ -135,6 +139,7 @@ namespace oox { namespace ppt {
::avmedia::EmbedMedia(getFilter().getModel(), srcFile, mpTarget->msValue, xInputStream); ::avmedia::EmbedMedia(getFilter().getModel(), srcFile, mpTarget->msValue, xInputStream);
xInputStream->closeInput(); xInputStream->closeInput();
} }
#endif
break; break;
} }
case PPT_TOKEN( spTgt ): case PPT_TOKEN( spTgt ):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment