openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stev...@apache.org
Subject svn commit: r1541847 [1/18] - in /openoffice/trunk: ./ main/accessibility/inc/accessibility/extended/ main/accessibility/inc/accessibility/helper/ main/accessibility/inc/accessibility/standard/ main/accessibility/source/extended/ main/accessibility/sou...
Date Thu, 14 Nov 2013 08:18:14 GMT
Author: steve_y
Date: Thu Nov 14 08:18:05 2013
New Revision: 1541847

URL: http://svn.apache.org/r1541847
Log:
Integrate branch of IAccessible2

Added:
    openoffice/trunk/main/editeng/inc/editeng/AccessibleSvxFindReplaceDialog.hxx
      - copied unchanged from r1541842, openoffice/branches/ia2/main/editeng/inc/editeng/AccessibleSvxFindReplaceDialog.hxx
    openoffice/trunk/main/offapi/com/sun/star/accessibility/MSAAService.idl
      - copied unchanged from r1541842, openoffice/branches/ia2/main/offapi/com/sun/star/accessibility/MSAAService.idl
    openoffice/trunk/main/offapi/com/sun/star/accessibility/XAccessibleExtendedAttributes.idl
      - copied unchanged from r1541842, openoffice/branches/ia2/main/offapi/com/sun/star/accessibility/XAccessibleExtendedAttributes.idl
    openoffice/trunk/main/offapi/com/sun/star/accessibility/XAccessibleGetAccFlowTo.idl
      - copied unchanged from r1541842, openoffice/branches/ia2/main/offapi/com/sun/star/accessibility/XAccessibleGetAccFlowTo.idl
    openoffice/trunk/main/offapi/com/sun/star/accessibility/XAccessibleGroupPosition.idl
      - copied unchanged from r1541842, openoffice/branches/ia2/main/offapi/com/sun/star/accessibility/XAccessibleGroupPosition.idl
    openoffice/trunk/main/offapi/com/sun/star/accessibility/XAccessibleTableSelection.idl
      - copied unchanged from r1541842, openoffice/branches/ia2/main/offapi/com/sun/star/accessibility/XAccessibleTableSelection.idl
    openoffice/trunk/main/offapi/com/sun/star/accessibility/XAccessibleTextSelection.idl
      - copied unchanged from r1541842, openoffice/branches/ia2/main/offapi/com/sun/star/accessibility/XAccessibleTextSelection.idl
    openoffice/trunk/main/offapi/com/sun/star/accessibility/XMSAAService.idl
      - copied unchanged from r1541842, openoffice/branches/ia2/main/offapi/com/sun/star/accessibility/XMSAAService.idl
    openoffice/trunk/main/svtools/inc/svtools/accessibleruler.hxx
      - copied unchanged from r1541842, openoffice/branches/ia2/main/svtools/inc/svtools/accessibleruler.hxx
    openoffice/trunk/main/svtools/inc/svtools/vclxaccessibleheaderbar.hxx
      - copied unchanged from r1541842, openoffice/branches/ia2/main/svtools/inc/svtools/vclxaccessibleheaderbar.hxx
    openoffice/trunk/main/svtools/inc/svtools/vclxaccessibleheaderbaritem.hxx
      - copied unchanged from r1541842, openoffice/branches/ia2/main/svtools/inc/svtools/vclxaccessibleheaderbaritem.hxx
    openoffice/trunk/main/svtools/source/control/accessibleruler.cxx
      - copied unchanged from r1541842, openoffice/branches/ia2/main/svtools/source/control/accessibleruler.cxx
    openoffice/trunk/main/svtools/source/control/ruler.src
      - copied unchanged from r1541842, openoffice/branches/ia2/main/svtools/source/control/ruler.src
    openoffice/trunk/main/svtools/source/control/vclxaccessibleheaderbar.cxx
      - copied unchanged from r1541842, openoffice/branches/ia2/main/svtools/source/control/vclxaccessibleheaderbar.cxx
    openoffice/trunk/main/svtools/source/control/vclxaccessibleheaderbaritem.cxx
      - copied unchanged from r1541842, openoffice/branches/ia2/main/svtools/source/control/vclxaccessibleheaderbaritem.cxx
    openoffice/trunk/main/svx/inc/svx/AccessibleSvxFindReplaceDialog.hxx
      - copied unchanged from r1541842, openoffice/branches/ia2/main/svx/inc/svx/AccessibleSvxFindReplaceDialog.hxx
    openoffice/trunk/main/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx
      - copied unchanged from r1541842, openoffice/branches/ia2/main/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx
    openoffice/trunk/main/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
      - copied unchanged from r1541842, openoffice/branches/ia2/main/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
    openoffice/trunk/main/svx/source/inc/svxpixelctlaccessiblecontext.hxx
      - copied unchanged from r1541842, openoffice/branches/ia2/main/svx/source/inc/svxpixelctlaccessiblecontext.hxx
    openoffice/trunk/main/sw/source/core/access/accfield.cxx
      - copied unchanged from r1541842, openoffice/branches/ia2/main/sw/source/core/access/accfield.cxx
    openoffice/trunk/main/sw/source/core/access/accfield.hxx
      - copied unchanged from r1541842, openoffice/branches/ia2/main/sw/source/core/access/accfield.hxx
    openoffice/trunk/main/sw/source/core/access/accnotexthyperlink.cxx
      - copied unchanged from r1541842, openoffice/branches/ia2/main/sw/source/core/access/accnotexthyperlink.cxx
    openoffice/trunk/main/sw/source/core/access/accnotexthyperlink.hxx
      - copied unchanged from r1541842, openoffice/branches/ia2/main/sw/source/core/access/accnotexthyperlink.hxx
    openoffice/trunk/main/vcl/inc/win/g_msaasvc.h
      - copied unchanged from r1541842, openoffice/branches/ia2/main/vcl/inc/win/g_msaasvc.h
    openoffice/trunk/main/winaccessibility/
      - copied from r1541842, openoffice/branches/ia2/main/winaccessibility/
