summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorjan Iversen <jani@libreoffice.org>2017-10-09 19:10:41 +0200
committerjan Iversen <jani@libreoffice.org>2017-10-09 19:13:55 +0200
commita3a89fc81a47640d0cd63453f72717a8ddb3970d (patch)
treecf0a036c4f431a1de7110bc048f1be48bf21344d /svx
parent64b3b366da326ca4eeb42c8c6195f21e2c563663 (diff)
svx, implement HAVE_FEATURE_AVMEDIA
iOS does not support avmedia, therefore HAVE_FEATURE_AVMEDIA is set, however not all sources test for it. Change-Id: I351d36769f82289e6b7fa61b3509aa1f34458989
Diffstat (limited to 'svx')
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx12
-rw-r--r--svx/source/svdraw/svdomedia.cxx19
2 files changed, 31 insertions, 0 deletions
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
index 46f4378f7f52..8b6915259ada 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
@@ -78,8 +78,12 @@ Size ViewObjectContactOfSdrMediaObj::getPreferredSize() const
{
Size aRet;
+#if HAVE_FEATURE_AVMEDIA
if( mpMediaWindow )
aRet = mpMediaWindow->getPreferredSize();
+#else
+ aRet = Size(0,0);
+#endif
return aRet;
}
@@ -87,6 +91,7 @@ Size ViewObjectContactOfSdrMediaObj::getPreferredSize() const
void ViewObjectContactOfSdrMediaObj::updateMediaItem( ::avmedia::MediaItem& rItem ) const
{
+#if HAVE_FEATURE_AVMEDIA
if( mpMediaWindow )
{
mpMediaWindow->updateMediaItem( rItem );
@@ -109,11 +114,15 @@ void ViewObjectContactOfSdrMediaObj::updateMediaItem( ::avmedia::MediaItem& rIte
mpMediaWindow->show();
}
}
+#else
+ (void) rItem;
+#endif
}
void ViewObjectContactOfSdrMediaObj::executeMediaItem( const ::avmedia::MediaItem& rItem )
{
+#if HAVE_FEATURE_AVMEDIA
if( mpMediaWindow )
{
::avmedia::MediaItem aUpdatedItem;
@@ -124,6 +133,9 @@ void ViewObjectContactOfSdrMediaObj::executeMediaItem( const ::avmedia::MediaIte
updateMediaItem( aUpdatedItem );
static_cast< ViewContactOfSdrMediaObj& >( GetViewContact() ).mediaPropertiesChanged( aUpdatedItem );
}
+#else
+ (void) rItem;
+#endif
}
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index 7dd17c5e7665..94156e43d939 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -170,6 +170,7 @@ SdrMediaObj& SdrMediaObj::operator=(const SdrMediaObj& rObj)
const uno::Reference< graphic::XGraphic > SdrMediaObj::getSnapshot() const
{
+#if HAVE_FEATURE_AVMEDIA
if( !m_xImpl->m_xCachedSnapshot.is() )
{
OUString aRealURL = m_xImpl->m_MediaProperties.getTempURL();
@@ -177,6 +178,7 @@ const uno::Reference< graphic::XGraphic > SdrMediaObj::getSnapshot() const
aRealURL = m_xImpl->m_MediaProperties.getURL();
m_xImpl->m_xCachedSnapshot = avmedia::MediaWindow::grabFrame( aRealURL, m_xImpl->m_MediaProperties.getReferer(), m_xImpl->m_MediaProperties.getMimeType());
}
+#endif
return m_xImpl->m_xCachedSnapshot;
}
@@ -229,15 +231,26 @@ void SdrMediaObj::AdjustToMaxRect( const tools::Rectangle& rMaxRect, bool bShrin
void SdrMediaObj::setURL( const OUString& rURL, const OUString& rReferer, const OUString& rMimeType )
{
::avmedia::MediaItem aURLItem;
+#if HAVE_FEATURE_AVMEDIA
if( !rMimeType.isEmpty() )
m_xImpl->m_MediaProperties.setMimeType(rMimeType);
aURLItem.setURL( rURL, "", rReferer );
+#else
+ (void) rMimeType;
+ (void) rURL;
+ (void) rReferer;
+#endif
setMediaProperties( aURLItem );
}
const OUString& SdrMediaObj::getURL() const
{
+#if HAVE_FEATURE_AVMEDIA
return m_xImpl->m_MediaProperties.getURL();
+#else
+static OUString ret;
+ return ret;
+#endif
}
void SdrMediaObj::setMediaProperties( const ::avmedia::MediaItem& rState )
@@ -374,6 +387,7 @@ void SdrMediaObj::SetInputStream(uno::Reference<io::XInputStream> const& xStream
}
/// copy a stream from XStorage to temp file
+#if HAVE_FEATURE_AVMEDIA
static bool lcl_HandlePackageURL(
OUString const & rURL,
SdrModel const *const pModel,
@@ -406,10 +420,12 @@ static bool lcl_HandlePackageURL(
}
return lcl_CopyToTempFile(xInStream, o_rTempFileURL);
}
+#endif
void SdrMediaObj::mediaPropertiesChanged( const ::avmedia::MediaItem& rNewProperties )
{
bool bBroadcastChanged = false;
+#if HAVE_FEATURE_AVMEDIA
const AVMediaSetMask nMaskSet = rNewProperties.getMaskSet();
// use only a subset of MediaItem properties for own properties
@@ -477,6 +493,9 @@ void SdrMediaObj::mediaPropertiesChanged( const ::avmedia::MediaItem& rNewProper
if( AVMediaSetMask::ZOOM & nMaskSet )
m_xImpl->m_MediaProperties.setZoom( rNewProperties.getZoom() );
+#else
+ (void) rNewProperties;
+#endif
if( bBroadcastChanged )
{