accessibility/bridge/org/openoffice/java/accessibility/ComboBox.java | 12 +++ accessibility/bridge/org/openoffice/java/accessibility/Dialog.java | 39 +++++++--- accessibility/bridge/org/openoffice/java/accessibility/Frame.java | 23 +++++ accessibility/bridge/org/openoffice/java/accessibility/Window.java | 23 +++++ vcl/source/gdi/base14.cxx | 4 - 5 files changed, 91 insertions(+), 10 deletions(-)
New commits: commit 3c07f6e14ebe9ef6260a5c04f7fd48a8c3a447c9 Author: Jürgen Schmidt <[email protected]> Date: Tue Jul 9 07:55:12 2013 +0000 #121510# apply patch to handle new focus check in Java 7 Patch By: David Ostrovsky Reviewed By: jsc diff --git a/accessibility/bridge/org/openoffice/java/accessibility/ComboBox.java b/accessibility/bridge/org/openoffice/java/accessibility/ComboBox.java index 59d980b..8fd3270 100644 --- a/accessibility/bridge/org/openoffice/java/accessibility/ComboBox.java +++ b/accessibility/bridge/org/openoffice/java/accessibility/ComboBox.java @@ -110,4 +110,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/Dialog.java b/accessibility/bridge/org/openoffice/java/accessibility/Dialog.java index ac657de..2de886a 100644 --- a/accessibility/bridge/org/openoffice/java/accessibility/Dialog.java +++ b/accessibility/bridge/org/openoffice/java/accessibility/Dialog.java @@ -118,20 +118,41 @@ public class Dialog extends java.awt.Dialog implements javax.accessibility.Acces public void removeNotify() { } - /** - * Determines if the object is visible. Note: this means that the - * object intends to be visible; however, it may not in fact be - * showing on the screen because one of the objects that this object - * is contained by is not visible. To determine if an object is - * showing on the screen, use <code>isShowing</code>. - * - * @return true if object is visible; otherwise, false - */ + /** + * Determines if the object is visible. Note: this means that the + * object intends to be visible; however, it may not in fact be + * showing on the screen because one of the objects that this object + * is contained by is not visible. To determine if an object is + * showing on the screen, use <code>isShowing</code>. + * + * @return true if object is visible; otherwise, false + */ public boolean isVisible(){ return visible; } /** + * 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 + */ + public boolean isDisplayable() { + return true; + } + + /** * Shows or hides this component depending on the value of parameter * <code>b</code>. * @param b if <code>true</code>, shows this component; diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Frame.java b/accessibility/bridge/org/openoffice/java/accessibility/Frame.java index ad437a0..8196d6f 100644 --- a/accessibility/bridge/org/openoffice/java/accessibility/Frame.java +++ b/accessibility/bridge/org/openoffice/java/accessibility/Frame.java @@ -638,5 +638,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 bcde3d7..1ff53dc 100644 --- a/accessibility/bridge/org/openoffice/java/accessibility/Window.java +++ b/accessibility/bridge/org/openoffice/java/accessibility/Window.java @@ -543,5 +543,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; + } + } commit df03a043e531182080d26449899fabe0b7078b81 Author: Herbert Dürr <[email protected]> Date: Tue Jul 9 07:13:09 2013 +0000 #i121127# use PDF base14's symbol font only if explicitly requested diff --git a/vcl/source/gdi/base14.cxx b/vcl/source/gdi/base14.cxx index 7983757..6934783 100644 --- a/vcl/source/gdi/base14.cxx +++ b/vcl/source/gdi/base14.cxx @@ -589,7 +589,9 @@ const PDFWriterImpl::BuiltinFont PDFWriterImpl::m_aBuiltinFonts[ 14 ] = { } }, -{ "Symbol", // family name +// The font name "Symbol" is too generic and causes plenty of trouble. +// To ensure WYSIWIG the PDF-Base14 variant gets a not-confusable name +{ "PDF_Base14_Symbol", // family name "Normal", // style "Symbol", // PSName 1010, -293, // ascend, descend
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
