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

[Caolán McNamara]

 vcl/unx/gtk3/app/gtk3gtkinst.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 5b9501f6da42ba5b9d1b3c702d527bf8795cdd7c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Sep 9 09:45:58 2015 +0100

    Resolves: tdf#93887 distinguish between empty selection lost selection
    
    Change-Id: Id0be728602b3c58b2853ff464336d68303531efe
    (cherry picked from commit f3f1919aa4eca2f6180649eda43bcb813b1f0450)
    Reviewed-on: https://gerrit.libreoffice.org/18434
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/vcl/unx/gtk3/app/gtk3gtkinst.cxx b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
index d8614df..f8fd6a6 100644
--- a/vcl/unx/gtk3/app/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
@@ -372,8 +372,11 @@ sal_Bool VclGtkClipboard::supportsService( const OUString& ServiceName ) throw(
 
 Reference< css::datatransfer::XTransferable > VclGtkClipboard::getContents() throw( RuntimeException, std::exception )
 {
-    if (!m_aContents.is())
+    if (G_OBJECT(m_pOwner) != gtk_clipboard_get_owner(gtk_clipboard_get(m_nSelection)) &&
+        !m_aContents.is())
     {
+        //tdf#93887 This is the system clipboard/selection. We fetch it when we are not
+        //the owner of the clipboard and have not already fetched it.
         m_aContents = new GtkTransferable(m_nSelection);
     }
     return m_aContents;