diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2019-04-30 13:52:00 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-04-30 14:59:35 +0200 |
| commit | a1a16b22629d7952ef3aaefc76f080f7fdba7296 (patch) | |
| tree | 85677091117a937962efcc8e426062ba78ae146f /svx | |
| parent | f2466b915cbf7bee03df16d0972f06155b7512de (diff) | |
svx: remove nested redundant #ifs
Change-Id: I325fbf7573903a1cb99ea1f1c81d6b5a482efe09
Reviewed-on: https://gerrit.libreoffice.org/71578
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdomedia.cxx | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx index 9951417613d5..5a355dd8cafd 100644 --- a/svx/source/svdraw/svdomedia.cxx +++ b/svx/source/svdraw/svdomedia.cxx @@ -356,16 +356,12 @@ void SdrMediaObj::mediaPropertiesChanged( const ::avmedia::MediaItem& rNewProper { m_xImpl->m_pTempFile.reset( new ::avmedia::MediaTempFile(tempFileURL)); -#if HAVE_FEATURE_AVMEDIA m_xImpl->m_MediaProperties.setURL(url, tempFileURL, ""); -#endif } else // this case is for Clone via operator= { m_xImpl->m_pTempFile.reset(); -#if HAVE_FEATURE_AVMEDIA m_xImpl->m_MediaProperties.setURL("", "", ""); -#endif // UGLY: oox import also gets here, because unlike ODF // getDocumentStorage() is not the imported file... m_xImpl->m_LastFailedPkgURL = url; @@ -373,18 +369,14 @@ void SdrMediaObj::mediaPropertiesChanged( const ::avmedia::MediaItem& rNewProper } else { -#if HAVE_FEATURE_AVMEDIA m_xImpl->m_MediaProperties.setURL(url, rNewProperties.getTempURL(), ""); -#endif } } else { m_xImpl->m_pTempFile.reset(); -#if HAVE_FEATURE_AVMEDIA m_xImpl->m_MediaProperties.setURL(url, "", rNewProperties.getReferer()); -#endif } bBroadcastChanged = true; } |