INTEGRATION: CWS uaa04 (1.3.12); FILE MERGED

2003/06/02 12:49:56 obr 1.3.12.1: #109747# implement getAccessibleContext in a failsafe way, so that it can't kill the dispatch thread of the Java AccessBridge for Windows

1 files changed, 6 insertions, 12 deletions

diff --git a/accessibility/bridge/org/openoffice/java/accessibility/MenuItem.java b/accessibility/bridge/org/openoffice/java/accessibility/MenuItem.java
index f882db6b38df..6a60401703fa 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/MenuItem.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/MenuItem.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: MenuItem.java,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: vg $ $Date: 2003-04-24 18:16:03 $
+ *  last change: $Author: rt $ $Date: 2003-06-12 08:01:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -58,28 +58,23 @@
  *
  *
  ************************************************************************/
-
 package org.openoffice.java.accessibility;
 
 import com.sun.star.accessibility.XAccessible;
 import com.sun.star.accessibility.XAccessibleContext;
 
-class MenuItem extends ToggleButton {
 
+class MenuItem extends ToggleButton {
     public MenuItem(XAccessible xAccessible, XAccessibleContext xAccessibleContext) {
         super(xAccessible, xAccessibleContext);
     }
 
-    /** Returns the AccessibleContext associated with this object */
-    public javax.accessibility.AccessibleContext getAccessibleContext() {
-        if (accessibleContext == null) {
-            accessibleContext = new AccessibleMenuItem();
-        }
-        return accessibleContext;
+    /** Creates the AccessibleContext associated with this object */
+    public javax.accessibility.AccessibleContext createAccessibleContext() {
+        return new AccessibleMenuItem();
     }
 
     protected class AccessibleMenuItem extends AccessibleToggleButton {
-
         /** Gets the role of this object */
         public javax.accessibility.AccessibleRole getAccessibleRole() {
             return javax.accessibility.AccessibleRole.MENU_ITEM;
@@ -95,4 +90,3 @@ class MenuItem extends ToggleButton {
         }
     }
 }
-