summaryrefslogtreecommitdiff
path: root/basctl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-01-08 11:56:03 +0000
committerJulien Nabet <serval2412@yahoo.fr>2018-01-08 20:01:45 +0100
commite7980e60ee60d9707780d0eee3841850351febf6 (patch)
tree56b9ac4ec34a3172bde5901c2592e99e4f68788c /basctl
parentcd44182c345adf3fe197e49575463ca34b10223d (diff)
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/47590 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'basctl')
-rw-r--r--basctl/source/dlged/dlged.cxx14
1 files changed, 8 insertions, 6 deletions
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index f8ac1f4e6561..8b698c407230 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -822,7 +822,6 @@ void DlgEditor::Paste()
if ( xClipboard.is() )
{
Reference< datatransfer::XTransferable > xTransf;
-
{
SolarMutexReleaser aReleaser;
// get clipboard content
@@ -1051,11 +1050,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;
}