The following builds for me: basebmp, basegfx, comphelper, dtrans, i18npool, i18nutil, l10ntools, o3tl, psprint_config, regexp, rsc, sax, sot, tools, ucbhelper, unotools, vcl The rest still needs fixing ;-) Conflicts: canvas/prj/build.lst canvas/source/cairo/cairo_textlayout.cxx canvas/source/directx/dx_winstuff.hxx canvas/source/tools/image.cxx canvas/source/vcl/canvashelper.cxx comphelper/inc/comphelper/documentconstants.hxx comphelper/inc/comphelper/optionalvalue.hxx comphelper/inc/comphelper/querydeep.hxx comphelper/prj/build.lst comphelper/qa/complex/makefile.mk comphelper/qa/string/test_string_noadditional.cxx comphelper/source/misc/componentmodule.cxx comphelper/source/misc/mimeconfighelper.cxx comphelper/source/misc/querydeep.cxx comphelper/source/misc/uieventslogger.cxx comphelper/source/property/TypeGeneration.cxx comphelper/test/uno_iterators/uno_iterators.cxx comphelper/util/makefile.mk cppcanvas/source/mtfrenderer/implrenderer.cxx dtrans/prj/build.lst dtrans/source/generic/dtrans.cxx dtrans/source/win32/dtobj/FmtFilter.cxx i18npool/prj/build.lst i18npool/source/localedata/data/localedata_others.map i18npool/source/localedata/data/makefile.mk i18npool/source/localedata/localedata.cxx i18npool/source/localedata/saxparser.cxx i18npool/source/registerservices/registerservices.cxx i18npool/source/search/textsearch.cxx l10ntools/inc/cfgmerge.hxx l10ntools/inc/export.hxx l10ntools/inc/gsicheck.hxx l10ntools/inc/l10ntools/vosapp.hxx l10ntools/inc/tagtest.hxx l10ntools/inc/xmlparse.hxx l10ntools/layout/layoutparse.cxx l10ntools/layout/tralay.cxx l10ntools/source/cfgmerge.cxx l10ntools/source/export.cxx l10ntools/source/export2.cxx l10ntools/source/gsicheck.cxx l10ntools/source/help/HelpLinker.cxx l10ntools/source/lngex.cxx l10ntools/source/lngmerge.cxx l10ntools/source/merge.cxx l10ntools/source/tagtest.cxx l10ntools/source/xmlparse.cxx padmin/source/fontentry.cxx padmin/source/padialog.cxx padmin/source/padialog.src padmin/source/pamain.cxx rsc/inc/rscarray.hxx rsc/inc/rscclass.hxx rsc/inc/rscclobj.hxx rsc/inc/rsccont.hxx rsc/inc/rscdb.hxx rsc/inc/rscdef.hxx rsc/inc/rscmgr.hxx rsc/inc/rscrange.hxx rsc/inc/rsctop.hxx rsc/inc/vclrsc.hxx rsc/source/parser/rscdb.cxx rsc/source/parser/rscicpx.cxx rsc/source/parser/rscinit.cxx rsc/source/prj/start.cxx rsc/source/res/rscarray.cxx rsc/source/res/rscclass.cxx rsc/source/res/rscclobj.cxx rsc/source/res/rsccont.cxx rsc/source/res/rscmgr.cxx rsc/source/res/rscrange.cxx rsc/source/res/rsctop.cxx rsc/source/rsc/rsc.cxx rsc/source/tools/rscdef.cxx rsc/source/tools/rsctools.cxx sax/source/expatwrap/sax_expat.cxx sax/source/fastparser/facreg.cxx sax/source/tools/fastserializer.cxx sot/inc/sot/filelist.hxx sot/inc/sot/object.hxx sot/source/base/factory.cxx sot/source/base/filelist.cxx sot/source/sdstor/stg.cxx sot/source/sdstor/stgcache.cxx sot/source/sdstor/stgole.cxx sot/source/sdstor/stgstrms.cxx sot/source/sdstor/storage.cxx sot/source/sdstor/ucbstorage.cxx svl/inc/svl/cenumitm.hxx svl/inc/svl/cintitem.hxx svl/inc/svl/cntwall.hxx svl/inc/svl/ctypeitm.hxx svl/inc/svl/custritm.hxx svl/inc/svl/dateitem.hxx svl/inc/svl/filerec.hxx svl/inc/svl/globalnameitem.hxx svl/inc/svl/ilstitem.hxx svl/inc/svl/imageitm.hxx svl/inc/svl/intitem.hxx svl/inc/svl/itempool.hxx svl/inc/svl/itemset.hxx svl/inc/svl/lckbitem.hxx svl/inc/svl/poolitem.hxx svl/inc/svl/ptitem.hxx svl/inc/svl/rectitem.hxx svl/inc/svl/sfontitm.hxx svl/inc/svl/slstitm.hxx svl/inc/svl/srchitem.hxx svl/inc/svl/svarray.hxx svl/inc/svl/svdde.hxx svl/inc/svl/svstdarr.hxx svl/inc/svl/szitem.hxx svl/inc/svl/visitem.hxx svl/inc/svl/zforlist.hxx svl/inc/svl/zformat.hxx svl/prj/build.lst svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx svl/qa/complex/ConfigItems/helper/makefile.mk svl/qa/makefile.mk svl/source/filepicker/pickerhelper.cxx svl/source/filerec/filerec.cxx svl/source/items/cenumitm.cxx svl/source/items/cintitem.cxx svl/source/items/cntwall.cxx svl/source/items/ctypeitm.cxx svl/source/items/custritm.cxx svl/source/items/dateitem.cxx svl/source/items/globalnameitem.cxx svl/source/items/ilstitem.cxx svl/source/items/imageitm.cxx svl/source/items/intitem.cxx svl/source/items/itempool.cxx svl/source/items/itemprop.cxx svl/source/items/itemset.cxx svl/source/items/lckbitem.cxx svl/source/items/poolio.cxx svl/source/items/poolitem.cxx svl/source/items/ptitem.cxx svl/source/items/rectitem.cxx svl/source/items/slstitm.cxx svl/source/items/srchitem.cxx svl/source/items/style.cxx svl/source/items/szitem.cxx svl/source/items/visitem.cxx svl/source/items/whiter.cxx svl/source/memtools/svarray.cxx svl/source/misc/PasswordHelper.cxx svl/source/misc/adrparse.cxx svl/source/misc/lngmisc.cxx svl/source/notify/brdcst.cxx svl/source/notify/listener.cxx svl/source/notify/listenerbase.cxx svl/source/numbers/makefile.mk svl/source/numbers/nbdll.cxx svl/source/numbers/zforfind.cxx svl/source/numbers/zforlist.cxx svl/source/numbers/zformat.cxx svl/source/numbers/zforscan.cxx svl/source/passwordcontainer/passwordcontainer.cxx svl/source/svdde/ddecli.cxx svl/source/svdde/ddeimp.hxx svl/source/svdde/ddemlos2.h svl/source/svdde/ddesvr.cxx svl/source/undo/undo.cxx svl/source/uno/registerservices.cxx svl/util/makefile.mk svtools/bmpmaker/bmpsum.cxx svtools/bmpmaker/g2g.cxx svtools/bmpmaker/makefile.mk svtools/inc/borderhelper.hxx svtools/inc/svtools/accessiblefactory.hxx svtools/inc/svtools/apearcfg.hxx svtools/inc/svtools/brwbox.hxx svtools/inc/svtools/ctrlbox.hxx svtools/inc/svtools/ctrltool.hxx svtools/inc/svtools/editbrowsebox.hxx svtools/inc/svtools/ehdl.hxx svtools/inc/svtools/embedhlp.hxx svtools/inc/svtools/filter.hxx svtools/inc/svtools/ivctrl.hxx svtools/inc/svtools/parhtml.hxx svtools/inc/svtools/printdlg.hxx svtools/inc/svtools/rtftoken.h svtools/inc/svtools/ruler.hxx svtools/inc/svtools/svicnvw.hxx svtools/inc/svtools/svlbitm.hxx svtools/inc/svtools/svlbox.hxx svtools/inc/svtools/svtreebx.hxx svtools/inc/svtools/tabbar.hxx svtools/inc/svtools/table/abstracttablecontrol.hxx svtools/inc/svtools/taskbar.hxx svtools/inc/svtools/textview.hxx svtools/inc/svtools/valueset.hxx svtools/source/brwbox/brwbox1.cxx svtools/source/brwbox/brwbox2.cxx svtools/source/brwbox/datwin.cxx svtools/source/brwbox/datwin.hxx svtools/source/brwbox/makefile.mk svtools/source/config/apearcfg.cxx svtools/source/config/htmlcfg.cxx svtools/source/config/menuoptions.cxx svtools/source/config/miscopt.cxx svtools/source/contnr/cont_pch.cxx svtools/source/contnr/ctrdll.cxx svtools/source/contnr/fileview.cxx svtools/source/contnr/imivctl1.cxx svtools/source/contnr/ivctrl.cxx svtools/source/contnr/makefile.mk svtools/source/contnr/svcontnr.src svtools/source/contnr/svicnvw.cxx svtools/source/contnr/svimpbox.cxx svtools/source/contnr/svimpicn.cxx svtools/source/contnr/svlbitm.cxx svtools/source/contnr/svtreebx.cxx svtools/source/contnr/templwin.cxx svtools/source/contnr/templwin.hxx svtools/source/control/asynclink.cxx svtools/source/control/ctrlbox.cxx svtools/source/control/ctrldll.cxx svtools/source/control/ctrltool.cxx svtools/source/control/filectrl.cxx svtools/source/control/filectrl.src svtools/source/control/headbar.cxx svtools/source/control/inettbc.cxx svtools/source/control/makefile.mk svtools/source/control/prgsbar.cxx svtools/source/control/roadmap.cxx svtools/source/control/ruler.cxx svtools/source/control/scriptedtext.cxx svtools/source/control/stdmenu.cxx svtools/source/control/tabbar.cxx svtools/source/control/taskbar.cxx svtools/source/control/taskbox.cxx svtools/source/control/taskmisc.cxx svtools/source/control/taskstat.cxx svtools/source/control/valueacc.cxx svtools/source/control/valueset.cxx svtools/source/dialogs/addresstemplate.cxx svtools/source/dialogs/addresstemplate.src svtools/source/dialogs/colrdlg.src svtools/source/dialogs/filedlg2.cxx svtools/source/dialogs/filedlg2.hxx svtools/source/dialogs/makefile.mk svtools/source/dialogs/printdlg.cxx svtools/source/dialogs/printdlg.src svtools/source/dialogs/propctrl.cxx svtools/source/dialogs/propctrl.hxx svtools/source/dialogs/property.cxx svtools/source/edit/makefile.mk svtools/source/edit/sychconv.cxx svtools/source/edit/syntaxhighlight.cxx svtools/source/edit/textdoc.cxx svtools/source/edit/texteng.cxx svtools/source/edit/textundo.cxx svtools/source/edit/textview.cxx svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx svtools/source/filter.vcl/filter/dlgejpg.cxx svtools/source/filter.vcl/filter/dlgejpg.hxx svtools/source/filter.vcl/filter/dlgejpg.src svtools/source/filter.vcl/filter/dlgepng.cxx svtools/source/filter.vcl/filter/dlgepng.hxx svtools/source/filter.vcl/filter/dlgepng.src svtools/source/filter.vcl/filter/dlgexpor.cxx svtools/source/filter.vcl/filter/dlgexpor.hxx svtools/source/filter.vcl/filter/dlgexpor.src svtools/source/filter.vcl/filter/filter2.cxx svtools/source/filter.vcl/filter/makefile.mk svtools/source/filter.vcl/filter/sgfbram.cxx svtools/source/filter.vcl/filter/sgvmain.cxx svtools/source/filter.vcl/filter/sgvspln.cxx svtools/source/filter.vcl/filter/strings.src svtools/source/filter.vcl/jpeg/makefile.mk svtools/source/filter.vcl/wmf/emfwr.cxx svtools/source/filter.vcl/wmf/emfwr.hxx svtools/source/filter.vcl/wmf/enhwmf.cxx svtools/source/filter.vcl/wmf/winmtf.hxx svtools/source/filter.vcl/wmf/wmfwr.cxx svtools/source/filter.vcl/wmf/wmfwr.hxx svtools/source/graphic/grfcache.cxx svtools/source/graphic/grfcache.hxx svtools/source/graphic/grfmgr.cxx svtools/source/graphic/makefile.mk svtools/source/inc/accessibletableimp.hxx svtools/source/inc/svimpbox.hxx svtools/source/java/patchjavaerror.src svtools/source/misc/ehdl.cxx svtools/source/misc/errtxt.src svtools/source/misc/helpagentwindow.cxx svtools/source/misc/imagemgr.cxx svtools/source/misc/imagemgr.src svtools/source/misc/imageresourceaccess.cxx svtools/source/misc/imap.cxx svtools/source/misc/langtab.src svtools/source/misc/makefile.mk svtools/source/misc/svtdata.cxx svtools/source/misc/templatefoldercache.cxx svtools/source/misc/transfer2.cxx svtools/source/misc/undo.src svtools/source/plugapp/commtest.cxx svtools/source/plugapp/commtest.src svtools/source/plugapp/makefile.mk svtools/source/plugapp/testtool.src svtools/source/productregistration/productregistration.cxx svtools/source/svhtml/htmlkywd.cxx svtools/source/svhtml/parhtml.cxx svtools/source/svrtf/rtfkey2.cxx svtools/source/svrtf/rtfkeywd.cxx svtools/source/table/defaultinputhandler.cxx svtools/source/table/makefile.mk svtools/source/table/tablecontrol.cxx svtools/source/table/tablecontrol_impl.cxx svtools/source/table/tablecontrol_impl.hxx svtools/source/table/tabledatawindow.cxx svtools/source/table/tablegeometry.cxx svtools/source/table/tablegeometry.hxx svtools/source/toolpanel/makefile.mk svtools/source/toolpanel/toolpaneldrawer.cxx svtools/source/uno/addrtempuno.cxx svtools/source/uno/miscservices.cxx svtools/source/uno/svtxgridcontrol.cxx svtools/source/uno/svtxgridcontrol.hxx svtools/source/uno/toolboxcontroller.cxx svtools/source/uno/treecontrolpeer.cxx svtools/source/uno/unocontroltablemodel.cxx svtools/source/uno/unocontroltablemodel.hxx svtools/source/uno/unoimap.cxx svtools/source/urlobj/inetimg.cxx svtools/util/makefile.mk svtools/workben/browser.cxx svtools/workben/cui/makefile.mk svtools/workben/makefile.mk svtools/workben/stest.cxx svtools/workben/toolpanel/makefile.mk svtools/workben/urange.cxx toolkit/inc/toolkit/awt/vclxdevice.hxx toolkit/inc/toolkit/awt/vclxgraphics.hxx toolkit/inc/toolkit/awt/vclxwindows.hxx toolkit/inc/toolkit/controls/dialogcontrol.hxx toolkit/inc/toolkit/helper/property.hxx toolkit/inc/toolkit/helper/servicenames.hxx toolkit/inc/toolkit/helper/throbberimpl.hxx toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java toolkit/source/awt/asynccallback.cxx toolkit/source/awt/vclxgraphics.cxx toolkit/source/awt/vclxtoolkit.cxx toolkit/source/awt/vclxwindow.cxx toolkit/source/awt/xsimpleanimation.cxx toolkit/source/awt/xthrobber.cxx toolkit/source/controls/dialogcontrol.cxx toolkit/source/controls/grid/defaultgridcolumnmodel.cxx toolkit/source/controls/grid/defaultgriddatamodel.cxx toolkit/source/controls/grid/gridcontrol.cxx toolkit/source/controls/grid/initguard.hxx toolkit/source/controls/unocontrol.cxx toolkit/source/controls/unocontrolcontainer.cxx toolkit/source/controls/unocontrols.cxx toolkit/source/helper/listenermultiplexer.cxx toolkit/source/helper/property.cxx toolkit/source/helper/registerservices.cxx toolkit/source/helper/servicenames.cxx toolkit/source/helper/throbberimpl.cxx toolkit/source/helper/tkresmgr.cxx tools/StaticLibrary_ooopathutils.mk tools/bootstrp/addexes/makefile.mk tools/bootstrp/addexes2/makefile.mk tools/bootstrp/addexes2/mkfilt.cxx tools/bootstrp/command.cxx tools/bootstrp/cppdep.cxx tools/bootstrp/iserver.cxx tools/bootstrp/makefile.mk tools/bootstrp/mkcreate.cxx tools/bootstrp/prj.cxx tools/bootstrp/rscdep.cxx tools/bootstrp/sstring.cxx tools/inc/bootstrp/command.hxx tools/inc/bootstrp/mkcreate.hxx tools/inc/bootstrp/prj.hxx tools/inc/bootstrp/sstring.hxx tools/inc/tools/agapi.hxx tools/inc/tools/agitem.hxx tools/inc/tools/chapi.hxx tools/inc/tools/download.hxx tools/inc/tools/eacopier.hxx tools/inc/tools/fract.hxx tools/inc/tools/fsys.hxx tools/inc/tools/geninfo.hxx tools/inc/tools/globname.hxx tools/inc/tools/inetmime.hxx tools/inc/tools/multisel.hxx tools/inc/tools/poly.hxx tools/inc/tools/postsys.h tools/inc/tools/postwin.h tools/inc/tools/presys.h tools/inc/tools/prewin.h tools/inc/tools/pstm.hxx tools/inc/tools/ref.hxx tools/inc/tools/simplerm.hxx tools/inc/tools/solar.h tools/inc/tools/table.hxx tools/inc/tools/urlkeys.hxx tools/inc/tools/urlobj.hxx tools/prj/build.lst tools/prj/d.lst tools/qa/makefile.mk tools/source/communi/geninfo.cxx tools/source/debug/debug.cxx tools/source/fsys/dirent.cxx tools/source/fsys/tdir.cxx tools/source/fsys/unx.cxx tools/source/fsys/urlobj.cxx tools/source/generic/color.cxx tools/source/generic/config.cxx tools/source/generic/fract.cxx tools/source/inet/inetmime.cxx tools/source/memtools/multisel.cxx tools/source/memtools/table.cxx tools/source/rc/resmgr.cxx tools/source/ref/globname.cxx tools/source/ref/pstm.cxx tools/source/solar/solar.c tools/source/stream/strmos2.cxx tools/source/stream/strmunx.cxx tools/source/stream/strmwnt.cxx tools/source/string/makefile.mk tools/source/testtoolloader/testtoolloader.cxx tools/test/makefile.mk tools/util/makefile.mk tools/win/inc/dll.hxx tools/win/inc/parser.hxx tools/win/inc/shellex.h tools/win/inc/shutil.h tools/win/inc/toolsdll.hxx tools/win/inc/winshell.hxx tools/workben/makefile.mk ucbhelper/source/client/proxydecider.cxx ucbhelper/workben/ucbexplorer/ucbexplorer.hrc unotools/inc/unotools/unotunnelhelper.hxx unotools/source/config/fltrcfg.cxx unotools/source/config/lingucfg.cxx unotools/source/config/misccfg.cxx unotools/source/config/pathoptions.cxx unotools/source/config/searchopt.cxx unotools/source/i18n/localedatawrapper.cxx unotools/source/ucbhelper/localfilehelper.cxx unotools/source/ucbhelper/ucbhelper.cxx unotools/source/ucbhelper/xtempfile.cxx vcl/aqua/inc/salbmp.h vcl/aqua/inc/salgdi.h vcl/aqua/inc/salinst.h vcl/aqua/source/app/salinst.cxx vcl/aqua/source/gdi/aquaprintaccessoryview.mm vcl/aqua/source/gdi/salgdi.cxx vcl/aqua/source/gdi/salprn.cxx vcl/aqua/source/window/salframeview.mm vcl/aqua/source/window/salobj.cxx vcl/inc/vcl/bitmap.hxx vcl/inc/vcl/brdwin.hxx vcl/inc/vcl/button.hxx vcl/inc/vcl/cmdevt.hxx vcl/inc/vcl/cvtgrf.hxx vcl/inc/vcl/dialog.hxx vcl/inc/vcl/dockwin.hxx vcl/inc/vcl/event.hxx vcl/inc/vcl/fixed.hxx vcl/inc/vcl/fldunit.hxx vcl/inc/vcl/floatwin.hxx vcl/inc/vcl/gdimtf.hxx vcl/inc/vcl/glyphcache.hxx vcl/inc/vcl/graphite_adaptors.hxx vcl/inc/vcl/graphite_features.hxx vcl/inc/vcl/graphite_layout.hxx vcl/inc/vcl/ilstbox.hxx vcl/inc/vcl/image.h vcl/inc/vcl/imgctrl.hxx vcl/inc/vcl/impbmpconv.hxx vcl/inc/vcl/impprn.hxx vcl/inc/vcl/jobset.h vcl/inc/vcl/keycodes.hxx vcl/inc/vcl/lstbox.hxx vcl/inc/vcl/mapunit.hxx vcl/inc/vcl/menu.hxx vcl/inc/vcl/msgbox.hxx vcl/inc/vcl/outdev.hxx vcl/inc/vcl/prndlg.hxx vcl/inc/vcl/salatype.hxx vcl/inc/vcl/salbmp.hxx vcl/inc/vcl/salgdi.hxx vcl/inc/vcl/salinst.hxx vcl/inc/vcl/seleng.hxx vcl/inc/vcl/settings.hxx vcl/inc/vcl/smartid.hxx vcl/inc/vcl/status.hxx vcl/inc/vcl/strhelper.hxx vcl/inc/vcl/svapp.hxx vcl/inc/vcl/svdata.hxx vcl/inc/vcl/syschild.hxx vcl/inc/vcl/sysdata.hxx vcl/inc/vcl/taskpanelist.hxx vcl/inc/vcl/toolbox.hxx vcl/inc/vcl/vclevent.hxx vcl/inc/vcl/windata.hxx vcl/inc/vcl/window.hxx vcl/inc/vcl/wintypes.hxx vcl/os2/source/app/salinst.cxx vcl/os2/source/gdi/salgdi.cxx vcl/os2/source/window/salmenu.cxx vcl/os2/source/window/salobj.cxx vcl/prj/build.lst vcl/source/app/dbggui.cxx vcl/source/app/help.cxx vcl/source/app/idlemgr.cxx vcl/source/app/settings.cxx vcl/source/app/svapp.cxx vcl/source/app/svdata.cxx vcl/source/app/svmain.cxx vcl/source/app/svmainhook.cxx vcl/source/app/unohelp.cxx vcl/source/app/vclevent.cxx vcl/source/control/button.cxx vcl/source/control/combobox.cxx vcl/source/control/edit.cxx vcl/source/control/field.cxx vcl/source/control/fixed.cxx vcl/source/control/ilstbox.cxx vcl/source/control/imgctrl.cxx vcl/source/control/makefile.mk vcl/source/control/tabctrl.cxx vcl/source/gdi/bitmap.cxx vcl/source/gdi/bitmap2.cxx vcl/source/gdi/bitmap4.cxx vcl/source/gdi/bmpconv.cxx vcl/source/gdi/cvtsvm.cxx vcl/source/gdi/font.cxx vcl/source/gdi/gdimtf.cxx vcl/source/gdi/image.cxx vcl/source/gdi/impimage.cxx vcl/source/gdi/jobset.cxx vcl/source/gdi/makefile.mk vcl/source/gdi/metaact.cxx vcl/source/gdi/outdev.cxx vcl/source/gdi/outdev3.cxx vcl/source/gdi/outdev4.cxx vcl/source/gdi/outdevnative.cxx vcl/source/gdi/pdfwriter.cxx vcl/source/gdi/pdfwriter_impl.cxx vcl/source/gdi/print3.cxx vcl/source/gdi/salmisc.cxx vcl/source/glyphs/gcach_ftyp.cxx vcl/source/glyphs/gcach_ftyp.hxx vcl/source/glyphs/glyphcache.cxx vcl/source/glyphs/graphite_cache.cxx vcl/source/glyphs/graphite_layout.cxx vcl/source/glyphs/graphite_textsrc.hxx vcl/source/helper/canvasbitmap.cxx vcl/source/helper/smartid.cxx vcl/source/helper/xconnection.cxx vcl/source/src/btntext.src vcl/source/src/images.src vcl/source/src/print.src vcl/source/window/accel.cxx vcl/source/window/accmgr.cxx vcl/source/window/brdwin.cxx vcl/source/window/btndlg.cxx vcl/source/window/dlgctrl.cxx vcl/source/window/javachild.cxx vcl/source/window/menu.cxx vcl/source/window/msgbox.cxx vcl/source/window/printdlg.cxx vcl/source/window/status.cxx vcl/source/window/syschild.cxx vcl/source/window/toolbox.cxx vcl/source/window/toolbox2.cxx vcl/source/window/window.cxx vcl/source/window/window2.cxx vcl/source/window/wrkwin.cxx vcl/unx/gtk/app/gtkdata.cxx vcl/unx/gtk/app/gtkinst.cxx vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx vcl/unx/gtk/window/gtkframe.cxx vcl/unx/gtk/window/gtkobject.cxx vcl/unx/headless/svpbmp.hxx vcl/unx/headless/svpgdi.cxx vcl/unx/headless/svpgdi.hxx vcl/unx/headless/svpinst.cxx vcl/unx/headless/svpinst.hxx vcl/unx/headless/svpprn.cxx vcl/unx/headless/svpprn.hxx vcl/unx/headless/svppspgraphics.cxx vcl/unx/headless/svppspgraphics.hxx vcl/unx/headless/svptext.cxx vcl/unx/inc/dtint.hxx vcl/unx/inc/plugins/gtk/gtkdata.hxx vcl/unx/inc/pspgraphics.h vcl/unx/inc/salbmp.h vcl/unx/inc/saldata.hxx vcl/unx/inc/saldisp.hxx vcl/unx/inc/salgdi.h vcl/unx/inc/salinst.h vcl/unx/inc/xfont.hxx vcl/unx/kde/kdedata.cxx vcl/unx/kde4/KDESalGraphics.cxx vcl/unx/source/app/keysymnames.cxx vcl/unx/source/app/saldata.cxx vcl/unx/source/app/saldisp.cxx vcl/unx/source/app/salinst.cxx vcl/unx/source/app/wmadaptor.cxx vcl/unx/source/dtrans/X11_selection.cxx vcl/unx/source/dtrans/X11_service.cxx vcl/unx/source/gdi/makefile.mk vcl/unx/source/gdi/pspgraphics.cxx vcl/unx/source/gdi/salgdi.cxx vcl/unx/source/gdi/salgdi3.cxx vcl/unx/source/gdi/salprnpsp.cxx vcl/unx/source/gdi/xfont.cxx vcl/unx/source/gdi/xlfd_attr.cxx vcl/unx/source/gdi/xlfd_attr.hxx vcl/unx/source/gdi/xlfd_extd.cxx vcl/unx/source/gdi/xlfd_extd.hxx vcl/unx/source/gdi/xlfd_smpl.cxx vcl/unx/source/gdi/xlfd_smpl.hxx vcl/unx/source/printer/ppdparser.cxx vcl/unx/source/printer/printerinfomanager.cxx vcl/unx/source/window/salframe.cxx vcl/unx/source/window/salmenu.cxx vcl/unx/source/window/salobj.cxx vcl/util/makefile2.pmk vcl/win/inc/salbmp.h vcl/win/inc/saldata.hxx vcl/win/inc/salgdi.h vcl/win/inc/salinst.h vcl/win/source/app/saldata.cxx vcl/win/source/app/salinst.cxx vcl/win/source/gdi/salgdi.cxx vcl/win/source/gdi/salgdi3.cxx vcl/win/source/gdi/salprn.cxx vcl/win/source/gdi/winlayout.cxx vcl/win/source/window/salframe.cxx vcl/win/source/window/salobj.cxx vcl/workben/outdevgrind.cxx vos/inc/vos/execabl.hxx vos/inc/vos/macros.hxx vos/inc/vos/pipe.hxx vos/inc/vos/process.hxx vos/inc/vos/refernce.hxx vos/inc/vos/signal.hxx vos/inc/vos/socket.hxx vos/inc/vos/stream.hxx vos/inc/vos/thread.hxx vos/source/pipe.cxx vos/source/process.cxx vos/source/signal.cxx vos/source/thread.cxx vos/source/timer.cxx
927 lines
34 KiB
C++
927 lines
34 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*************************************************************************
|
|
*
|
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
*
|
|
* Copyright 2000, 2010 Oracle and/or its affiliates.
|
|
*
|
|
* OpenOffice.org - a multi-platform office productivity suite
|
|
*
|
|
* This file is part of OpenOffice.org.
|
|
*
|
|
* OpenOffice.org is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Lesser General Public License version 3
|
|
* only, as published by the Free Software Foundation.
|
|
*
|
|
* OpenOffice.org is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License version 3 for more details
|
|
* (a copy is included in the LICENSE file that accompanied this code).
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
* version 3 along with OpenOffice.org. If not, see
|
|
* <http://www.openoffice.org/license.html>
|
|
* for a copy of the LGPLv3 License.
|
|
*
|
|
************************************************************************/
|
|
|
|
// MARKER(update_precomp.py): autogen include statement, do not remove
|
|
#include "precompiled_toolkit.hxx"
|
|
|
|
|
|
#include <com/sun/star/accessibility/AccessibleRole.hpp>
|
|
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
|
|
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
|
|
#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
|
|
#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
|
|
#include <toolkit/awt/vclxaccessiblecomponent.hxx>
|
|
#include <toolkit/helper/externallock.hxx>
|
|
#include <toolkit/awt/vclxwindow.hxx>
|
|
#include <toolkit/helper/convert.hxx>
|
|
#include <toolkit/awt/vclxfont.hxx>
|
|
#include <vcl/dialog.hxx>
|
|
#include <vcl/window.hxx>
|
|
#include <tools/debug.hxx>
|
|
#include <unotools/accessiblestatesethelper.hxx>
|
|
#include <unotools/accessiblerelationsethelper.hxx>
|
|
#include <vcl/svapp.hxx>
|
|
#include <vcl/menu.hxx>
|
|
|
|
#ifndef VCLEVENT_WINDOW_FRAMETITLECHANGED
|
|
#define VCLEVENT_WINDOW_FRAMETITLECHANGED 1018 // pData = XubString* = oldTitle
|
|
#endif
|
|
|
|
using namespace ::com::sun::star;
|
|
using namespace ::comphelper;
|
|
|
|
|
|
DBG_NAME(VCLXAccessibleComponent)
|
|
|
|
|
|
// ----------------------------------------------------
|
|
// class VCLXAccessibleComponent
|
|
// ----------------------------------------------------
|
|
VCLXAccessibleComponent::VCLXAccessibleComponent( VCLXWindow* pVCLXindow )
|
|
: AccessibleExtendedComponentHelper_BASE( new VCLExternalSolarLock() )
|
|
, OAccessibleImplementationAccess( )
|
|
{
|
|
DBG_CTOR( VCLXAccessibleComponent, 0 );
|
|
mpVCLXindow = pVCLXindow;
|
|
mxWindow = pVCLXindow;
|
|
|
|
m_pSolarLock = static_cast< VCLExternalSolarLock* >( getExternalLock( ) );
|
|
|
|
DBG_ASSERT( pVCLXindow->GetWindow(), "VCLXAccessibleComponent - no window!" );
|
|
if ( pVCLXindow->GetWindow() )
|
|
{
|
|
pVCLXindow->GetWindow()->AddEventListener( LINK( this, VCLXAccessibleComponent, WindowEventListener ) );
|
|
pVCLXindow->GetWindow()->AddChildEventListener( LINK( this, VCLXAccessibleComponent, WindowChildEventListener ) );
|
|
}
|
|
|
|
// announce the XAccessible of our creator to the base class
|
|
lateInit( pVCLXindow );
|
|
}
|
|
|
|
VCLXAccessibleComponent::~VCLXAccessibleComponent()
|
|
{
|
|
DBG_DTOR( VCLXAccessibleComponent, 0 );
|
|
|
|
ensureDisposed();
|
|
|
|
if ( mpVCLXindow && mpVCLXindow->GetWindow() )
|
|
{
|
|
mpVCLXindow->GetWindow()->RemoveEventListener( LINK( this, VCLXAccessibleComponent, WindowEventListener ) );
|
|
mpVCLXindow->GetWindow()->RemoveChildEventListener( LINK( this, VCLXAccessibleComponent, WindowChildEventListener ) );
|
|
}
|
|
|
|
delete m_pSolarLock;
|
|
m_pSolarLock = NULL;
|
|
// This is not completely safe. If we assume that the base class dtor calls some method which
|
|
// uses this lock, the we crash. However, as the base class' dtor does not have a chance to call _out_
|
|
// virtual methods, this is no problem as long as the base class is safe, i.e. does not use the external
|
|
// lock from within it's dtor. At the moment, we _know_ the base class is safe in this respect, so
|
|
// let's assume it keeps this way.
|
|
// @see OAccessibleContextHelper::OAccessibleContextHelper( IMutex* )
|
|
}
|
|
|
|
IMPLEMENT_FORWARD_XINTERFACE3( VCLXAccessibleComponent, AccessibleExtendedComponentHelper_BASE, OAccessibleImplementationAccess, VCLXAccessibleComponent_BASE )
|
|
IMPLEMENT_FORWARD_XTYPEPROVIDER3( VCLXAccessibleComponent, AccessibleExtendedComponentHelper_BASE, OAccessibleImplementationAccess, VCLXAccessibleComponent_BASE )
|
|
|
|
::rtl::OUString VCLXAccessibleComponent::getImplementationName() throw (uno::RuntimeException)
|
|
{
|
|
return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.toolkit.AccessibleWindow"));
|
|
}
|
|
|
|
sal_Bool VCLXAccessibleComponent::supportsService( const ::rtl::OUString& rServiceName ) throw (uno::RuntimeException)
|
|
{
|
|
uno::Sequence< ::rtl::OUString > aNames( getSupportedServiceNames() );
|
|
const ::rtl::OUString* pNames = aNames.getConstArray();
|
|
const ::rtl::OUString* pEnd = pNames + aNames.getLength();
|
|
for ( ; pNames != pEnd && !pNames->equals( rServiceName ); ++pNames )
|
|
;
|
|
|
|
return pNames != pEnd;
|
|
}
|
|
|
|
uno::Sequence< ::rtl::OUString > VCLXAccessibleComponent::getSupportedServiceNames() throw (uno::RuntimeException)
|
|
{
|
|
uno::Sequence< ::rtl::OUString > aNames(1);
|
|
aNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleWindow"));
|
|
return aNames;
|
|
}
|
|
|
|
IMPL_LINK( VCLXAccessibleComponent, WindowEventListener, VclSimpleEvent*, pEvent )
|
|
{
|
|
DBG_CHKTHIS(VCLXAccessibleComponent,0);
|
|
|
|
DBG_ASSERT( pEvent && pEvent->ISA( VclWindowEvent ), "Unknown WindowEvent!" );
|
|
|
|
/* Ignore VCLEVENT_WINDOW_ENDPOPUPMODE, because the UNO accessibility wrapper
|
|
* might have been destroyed by the previous VCLEventListener (if no AT tool
|
|
* is running), e.g. sub-toolbars in impress.
|
|
*/
|
|
if ( pEvent && pEvent->ISA( VclWindowEvent ) && mxWindow.is() /* #122218# */ && (pEvent->GetId() != VCLEVENT_WINDOW_ENDPOPUPMODE) )
|
|
{
|
|
DBG_ASSERT( ((VclWindowEvent*)pEvent)->GetWindow(), "Window???" );
|
|
if( !((VclWindowEvent*)pEvent)->GetWindow()->IsAccessibilityEventsSuppressed() || ( pEvent->GetId() == VCLEVENT_OBJECT_DYING ) )
|
|
{
|
|
ProcessWindowEvent( *(VclWindowEvent*)pEvent );
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
IMPL_LINK( VCLXAccessibleComponent, WindowChildEventListener, VclSimpleEvent*, pEvent )
|
|
{
|
|
DBG_CHKTHIS(VCLXAccessibleComponent,0);
|
|
|
|
DBG_ASSERT( pEvent && pEvent->ISA( VclWindowEvent ), "Unknown WindowEvent!" );
|
|
if ( pEvent && pEvent->ISA( VclWindowEvent ) && mxWindow.is() /* #i68079# */ )
|
|
{
|
|
DBG_ASSERT( ((VclWindowEvent*)pEvent)->GetWindow(), "Window???" );
|
|
if( !((VclWindowEvent*)pEvent)->GetWindow()->IsAccessibilityEventsSuppressed() )
|
|
{
|
|
// #103087# to prevent an early release of the component
|
|
uno::Reference< accessibility::XAccessibleContext > xTmp = this;
|
|
|
|
ProcessWindowChildEvent( *(VclWindowEvent*)pEvent );
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::GetChildAccessible( const VclWindowEvent& rVclWindowEvent )
|
|
{
|
|
// checks if the data in the window event is our direct child
|
|
// and returns its accessible
|
|
|
|
// MT: Change this later, normaly a show/hide event shouldn't have the Window* in pData.
|
|
Window* pChildWindow = (Window *) rVclWindowEvent.GetData();
|
|
if( pChildWindow && GetWindow() == pChildWindow->GetAccessibleParentWindow() )
|
|
return pChildWindow->GetAccessible( rVclWindowEvent.GetId() == VCLEVENT_WINDOW_SHOW );
|
|
else
|
|
return uno::Reference< accessibility::XAccessible > ();
|
|
}
|
|
|
|
void VCLXAccessibleComponent::ProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent )
|
|
{
|
|
uno::Any aOldValue, aNewValue;
|
|
uno::Reference< accessibility::XAccessible > xAcc;
|
|
|
|
switch ( rVclWindowEvent.GetId() )
|
|
{
|
|
case VCLEVENT_WINDOW_SHOW: // send create on show for direct accessible children
|
|
{
|
|
xAcc = GetChildAccessible( rVclWindowEvent );
|
|
if( xAcc.is() )
|
|
{
|
|
aNewValue <<= xAcc;
|
|
NotifyAccessibleEvent( accessibility::AccessibleEventId::CHILD, aOldValue, aNewValue );
|
|
}
|
|
}
|
|
break;
|
|
case VCLEVENT_WINDOW_HIDE: // send destroy on hide for direct accessible children
|
|
{
|
|
xAcc = GetChildAccessible( rVclWindowEvent );
|
|
if( xAcc.is() )
|
|
{
|
|
aOldValue <<= xAcc;
|
|
NotifyAccessibleEvent( accessibility::AccessibleEventId::CHILD, aOldValue, aNewValue );
|
|
}
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
|
|
void VCLXAccessibleComponent::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
|
|
{
|
|
uno::Any aOldValue, aNewValue;
|
|
|
|
Window* pAccWindow = rVclWindowEvent.GetWindow();
|
|
DBG_ASSERT( pAccWindow, "VCLXAccessibleComponent::ProcessWindowEvent - Window?" );
|
|
|
|
switch ( rVclWindowEvent.GetId() )
|
|
{
|
|
case VCLEVENT_OBJECT_DYING:
|
|
{
|
|
pAccWindow->RemoveEventListener( LINK( this, VCLXAccessibleComponent, WindowEventListener ) );
|
|
pAccWindow->RemoveChildEventListener( LINK( this, VCLXAccessibleComponent, WindowChildEventListener ) );
|
|
mxWindow.clear();
|
|
mpVCLXindow = NULL;
|
|
}
|
|
break;
|
|
//
|
|
// dont handle CHILDCREATED events here
|
|
// they are handled separately as child events, see ProcessWindowChildEvent above
|
|
//
|
|
/*
|
|
case VCLEVENT_WINDOW_CHILDCREATED:
|
|
{
|
|
Window* pWindow = (Window*) rVclWindowEvent.GetData();
|
|
DBG_ASSERT( pWindow, "VCLEVENT_WINDOW_CHILDCREATED - Window=?" );
|
|
aNewValue <<= pWindow->GetAccessible();
|
|
NotifyAccessibleEvent( accessibility::AccessibleEventId::CHILD, aOldValue, aNewValue );
|
|
}
|
|
break;
|
|
*/
|
|
case VCLEVENT_WINDOW_CHILDDESTROYED:
|
|
{
|
|
Window* pWindow = (Window*) rVclWindowEvent.GetData();
|
|
DBG_ASSERT( pWindow, "VCLEVENT_WINDOW_CHILDDESTROYED - Window=?" );
|
|
if ( pWindow->GetAccessible( sal_False ).is() )
|
|
{
|
|
aOldValue <<= pWindow->GetAccessible( sal_False );
|
|
NotifyAccessibleEvent( accessibility::AccessibleEventId::CHILD, aOldValue, aNewValue );
|
|
}
|
|
}
|
|
break;
|
|
|
|
//
|
|
// show and hide will be handled as child events only and are
|
|
// responsible for sending create/destroy events, see ProcessWindowChildEvent above
|
|
//
|
|
/*
|
|
case VCLEVENT_WINDOW_SHOW:
|
|
{
|
|
aNewValue <<= accessibility::AccessibleStateType::VISIBLE;
|
|
NotifyAccessibleEvent( accessibility::AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
|
|
|
|
aNewValue <<= accessibility::AccessibleStateType::SHOWING;
|
|
NotifyAccessibleEvent( accessibility::AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
|
|
|
|
aNewValue.clear();
|
|
aOldValue <<= accessibility::AccessibleStateType::INVALID;
|
|
NotifyAccessibleEvent( accessibility::AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
|
|
}
|
|
break;
|
|
case VCLEVENT_WINDOW_HIDE:
|
|
{
|
|
aOldValue <<= accessibility::AccessibleStateType::VISIBLE;
|
|
NotifyAccessibleEvent( accessibility::AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
|
|
|
|
aOldValue <<= accessibility::AccessibleStateType::SHOWING;
|
|
NotifyAccessibleEvent( accessibility::AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
|
|
|
|
aOldValue.clear();
|
|
aNewValue <<= accessibility::AccessibleStateType::INVALID;
|
|
NotifyAccessibleEvent( accessibility::AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
|
|
}
|
|
break;
|
|
*/
|
|
case VCLEVENT_WINDOW_ACTIVATE:
|
|
{
|
|
// avoid notification if a child frame is already active
|
|
// only one frame may be active at a given time
|
|
if ( !pAccWindow->HasActiveChildFrame() &&
|
|
( getAccessibleRole() == accessibility::AccessibleRole::FRAME ||
|
|
getAccessibleRole() == accessibility::AccessibleRole::ALERT ||
|
|
getAccessibleRole() == accessibility::AccessibleRole::DIALOG ) ) // #i18891#
|
|
{
|
|
aNewValue <<= accessibility::AccessibleStateType::ACTIVE;
|
|
NotifyAccessibleEvent( accessibility::AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
|
|
}
|
|
}
|
|
break;
|
|
case VCLEVENT_WINDOW_DEACTIVATE:
|
|
{
|
|
if ( getAccessibleRole() == accessibility::AccessibleRole::FRAME ||
|
|
getAccessibleRole() == accessibility::AccessibleRole::ALERT ||
|
|
getAccessibleRole() == accessibility::AccessibleRole::DIALOG ) // #i18891#
|
|
{
|
|
aOldValue <<= accessibility::AccessibleStateType::ACTIVE;
|
|
NotifyAccessibleEvent( accessibility::AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
|
|
}
|
|
}
|
|
break;
|
|
case VCLEVENT_WINDOW_GETFOCUS:
|
|
case VCLEVENT_CONTROL_GETFOCUS:
|
|
{
|
|
if( (pAccWindow->IsCompoundControl() && rVclWindowEvent.GetId() == VCLEVENT_CONTROL_GETFOCUS) ||
|
|
(!pAccWindow->IsCompoundControl() && rVclWindowEvent.GetId() == VCLEVENT_WINDOW_GETFOCUS) )
|
|
{
|
|
// if multiple listeners were registered it is possible that the
|
|
// focus was changed during event processing (eg SfxTopWindow )
|
|
// #106082# allow ChildPathFocus only for CompoundControls, for windows the focus must be in the window itself
|
|
if( (pAccWindow->IsCompoundControl() && pAccWindow->HasChildPathFocus()) ||
|
|
(!pAccWindow->IsCompoundControl() && pAccWindow->HasFocus()) )
|
|
{
|
|
aNewValue <<= accessibility::AccessibleStateType::FOCUSED;
|
|
NotifyAccessibleEvent( accessibility::AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
|
|
}
|
|
}
|
|
}
|
|
break;
|
|
case VCLEVENT_WINDOW_LOSEFOCUS:
|
|
case VCLEVENT_CONTROL_LOSEFOCUS:
|
|
{
|
|
if( (pAccWindow->IsCompoundControl() && rVclWindowEvent.GetId() == VCLEVENT_CONTROL_LOSEFOCUS) ||
|
|
(!pAccWindow->IsCompoundControl() && rVclWindowEvent.GetId() == VCLEVENT_WINDOW_LOSEFOCUS) )
|
|
{
|
|
aOldValue <<= accessibility::AccessibleStateType::FOCUSED;
|
|
NotifyAccessibleEvent( accessibility::AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
|
|
}
|
|
}
|
|
break;
|
|
case VCLEVENT_WINDOW_FRAMETITLECHANGED:
|
|
{
|
|
::rtl::OUString aOldName( *((::rtl::OUString*) rVclWindowEvent.GetData()) );
|
|
::rtl::OUString aNewName( getAccessibleName() );
|
|
aOldValue <<= aOldName;
|
|
aNewValue <<= aNewName;
|
|
NotifyAccessibleEvent( accessibility::AccessibleEventId::NAME_CHANGED, aOldValue, aNewValue );
|
|
}
|
|
break;
|
|
case VCLEVENT_WINDOW_ENABLED:
|
|
{
|
|
aNewValue <<= accessibility::AccessibleStateType::ENABLED;
|
|
NotifyAccessibleEvent( accessibility::AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
|
|
aNewValue <<= accessibility::AccessibleStateType::SENSITIVE;
|
|
NotifyAccessibleEvent( accessibility::AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
|
|
}
|
|
break;
|
|
case VCLEVENT_WINDOW_DISABLED:
|
|
{
|
|
aOldValue <<= accessibility::AccessibleStateType::SENSITIVE;
|
|
NotifyAccessibleEvent( accessibility::AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
|
|
|
|
aOldValue <<= accessibility::AccessibleStateType::ENABLED;
|
|
NotifyAccessibleEvent( accessibility::AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
|
|
}
|
|
break;
|
|
case VCLEVENT_WINDOW_MOVE:
|
|
case VCLEVENT_WINDOW_RESIZE:
|
|
{
|
|
NotifyAccessibleEvent( accessibility::AccessibleEventId::BOUNDRECT_CHANGED, aOldValue, aNewValue );
|
|
}
|
|
break;
|
|
case VCLEVENT_WINDOW_MENUBARADDED:
|
|
{
|
|
MenuBar* pMenuBar = (MenuBar*) rVclWindowEvent.GetData();
|
|
if ( pMenuBar )
|
|
{
|
|
uno::Reference< accessibility::XAccessible > xChild( pMenuBar->GetAccessible() );
|
|
if ( xChild.is() )
|
|
{
|
|
aNewValue <<= xChild;
|
|
NotifyAccessibleEvent( accessibility::AccessibleEventId::CHILD, aOldValue, aNewValue );
|
|
}
|
|
}
|
|
}
|
|
break;
|
|
case VCLEVENT_WINDOW_MENUBARREMOVED:
|
|
{
|
|
MenuBar* pMenuBar = (MenuBar*) rVclWindowEvent.GetData();
|
|
if ( pMenuBar )
|
|
{
|
|
uno::Reference< accessibility::XAccessible > xChild( pMenuBar->GetAccessible() );
|
|
if ( xChild.is() )
|
|
{
|
|
aOldValue <<= xChild;
|
|
NotifyAccessibleEvent( accessibility::AccessibleEventId::CHILD, aOldValue, aNewValue );
|
|
}
|
|
}
|
|
}
|
|
break;
|
|
case VCLEVENT_WINDOW_MINIMIZE:
|
|
{
|
|
aNewValue <<= accessibility::AccessibleStateType::ICONIFIED;
|
|
NotifyAccessibleEvent( accessibility::AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
|
|
}
|
|
break;
|
|
case VCLEVENT_WINDOW_NORMALIZE:
|
|
{
|
|
aOldValue <<= accessibility::AccessibleStateType::ICONIFIED;
|
|
NotifyAccessibleEvent( accessibility::AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
|
|
}
|
|
break;
|
|
default:
|
|
{
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
|
|
void VCLXAccessibleComponent::disposing()
|
|
{
|
|
if ( mpVCLXindow && mpVCLXindow->GetWindow() )
|
|
{
|
|
mpVCLXindow->GetWindow()->RemoveEventListener( LINK( this, VCLXAccessibleComponent, WindowEventListener ) );
|
|
mpVCLXindow->GetWindow()->RemoveChildEventListener( LINK( this, VCLXAccessibleComponent, WindowChildEventListener ) );
|
|
}
|
|
|
|
AccessibleExtendedComponentHelper_BASE::disposing();
|
|
|
|
mxWindow.clear();
|
|
mpVCLXindow = NULL;
|
|
}
|
|
|
|
Window* VCLXAccessibleComponent::GetWindow() const
|
|
{
|
|
return GetVCLXWindow() ? GetVCLXWindow()->GetWindow() : NULL;
|
|
}
|
|
|
|
void VCLXAccessibleComponent::FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet )
|
|
{
|
|
Window* pWindow = GetWindow();
|
|
if ( pWindow )
|
|
{
|
|
Window *pLabeledBy = pWindow->GetAccessibleRelationLabeledBy();
|
|
if ( pLabeledBy && pLabeledBy != pWindow )
|
|
{
|
|
uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1);
|
|
aSequence[0] = pLabeledBy->GetAccessible();
|
|
rRelationSet.AddRelation( accessibility::AccessibleRelation( accessibility::AccessibleRelationType::LABELED_BY, aSequence ) );
|
|
}
|
|
|
|
Window* pLabelFor = pWindow->GetAccessibleRelationLabelFor();
|
|
if ( pLabelFor && pLabelFor != pWindow )
|
|
{
|
|
uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1);
|
|
aSequence[0] = pLabelFor->GetAccessible();
|
|
rRelationSet.AddRelation( accessibility::AccessibleRelation( accessibility::AccessibleRelationType::LABEL_FOR, aSequence ) );
|
|
}
|
|
}
|
|
}
|
|
|
|
void VCLXAccessibleComponent::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
|
|
{
|
|
Window* pWindow = GetWindow();
|
|
if ( pWindow )
|
|
{
|
|
if ( pWindow->IsVisible() )
|
|
{
|
|
rStateSet.AddState( accessibility::AccessibleStateType::VISIBLE );
|
|
rStateSet.AddState( accessibility::AccessibleStateType::SHOWING );
|
|
}
|
|
else
|
|
{
|
|
rStateSet.AddState( accessibility::AccessibleStateType::INVALID );
|
|
}
|
|
|
|
if ( pWindow->IsEnabled() )
|
|
{
|
|
rStateSet.AddState( accessibility::AccessibleStateType::ENABLED );
|
|
rStateSet.AddState( accessibility::AccessibleStateType::SENSITIVE );
|
|
}
|
|
|
|
if ( pWindow->HasChildPathFocus() &&
|
|
( getAccessibleRole() == accessibility::AccessibleRole::FRAME ||
|
|
getAccessibleRole() == accessibility::AccessibleRole::ALERT ||
|
|
getAccessibleRole() == accessibility::AccessibleRole::DIALOG ) ) // #i18891#
|
|
rStateSet.AddState( accessibility::AccessibleStateType::ACTIVE );
|
|
|
|
// #104290# MT: This way, a ComboBox doesn't get state FOCUSED.
|
|
// I also don't understand
|
|
// a) why WINDOW_FIRSTCHILD is used here (which btw is a border window in the case of a combo box)
|
|
// b) why HasFocus() is nout "enough" for a compound control
|
|
/*
|
|
Window* pChild = pWindow->GetWindow( WINDOW_FIRSTCHILD );
|
|
if ( ( !pWindow->IsCompoundControl() && pWindow->HasFocus() ) ||
|
|
( pWindow->IsCompoundControl() && pChild && pChild->HasFocus() ) )
|
|
rStateSet.AddState( accessibility::AccessibleStateType::FOCUSED );
|
|
*/
|
|
if ( pWindow->HasFocus() || ( pWindow->IsCompoundControl() && pWindow->HasChildPathFocus() ) )
|
|
rStateSet.AddState( accessibility::AccessibleStateType::FOCUSED );
|
|
|
|
if ( pWindow->IsWait() )
|
|
rStateSet.AddState( accessibility::AccessibleStateType::BUSY );
|
|
|
|
if ( pWindow->GetStyle() & WB_SIZEABLE )
|
|
rStateSet.AddState( accessibility::AccessibleStateType::RESIZABLE );
|
|
|
|
if( pWindow->IsDialog() )
|
|
{
|
|
Dialog *pDlg = static_cast< Dialog* >( pWindow );
|
|
if( pDlg->IsInExecute() )
|
|
rStateSet.AddState( accessibility::AccessibleStateType::MODAL );
|
|
}
|
|
}
|
|
else
|
|
{
|
|
rStateSet.AddState( accessibility::AccessibleStateType::DEFUNC );
|
|
}
|
|
|
|
/*
|
|
|
|
MUST BE SET FROM DERIVED CLASSES:
|
|
|
|
CHECKED
|
|
COLLAPSED
|
|
EXPANDED
|
|
EXPANDABLE
|
|
EDITABLE
|
|
FOCUSABLE
|
|
HORIZONTAL
|
|
VERTICAL
|
|
ICONIFIED
|
|
MULTILINE
|
|
MULTI_SELECTABLE
|
|
PRESSED
|
|
SELECTABLE
|
|
SELECTED
|
|
SINGLE_LINE
|
|
TRANSIENT
|
|
|
|
*/
|
|
}
|
|
|
|
|
|
// accessibility::XAccessibleContext
|
|
sal_Int32 VCLXAccessibleComponent::getAccessibleChildCount() throw (uno::RuntimeException)
|
|
{
|
|
OExternalLockGuard aGuard( this );
|
|
|
|
sal_Int32 nChildren = 0;
|
|
if ( GetWindow() )
|
|
nChildren = GetWindow()->GetAccessibleChildWindowCount();
|
|
|
|
return nChildren;
|
|
}
|
|
|
|
uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessibleChild( sal_Int32 i ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
|
|
{
|
|
OExternalLockGuard aGuard( this );
|
|
|
|
if ( i >= getAccessibleChildCount() )
|
|
throw lang::IndexOutOfBoundsException();
|
|
|
|
uno::Reference< accessibility::XAccessible > xAcc;
|
|
if ( GetWindow() )
|
|
{
|
|
Window* pChild = GetWindow()->GetAccessibleChildWindow( (sal_uInt16)i );
|
|
if ( pChild )
|
|
xAcc = pChild->GetAccessible();
|
|
}
|
|
|
|
return xAcc;
|
|
}
|
|
|
|
uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getVclParent() const
|
|
{
|
|
uno::Reference< accessibility::XAccessible > xAcc;
|
|
if ( GetWindow() )
|
|
{
|
|
Window* pParent = GetWindow()->GetAccessibleParentWindow();
|
|
if ( pParent )
|
|
xAcc = pParent->GetAccessible();
|
|
}
|
|
return xAcc;
|
|
}
|
|
|
|
uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessibleParent( ) throw (uno::RuntimeException)
|
|
{
|
|
OExternalLockGuard aGuard( this );
|
|
|
|
uno::Reference< accessibility::XAccessible > xAcc( implGetForeignControlledParent() );
|
|
if ( !xAcc.is() )
|
|
// we do _not_ have a foreign-controlled parent -> default to our VCL parent
|
|
xAcc = getVclParent();
|
|
|
|
return xAcc;
|
|
}
|
|
|
|
sal_Int32 VCLXAccessibleComponent::getAccessibleIndexInParent( ) throw (uno::RuntimeException)
|
|
{
|
|
OExternalLockGuard aGuard( this );
|
|
|
|
sal_Int32 nIndex = -1;
|
|
|
|
uno::Reference< accessibility::XAccessible > xAcc( implGetForeignControlledParent() );
|
|
if ( xAcc.is() )
|
|
{ // we _do_ have a foreign-controlled parent -> use the base class' implementation,
|
|
// which goes the UNO way
|
|
nIndex = AccessibleExtendedComponentHelper_BASE::getAccessibleIndexInParent( );
|
|
}
|
|
else
|
|
{
|
|
if ( GetWindow() )
|
|
{
|
|
Window* pParent = GetWindow()->GetAccessibleParentWindow();
|
|
if ( pParent )
|
|
{
|
|
/*
|
|
for ( sal_uInt16 n = pParent->GetAccessibleChildWindowCount(); n; )
|
|
{
|
|
Window* pChild = pParent->GetAccessibleChildWindow( --n );
|
|
if ( pChild == GetWindow() )
|
|
{
|
|
nIndex = n;
|
|
break;
|
|
}
|
|
}
|
|
*/
|
|
// Iterate over all the parent's children and search for this object.
|
|
// this should be compatible with the code in SVX
|
|
uno::Reference< accessibility::XAccessible > xParentAcc( pParent->GetAccessible() );
|
|
if ( xParentAcc.is() )
|
|
{
|
|
uno::Reference< accessibility::XAccessibleContext > xParentContext ( xParentAcc->getAccessibleContext() );
|
|
if ( xParentContext.is() )
|
|
{
|
|
sal_Int32 nChildCount = xParentContext->getAccessibleChildCount();
|
|
for ( sal_Int32 i=0; i<nChildCount; i++ )
|
|
{
|
|
uno::Reference< accessibility::XAccessible > xChild( xParentContext->getAccessibleChild(i) );
|
|
if ( xChild.is() )
|
|
{
|
|
uno::Reference< accessibility::XAccessibleContext > xChildContext = xChild->getAccessibleContext();
|
|
if ( xChildContext == (accessibility::XAccessibleContext*) this )
|
|
{
|
|
nIndex = i;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return nIndex;
|
|
}
|
|
|
|
sal_Int16 VCLXAccessibleComponent::getAccessibleRole( ) throw (uno::RuntimeException)
|
|
{
|
|
OExternalLockGuard aGuard( this );
|
|
|
|
sal_Int16 nRole = 0;
|
|
|
|
if ( GetWindow() )
|
|
nRole = GetWindow()->GetAccessibleRole();
|
|
|
|
return nRole;
|
|
}
|
|
|
|
::rtl::OUString VCLXAccessibleComponent::getAccessibleDescription( ) throw (uno::RuntimeException)
|
|
{
|
|
OExternalLockGuard aGuard( this );
|
|
|
|
::rtl::OUString aDescription;
|
|
|
|
if ( GetWindow() )
|
|
aDescription = GetWindow()->GetAccessibleDescription();
|
|
|
|
return aDescription;
|
|
}
|
|
|
|
::rtl::OUString VCLXAccessibleComponent::getAccessibleName( ) throw (uno::RuntimeException)
|
|
{
|
|
OExternalLockGuard aGuard( this );
|
|
|
|
::rtl::OUString aName;
|
|
if ( GetWindow() )
|
|
{
|
|
aName = GetWindow()->GetAccessibleName();
|
|
#if OSL_DEBUG_LEVEL > 1
|
|
aName += String( RTL_CONSTASCII_USTRINGPARAM( " (Type = " ) );
|
|
aName += String::CreateFromInt32( GetWindow()->GetType() );
|
|
aName += String( RTL_CONSTASCII_USTRINGPARAM( ")" ) );
|
|
#endif
|
|
}
|
|
return aName;
|
|
}
|
|
|
|
uno::Reference< accessibility::XAccessibleRelationSet > VCLXAccessibleComponent::getAccessibleRelationSet( ) throw (uno::RuntimeException)
|
|
{
|
|
OExternalLockGuard aGuard( this );
|
|
|
|
utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper;
|
|
uno::Reference< accessibility::XAccessibleRelationSet > xSet = pRelationSetHelper;
|
|
FillAccessibleRelationSet( *pRelationSetHelper );
|
|
return xSet;
|
|
}
|
|
|
|
uno::Reference< accessibility::XAccessibleStateSet > VCLXAccessibleComponent::getAccessibleStateSet( ) throw (uno::RuntimeException)
|
|
{
|
|
OExternalLockGuard aGuard( this );
|
|
|
|
utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper;
|
|
uno::Reference< accessibility::XAccessibleStateSet > xSet = pStateSetHelper;
|
|
FillAccessibleStateSet( *pStateSetHelper );
|
|
return xSet;
|
|
}
|
|
|
|
lang::Locale VCLXAccessibleComponent::getLocale() throw (accessibility::IllegalAccessibleComponentStateException, uno::RuntimeException)
|
|
{
|
|
OExternalLockGuard aGuard( this );
|
|
|
|
return Application::GetSettings().GetLocale();
|
|
}
|
|
|
|
uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessibleAtPoint( const awt::Point& rPoint ) throw (uno::RuntimeException)
|
|
{
|
|
OExternalLockGuard aGuard( this );
|
|
|
|
uno::Reference< accessibility::XAccessible > xChild;
|
|
for ( sal_uInt32 i = 0, nCount = getAccessibleChildCount(); i < nCount; ++i )
|
|
{
|
|
uno::Reference< accessibility::XAccessible > xAcc = getAccessibleChild( i );
|
|
if ( xAcc.is() )
|
|
{
|
|
uno::Reference< accessibility::XAccessibleComponent > xComp( xAcc->getAccessibleContext(), uno::UNO_QUERY );
|
|
if ( xComp.is() )
|
|
{
|
|
Rectangle aRect = VCLRectangle( xComp->getBounds() );
|
|
Point aPos = VCLPoint( rPoint );
|
|
if ( aRect.IsInside( aPos ) )
|
|
{
|
|
xChild = xAcc;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
return xChild;
|
|
}
|
|
|
|
// accessibility::XAccessibleComponent
|
|
awt::Rectangle VCLXAccessibleComponent::implGetBounds() throw (uno::RuntimeException)
|
|
{
|
|
awt::Rectangle aBounds ( 0, 0, 0, 0 );
|
|
|
|
Window* pWindow = GetWindow();
|
|
if ( pWindow )
|
|
{
|
|
Rectangle aRect = pWindow->GetWindowExtentsRelative( NULL );
|
|
aBounds = AWTRectangle( aRect );
|
|
Window* pParent = pWindow->GetAccessibleParentWindow();
|
|
if ( pParent )
|
|
{
|
|
Rectangle aParentRect = pParent->GetWindowExtentsRelative( NULL );
|
|
awt::Point aParentScreenLoc = AWTPoint( aParentRect.TopLeft() );
|
|
aBounds.X -= aParentScreenLoc.X;
|
|
aBounds.Y -= aParentScreenLoc.Y;
|
|
}
|
|
}
|
|
|
|
uno::Reference< accessibility::XAccessible > xParent( implGetForeignControlledParent() );
|
|
if ( xParent.is() )
|
|
{ // hmm, we can't rely on our VCL coordinates, as in the Accessibility Hierarchy, somebody gave
|
|
// us a parent which is different from our VCL parent
|
|
// (actually, we did not check if it's really different ...)
|
|
|
|
// the screen location of the foreign parent
|
|
uno::Reference< accessibility::XAccessibleComponent > xParentComponent( xParent->getAccessibleContext(), uno::UNO_QUERY );
|
|
DBG_ASSERT( xParentComponent.is(), "VCLXAccessibleComponent::implGetBounds: invalid (foreign) parent component!" );
|
|
|
|
awt::Point aScreenLocForeign( 0, 0 );
|
|
if ( xParentComponent.is() )
|
|
aScreenLocForeign = xParentComponent->getLocationOnScreen();
|
|
|
|
// the screen location of the VCL parent
|
|
xParent = getVclParent();
|
|
if ( xParent.is() )
|
|
xParentComponent = xParentComponent.query( xParent->getAccessibleContext() );
|
|
|
|
awt::Point aScreenLocVCL( 0, 0 );
|
|
if ( xParentComponent.is() )
|
|
aScreenLocVCL = xParentComponent->getLocationOnScreen();
|
|
|
|
// the difference between them
|
|
awt::Size aOffset( aScreenLocVCL.X - aScreenLocForeign.X, aScreenLocVCL.Y - aScreenLocForeign.Y );
|
|
// move the bounds
|
|
aBounds.X += aOffset.Width;
|
|
aBounds.Y += aOffset.Height;
|
|
}
|
|
|
|
return aBounds;
|
|
}
|
|
|
|
awt::Point VCLXAccessibleComponent::getLocationOnScreen( ) throw (uno::RuntimeException)
|
|
{
|
|
OExternalLockGuard aGuard( this );
|
|
|
|
awt::Point aPos;
|
|
if ( GetWindow() )
|
|
{
|
|
Rectangle aRect = GetWindow()->GetWindowExtentsRelative( NULL );
|
|
aPos.X = aRect.Left();
|
|
aPos.Y = aRect.Top();
|
|
}
|
|
|
|
return aPos;
|
|
}
|
|
|
|
void VCLXAccessibleComponent::grabFocus( ) throw (uno::RuntimeException)
|
|
{
|
|
OExternalLockGuard aGuard( this );
|
|
|
|
uno::Reference< accessibility::XAccessibleStateSet > xStates = getAccessibleStateSet();
|
|
if ( mxWindow.is() && xStates.is() && xStates->contains( accessibility::AccessibleStateType::FOCUSABLE ) )
|
|
mxWindow->setFocus();
|
|
}
|
|
|
|
sal_Int32 SAL_CALL VCLXAccessibleComponent::getForeground( ) throw (uno::RuntimeException)
|
|
{
|
|
OExternalLockGuard aGuard( this );
|
|
|
|
sal_Int32 nColor = 0;
|
|
Window* pWindow = GetWindow();
|
|
if ( pWindow )
|
|
{
|
|
if ( pWindow->IsControlForeground() )
|
|
nColor = pWindow->GetControlForeground().GetColor();
|
|
else
|
|
{
|
|
Font aFont;
|
|
if ( pWindow->IsControlFont() )
|
|
aFont = pWindow->GetControlFont();
|
|
else
|
|
aFont = pWindow->GetFont();
|
|
nColor = aFont.GetColor().GetColor();
|
|
}
|
|
}
|
|
|
|
return nColor;
|
|
}
|
|
|
|
sal_Int32 SAL_CALL VCLXAccessibleComponent::getBackground( ) throw (uno::RuntimeException)
|
|
{
|
|
OExternalLockGuard aGuard( this );
|
|
|
|
sal_Int32 nColor = 0;
|
|
Window* pWindow = GetWindow();
|
|
if ( pWindow )
|
|
{
|
|
if ( pWindow->IsControlBackground() )
|
|
nColor = pWindow->GetControlBackground().GetColor();
|
|
else
|
|
nColor = pWindow->GetBackground().GetColor().GetColor();
|
|
}
|
|
|
|
return nColor;
|
|
}
|
|
|
|
// XAccessibleExtendedComponent
|
|
|
|
uno::Reference< awt::XFont > SAL_CALL VCLXAccessibleComponent::getFont( ) throw (uno::RuntimeException)
|
|
{
|
|
OExternalLockGuard aGuard( this );
|
|
|
|
uno::Reference< awt::XFont > xFont;
|
|
Window* pWindow = GetWindow();
|
|
if ( pWindow )
|
|
{
|
|
uno::Reference< awt::XDevice > xDev( pWindow->GetComponentInterface(), uno::UNO_QUERY );
|
|
if ( xDev.is() )
|
|
{
|
|
Font aFont;
|
|
if ( pWindow->IsControlFont() )
|
|
aFont = pWindow->GetControlFont();
|
|
else
|
|
aFont = pWindow->GetFont();
|
|
VCLXFont* pVCLXFont = new VCLXFont;
|
|
pVCLXFont->Init( *xDev.get(), aFont );
|
|
xFont = pVCLXFont;
|
|
}
|
|
}
|
|
|
|
return xFont;
|
|
}
|
|
|
|
::rtl::OUString SAL_CALL VCLXAccessibleComponent::getTitledBorderText( ) throw (uno::RuntimeException)
|
|
{
|
|
OExternalLockGuard aGuard( this );
|
|
|
|
::rtl::OUString sRet;
|
|
if ( GetWindow() )
|
|
sRet = GetWindow()->GetText();
|
|
|
|
return sRet;
|
|
}
|
|
|
|
::rtl::OUString SAL_CALL VCLXAccessibleComponent::getToolTipText( ) throw (uno::RuntimeException)
|
|
{
|
|
OExternalLockGuard aGuard( this );
|
|
|
|
::rtl::OUString sRet;
|
|
if ( GetWindow() )
|
|
sRet = GetWindow()->GetQuickHelpText();
|
|
|
|
return sRet;
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|