Kaydet (Commit) a1a16b22 authored tarafından Miklos Vajna's avatar Miklos Vajna

svx: remove nested redundant #ifs

Change-Id: I325fbf7573903a1cb99ea1f1c81d6b5a482efe09
Reviewed-on: https://gerrit.libreoffice.org/71578Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
üst f2466b91
......@@ -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;
}
......
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