diff options
author | jan Iversen <jani@libreoffice.org> | 2017-10-09 19:10:41 +0200 |
---|---|---|
committer | jan Iversen <jani@libreoffice.org> | 2017-10-09 19:13:55 +0200 |
commit | a3a89fc81a47640d0cd63453f72717a8ddb3970d (patch) | |
tree | cf0a036c4f431a1de7110bc048f1be48bf21344d /svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx | |
parent | 64b3b366da326ca4eeb42c8c6195f21e2c563663 (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/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx')
-rw-r--r-- | svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx | 12 |
1 files changed, 12 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 } |