Modified:
    openoffice/trunk/   (props changed)
    openoffice/trunk/main/accessibility/inc/accessibility/extended/accessiblelistbox.hxx
    openoffice/trunk/main/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx
    openoffice/trunk/main/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx
    openoffice/trunk/main/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
    openoffice/trunk/main/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
    openoffice/trunk/main/accessibility/inc/accessibility/helper/accessiblestrings.hrc
    openoffice/trunk/main/accessibility/inc/accessibility/helper/listboxhelper.hxx
    openoffice/trunk/main/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx
    openoffice/trunk/main/accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.hxx
    openoffice/trunk/main/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx
    openoffice/trunk/main/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx
    openoffice/trunk/main/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx
    openoffice/trunk/main/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx
    openoffice/trunk/main/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx
    openoffice/trunk/main/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx
    openoffice/trunk/main/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx
    openoffice/trunk/main/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
    openoffice/trunk/main/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
    openoffice/trunk/main/accessibility/source/extended/accessibleiconchoicectrl.cxx
    openoffice/trunk/main/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
    openoffice/trunk/main/accessibility/source/extended/accessiblelistbox.cxx
    openoffice/trunk/main/accessibility/source/extended/accessiblelistboxentry.cxx
    openoffice/trunk/main/accessibility/source/extended/accessibletablistboxtable.cxx
    openoffice/trunk/main/accessibility/source/extended/textwindowaccessibility.cxx
    openoffice/trunk/main/accessibility/source/helper/accessiblestrings.src
    openoffice/trunk/main/accessibility/source/helper/characterattributeshelper.cxx
    openoffice/trunk/main/accessibility/source/standard/accessiblemenubasecomponent.cxx
    openoffice/trunk/main/accessibility/source/standard/accessiblemenuitemcomponent.cxx
    openoffice/trunk/main/accessibility/source/standard/vclxaccessiblebox.cxx
    openoffice/trunk/main/accessibility/source/standard/vclxaccessiblebutton.cxx
    openoffice/trunk/main/accessibility/source/standard/vclxaccessiblecheckbox.cxx
    openoffice/trunk/main/accessibility/source/standard/vclxaccessiblelist.cxx
    openoffice/trunk/main/accessibility/source/standard/vclxaccessiblelistitem.cxx
    openoffice/trunk/main/accessibility/source/standard/vclxaccessiblemenu.cxx
    openoffice/trunk/main/accessibility/source/standard/vclxaccessiblemenuitem.cxx
    openoffice/trunk/main/accessibility/source/standard/vclxaccessibleradiobutton.cxx
    openoffice/trunk/main/accessibility/source/standard/vclxaccessiblescrollbar.cxx
    openoffice/trunk/main/accessibility/source/standard/vclxaccessibletabcontrol.cxx
    openoffice/trunk/main/accessibility/source/standard/vclxaccessibletextcomponent.cxx
    openoffice/trunk/main/accessibility/source/standard/vclxaccessibletoolbox.cxx
    openoffice/trunk/main/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
    openoffice/trunk/main/chart2/source/controller/accessibility/AccessibleBase.cxx
    openoffice/trunk/main/chart2/source/controller/dialogs/tp_DataSource.cxx
    openoffice/trunk/main/cui/source/customize/cfg.cxx
    openoffice/trunk/main/cui/source/customize/cfg.src
    openoffice/trunk/main/cui/source/customize/macropg.cxx
    openoffice/trunk/main/cui/source/dialogs/cuigrfflt.cxx
    openoffice/trunk/main/cui/source/dialogs/iconcdlg.cxx
    openoffice/trunk/main/cui/source/inc/cuicharmap.hxx
    openoffice/trunk/main/cui/source/inc/headertablistbox.hxx
    openoffice/trunk/main/cui/source/tabpages/autocdlg.cxx
    openoffice/trunk/main/cui/source/tabpages/autocdlg.src
    openoffice/trunk/main/cui/source/tabpages/connect.hrc
    openoffice/trunk/main/cui/source/tabpages/tabarea.src
    openoffice/trunk/main/cui/source/tabpages/tparea.cxx
    openoffice/trunk/main/curl/curl-7.19.7_win.patch   (contents, props changed)
    openoffice/trunk/main/editeng/inc/editeng/AccessibleEditableTextPara.hxx
    openoffice/trunk/main/editeng/inc/editeng/editdata.hxx
    openoffice/trunk/main/editeng/inc/editeng/editeng.hxx
    openoffice/trunk/main/editeng/inc/editeng/editrids.hrc
    openoffice/trunk/main/editeng/inc/editeng/editview.hxx
    openoffice/trunk/main/editeng/inc/editeng/splwrap.hxx
    openoffice/trunk/main/editeng/inc/editeng/unoedhlp.hxx
    openoffice/trunk/main/editeng/inc/editeng/unoedprx.hxx
    openoffice/trunk/main/editeng/inc/editeng/unoedsrc.hxx
    openoffice/trunk/main/editeng/inc/editeng/unofored.hxx
    openoffice/trunk/main/editeng/inc/editeng/unoforou.hxx
    openoffice/trunk/main/editeng/inc/editeng/unotext.hxx
    openoffice/trunk/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx
    openoffice/trunk/main/editeng/source/accessibility/AccessibleHyperlink.cxx
    openoffice/trunk/main/editeng/source/accessibility/AccessibleParaManager.cxx
    openoffice/trunk/main/editeng/source/accessibility/AccessibleStaticTextBase.cxx
    openoffice/trunk/main/editeng/source/accessibility/accessibility.src
    openoffice/trunk/main/editeng/source/editeng/editdoc.hxx
    openoffice/trunk/main/editeng/source/editeng/edtspell.cxx
    openoffice/trunk/main/editeng/source/editeng/impedit.cxx
    openoffice/trunk/main/editeng/source/editeng/impedit.hxx
    openoffice/trunk/main/editeng/source/editeng/impedit2.cxx
    openoffice/trunk/main/editeng/source/editeng/impedit3.cxx
    openoffice/trunk/main/editeng/source/misc/splwrap.cxx
    openoffice/trunk/main/editeng/source/outliner/outliner.cxx
    openoffice/trunk/main/editeng/source/outliner/outlvw.cxx
    openoffice/trunk/main/editeng/source/uno/unoedhlp.cxx
    openoffice/trunk/main/editeng/source/uno/unoedprx.cxx
    openoffice/trunk/main/editeng/source/uno/unofored.cxx
    openoffice/trunk/main/editeng/source/uno/unoforou.cxx
    openoffice/trunk/main/editeng/source/uno/unonrule.cxx
    openoffice/trunk/main/editeng/source/uno/unotext.cxx
    openoffice/trunk/main/filter/source/pdf/impdialog.cxx
    openoffice/trunk/main/formula/source/ui/dlg/ControlHelper.hxx
    openoffice/trunk/main/formula/source/ui/dlg/formdlgs.src
    openoffice/trunk/main/formula/source/ui/dlg/funcutl.cxx
    openoffice/trunk/main/formula/source/ui/dlg/parawin.cxx
    openoffice/trunk/main/framework/source/loadenv/loadenv.cxx
    openoffice/trunk/main/graphite/graphite-2.3.1.patch
    openoffice/trunk/main/offapi/com/sun/star/accessibility/AccessibleEventId.idl
    openoffice/trunk/main/offapi/com/sun/star/accessibility/AccessibleRelationType.idl
    openoffice/trunk/main/offapi/com/sun/star/accessibility/AccessibleStateType.idl
    openoffice/trunk/main/offapi/com/sun/star/accessibility/XAccessibleTable.idl
    openoffice/trunk/main/offapi/com/sun/star/accessibility/XAccessibleValue.idl
    openoffice/trunk/main/offapi/com/sun/star/accessibility/makefile.mk
    openoffice/trunk/main/postprocess/packcomponents/makefile.mk
    openoffice/trunk/main/postprocess/prj/build.lst
    openoffice/trunk/main/sc/inc/chgtrack.hxx
    openoffice/trunk/main/sc/inc/detfunc.hxx
    openoffice/trunk/main/sc/inc/document.hxx
    openoffice/trunk/main/sc/inc/dptablecache.hxx
    openoffice/trunk/main/sc/inc/drwlayer.hxx
    openoffice/trunk/main/sc/inc/table.hxx
    openoffice/trunk/main/sc/source/core/data/documen2.cxx
    openoffice/trunk/main/sc/source/core/data/document.cxx
    openoffice/trunk/main/sc/source/core/data/dpsave.cxx
    openoffice/trunk/main/sc/source/core/data/dptablecache.cxx
    openoffice/trunk/main/sc/source/core/data/drwlayer.cxx
    openoffice/trunk/main/sc/source/core/data/table2.cxx
    openoffice/trunk/main/sc/source/core/tool/detfunc.cxx
    openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleCell.cxx
    openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleCellBase.cxx
    openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
    openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocument.cxx
    openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx
    openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
    openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleEditObject.cxx
    openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
    openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleTableBase.cxx
    openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleText.cxx
    openoffice/trunk/main/sc/source/ui/dbgui/dbnamdlg.cxx
    openoffice/trunk/main/sc/source/ui/docshell/docsh.cxx
    openoffice/trunk/main/sc/source/ui/drawfunc/fudraw.cxx
    openoffice/trunk/main/sc/source/ui/inc/AccessibleCell.hxx
    openoffice/trunk/main/sc/source/ui/inc/AccessibleCellBase.hxx
    openoffice/trunk/main/sc/source/ui/inc/AccessibleDocument.hxx
    openoffice/trunk/main/sc/source/ui/inc/AccessibleDocumentBase.hxx
    openoffice/trunk/main/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx
    openoffice/trunk/main/sc/source/ui/inc/AccessibleEditObject.hxx
    openoffice/trunk/main/sc/source/ui/inc/AccessibleSpreadsheet.hxx
    openoffice/trunk/main/sc/source/ui/inc/AccessibleTableBase.hxx
    openoffice/trunk/main/sc/source/ui/inc/AccessibleText.hxx
    openoffice/trunk/main/sc/source/ui/inc/content.hxx
    openoffice/trunk/main/sc/source/ui/inc/dbnamdlg.hxx
    openoffice/trunk/main/sc/source/ui/inc/docsh.hxx
    openoffice/trunk/main/sc/source/ui/inc/drawview.hxx
    openoffice/trunk/main/sc/source/ui/inc/gridwin.hxx
    openoffice/trunk/main/sc/source/ui/inc/preview.hxx
    openoffice/trunk/main/sc/source/ui/inc/scuitphfedit.hxx
    openoffice/trunk/main/sc/source/ui/inc/tabview.hxx
    openoffice/trunk/main/sc/source/ui/inc/tabvwsh.hxx
    openoffice/trunk/main/sc/source/ui/inc/tphfedit.hxx
    openoffice/trunk/main/sc/source/ui/inc/validate.hxx
    openoffice/trunk/main/sc/source/ui/inc/viewfunc.hxx
    openoffice/trunk/main/sc/source/ui/miscdlgs/highred.cxx
    openoffice/trunk/main/sc/source/ui/miscdlgs/solveroptions.cxx
    openoffice/trunk/main/sc/source/ui/navipi/content.cxx
    openoffice/trunk/main/sc/source/ui/navipi/navipi.cxx
    openoffice/trunk/main/sc/source/ui/pagedlg/scuitphfedit.cxx
    openoffice/trunk/main/sc/source/ui/pagedlg/tphfedit.cxx
    openoffice/trunk/main/sc/source/ui/view/drawview.cxx
    openoffice/trunk/main/sc/source/ui/view/gridwin.cxx
    openoffice/trunk/main/sc/source/ui/view/gridwin3.cxx
    openoffice/trunk/main/sc/source/ui/view/gridwin5.cxx
    openoffice/trunk/main/sc/source/ui/view/output.cxx
    openoffice/trunk/main/sc/source/ui/view/preview.cxx
    openoffice/trunk/main/sc/source/ui/view/select.cxx
    openoffice/trunk/main/sc/source/ui/view/tabview2.cxx
    openoffice/trunk/main/sc/source/ui/view/tabvwsh.cxx
    openoffice/trunk/main/sc/source/ui/view/tabvwsh4.cxx
    openoffice/trunk/main/sc/source/ui/view/tabvwshe.cxx
    openoffice/trunk/main/sc/source/ui/view/viewfun2.cxx
    openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
    openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp
    openoffice/trunk/main/sd/inc/drawdoc.hxx
    openoffice/trunk/main/sd/inc/glob.hxx
    openoffice/trunk/main/sd/source/core/drawdoc.cxx
    openoffice/trunk/main/sd/source/core/drawdoc2.cxx
    openoffice/trunk/main/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
    openoffice/trunk/main/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
    openoffice/trunk/main/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
    openoffice/trunk/main/sd/source/ui/accessibility/AccessibleOutlineView.cxx
    openoffice/trunk/main/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx
    openoffice/trunk/main/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
    openoffice/trunk/main/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
    openoffice/trunk/main/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
    openoffice/trunk/main/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
    openoffice/trunk/main/sd/source/ui/accessibility/accessibility.hrc
    openoffice/trunk/main/sd/source/ui/accessibility/accessibility.src
    openoffice/trunk/main/sd/source/ui/dlg/navigatr.cxx
    openoffice/trunk/main/sd/source/ui/dlg/sdtreelb.cxx
    openoffice/trunk/main/sd/source/ui/docshell/docshel4.cxx
    openoffice/trunk/main/sd/source/ui/func/fudraw.cxx
    openoffice/trunk/main/sd/source/ui/func/fuediglu.cxx
    openoffice/trunk/main/sd/source/ui/func/fusel.cxx
    openoffice/trunk/main/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
    openoffice/trunk/main/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
    openoffice/trunk/main/sd/source/ui/inc/AccessibleOutlineView.hxx
    openoffice/trunk/main/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx
    openoffice/trunk/main/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx
    openoffice/trunk/main/sd/source/ui/inc/AccessiblePresentationShape.hxx
    openoffice/trunk/main/sd/source/ui/inc/AccessibleSlideSorterView.hxx
    openoffice/trunk/main/sd/source/ui/inc/AccessibleSlideView.hxx
    openoffice/trunk/main/sd/source/ui/inc/DrawController.hxx
    openoffice/trunk/main/sd/source/ui/inc/DrawDocShell.hxx
    openoffice/trunk/main/sd/source/ui/inc/DrawViewShell.hxx
    openoffice/trunk/main/sd/source/ui/inc/OutlineViewShell.hxx
    openoffice/trunk/main/sd/source/ui/inc/SdUnoDrawView.hxx
    openoffice/trunk/main/sd/source/ui/inc/SlideSorterViewShell.hxx
    openoffice/trunk/main/sd/source/ui/inc/SlideViewShell.hxx
    openoffice/trunk/main/sd/source/ui/inc/TabControl.hxx
    openoffice/trunk/main/sd/source/ui/inc/ViewShell.hxx
    openoffice/trunk/main/sd/source/ui/inc/Window.hxx
    openoffice/trunk/main/sd/source/ui/inc/fuediglu.hxx
    openoffice/trunk/main/sd/source/ui/inc/fusel.hxx
    openoffice/trunk/main/sd/source/ui/inc/navigatr.hxx
    openoffice/trunk/main/sd/source/ui/inc/sdtreelb.hxx
    openoffice/trunk/main/sd/source/ui/slideshow/showwin.cxx
    openoffice/trunk/main/sd/source/ui/slideshow/showwindow.hxx
    openoffice/trunk/main/sd/source/ui/slideshow/slideshow.cxx
    openoffice/trunk/main/sd/source/ui/slideshow/slideshowimpl.cxx
    openoffice/trunk/main/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx
    openoffice/trunk/main/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
    openoffice/trunk/main/sd/source/ui/unoidl/DrawController.cxx
    openoffice/trunk/main/sd/source/ui/unoidl/SdUnoDrawView.cxx
    openoffice/trunk/main/sd/source/ui/view/Outliner.cxx
    openoffice/trunk/main/sd/source/ui/view/drviews4.cxx
    openoffice/trunk/main/sd/source/ui/view/drviews5.cxx
    openoffice/trunk/main/sd/source/ui/view/outlnvsh.cxx
    openoffice/trunk/main/sd/source/ui/view/sdwindow.cxx
    openoffice/trunk/main/sd/source/ui/view/tabcontr.cxx
    openoffice/trunk/main/sd/source/ui/view/viewshel.cxx
    openoffice/trunk/main/sfx2/inc/sfx2/dinfdlg.hxx
    openoffice/trunk/main/sfx2/source/dialog/newstyle.cxx
    openoffice/trunk/main/sfx2/source/dialog/tabdlg.cxx
    openoffice/trunk/main/sfx2/source/dialog/templdlg.hrc
    openoffice/trunk/main/sfx2/source/menu/mnuitem.cxx
    openoffice/trunk/main/sfx2/source/view/viewfrm.cxx
    openoffice/trunk/main/soldep/source/soldep.cxx
    openoffice/trunk/main/solenv/inc/lldb4aoo.py
    openoffice/trunk/main/starmath/source/accessibility.cxx
    openoffice/trunk/main/starmath/source/accessibility.hxx
    openoffice/trunk/main/svtools/AllLangResTarget_svt.mk
    openoffice/trunk/main/svtools/Library_svt.mk
    openoffice/trunk/main/svtools/Package_inc.mk
    openoffice/trunk/main/svtools/inc/svtools/embedhlp.hxx
    openoffice/trunk/main/svtools/inc/svtools/headbar.hxx
    openoffice/trunk/main/svtools/inc/svtools/ruler.hxx
    openoffice/trunk/main/svtools/inc/svtools/svlbitm.hxx
    openoffice/trunk/main/svtools/inc/svtools/svlbox.hxx
    openoffice/trunk/main/svtools/inc/svtools/svtools.hrc
    openoffice/trunk/main/svtools/inc/svtools/svtreebx.hxx
    openoffice/trunk/main/svtools/inc/svtools/texteng.hxx
    openoffice/trunk/main/svtools/inc/svtools/treelist.hxx
    openoffice/trunk/main/svtools/inc/svtools/valueset.hxx
    openoffice/trunk/main/svtools/source/brwbox/brwbox3.cxx
    openoffice/trunk/main/svtools/source/brwbox/editbrowsebox.cxx
    openoffice/trunk/main/svtools/source/contnr/imivctl1.cxx
    openoffice/trunk/main/svtools/source/contnr/svimpbox.cxx
    openoffice/trunk/main/svtools/source/contnr/svtabbx.cxx
    openoffice/trunk/main/svtools/source/contnr/svtreebx.cxx
    openoffice/trunk/main/svtools/source/control/headbar.cxx
    openoffice/trunk/main/svtools/source/control/ruler.cxx
    openoffice/trunk/main/svtools/source/control/valueacc.cxx
    openoffice/trunk/main/svtools/source/control/valueimp.hxx
    openoffice/trunk/main/svtools/source/control/valueset.cxx
    openoffice/trunk/main/svtools/source/edit/svmedit.cxx
    openoffice/trunk/main/svtools/source/misc/acceleratorexecute.cxx
    openoffice/trunk/main/svtools/source/misc/embedhlp.cxx
    openoffice/trunk/main/svx/Library_svx.mk
    openoffice/trunk/main/svx/inc/svx/AccessibleControlShape.hxx
    openoffice/trunk/main/svx/inc/svx/AccessibleGraphicShape.hxx
    openoffice/trunk/main/svx/inc/svx/AccessibleOLEShape.hxx
    openoffice/trunk/main/svx/inc/svx/AccessibleShape.hxx
    openoffice/trunk/main/svx/inc/svx/AccessibleTableShape.hxx
    openoffice/trunk/main/svx/inc/svx/ChildrenManager.hxx
    openoffice/trunk/main/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx
    openoffice/trunk/main/svx/inc/svx/IAccessibleParent.hxx
    openoffice/trunk/main/svx/inc/svx/ctredlin.hxx
    openoffice/trunk/main/svx/inc/svx/dlgctrl.hxx
    openoffice/trunk/main/svx/inc/svx/nbdtmg.hxx
    openoffice/trunk/main/svx/inc/svx/sdr/table/tablecontroller.hxx
    openoffice/trunk/main/svx/inc/svx/srchdlg.hxx
    openoffice/trunk/main/svx/inc/svx/svdmodel.hxx
    openoffice/trunk/main/svx/inc/svx/svdmrkv.hxx
    openoffice/trunk/main/svx/inc/svx/svdoashp.hxx
    openoffice/trunk/main/svx/inc/svx/svdobj.hxx
    openoffice/trunk/main/svx/inc/svx/svdoole2.hxx
    openoffice/trunk/main/svx/source/accessibility/AccessibleControlShape.cxx
    openoffice/trunk/main/svx/source/accessibility/AccessibleEmptyEditSource.cxx
    openoffice/trunk/main/svx/source/accessibility/AccessibleFrameSelector.cxx
    openoffice/trunk/main/svx/source/accessibility/AccessibleGraphicShape.cxx
    openoffice/trunk/main/svx/source/accessibility/AccessibleOLEShape.cxx
    openoffice/trunk/main/svx/source/accessibility/AccessibleShape.cxx
    openoffice/trunk/main/svx/source/accessibility/AccessibleTextHelper.cxx
    openoffice/trunk/main/svx/source/accessibility/ChildrenManager.cxx
    openoffice/trunk/main/svx/source/accessibility/ChildrenManagerImpl.cxx
    openoffice/trunk/main/svx/source/accessibility/ChildrenManagerImpl.hxx
    openoffice/trunk/main/svx/source/accessibility/ShapeTypeHandler.cxx
    openoffice/trunk/main/svx/source/accessibility/charmapacc.cxx
    openoffice/trunk/main/svx/source/accessibility/svxrectctaccessiblecontext.cxx
    openoffice/trunk/main/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
    openoffice/trunk/main/svx/source/dialog/_bmpmask.cxx
    openoffice/trunk/main/svx/source/dialog/charmap.cxx
    openoffice/trunk/main/svx/source/dialog/ctredlin.cxx
    openoffice/trunk/main/svx/source/dialog/ctredlin.src
    openoffice/trunk/main/svx/source/dialog/dlgctrl.cxx
    openoffice/trunk/main/svx/source/dialog/frmsel.cxx
    openoffice/trunk/main/svx/source/dialog/srchdlg.cxx
    openoffice/trunk/main/svx/source/inc/AccessibleFrameSelector.hxx
    openoffice/trunk/main/svx/source/inc/svxrectctaccessiblecontext.hxx
    openoffice/trunk/main/svx/source/sidebar/nbdtmg.cxx
    openoffice/trunk/main/svx/source/svdraw/svdoashp.cxx
    openoffice/trunk/main/svx/source/svdraw/svdobj.cxx
    openoffice/trunk/main/svx/source/svdraw/svdoole2.cxx
    openoffice/trunk/main/svx/source/table/accessiblecell.cxx
    openoffice/trunk/main/svx/source/table/accessiblecell.hxx
    openoffice/trunk/main/svx/source/table/accessibletableshape.cxx
    openoffice/trunk/main/svx/source/table/tablecontroller.cxx
    openoffice/trunk/main/svx/source/unodraw/unoprov.cxx
    openoffice/trunk/main/svx/source/unodraw/unoshtxt.cxx
    openoffice/trunk/main/sw/Library_sw.mk
    openoffice/trunk/main/sw/inc/PostItMgr.hxx
    openoffice/trunk/main/sw/inc/access.hrc
    openoffice/trunk/main/sw/inc/accmap.hxx
    openoffice/trunk/main/sw/inc/crsrsh.hxx
    openoffice/trunk/main/sw/inc/doc.hxx
    openoffice/trunk/main/sw/inc/docsh.hxx
    openoffice/trunk/main/sw/inc/fesh.hxx
    openoffice/trunk/main/sw/inc/fldbas.hxx
    openoffice/trunk/main/sw/inc/frmfmt.hxx
    openoffice/trunk/main/sw/inc/mdiexp.hxx
    openoffice/trunk/main/sw/inc/ndole.hxx
    openoffice/trunk/main/sw/inc/node.hxx
    openoffice/trunk/main/sw/inc/tblsel.hxx
    openoffice/trunk/main/sw/inc/viewsh.hxx
    openoffice/trunk/main/sw/source/core/access/acccell.cxx
    openoffice/trunk/main/sw/source/core/access/acccell.hxx
    openoffice/trunk/main/sw/source/core/access/acccontext.cxx
    openoffice/trunk/main/sw/source/core/access/acccontext.hxx
    openoffice/trunk/main/sw/source/core/access/accdoc.cxx
    openoffice/trunk/main/sw/source/core/access/accdoc.hxx
    openoffice/trunk/main/sw/source/core/access/accembedded.cxx
    openoffice/trunk/main/sw/source/core/access/accembedded.hxx
    openoffice/trunk/main/sw/source/core/access/accfootnote.cxx
    openoffice/trunk/main/sw/source/core/access/accfootnote.hxx
    openoffice/trunk/main/sw/source/core/access/accframe.cxx
    openoffice/trunk/main/sw/source/core/access/accframe.hxx
    openoffice/trunk/main/sw/source/core/access/accframebase.cxx
    openoffice/trunk/main/sw/source/core/access/accframebase.hxx
    openoffice/trunk/main/sw/source/core/access/accfrmobj.cxx
    openoffice/trunk/main/sw/source/core/access/accfrmobj.hxx
    openoffice/trunk/main/sw/source/core/access/accfrmobjmap.cxx
    openoffice/trunk/main/sw/source/core/access/accfrmobjmap.hxx
    openoffice/trunk/main/sw/source/core/access/accgraphic.cxx
    openoffice/trunk/main/sw/source/core/access/accgraphic.hxx
    openoffice/trunk/main/sw/source/core/access/accheaderfooter.cxx
    openoffice/trunk/main/sw/source/core/access/accheaderfooter.hxx
    openoffice/trunk/main/sw/source/core/access/acchyperlink.cxx
    openoffice/trunk/main/sw/source/core/access/accmap.cxx
    openoffice/trunk/main/sw/source/core/access/accnotextframe.cxx
    openoffice/trunk/main/sw/source/core/access/accnotextframe.hxx
    openoffice/trunk/main/sw/source/core/access/accpara.cxx
    openoffice/trunk/main/sw/source/core/access/accpara.hxx
    openoffice/trunk/main/sw/source/core/access/accportions.cxx
    openoffice/trunk/main/sw/source/core/access/accportions.hxx
    openoffice/trunk/main/sw/source/core/access/accpreview.cxx
    openoffice/trunk/main/sw/source/core/access/accpreview.hxx
    openoffice/trunk/main/sw/source/core/access/accselectionhelper.cxx
    openoffice/trunk/main/sw/source/core/access/acctable.cxx
    openoffice/trunk/main/sw/source/core/access/acctable.hxx
    openoffice/trunk/main/sw/source/core/access/acctextframe.cxx
    openoffice/trunk/main/sw/source/core/access/acctextframe.hxx
    openoffice/trunk/main/sw/source/core/attr/format.cxx
    openoffice/trunk/main/sw/source/core/crsr/crsrsh.cxx
    openoffice/trunk/main/sw/source/core/doc/tblcpy.cxx
    openoffice/trunk/main/sw/source/core/docnode/node.cxx
    openoffice/trunk/main/sw/source/core/docnode/nodes.cxx
    openoffice/trunk/main/sw/source/core/edit/ednumber.cxx
    openoffice/trunk/main/sw/source/core/frmedt/feshview.cxx
    openoffice/trunk/main/sw/source/core/frmedt/tblsel.cxx
    openoffice/trunk/main/sw/source/core/inc/SwPortionHandler.hxx
    openoffice/trunk/main/sw/source/core/inc/doctxm.hxx
    openoffice/trunk/main/sw/source/core/inc/frame.hxx
    openoffice/trunk/main/sw/source/core/inc/txtfrm.hxx
    openoffice/trunk/main/sw/source/core/inc/viewimp.hxx
    openoffice/trunk/main/sw/source/core/layout/atrfrm.cxx
    openoffice/trunk/main/sw/source/core/layout/wsfrm.cxx
    openoffice/trunk/main/sw/source/core/ole/ndole.cxx
    openoffice/trunk/main/sw/source/core/text/frmform.cxx
    openoffice/trunk/main/sw/source/core/text/porfld.cxx
    openoffice/trunk/main/sw/source/core/text/porfld.hxx
    openoffice/trunk/main/sw/source/core/text/txtfld.cxx
    openoffice/trunk/main/sw/source/core/unocore/unomap.cxx
    openoffice/trunk/main/sw/source/core/view/viewimp.cxx
    openoffice/trunk/main/sw/source/filter/ww8/wrtw8esh.cxx
    openoffice/trunk/main/sw/source/ui/app/docsh.cxx
    openoffice/trunk/main/sw/source/ui/cctrl/actctrl.cxx
    openoffice/trunk/main/sw/source/ui/cctrl/swlbox.cxx
    openoffice/trunk/main/sw/source/ui/chrdlg/swuiccoll.cxx
    openoffice/trunk/main/sw/source/ui/dialog/uiregionsw.cxx
    openoffice/trunk/main/sw/source/ui/docvw/edtwin.cxx
    openoffice/trunk/main/sw/source/ui/docvw/edtwin3.cxx
    openoffice/trunk/main/sw/source/ui/frmdlg/column.cxx
    openoffice/trunk/main/sw/source/ui/frmdlg/column.hrc
    openoffice/trunk/main/sw/source/ui/frmdlg/frmpage.cxx
    openoffice/trunk/main/sw/source/ui/inc/conttree.hxx
    openoffice/trunk/main/sw/source/ui/inc/edtwin.hxx
    openoffice/trunk/main/sw/source/ui/inc/pview.hxx
    openoffice/trunk/main/sw/source/ui/inc/swlbox.hxx
    openoffice/trunk/main/sw/source/ui/inc/swuicnttab.hxx
    openoffice/trunk/main/sw/source/ui/inc/view.hxx
    openoffice/trunk/main/sw/source/ui/index/cnttab.cxx
    openoffice/trunk/main/sw/source/ui/index/cnttab.hrc
    openoffice/trunk/main/sw/source/ui/index/cnttab.src
    openoffice/trunk/main/sw/source/ui/misc/glossary.hrc
    openoffice/trunk/main/sw/source/ui/ribbar/inputwin.cxx
    openoffice/trunk/main/sw/source/ui/ribbar/inputwin.hrc
    openoffice/trunk/main/sw/source/ui/ribbar/inputwin.src
    openoffice/trunk/main/sw/source/ui/ribbar/workctrl.cxx
    openoffice/trunk/main/sw/source/ui/shells/textsh1.cxx
    openoffice/trunk/main/sw/source/ui/shells/txtnum.cxx
    openoffice/trunk/main/sw/source/ui/table/convert.hrc
    openoffice/trunk/main/sw/source/ui/table/tabledlg.cxx
    openoffice/trunk/main/sw/source/ui/table/tabledlg.hrc
    openoffice/trunk/main/sw/source/ui/uiview/pview.cxx
    openoffice/trunk/main/sw/source/ui/uiview/view.cxx
    openoffice/trunk/main/sw/source/ui/uiview/view2.cxx
    openoffice/trunk/main/sw/source/ui/uiview/viewsrch.cxx
    openoffice/trunk/main/sw/source/ui/utlui/content.cxx
    openoffice/trunk/main/sw/source/ui/utlui/navipi.hrc
    openoffice/trunk/main/sw/source/ui/wrtsh/select.cxx
    openoffice/trunk/main/toolkit/inc/toolkit/awt/vclxwindows.hxx
    openoffice/trunk/main/toolkit/source/awt/vclxaccessiblecomponent.cxx
    openoffice/trunk/main/toolkit/source/awt/vclxtoolkit.cxx
    openoffice/trunk/main/toolkit/source/awt/vclxwindows.cxx
    openoffice/trunk/main/vcl/inc/ilstbox.hxx
    openoffice/trunk/main/vcl/inc/svdata.hxx
    openoffice/trunk/main/vcl/inc/vcl/combobox.hxx
    openoffice/trunk/main/vcl/inc/vcl/lstbox.hxx
    openoffice/trunk/main/vcl/inc/vcl/menu.hxx
    openoffice/trunk/main/vcl/inc/vcl/svapp.hxx
    openoffice/trunk/main/vcl/inc/vcl/vclevent.hxx
    openoffice/trunk/main/vcl/inc/vcl/window.hxx
    openoffice/trunk/main/vcl/source/app/svapp.cxx
    openoffice/trunk/main/vcl/source/app/svdata.cxx
    openoffice/trunk/main/vcl/source/app/svmain.cxx
    openoffice/trunk/main/vcl/source/control/combobox.cxx
    openoffice/trunk/main/vcl/source/control/edit.cxx
    openoffice/trunk/main/vcl/source/control/ilstbox.cxx
    openoffice/trunk/main/vcl/source/control/lstbox.cxx
    openoffice/trunk/main/vcl/source/control/morebtn.cxx
    openoffice/trunk/main/vcl/source/control/tabctrl.cxx
    openoffice/trunk/main/vcl/source/window/btndlg.cxx
    openoffice/trunk/main/vcl/source/window/dlgctrl.cxx
    openoffice/trunk/main/vcl/source/window/menu.cxx
    openoffice/trunk/main/vcl/source/window/toolbox.cxx
    openoffice/trunk/main/vcl/source/window/toolbox2.cxx
    openoffice/trunk/main/vcl/source/window/window.cxx
    openoffice/trunk/main/vcl/win/source/window/salframe.cxx
    openoffice/trunk/test/   (props changed)
    openoffice/trunk/test/testcommon/source/org/openoffice/test/vcl/   (props changed)

