vcl/unx/gtk3/app/gtk3gtkinst.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0257b5c9edba1fda1c8ada32fc9e2378c3847726
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Aug 8 12:39:20 2015 +0100
gtk3: name CLIPBOARD and PRIMARY with different names
Change-Id: I4b8f36931f7ee19fe774a735a6d36ecd91de47ef
diff --git a/vcl/unx/gtk3/app/gtk3gtkinst.cxx b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
index 76b44da..d8c278f 100644
--- a/vcl/unx/gtk3/app/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
@@ -592,7 +592,7 @@ void VclGtkClipboard::setContents(
OUString VclGtkClipboard::getName() throw( RuntimeException, std::exception )
{
- return OUString( "CLIPBOARD" );
+ return (m_nSelection == GDK_SELECTION_CLIPBOARD) ? OUString("CLIPBOARD") :
OUString("PRIMARY");
}
sal_Int8 VclGtkClipboard::getRenderingCapabilities() throw( RuntimeException,
std::exception )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
