[Libreoffice-commits] core.git: svx/source

[Miklos Vajna (via logerrit)]

 svx/source/svdraw/svdomedia.cxx |    8 --------
 1 file changed, 8 deletions(-)

New commits:
commit a1a16b22629d7952ef3aaefc76f080f7fdba7296
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Tue Apr 30 13:52:00 2019 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Tue Apr 30 14:59:35 2019 +0200

    svx: remove nested redundant #ifs
    
    Change-Id: I325fbf7573903a1cb99ea1f1c81d6b5a482efe09
    Reviewed-on: https://gerrit.libreoffice.org/71578
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Tested-by: Jenkins

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;
     }