Propchange: openoffice/trunk/
------------------------------------------------------------------------------
  Merged /openoffice/branches/ia2:r1417739-1541842

Modified: openoffice/trunk/main/accessibility/inc/accessibility/extended/accessiblelistbox.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/inc/accessibility/extended/accessiblelistbox.hxx?rev=1541847&r1=1541846&r2=1541847&view=diff
==============================================================================
--- openoffice/trunk/main/accessibility/inc/accessibility/extended/accessiblelistbox.hxx (original)
+++ openoffice/trunk/main/accessibility/inc/accessibility/extended/accessiblelistbox.hxx Thu Nov 14 08:18:05 2013
@@ -30,14 +30,16 @@
 #include <vcl/vclevent.hxx>
 #include <toolkit/awt/vclxaccessiblecomponent.hxx>
 
+#include <map>
 
 // class AccessibleListBox -----------------------------------------------
 
 class SvTreeListBox;
-
+class SvLBoxEntry;
 //........................................................................
 namespace accessibility
 {
+	class AccessibleListBoxEntry;
 //........................................................................
 
 	typedef ::cppu::ImplHelper2<  ::com::sun::star::accessibility::XAccessible
@@ -65,6 +67,8 @@ namespace accessibility
 		virtual void	FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
 
 		SvTreeListBox*	getListBox() const;
+		
+		void 			RemoveChildEntries(SvLBoxEntry*);
 
 	public:
 		/** OAccessibleBase needs a valid view
@@ -111,6 +115,19 @@ namespace accessibility
 		sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
 		::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
 		void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+		// IA2 CWS
+		sal_Int32 SAL_CALL getRoleType();
+		
+private:
+
+	typedef std::map< SvLBoxEntry*, ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > > MAP_ENTRY;
+	MAP_ENTRY m_mapEntry;
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xFocusedChild; 	
+	
+	accessibility::AccessibleListBoxEntry* GetCurEventEntry( const VclWindowEvent& rVclWindowEvent );
+
 	};
 
 //........................................................................

Modified: openoffice/trunk/main/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx?rev=1541847&r1=1541846&r2=1541847&view=diff
==============================================================================
--- openoffice/trunk/main/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx (original)
+++ openoffice/trunk/main/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx Thu Nov 14 08:18:05 2013
@@ -35,7 +35,15 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
+/*
 #include <cppuhelper/compbase8.hxx>
+*/
+#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEVALUE_HPP_
+#include <com/sun/star/accessibility/XAccessibleValue.hpp>
+#endif
+#ifndef _CPPUHELPER_COMPBASE9_HXX_
+#include <cppuhelper/compbase9.hxx>
+#endif
 #include <comphelper/broadcasthelper.hxx>
 #include <comphelper/accessibletexthelper.hxx>
 #include <tools/gen.hxx>
@@ -59,7 +67,7 @@ namespace accessibility
 //........................................................................
 
 // class AccessibleListBoxEntry ------------------------------------------
-
+/*
 	typedef ::cppu::WeakAggComponentImplHelper8< ::com::sun::star::accessibility::XAccessible
 												, ::com::sun::star::accessibility::XAccessibleContext
 												, ::com::sun::star::accessibility::XAccessibleComponent
@@ -68,7 +76,17 @@ namespace accessibility
 												, ::com::sun::star::accessibility::XAccessibleSelection
 												, ::com::sun::star::accessibility::XAccessibleText
 										    	, ::com::sun::star::lang::XServiceInfo > AccessibleListBoxEntry_BASE;
-
+*/
+	typedef ::cppu::WeakAggComponentImplHelper9< ::com::sun::star::accessibility::XAccessible
+												, ::com::sun::star::accessibility::XAccessibleContext
+												, ::com::sun::star::accessibility::XAccessibleComponent
+												, ::com::sun::star::accessibility::XAccessibleEventBroadcaster
+												, ::com::sun::star::accessibility::XAccessibleAction
+												, ::com::sun::star::accessibility::XAccessibleSelection
+												, ::com::sun::star::accessibility::XAccessibleText
+												, ::com::sun::star::accessibility::XAccessibleValue
+										    	, ::com::sun::star::lang::XServiceInfo > AccessibleListBoxEntry_BASE;
+										    	
 	/** the class AccessibleListBoxEntry represents the class for an accessible object of a listbox entry */
 	class AccessibleListBoxEntry:public ::comphelper::OBaseMutex
 							   	,public AccessibleListBoxEntry_BASE
@@ -81,6 +99,8 @@ namespace accessibility
 		/** The treelistbox control */
 		SvTreeListBox*						m_pListBox;
 		::std::deque< sal_Int32 >			m_aEntryPath;
+		SvLBoxEntry* 						m_pSvLBoxEntry;	// IA2 CWS. Needed for focused item...
+		
 
 	protected:
         /// client id in the AccessibleEventNotifier queue
@@ -99,6 +119,8 @@ namespace accessibility
 		Rectangle				GetBoundingBoxOnScreen() throw ( ::com::sun::star::lang::DisposedException );
     	void 					EnsureIsAlive() const throw ( ::com::sun::star::lang::DisposedException );
 
+		void	NotifyAccessibleEvent( sal_Int16 _nEventId, const ::com::sun::star::uno::Any& _aOldValue, const ::com::sun::star::uno::Any& _aNewValue );
+
 	protected:
 		virtual ~AccessibleListBoxEntry();
 
@@ -126,6 +148,9 @@ namespace accessibility
 		AccessibleListBoxEntry(	SvTreeListBox& _rListBox, SvLBoxEntry* _pEntry,
 								const ::com::sun::star::uno::Reference<
 									::com::sun::star::accessibility::XAccessible >& _xParent );
+									
+		SvLBoxEntry* GetSvLBoxEntry() const { return m_pSvLBoxEntry; }
+									
 
 	protected:
 		// XTypeProvider
@@ -206,9 +231,15 @@ namespace accessibility
 		sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
 		::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
 		void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-
+		virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue(  ) throw (::com::sun::star::uno::RuntimeException);
+		virtual sal_Bool SAL_CALL setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) throw (::com::sun::star::uno::RuntimeException);
+		virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue(  ) throw (::com::sun::star::uno::RuntimeException);
+		virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue(  ) throw (::com::sun::star::uno::RuntimeException);
     private:
         ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > implGetParentAccessible( ) const;
