diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-09-17 17:24:45 +0000 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-09-17 17:24:45 +0000 |
commit | c067c248131fa69c562c9a0cd907c4556ed8a9f3 (patch) | |
tree | e4291f11ad9edfbb29e3c61d04d667f5a684efe5 | |
parent | f8cdf86559c346cd00310f93b6f7d243903217bd (diff) |
CWS-TOOLING: integrate CWS a11y32
2009-09-08 11:46:26 +0200 tl r275921 : #i74816# use hi-contrast for all but for printer; namely use it for virtual devices as well
2009-08-25 10:14:46 +0200 tl r275337 : CWS-TOOLING: rebase CWS a11y32 to trunk@274622 (milestone: DEV300:m54)
2009-08-17 11:13:19 +0200 ab r275036 : #i71360# Added attribute support for misspelled
2009-07-24 14:28:11 +0200 tl r274306 : #i48354# fixed hierarchy order in SvHeaderTabListBox
2009-07-24 13:47:40 +0200 mav r274305 : #i102870# let roadmap control behave as a monolite tabstop control
2009-07-24 13:47:06 +0200 mav r274304 : #i102870# let roadmap control behave as a monolite tabstop control
2009-07-24 13:46:33 +0200 mav r274303 : #i102870# let roadmap control behave as a monolite tabstop control
2009-07-24 09:41:16 +0200 tl r274289 : #i74816# fixed evaluation of high-contrast-mode
2009-07-22 15:46:50 +0200 tl r274246 : warning-free-code fix when build with debug=t
2009-07-22 15:28:59 +0200 tl r274243 : #i74816# fixed evaluation of high-contrast-mode
-rw-r--r-- | accessibility/source/extended/accessibletablistbox.cxx | 14 | ||||
-rw-r--r-- | wizards/com/sun/star/wizards/ui/WizardDialog.java | 19 |
2 files changed, 27 insertions, 6 deletions
diff --git a/accessibility/source/extended/accessibletablistbox.cxx b/accessibility/source/extended/accessibletablistbox.cxx index 42fba56981e5..2912056827b4 100644 --- a/accessibility/source/extended/accessibletablistbox.cxx +++ b/accessibility/source/extended/accessibletablistbox.cxx @@ -107,7 +107,7 @@ namespace accessibility sal_Int32 SAL_CALL AccessibleTabListBox::getAccessibleChildCount() throw ( uno::RuntimeException ) { - return 1; // no header, only table + return 2; // header and table } // ----------------------------------------------------------------------------- @@ -125,11 +125,17 @@ namespace accessibility ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); - if ( nChildIndex != 0 ) - // only one child + if ( nChildIndex < 0 || nChildIndex > 1 ) throw IndexOutOfBoundsException(); - Reference< XAccessible > xRet = implGetFixedChild( ::svt::BBINDEX_TABLE ); + Reference< XAccessible > xRet; + if (nChildIndex == 0) + { + //! so far the actual implementation object only supports column headers + xRet = implGetFixedChild( ::svt::BBINDEX_COLUMNHEADERBAR ); + } + else if (nChildIndex == 1) + xRet = implGetFixedChild( ::svt::BBINDEX_TABLE ); if ( !xRet.is() ) throw RuntimeException(); diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.java b/wizards/com/sun/star/wizards/ui/WizardDialog.java index 2e101ff3398a..15b840fa9c89 100644 --- a/wizards/com/sun/star/wizards/ui/WizardDialog.java +++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java @@ -232,14 +232,29 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL { int iDialogHeight = ((Integer) Helper.getUnoPropertyValue(this.xDialogModel, "Height")).intValue(); + // the roadmap control has got no real TabIndex ever + // that is not correct, but changing this would need time, so it is used + // without TabIndex as before oRoadmap = insertControlModel("com.sun.star.awt.UnoControlRoadmapModel", "rdmNavi", new String[] { - "Height", "PositionX", "PositionY", "Step", "TabIndex", "Width" + "Height", + "PositionX", + "PositionY", + "Step", + "TabIndex", + "Tabstop", + "Width" }, new Object[] { - new Integer(iDialogHeight - 26), new Integer(0), new Integer(0), new Integer(0), new Short((short) 0), new Integer(85) + new Integer(iDialogHeight - 26), + new Integer(0), + new Integer(0), + new Integer(0), + new Short((short)0), + Boolean.TRUE, + new Integer(85) }); XPropertySet xPSet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, oRoadmap); xPSet.setPropertyValue("Name", "rdmNavi"); |