[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - basctl/source

[Caolán McNamara]

 basctl/source/dlged/dlged.cxx |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

New commits:
commit b5e9fc18cb51e52f2f3f5b35cba7fed5cd6cb122
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 8 11:56:03 2018 +0000

    Resolves: tdf#114766 gtk3 solar mutex assert
    
    since
    
    commit 33de587e95dddfc8e3c89b84f90b3d1bca823dae
    Date:   Tue Mar 17 12:56:54 2015 +0530
    
        tdf#88230: cleanup solar mutex yielding
    
        Use SolarMutexReleaser, instead.
    
    Change-Id: Ied2c78f95592c87b7908d14e9ab6c78e62f987e7
    Reviewed-on: https://gerrit.libreoffice.org/47592
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index f5cc428272d2..c6987520bc8c 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -823,7 +823,6 @@ void DlgEditor::Paste()
     if ( xClipboard.is() )
     {
         Reference< datatransfer::XTransferable > xTransf;
-
         {
             SolarMutexReleaser aReleaser;
             // get clipboard content
@@ -1052,11 +1051,14 @@ bool DlgEditor::IsPasteAllowed()
     Reference< datatransfer::clipboard::XClipboard > xClipboard = GetWindow().GetClipboard();
     if ( xClipboard.is() )
     {
-        // get clipboard content
-        SolarMutexReleaser aReleaser;
-        Reference< datatransfer::XTransferable > xTransf = xClipboard->getContents();
-
-        return xTransf.is() && xTransf->isDataFlavorSupported( m_ClipboardDataFlavors[0] );
+        Reference< datatransfer::XTransferable > xTransf;
+        {
+            SolarMutexReleaser aReleaser;
+            // get clipboard content
+            xTransf = xClipboard->getContents();
+        }
+        if (xTransf.is())
+            return xTransf->isDataFlavorSupported(m_ClipboardDataFlavors[0]);
     }
     return false;
 }