+		SvLBoxEntry* GetRealChild(sal_Int32 nIndex);
+	public:
+		sal_Int32 SAL_CALL getRoleType();
 	};
 
 //........................................................................

Modified: openoffice/trunk/main/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx?rev=1541847&r1=1541846&r2=1541847&view=diff
==============================================================================
--- openoffice/trunk/main/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx (original)
+++ openoffice/trunk/main/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx Thu Nov 14 08:18:05 2013
@@ -42,6 +42,8 @@ class AccessibleTabListBoxTable : public
 {
 private:
 	SvHeaderTabListBox*		m_pTabListBox;
+	
+	::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >  m_xCurChild;
 
 	void					ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
 	DECL_LINK(      		WindowEventListener, VclSimpleEvent* );

Modified: openoffice/trunk/main/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx?rev=1541847&r1=1541846&r2=1541847&view=diff
==============================================================================
--- openoffice/trunk/main/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx (original)
+++ openoffice/trunk/main/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx Thu Nov 14 08:18:05 2013
@@ -52,6 +52,22 @@
 #include <comphelper/accessibletexthelper.hxx>
 #include <rtl/ref.hxx>
 
+// IAccessible2 implementation, 2009
+#ifndef _SVTOOLS_HRC 
+#include "svtools/svtools.hrc" 
+#endif
+#ifndef _SVTOOLS_SVTDATA_HXX 
+#include "svtools/svtdata.hxx" 
+#endif
+#ifndef _SV_SVAPP_HXX 
+#include <vcl/svapp.hxx> 
+#endif
+#ifndef _UTL_ACCESSIBLERELATIONSETHELPER_HXX_
+#include <unotools/accessiblerelationsethelper.hxx>
+#endif
+#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLERELATIONTYPE_HPP_
+#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
+#endif
 #include <memory>
 #include <queue>
 #include <hash_map>
@@ -578,7 +594,9 @@ private:
     virtual ::css::uno::Reference< ::css::accessibility::XAccessible >
     SAL_CALL getAccessibleAtPoint(::css::awt::Point const & rPoint)
         throw (::css::uno::RuntimeException);
-
+// IAccessible2 implementation, 2009
+    virtual void	FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+   virtual void	FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet );
     // ??? Will be called with both the external (Solar) and internal mutex
     // locked:
     virtual void SAL_CALL disposing();
