Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArun Thondapu2017-01-06 18:06:30 +0000
committerArun Thondapu2017-01-06 18:06:30 +0000
commit2955774d0f5a94e0ce1b2790f4cb863000624897 (patch)
tree55b84e7d56359fae3eb14eb74749f59ab46754b4
parent70fffff0d7987f9396a80f93be32399b448ef27c (diff)
downloadeclipse.platform.swt-2955774d0f5a94e0ce1b2790f4cb863000624897.tar.gz
eclipse.platform.swt-2955774d0f5a94e0ce1b2790f4cb863000624897.tar.xz
eclipse.platform.swt-2955774d0f5a94e0ce1b2790f4cb863000624897.zip
Revert "Bug 447930 - Accessibility: IA2 object not instantiated until IA2 interfaces are implemented"
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java20
1 files changed, 10 insertions, 10 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java
index 44c5411d9e..fc795f24a7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/win32/org/eclipse/swt/accessibility/Accessible.java
@@ -1555,11 +1555,11 @@ public class Accessible {
if (COM.IsEqualGUID(guid, COM.IIDIServiceProvider)) {
if (!UseIA2) return COM.E_NOINTERFACE;
- if (accessibleActionListenersSize() > 0 || accessibleAttributeListenersSize() > 0 ||
- accessibleHyperlinkListenersSize() > 0 || accessibleTableListenersSize() > 0 ||
- accessibleTableCellListenersSize() > 0 || accessibleTextExtendedListenersSize() > 0 ||
- accessibleValueListenersSize() > 0 || accessibleControlListenersSize() > 0 || getRelationCount() > 0
- || (control instanceof Button && ((control.getStyle() & SWT.RADIO) != 0)) || (control instanceof Composite)) {
+ if (accessibleActionListeners.size() > 0 || accessibleAttributeListeners.size() > 0 ||
+ accessibleHyperlinkListeners.size() > 0 || accessibleTableListeners.size() > 0 ||
+ accessibleTableCellListeners.size() > 0 || accessibleTextExtendedListeners.size() > 0 ||
+ accessibleValueListeners.size() > 0 || getRelationCount() > 0
+ || (control instanceof Button && ((control.getStyle() & SWT.RADIO) != 0))) {
if (objIServiceProvider == null) createIServiceProvider();
COM.MoveMemory(ppvObject, new int /*long*/[] { objIServiceProvider.getAddress() }, OS.PTR_SIZEOF);
AddRef();
@@ -1719,11 +1719,11 @@ public class Accessible {
int queryAccessible2Interfaces(GUID guid, int /*long*/ ppvObject) {
if (COM.IsEqualGUID(guid, COM.IIDIAccessible2)) {
- if (accessibleActionListenersSize() > 0 || accessibleAttributeListenersSize() > 0 ||
- accessibleHyperlinkListenersSize() > 0 || accessibleTableListenersSize() > 0 ||
- accessibleTableCellListenersSize() > 0 || accessibleTextExtendedListenersSize() > 0 ||
- accessibleValueListenersSize() > 0 || accessibleControlListenersSize() > 0 || getRelationCount() > 0
- || (control instanceof Button && ((control.getStyle() & SWT.RADIO) != 0)) || (control instanceof Composite)) {
+ if (accessibleActionListeners.size() > 0 || accessibleAttributeListeners.size() > 0 ||
+ accessibleHyperlinkListeners.size() > 0 || accessibleTableListeners.size() > 0 ||
+ accessibleTableCellListeners.size() > 0 || accessibleTextExtendedListeners.size() > 0 ||
+ accessibleValueListeners.size() > 0 || getRelationCount() > 0
+ || (control instanceof Button && ((control.getStyle() & SWT.RADIO) != 0))) {
if (objIAccessible2 == null) createIAccessible2();
COM.MoveMemory(ppvObject, new int /*long*/[] { objIAccessible2.getAddress() }, OS.PTR_SIZEOF);
AddRef();

Back to the top