[Libreoffice-commits] core.git: Branch 'feature/wasm' - svx/source

Armin Le Grand (Allotropia) (via logerrit) logerrit at kemper.freedesktop.org
Tue May 25 09:39:28 UTC 2021


 svx/source/svdraw/svdomedia.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 34243e3acfe8d27ef0b5bec97d4b795c5149974f
Author:     Armin Le Grand (Allotropia) <Armin.Le.Grand at me.com>
AuthorDate: Tue May 25 11:38:36 2021 +0200
Commit:     Armin Le Grand (Allotropia) <Armin.Le.Grand at me.com>
CommitDate: Tue May 25 11:38:36 2021 +0200

    Wasm correct unresolved CreateMediaTempFile
    
    Change-Id: Id697258ea694e1a6fc951c216a7cd34c116dd88d

diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index 5826d3e72bed..db4875c81d1a 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -260,6 +260,7 @@ void SdrMediaObj::SetInputStream(uno::Reference<io::XInputStream> const& xStream
         return;
     }
 
+#if HAVE_FEATURE_AVMEDIA
     OUString tempFileURL;
     const bool bSuccess(
         ::avmedia::CreateMediaTempFile(
@@ -270,12 +271,14 @@ void SdrMediaObj::SetInputStream(uno::Reference<io::XInputStream> const& xStream
     if (bSuccess)
     {
         m_xImpl->m_pTempFile = std::make_shared<::avmedia::MediaTempFile>(tempFileURL);
-#if HAVE_FEATURE_AVMEDIA
         m_xImpl->m_MediaProperties.setURL(
             m_xImpl->m_LastFailedPkgURL, tempFileURL, "");
-#endif
     }
     m_xImpl->m_LastFailedPkgURL.clear(); // once only
+#else
+    (void)xStream;
+    return;
+#endif
 }
 
 /// copy a stream from XStorage to temp file


More information about the Libreoffice-commits mailing list