@@ -630,6 +648,9 @@ private:
     void handleSelectionChangeNotification();
 
     void notifySelectionChange( sal_Int32 nFirst, sal_Int32 nLast );
+// IAccessible2 implementation, 2009
+    ::sal_Int32 getSelectionType(::sal_Int32 nNewFirstPara, ::sal_Int32 nNewFirstPos, ::sal_Int32 nNewLastPara, ::sal_Int32 nNewLastPos);
+    void sendEvent(::sal_Int32 start, ::sal_Int32 end, ::sal_Int16 nEventId);
 
     void justifySelection( TextPaM& rTextStart, TextPaM& rTextEnd );
 

Modified: openoffice/trunk/main/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx?rev=1541847&r1=1541846&r2=1541847&view=diff
==============================================================================
--- openoffice/trunk/main/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx (original)
+++ openoffice/trunk/main/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx Thu Nov 14 08:18:05 2013
@@ -42,6 +42,7 @@ namespace accessibility
 		virtual Rectangle		GetBoundingRectangle( sal_uInt16 nItem ) const = 0;
 		virtual Rectangle		GetWindowExtentsRelative( Window* pRelativeWindow ) = 0;
 		virtual sal_Bool        	IsActive() const = 0;
+		virtual sal_Bool        IsEnabled() const = 0;
 		virtual sal_Bool			IsEntryVisible( sal_uInt16 nPos ) const = 0;
 		virtual sal_uInt16			GetDisplayLineCount() const = 0;
 		virtual void            GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const = 0;

Modified: openoffice/trunk/main/accessibility/inc/accessibility/helper/accessiblestrings.hrc
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/inc/accessibility/helper/accessiblestrings.hrc?rev=1541847&r1=1541846&r2=1541847&view=diff
==============================================================================
--- openoffice/trunk/main/accessibility/inc/accessibility/helper/accessiblestrings.hrc (original)
+++ openoffice/trunk/main/accessibility/inc/accessibility/helper/accessiblestrings.hrc Thu Nov 14 08:18:05 2013
@@ -39,7 +39,18 @@
 #define RID_STR_ACC_ACTION_DECLINE			( RID_TK_ACC_START +    4 )
 #define RID_STR_ACC_ACTION_INCBLOCK			( RID_TK_ACC_START +    5 )
 #define RID_STR_ACC_ACTION_DECBLOCK			( RID_TK_ACC_START +    6 )
+#define RID_STR_ACC_NAME_PREVIEW            		( RID_TK_ACC_START +    7 )
 
