[Libreoffice-commits] core.git: vcl/source vcl/unx

[Caolán McNamara]

 vcl/source/control/edit.cxx  |    2 +-
 vcl/unx/gtk3/gtk3gtkinst.cxx |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 55b81956ab5f0f80a2edf69421164ac74597bfd1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 7 10:36:34 2016 +0000

    Resolves: tdf#98425 gtk3: grab the SolarMutex when setting the clipboard
    
    Change-Id: Ic439affbd69532534f5caf82a743786d5975939e

diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index d59d2b5..9dab058 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2633,7 +2633,7 @@ void Edit::Copy()
 
 void Edit::Paste()
 {
-        css::uno::Reference<css::datatransfer::clipboard::XClipboard> aClipboard(GetClipboard());
+    css::uno::Reference<css::datatransfer::clipboard::XClipboard> aClipboard(GetClipboard());
     ImplPaste( aClipboard );
 }
 
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 32e1a57..296c145 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -524,6 +524,8 @@ VclGtkClipboard::VclGtkClipboard(GdkAtom nSelection)
 void VclGtkClipboard::flushClipboard()
   throw (RuntimeException, std::exception)
 {
+    SolarMutexGuard aGuard;
+
     if (GDK_SELECTION_CLIPBOARD != m_nSelection)
         return;