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

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Fri Aug 21 09:04:53 UTC 2020


 sc/source/ui/drawfunc/fuins1.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 414b93285f081cd1a0bfb0847fbd3943bf50093a
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Aug 20 20:32:35 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Aug 21 11:04:08 2020 +0200

    cid#1466205 Logically dead code
    
    Change-Id: I965a998f9f1f08ba170a7ef0745d1c0da634c14a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101091
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx
index 686e00e596a4..2a17b04b582f 100644
--- a/sc/source/ui/drawfunc/fuins1.cxx
+++ b/sc/source/ui/drawfunc/fuins1.cxx
@@ -392,11 +392,12 @@ FuInsertMedia::FuInsertMedia( ScTabViewShell&   rViewSh,
     }
 
     bool bLink(true);
-    if (!bAPI
+    bool bInsertMedia = bAPI;
 #if HAVE_FEATURE_AVMEDIA
-        || !::avmedia::MediaWindow::executeMediaURLDialog(pWin ? pWin->GetFrameWeld() : nullptr, aURL, &bLink)
+    if (!bInsertMedia)
+        bInsertMedia = ::avmedia::MediaWindow::executeMediaURLDialog(pWin ? pWin->GetFrameWeld() : nullptr, aURL, &bLink);
 #endif
-       )
+    if (!bInsertMedia)
         return;
 
     Size aPrefSize;


More information about the Libreoffice-commits mailing list