infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 12:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

6607163: Linux: Cannot copy image from Java to OpenOffice

Browse Source 
TARGETS should have type ATOM

Reviewed-by: denis
This commit is contained in:
Oleg Sukhodolsky 2008-03-13 16:42:52 +03:00
parent c02f0bd9b7
commit 43fd376e71
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jdk/src/solaris/classes/sun/awt/X11/XSelection.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved.
* Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -281,8 +281,10 @@ public class XSelection {
if (targetsGetter.isExecuted() && !targetsGetter.isDisposed() &&
(targetsGetter.getActualType() == XAtom.XA_ATOM ||
targetsGetter.getActualType() == XDataTransferer.TARGETS_ATOM.getAtom()) &&
targetsGetter.getActualFormat() == 32) {
targetsGetter.getActualFormat() == 32)
{
// we accept property with TARGETS type to be compatible with old jdks
// see 6607163
int count = (int)targetsGetter.getNumberOfItems();
if (count > 0) {
long atoms = targetsGetter.getData();
@ -687,7 +689,7 @@ public class XSelection {
XToolkit.awtLock();
try {
XlibWrapper.XChangeProperty(XToolkit.getDisplay(), requestor,
property, format, dataFormat,
property, XAtom.XA_ATOM, dataFormat,
XlibWrapper.PropModeReplace,
nativeDataPtr, count);
} finally {