accessibility/bridge/org/openoffice/java/accessibility/ComboBox.java | 12 +++++ accessibility/bridge/org/openoffice/java/accessibility/Frame.java | 23 ++++++++++ accessibility/bridge/org/openoffice/java/accessibility/Window.java | 23 ++++++++++ accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx | 2 4 files changed, 59 insertions(+), 1 deletion(-)
New commits: commit 4364d1afac91bc90b3e7b665d971929fd8e7af36 Author: David Ostrovsky <[email protected]> Date: Sat Jun 29 09:12:57 2013 +0200 fdo#58995 Fix window handle is null on AT side of JAB bridge This reverts commit 41660feef6095f6d9510d11c99376652b41a504b. Change-Id: I25cdbc7d63b1ed244127a46b41e68e9c5a174697 diff --git a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx index 2f0b451..096138a 100644 --- a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx +++ b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx @@ -268,7 +268,7 @@ void handleWindowEvent(Window * pWindow, bool bShow) // the event listener would not have been attached. pJNIEnv->CallStaticVoidMethod(g_jcWindowsAccessBridgeAdapter, (bShow) ? g_jmRegisterTopWindow : g_jmRevokeTopWindow, - (jlong) GetHWND(pWindow), joXAccessible ); + (jint) GetHWND(pWindow), joXAccessible ); // Clear any exception that might have been occurred. if (pJNIEnv->ExceptionCheck()) { commit 9dfe00c74f384886cc3cf336061c6b35f25babd6 Author: David Ostrovsky <[email protected]> Date: Sun Jun 30 08:53:17 2013 +0200 fdo#58995 Fix focus gained/lost event dropping for Window and Frame See 9fd9b14cffbf2604022c099b6202bb0a1da6f06e for more details. Change-Id: Iea92076be8cbcc110deff3c617ee13bbd66aab79 diff --git a/accessibility/bridge/org/openoffice/java/accessibility/ComboBox.java b/accessibility/bridge/org/openoffice/java/accessibility/ComboBox.java index 404569f..a23967c 100644 --- a/accessibility/bridge/org/openoffice/java/accessibility/ComboBox.java +++ b/accessibility/bridge/org/openoffice/java/accessibility/ComboBox.java @@ -99,4 +99,16 @@ public class ComboBox extends Container { return 1; } } + + /** + * Returns whether this Component can be focused. + * + * @return <code>true</code> if this Component is focusable; + * <code>false</code> otherwise. + * @see #setFocusable + * @since 1.4 + */ + public boolean isFocusable() { + return true; + } } diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Frame.java b/accessibility/bridge/org/openoffice/java/accessibility/Frame.java index 7ea0877..fe927cb 100644 --- a/accessibility/bridge/org/openoffice/java/accessibility/Frame.java +++ b/accessibility/bridge/org/openoffice/java/accessibility/Frame.java @@ -632,5 +632,28 @@ public class Frame extends java.awt.Frame implements javax.accessibility.Accessi unoAccessibleComponent.grabFocus(); } } + + /** + * Determines whether this component is displayable. A component is + * displayable when it is connected to a native screen resource. + * <p> + * A component is made displayable either when it is added to + * a displayable containment hierarchy or when its containment + * hierarchy is made displayable. + * A containment hierarchy is made displayable when its ancestor + * window is either packed or made visible. + * <p> + * A component is made undisplayable either when it is removed from + * a displayable containment hierarchy or when its containment hierarchy + * is made undisplayable. A containment hierarchy is made + * undisplayable when its ancestor window is disposed. + * + * @return <code>true</code> if the component is displayable + */ + @Override + public boolean isDisplayable() { + return true; + } + } diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Window.java b/accessibility/bridge/org/openoffice/java/accessibility/Window.java index da4249a..137818e 100644 --- a/accessibility/bridge/org/openoffice/java/accessibility/Window.java +++ b/accessibility/bridge/org/openoffice/java/accessibility/Window.java @@ -537,5 +537,28 @@ public class Window extends java.awt.Window implements javax.accessibility.Acces unoAccessibleComponent.grabFocus(); } } + + /** + * Determines whether this component is displayable. A component is + * displayable when it is connected to a native screen resource. + * <p> + * A component is made displayable either when it is added to + * a displayable containment hierarchy or when its containment + * hierarchy is made displayable. + * A containment hierarchy is made displayable when its ancestor + * window is either packed or made visible. + * <p> + * A component is made undisplayable either when it is removed from + * a displayable containment hierarchy or when its containment hierarchy + * is made undisplayable. A containment hierarchy is made + * undisplayable when its ancestor window is disposed. + * + * @return <code>true</code> if the component is displayable + */ + @Override + public boolean isDisplayable() { + return true; + } + } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