+#define STR_SVT_ACC_ACTION_EXPAND			( RID_TK_ACC_START +    8 )
+#define STR_SVT_ACC_ACTION_COLLAPSE			( RID_TK_ACC_START +    9 )
+#define STR_SVT_ACC_LISTENTRY_SELCTED_STATE		( RID_TK_ACC_START +    10 )
+
+#define	RID_STR_ACC_ACTION_CHECK			( RID_TK_ACC_START +    11 )
+#define	RID_STR_ACC_ACTION_UNCHECK			( RID_TK_ACC_START +    12 )
+#define RID_STR_ACC_ACTION_DOUBLE_CLICK			( RID_TK_ACC_START +    13 )
+#define RID_STR_ACC_SCROLLBAR_NAME_VERTICAL		( RID_TK_ACC_START +    14 )
+#define RID_STR_ACC_SCROLLBAR_NAME_HORIZONTAL		( RID_TK_ACC_START +    15 )
+#define RID_STR_ACC_PANEL_DESCRIPTION  			( RID_TK_ACC_START +    16 )
 
 #define RID_STR_ACC_NAME_BROWSEBUTTON		( RID_TK_ACC_START + 100 )
 #define RID_STR_ACC_DESC_PANELDECL_TABBAR   ( RID_TK_ACC_START + 101 )

Modified: openoffice/trunk/main/accessibility/inc/accessibility/helper/listboxhelper.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/inc/accessibility/helper/listboxhelper.hxx?rev=1541847&r1=1541846&r2=1541847&view=diff
==============================================================================
--- openoffice/trunk/main/accessibility/inc/accessibility/helper/listboxhelper.hxx (original)
+++ openoffice/trunk/main/accessibility/inc/accessibility/helper/listboxhelper.hxx Thu Nov 14 08:18:05 2013
@@ -90,6 +90,11 @@ public:
 		return m_aComboListBox.IsActive();
 	}
 	// -----------------------------------------------------------------------------
+    virtual sal_Bool        	IsEnabled() const
+	{
+		return m_aComboListBox.IsEnabled();
+	}
+	// -----------------------------------------------------------------------------
 	virtual sal_Bool			IsEntryVisible( sal_uInt16 nPos ) const
 	{
 		sal_uInt16 nTopEntry = m_aComboListBox.GetTopEntry();

Modified: openoffice/trunk/main/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx?rev=1541847&r1=1541846&r2=1541847&view=diff
==============================================================================
--- openoffice/trunk/main/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx (original)
+++ openoffice/trunk/main/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx Thu Nov 14 08:18:05 2013
@@ -109,6 +109,8 @@ protected:
     virtual sal_Bool		IsHighlighted();
     sal_Bool                IsChildHighlighted();
 
+	virtual sal_Bool 		IsMenuHideDisabledEntries();
+
 	void					SelectChild( sal_Int32 i );
 	void					DeSelectAll();
 	sal_Bool				IsChildSelected( sal_Int32 i );

Modified: openoffice/trunk/main/accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.hxx?rev=1541847&r1=1541846&r2=1541847&view=diff
==============================================================================
--- openoffice/trunk/main/accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.hxx (original)
+++ openoffice/trunk/main/accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.hxx Thu Nov 14 08:18:05 2013
@@ -52,6 +52,8 @@ protected:
     ::rtl::OUString			GetAccessibleName();
     void					SetItemText( const ::rtl::OUString& sItemText );
     ::rtl::OUString			GetItemText();
+	
+	virtual sal_Bool 		IsMenuHideDisabledEntries();
 
     virtual void			FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
 

Modified: openoffice/trunk/main/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx?rev=1541847&r1=1541846&r2=1541847&view=diff
==============================================================================
--- openoffice/trunk/main/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx (original)
+++ openoffice/trunk/main/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx Thu Nov 14 08:18:05 2013
@@ -30,13 +30,17 @@
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #endif
 #include <com/sun/star/accessibility/XAccessibleKeyBinding.hpp>
+#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEVALUE_HPP_
+#include <com/sun/star/accessibility/XAccessibleValue.hpp>
+#endif
 #ifndef _CPPUHELPER_IMPLBASE2_HXX
 #include <cppuhelper/implbase2.hxx>
 #endif
 
 
-typedef ::cppu::ImplHelper2<
+typedef ::cppu::ImplHelper3<
     ::com::sun::star::accessibility::XAccessible,
+	::com::sun::star::accessibility::XAccessibleValue,
     ::com::sun::star::accessibility::XAccessibleAction
     > VCLXAccessibleBox_BASE;
 
@@ -129,7 +133,22 @@ public:
     */
 	virtual void SAL_CALL disposing (void);
 
+	//=====  XAccessibleValue  ================================================
+
+    virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue( )
+        throw (::com::sun::star::uno::RuntimeException);
+
+    virtual sal_Bool SAL_CALL setCurrentValue( 
+        const ::com::sun::star::uno::Any& aNumber ) 
+        throw (::com::sun::star::uno::RuntimeException);
+
+    virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue(  ) 
+        throw (::com::sun::star::uno::RuntimeException);
 
+    virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue(  ) 
+        throw (::com::sun::star::uno::RuntimeException);
+	bool IsDropDownBox() {return m_bIsDropDownBox;};
+	BoxType GetBoxType() { return m_aBoxType;};
 protected:
     /** Specifies whether the box is a combo box or a list box.  List boxes
         have multi selection.
@@ -170,6 +189,8 @@ protected:
 	virtual void ProcessWindowChildEvent (const VclWindowEvent& rVclWindowEvent);
 	virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent);
 
+// IAccessible2 implementation, 2009
+	virtual void	FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
 
 private:
     /// Index in parent.  This is settable from the outside.

Modified: openoffice/trunk/main/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx?rev=1541847&r1=1541846&r2=1541847&view=diff
==============================================================================
--- openoffice/trunk/main/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx (original)
+++ openoffice/trunk/main/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx Thu Nov 14 08:18:05 2013
@@ -76,6 +76,7 @@ public:
     /** Process some of the events and delegate the rest to the base classes.
     */
     virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent);
+    virtual void	FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet );
 
     /** Called on reception of selection events this method checks all known
         list items for a possible change in their selection state and
@@ -143,7 +144,14 @@ public:
 	virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
 
 	virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen(	) throw (::com::sun::star::uno::RuntimeException);
+	sal_Bool    IsInDropDown();
+	void 		HandleDropOpen();
+	virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent, bool b_IsDropDownList);
+	void UpdateSelection_Acc (::rtl::OUString sTextOfSelectedItem, bool b_IsDropDownList);
+	void UpdateSelection_Impl_Acc (bool b_IsDropDownList);
 
+	void UpdateFocus_Impl_Acc ( sal_uInt16 nPos, bool b_IsDropDownList) ;
+	void NotifyListItem(::com::sun::star::uno::Any& val);
 protected:
     BoxType		m_aBoxType;
 	::accessibility::IComboListBoxHelper* m_pListBoxHelper;
@@ -155,7 +163,7 @@ protected:
 	sal_uInt16		m_nLastSelectedPos;
 	bool		m_bDisableProcessEvent;
 	bool		m_bVisible;
-
+	sal_uInt16	m_nCurSelectedPos;
 	
 
     /// The currently selected item.

Modified: openoffice/trunk/main/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx?rev=1541847&r1=1541846&r2=1541847&view=diff
==============================================================================
--- openoffice/trunk/main/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx (original)
+++ openoffice/trunk/main/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx Thu Nov 14 08:18:05 2013
@@ -91,9 +91,9 @@ private:
 		@param	_aNewValue
 			is the new value
 	*/
-	void 					NotifyAccessibleEvent(	sal_Int16 _nEventId,
+	/*void 					NotifyAccessibleEvent(	sal_Int16 _nEventId,
 													const ::com::sun::star::uno::Any& _aOldValue,
-													const ::com::sun::star::uno::Any& _aNewValue );
+													const ::com::sun::star::uno::Any& _aNewValue );*/
 
 protected:
 	virtual ~VCLXAccessibleListItem();
@@ -119,6 +119,7 @@ public:
 							sal_Int32 _nIndexInParent,
 							const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _xParent );
 
+	void 					NotifyAccessibleEvent(	sal_Int16 _nEventId, const ::com::sun::star::uno::Any& _aOldValue, const ::com::sun::star::uno::Any& _aNewValue );
 
 	inline sal_Bool			IsSelected() const { return m_bSelected; }
 	void					SetSelected( sal_Bool _bSelected );

Modified: openoffice/trunk/main/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx?rev=1541847&r1=1541846&r2=1541847&view=diff
==============================================================================
--- openoffice/trunk/main/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx (original)
+++ openoffice/trunk/main/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx Thu Nov 14 08:18:05 2013
@@ -76,6 +76,9 @@ public:
 	virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
 	virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
 	virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+	// XAccessibleAction
+	virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
 };
 
 #endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENU_HXX

Modified: openoffice/trunk/main/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx?rev=1541847&r1=1541846&r2=1541847&view=diff
==============================================================================
--- openoffice/trunk/main/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx (original)
+++ openoffice/trunk/main/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx Thu Nov 14 08:18:05 2013
@@ -31,7 +31,7 @@
 #endif
 #include <com/sun/star/accessibility/XAccessibleValue.hpp>
 
-#ifndef _CPPUHELPER_IMPLBASE2_HXX
+#ifndef _CPPUHELPER_IMPLBASE2_HXX_
 #include <cppuhelper/implbase2.hxx>
 #endif
 

Modified: openoffice/trunk/main/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx?rev=1541847&r1=1541846&r2=1541847&view=diff
==============================================================================
--- openoffice/trunk/main/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx (original)
+++ openoffice/trunk/main/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx Thu Nov 14 08:18:05 2013
@@ -77,6 +77,10 @@ public:
 	virtual sal_Bool SAL_CALL setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) throw (::com::sun::star::uno::RuntimeException);
 	virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue(  ) throw (::com::sun::star::uno::RuntimeException);
 	virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue(  ) throw (::com::sun::star::uno::RuntimeException);
+
+	// XAccessibleContext
+	::rtl::OUString SAL_CALL getAccessibleName(  ) throw (::com::sun::star::uno::RuntimeException);
+
 };
 
 #endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLESCROLLBAR_HXX

Modified: openoffice/trunk/main/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx?rev=1541847&r1=1541846&r2=1541847&view=diff
==============================================================================
--- openoffice/trunk/main/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx (original)
+++ openoffice/trunk/main/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx Thu Nov 14 08:18:05 2013
@@ -34,7 +34,7 @@
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
 #include <com/sun/star/accessibility/XAccessibleValue.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#ifndef _CPPUHELPER_IMPLBASE4_HXX
+#ifndef _CPPUHELPER_IMPLBASE4_HXX_
 #include <cppuhelper/implbase4.hxx>
 #endif
 #include <comphelper/accessibletexthelper.hxx>

Modified: openoffice/trunk/main/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx?rev=1541847&r1=1541846&r2=1541847&view=diff
==============================================================================
--- openoffice/trunk/main/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx (original)
+++ openoffice/trunk/main/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx Thu Nov 14 08:18:05 2013
@@ -65,7 +65,7 @@ AccessibleBrowseBoxHeaderCell::Accessibl
 		// SHOWING done with mxParent
 		if( implIsShowing() )
 			pStateSetHelper->AddState( AccessibleStateType::SHOWING );
-
+		mpBrowseBox->FillAccessibleStateSet( *pStateSetHelper, getType() );
 		BBSolarGuard aSolarGuard;
 		pStateSetHelper->AddState( AccessibleStateType::VISIBLE );
 		pStateSetHelper->AddState( AccessibleStateType::FOCUSABLE );

Modified: openoffice/trunk/main/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/source/extended/accessibleeditbrowseboxcell.cxx?rev=1541847&r1=1541846&r2=1541847&view=diff
==============================================================================
--- openoffice/trunk/main/accessibility/source/extended/accessibleeditbrowseboxcell.cxx (original)
+++ openoffice/trunk/main/accessibility/source/extended/accessibleeditbrowseboxcell.cxx Thu Nov 14 08:18:05 2013
@@ -130,13 +130,15 @@ namespace accessibility
 		SolarMethodGuard aGuard( *this );
 
         // TODO: localize this!
-        String sName = mpBrowseBox->GetColumnDescription( ::sal::static_int_cast< sal_uInt16 >( getColumnPos() ) );
-        if ( 0 == sName.Len() )
-        {
-            sName = String::CreateFromAscii( "Column " );
-            sName += String::CreateFromInt32( getColumnPos( ) );
-        }
-
+// IAccessible2 implementation, 2009
+        //String sName = mpBrowseBox->GetColumnDescription( getColumnPos( ) );
+		
+        //if ( 0 == sName.Len() )
+        //{
+        //    sName = String::CreateFromAscii( "Column " );
+			String  sName = String::CreateFromAscii( "Column " );
+            sName += String::CreateFromInt32( getColumnPos( ) - 1 );
+        //}
         sName += String::CreateFromAscii( ", Row " );
         sName += String::CreateFromInt32( getRowPos( ) );
 

Modified: openoffice/trunk/main/accessibility/source/extended/accessibleiconchoicectrl.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/source/extended/accessibleiconchoicectrl.cxx?rev=1541847&r1=1541846&r2=1541847&view=diff
==============================================================================
--- openoffice/trunk/main/accessibility/source/extended/accessibleiconchoicectrl.cxx (original)
+++ openoffice/trunk/main/accessibility/source/extended/accessibleiconchoicectrl.cxx Thu Nov 14 08:18:05 2013
@@ -79,11 +79,36 @@ namespace accessibility
                     // modified selection.  The active descendant event is
                     // send after that so that the receiving AT has time to
                     // read the text or name of the active child.
-                    NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() );
+//                  NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() );
+
+					if ( getCtrl() && getCtrl()->HasFocus() )
+					{
+						SvxIconChoiceCtrlEntry* pEntry = static_cast< SvxIconChoiceCtrlEntry* >( rVclWindowEvent.GetData() );
+						if ( pEntry )
+						{
+							sal_uLong nPos = getCtrl()->GetEntryListPos( pEntry );
+							Reference< XAccessible > xChild = new AccessibleIconChoiceCtrlEntry( *getCtrl(), nPos, this );
+							uno::Any aOldValue, aNewValue;
+							aNewValue <<= xChild;
+							NotifyAccessibleEvent( AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, aOldValue, aNewValue );
+
+							NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, aOldValue, aNewValue );
+							
+						}
+					}
+					break;
+				}
+				case VCLEVENT_WINDOW_GETFOCUS :
+				{
 					SvtIconChoiceCtrl* pCtrl = getCtrl();
 					if ( pCtrl && pCtrl->HasFocus() )
 					{
 						SvxIconChoiceCtrlEntry* pEntry = static_cast< SvxIconChoiceCtrlEntry* >( rVclWindowEvent.GetData() );
+						if ( pEntry == NULL )
+						{
+							sal_uLong nPos=0;
+							pEntry = getCtrl()->GetSelectedEntry ( nPos );
+						}
 						if ( pEntry )
 						{
 							sal_uLong nPos = pCtrl->GetEntryListPos( pEntry );
@@ -91,6 +116,7 @@ namespace accessibility
 							uno::Any aOldValue, aNewValue;
 							aNewValue <<= xChild;
 							NotifyAccessibleEvent( AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, aOldValue, aNewValue );
+							NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, aOldValue, aNewValue );
 						}
 					}
 					break;
@@ -190,7 +216,8 @@ namespace accessibility
 	// -----------------------------------------------------------------------------
 	sal_Int16 SAL_CALL AccessibleIconChoiceCtrl::getAccessibleRole(  ) throw (RuntimeException)
 	{
-		return AccessibleRole::TREE;
+		//return AccessibleRole::TREE;
+		return AccessibleRole::LIST;
 	}
 	// -----------------------------------------------------------------------------
 	::rtl::OUString SAL_CALL AccessibleIconChoiceCtrl::getAccessibleDescription(  ) throw (RuntimeException)

Modified: openoffice/trunk/main/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/source/extended/accessibleiconchoicectrlentry.cxx?rev=1541847&r1=1541846&r2=1541847&view=diff
==============================================================================
--- openoffice/trunk/main/accessibility/source/extended/accessibleiconchoicectrlentry.cxx (original)
+++ openoffice/trunk/main/accessibility/source/extended/accessibleiconchoicectrlentry.cxx Thu Nov 14 08:18:05 2013
@@ -351,7 +351,8 @@ throw(RuntimeException)
 	// -----------------------------------------------------------------------------
 	sal_Int16 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleRole(  ) throw (RuntimeException)
 	{
-		return AccessibleRole::LABEL;
+		//return AccessibleRole::LABEL;
+		return AccessibleRole::LIST_ITEM;
 	}
 	// -----------------------------------------------------------------------------
 	::rtl::OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleDescription(  ) throw (RuntimeException)

Modified: openoffice/trunk/main/accessibility/source/extended/accessiblelistbox.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/source/extended/accessiblelistbox.cxx?rev=1541847&r1=1541846&r2=1541847&view=diff
==============================================================================
--- openoffice/trunk/main/accessibility/source/extended/accessiblelistbox.cxx (original)
+++ openoffice/trunk/main/accessibility/source/extended/accessiblelistbox.cxx Thu Nov 14 08:18:05 2013
@@ -89,19 +89,25 @@ namespace accessibility
 			{
 				case  VCLEVENT_CHECKBOX_TOGGLE :
 				{
-					if ( getListBox() && getListBox()->HasFocus() )
+					if ( !getListBox() || !getListBox()->HasFocus() )
 					{
-						SvLBoxEntry* pEntry = static_cast< SvLBoxEntry* >( rVclWindowEvent.GetData() );
-						if ( !pEntry )
-							pEntry = getListBox()->GetCurEntry();
-
-						if ( pEntry )
-						{
-							Reference< XAccessible > xChild = new AccessibleListBoxEntry( *getListBox(), pEntry, this );
-							uno::Any aOldValue, aNewValue;
-							aNewValue <<= xChild;
-							NotifyAccessibleEvent( AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, aOldValue, aNewValue );
-						}
+						return;
+					}
+					AccessibleListBoxEntry* pCurOpEntry = GetCurEventEntry(rVclWindowEvent);
+					if(!pCurOpEntry)
+					{
+						return ;
+					}
+					uno::Any aValue;
+					aValue <<= AccessibleStateType::CHECKED;
+					
+					if ( getListBox()->GetCheckButtonState( pCurOpEntry->GetSvLBoxEntry() ) == SV_BUTTON_CHECKED )
+					{
+						pCurOpEntry->NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, uno::Any(), aValue );
+					}
+					else
+					{
+						pCurOpEntry->NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aValue,uno::Any() );
 					}
 					break;
 				}
@@ -112,17 +118,104 @@ namespace accessibility
                     // modified selection.  The active descendant event is
                     // send after that so that the receiving AT has time to
                     // read the text or name of the active child.
-                    NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() );
-					if ( getListBox() && getListBox()->HasFocus() )
+//                    NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() );
+					OSL_ASSERT(0 && "Debug: Treelist shouldn't use VCLEVENT_LISTBOX_SELECT");
+				}
+				case VCLEVENT_LISTBOX_TREESELECT:
+					{
+						if ( getListBox() && getListBox()->HasFocus() )
+						{
+							AccessibleListBoxEntry* pEntry =static_cast< AccessibleListBoxEntry* >(m_xFocusedChild.get());
+							if (pEntry)
+							{
+								pEntry->NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() );
+							}
+						}
+					}
+					break;
+				case VCLEVENT_LISTBOX_TREEFOCUS:
+					{
+						SvTreeListBox* pBox = getListBox();
+						sal_Bool bNeedFocus = sal_False;
+						if (pBox)
+						{
+							Window* pParent = ((Window*)pBox)->GetParent();
+							if (pParent && pParent->GetType() == WINDOW_FLOATINGWINDOW)
+							{
+								// MT: ImplGetAppSVData shouldn't be exported from VCL.
+								// In which scenario is this needed?
+								// If needed, we need to find an other solution
+								/*
+								ImplSVData* pSVData = ImplGetAppSVData();
+								if (pSVData && pSVData->maWinData.mpFirstFloat == (FloatingWindow*)pParent)
+									bNeedFocus = sal_True;
+								*/
+							}	
+						}
+						if( pBox && (pBox->HasFocus() || bNeedFocus) )
+						{
+							uno::Any aOldValue, aNewValue;
+							SvLBoxEntry* pEntry = static_cast< SvLBoxEntry* >( rVclWindowEvent.GetData() );
+							if ( pEntry )
+							{
+								AccessibleListBoxEntry* pEntryFocus =static_cast< AccessibleListBoxEntry* >(m_xFocusedChild.get());
+								if (pEntryFocus && pEntryFocus->GetSvLBoxEntry() == pEntry)
+								{
+									aOldValue <<= uno::Any();
+									aNewValue <<= m_xFocusedChild;
+									NotifyAccessibleEvent( AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, aOldValue, aNewValue );
+									return ;
+								}
+
+								aOldValue <<= m_xFocusedChild;
+
+								MAP_ENTRY::iterator mi = m_mapEntry.find(pEntry);
+								if(mi != m_mapEntry.end())
+								{
+									OSL_ASSERT(mi->second.get() != NULL);
+									m_xFocusedChild = mi->second;
+								}
+								else
+								{
+									AccessibleListBoxEntry *pEntNew = new AccessibleListBoxEntry( *getListBox(), pEntry, NULL );
+									m_xFocusedChild = pEntNew;
+									m_mapEntry.insert(MAP_ENTRY::value_type(pEntry,pEntNew));
+								}
+								
+								aNewValue <<= m_xFocusedChild;
+								NotifyAccessibleEvent( AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, aOldValue, aNewValue );
+							}
+							else
+							{
+								aOldValue <<= uno::Any();
+								aNewValue <<= AccessibleStateType::FOCUSED;
+								NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+							}
+						}			
+					}
+					break;
+				case VCLEVENT_LISTBOX_ITEMREMOVED:
 					{
 						SvLBoxEntry* pEntry = static_cast< SvLBoxEntry* >( rVclWindowEvent.GetData() );
 						if ( pEntry )
 						{
-							Reference< XAccessible > xChild = new AccessibleListBoxEntry( *getListBox(), pEntry, this );
-							uno::Any aOldValue, aNewValue;
-							aNewValue <<= xChild;
-							NotifyAccessibleEvent( AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, aOldValue, aNewValue );
+							RemoveChildEntries(pEntry);
+						}
+						else
+						{
+							// NULL means Clear()
+							MAP_ENTRY::iterator mi = m_mapEntry.begin();
+							for ( ; mi != m_mapEntry.end() ; ++mi)
+							{
+								uno::Any aNewValue;
+								uno::Any aOldValue;
+								aOldValue <<= mi->second;							
+								NotifyAccessibleEvent( AccessibleEventId::CHILD, aOldValue, aNewValue );
+							}
+							m_mapEntry.clear();
 						}
+			
+						
 					}
 					break;
 
@@ -148,15 +241,72 @@ namespace accessibility
                             NotifyAccessibleEvent( AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, Any(), aListBoxEntry );
                         }
                     }
-                    break;
                 }
+                break;
                 // <--
-                }
 				default:
 					VCLXAccessibleComponent::ProcessWindowEvent (rVclWindowEvent);
 			}
 		}
 	}
+
+	AccessibleListBoxEntry* AccessibleListBox::GetCurEventEntry( const VclWindowEvent& rVclWindowEvent )
+	{
+		SvLBoxEntry* pEntry = static_cast< SvLBoxEntry* >( rVclWindowEvent.GetData() );
+		if ( !pEntry )
+			pEntry = getListBox()->GetCurEntry();
+		
+		AccessibleListBoxEntry* pEntryFocus =static_cast< AccessibleListBoxEntry* >(m_xFocusedChild.get());
+		if (pEntryFocus && pEntry && pEntry != pEntryFocus->GetSvLBoxEntry())
+		{
+			AccessibleListBoxEntry *pAccCurOptionEntry =NULL;
+			MAP_ENTRY::iterator mi = m_mapEntry.find(pEntry);
+			if (mi != m_mapEntry.end())
+			{
+				pAccCurOptionEntry= static_cast< AccessibleListBoxEntry* >(mi->second.get());
+			}
+			else
+			{
+				pAccCurOptionEntry =new AccessibleListBoxEntry( *getListBox(), pEntry, NULL ); 
+				std::pair<MAP_ENTRY::iterator, bool> pairMi =  m_mapEntry.insert(MAP_ENTRY::value_type(pAccCurOptionEntry->GetSvLBoxEntry(),pAccCurOptionEntry));
+				mi = pairMi.first;
+			}		
+
+			uno::Any aNewValue;				
+			aNewValue <<= mi->second;//xAcc
+			NotifyAccessibleEvent( AccessibleEventId::CHILD, uno::Any(), aNewValue );//Add 
+	
+			return pAccCurOptionEntry;
+		}
+		else
+		{
+			return pEntryFocus;
+		}
+		return NULL;
+	}
+
+	void AccessibleListBox::RemoveChildEntries(SvLBoxEntry* pEntry)
+	{
+		MAP_ENTRY::iterator mi = m_mapEntry.find(pEntry);
+		if ( mi != m_mapEntry.end() )
+		{
+			uno::Any aNewValue;
+			uno::Any aOldValue;
+			aOldValue <<= mi->second;							
+			NotifyAccessibleEvent( AccessibleEventId::CHILD, aOldValue, aNewValue );
+
+			m_mapEntry.erase(mi);
+		}
+
+		SvTreeListBox* pBox = getListBox();
+		SvLBoxEntry* pEntryChild = pBox->FirstChild(pEntry);
+		while (pEntryChild)
+		{
+			RemoveChildEntries(pEntryChild);
+			pEntryChild = pBox->NextSibling(pEntryChild);
+		}		
+	}
+
 	// -----------------------------------------------------------------------------
     void AccessibleListBox::ProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent )
     {
@@ -182,6 +332,7 @@ namespace accessibility
 	{
 		::osl::MutexGuard aGuard( m_aMutex );
 
+		m_mapEntry.clear();
 		VCLXAccessibleComponent::disposing();
 	    m_xParent = NULL;
 	}
@@ -258,7 +409,9 @@ namespace accessibility
 		if ( !pEntry )
 			throw IndexOutOfBoundsException();
 
-		return new AccessibleListBoxEntry( *getListBox(), pEntry, this );
+		// Solution: Set the parameter of the parent to null to let entry determine the parent by itself
+		//return new AccessibleListBoxEntry( *getListBox(), pEntry, this );
+		return new AccessibleListBoxEntry( *getListBox(), pEntry, NULL );
 	}
 	// -----------------------------------------------------------------------------
 	Reference< XAccessible > SAL_CALL AccessibleListBox::getAccessibleParent(  ) throw (RuntimeException)
@@ -269,9 +422,54 @@ namespace accessibility
 		return m_xParent;
 	}
 	// -----------------------------------------------------------------------------
+	sal_Int32 SAL_CALL AccessibleListBox::getRoleType()
+	{
+		sal_Int32 nCase = 0;
+		SvLBoxEntry* pEntry = getListBox()->GetEntry(0);
+		if ( pEntry )
+		{
+			if( pEntry->HasChildsOnDemand() || getListBox()->GetChildCount(pEntry) > 0  )
+			{
+				nCase = 1;
+				return nCase;
+			}
+		}
+
+		sal_Bool bHasButtons = (getListBox()->GetStyle() & WB_HASBUTTONS)!=0; 
+		if( !(getListBox()->GetTreeFlags() & TREEFLAG_CHKBTN) )
+		{
+			if( bHasButtons )
+				nCase = 1;
+		}
+		else
+		{
+			if( bHasButtons )
+				nCase = 2;
+			 else
+				nCase = 3;
+		}
+		return nCase;
+	}
 	sal_Int16 SAL_CALL AccessibleListBox::getAccessibleRole(  ) throw (RuntimeException)
 	{
-		return AccessibleRole::TREE;
+		if(getListBox())
+		{
+			short nType = getListBox()->GetAllEntriesAccessibleRoleType();			
+			if( nType == TREEBOX_ALLITEM_ACCROLE_TYPE_TREE)
+					return AccessibleRole::TREE;
+			else if( nType == TREEBOX_ALLITEM_ACCROLE_TYPE_LIST)
+					return AccessibleRole::LIST;
+		}
+
+		//o is: return AccessibleRole::TREE;
+		sal_Bool bHasButtons = (getListBox()->GetStyle() & WB_HASBUTTONS)!=0; 
+		if(!bHasButtons && (getListBox()->GetTreeFlags() & TREEFLAG_CHKBTN))
+			return AccessibleRole::LIST;
+		else
+			if(getRoleType() == 0)
+				return AccessibleRole::LIST;
+			else
+			return AccessibleRole::TREE;
 	}
 	// -----------------------------------------------------------------------------
 	::rtl::OUString SAL_CALL AccessibleListBox::getAccessibleDescription(  ) throw (RuntimeException)
@@ -355,17 +553,20 @@ namespace accessibility
     	::comphelper::OExternalLockGuard aGuard( this );
 
 		ensureAlive();
+		
 
-    	sal_Int32 i, nSelCount = 0, nCount = 0;
-		nCount = getListBox()->GetLevelChildCount( NULL );
-		for ( i = 0; i < nCount; ++i )
-		{
-			SvLBoxEntry* pEntry = getListBox()->GetEntry( i );
-			if ( getListBox()->IsSelected( pEntry ) )
-				++nSelCount;
-		}
+//     	sal_Int32 i, nSelCount = 0, nCount = 0;
+// 		nCount = getListBox()->GetLevelChildCount( NULL );
+// 		for ( i = 0; i < nCount; ++i )
+// 		{
+// 			SvLBoxEntry* pEntry = getListBox()->GetEntry( i );
+// 			if ( getListBox()->IsSelected( pEntry ) )
+// 				++nSelCount;
+// 		}
+//    	return nSelCount;
 
-    	return nSelCount;
+		int nTestCount =  getListBox()->GetSelectionCount();
+		return nTestCount;
 	}
 	// -----------------------------------------------------------------------------
 	Reference< XAccessible > SAL_CALL AccessibleListBox::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
@@ -388,7 +589,9 @@ namespace accessibility
 
 			if ( nSelCount == ( nSelectedChildIndex + 1 ) )
 			{
-				xChild = new AccessibleListBoxEntry( *getListBox(), pEntry, this );
+				// Solution: Set the parameter of the parent to null to let entry determine the parent by itself
+				//xChild = new AccessibleListBoxEntry( *getListBox(), pEntry, this );
+				xChild = new AccessibleListBoxEntry( *getListBox(), pEntry, NULL );
 				break;
 			}
 		}



Mime
View raw message