[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/unx

[Caolán McNamara]

 vcl/unx/gtk3/app/gtk3gtkinst.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 60b23430d3eba5e3cf1b45faed791120f5f0e197
Author: Caolán McNamara <caol...@redhat.com>
Date:   Fri Aug 28 15:09:31 2015 +0100

    deb#795131 plausible fix
    
    Change-Id: I95c191ed865d6920845b146c3ef4baf30280a734
    (cherry picked from commit e5539b0b53ebaf9b792652e4866eeacf8c10b101)
    Reviewed-on: https://gerrit.libreoffice.org/18672
    Reviewed-by: Maxim Monastirsky <momonas...@gmail.com>
    Tested-by: Maxim Monastirsky <momonas...@gmail.com>

diff --git a/vcl/unx/gtk3/app/gtk3gtkinst.cxx b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
index f8fd6a6..5716058 100644
--- a/vcl/unx/gtk3/app/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
@@ -385,6 +385,8 @@ Reference< css::datatransfer::XTransferable > 
VclGtkClipboard::getContents() thr
 void VclGtkClipboard::ClipboardGet(GtkClipboard* /*clipboard*/, 
GtkSelectionData *selection_data,
                                    guint info)
 {
+    if (!m_aContents.is())
+        return;
 
     GdkAtom 
type(gdk_atom_intern(OUStringToOString(m_aInfoToFlavor[info].MimeType,
                                                    
RTL_TEXTENCODING_UTF8).getStr(),

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits