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
519 lines
18 KiB
C++
519 lines
18 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.
|
|
*
|
|
************************************************************************/
|
|
|
|
#include <vclxtabcontrol.hxx>
|
|
|
|
#include <com/sun/star/awt/PosSize.hpp>
|
|
#include <sal/macros.h>
|
|
#include <toolkit/helper/property.hxx>
|
|
#include <toolkit/helper/vclunohelper.hxx>
|
|
#include <vcl/tabctrl.hxx>
|
|
#include <vcl/tabpage.hxx>
|
|
#include <vcl/svapp.hxx>
|
|
|
|
#include "forward.hxx"
|
|
|
|
namespace layoutimpl
|
|
{
|
|
|
|
using namespace ::com::sun::star::lang;
|
|
using namespace ::com::sun::star::beans;
|
|
using namespace ::com::sun::star;
|
|
|
|
VCLXTabControl::ChildProps::ChildProps( VCLXTabControl::ChildData *pData )
|
|
{
|
|
addProp( RTL_CONSTASCII_USTRINGPARAM( "Title" ),
|
|
::getCppuType( static_cast< const rtl::OUString* >( NULL ) ),
|
|
&(pData->maTitle) );
|
|
}
|
|
|
|
VCLXTabControl::ChildData::ChildData( uno::Reference< awt::XLayoutConstrains > const& xChild )
|
|
: Box_Base::ChildData( xChild )
|
|
, maTitle()
|
|
{
|
|
}
|
|
|
|
VCLXTabControl::ChildData*
|
|
VCLXTabControl::createChild( uno::Reference< awt::XLayoutConstrains > const& xChild )
|
|
{
|
|
return new ChildData( xChild );
|
|
}
|
|
|
|
VCLXTabControl::ChildProps*
|
|
VCLXTabControl::createChildProps( Box_Base::ChildData *pData )
|
|
{
|
|
return new ChildProps( static_cast<VCLXTabControl::ChildData*> ( pData ) );
|
|
}
|
|
|
|
DBG_NAME( VCLXTabControl );
|
|
|
|
#if !defined (__GNUC__)
|
|
#define __PRETTY_FUNCTION__ __FUNCTION__
|
|
#endif /* !__GNUC__ */
|
|
|
|
VCLXTabControl::VCLXTabControl()
|
|
: VCLXWindow()
|
|
, VCLXTabControl_Base()
|
|
, Box_Base()
|
|
, mTabId (1)
|
|
, bRealized (false)
|
|
{
|
|
#ifndef __SUNPRO_CC
|
|
OSL_TRACE ("\n********%s:%x", __PRETTY_FUNCTION__, this);
|
|
#endif
|
|
DBG_CTOR( VCLXTabControl, NULL );
|
|
}
|
|
|
|
VCLXTabControl::~VCLXTabControl()
|
|
{
|
|
DBG_DTOR( VCLXTabControl, NULL );
|
|
}
|
|
|
|
IMPLEMENT_2_FORWARD_XINTERFACE2( VCLXTabControl, VCLXWindow, Container, VCLXTabControl_Base );
|
|
|
|
IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXTabControl, VCLXWindow, VCLXTabControl_Base );
|
|
|
|
void SAL_CALL VCLXTabControl::dispose( ) throw(uno::RuntimeException)
|
|
{
|
|
{
|
|
SolarMutexGuard aGuard;
|
|
|
|
EventObject aDisposeEvent;
|
|
aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this);
|
|
// maTabListeners.disposeAndClear( aDisposeEvent );
|
|
}
|
|
|
|
VCLXWindow::dispose();
|
|
}
|
|
|
|
|
|
TabControl *VCLXTabControl::getTabControl() const throw (uno::RuntimeException)
|
|
{
|
|
TabControl *pTabControl = static_cast< TabControl* >( GetWindow() );
|
|
if ( pTabControl )
|
|
return pTabControl;
|
|
throw uno::RuntimeException();
|
|
}
|
|
|
|
sal_Int32 SAL_CALL VCLXTabControl::insertTab() throw (uno::RuntimeException)
|
|
{
|
|
TabControl *pTabControl = getTabControl();
|
|
sal_uInt16 id = sal::static_int_cast< sal_uInt16 >( mTabId++ );
|
|
rtl::OUString title (RTL_CONSTASCII_USTRINGPARAM( "" ) );
|
|
pTabControl->InsertPage( id, title.getStr(), TAB_APPEND );
|
|
pTabControl->SetTabPage( id, new TabPage( pTabControl ) );
|
|
return id;
|
|
}
|
|
|
|
void SAL_CALL VCLXTabControl::removeTab( sal_Int32 ID ) throw (uno::RuntimeException, IndexOutOfBoundsException)
|
|
{
|
|
TabControl *pTabControl = getTabControl();
|
|
if ( pTabControl->GetTabPage( sal::static_int_cast< sal_uInt16 >( ID ) ) == NULL )
|
|
throw IndexOutOfBoundsException();
|
|
pTabControl->RemovePage( sal::static_int_cast< sal_uInt16 >( ID ) );
|
|
}
|
|
|
|
void SAL_CALL VCLXTabControl::activateTab( sal_Int32 ID ) throw (uno::RuntimeException, IndexOutOfBoundsException)
|
|
{
|
|
TabControl *pTabControl = getTabControl();
|
|
if ( pTabControl->GetTabPage( sal::static_int_cast< sal_uInt16 >( ID ) ) == NULL )
|
|
throw IndexOutOfBoundsException();
|
|
pTabControl->SelectTabPage( sal::static_int_cast< sal_uInt16 >( ID ) );
|
|
}
|
|
|
|
sal_Int32 SAL_CALL VCLXTabControl::getActiveTabID() throw (uno::RuntimeException)
|
|
{
|
|
return getTabControl()->GetCurPageId( );
|
|
}
|
|
|
|
void SAL_CALL VCLXTabControl::addTabListener( const uno::Reference< awt::XTabListener >& xListener ) throw (uno::RuntimeException)
|
|
{
|
|
for ( std::list< uno::Reference
|
|
< awt::XTabListener > >::const_iterator it
|
|
= mxTabListeners.begin(); it != mxTabListeners.end(); ++it )
|
|
{
|
|
if ( *it == xListener )
|
|
// already added
|
|
return;
|
|
}
|
|
mxTabListeners.push_back( xListener );
|
|
}
|
|
|
|
void SAL_CALL VCLXTabControl::removeTabListener( const uno::Reference< awt::XTabListener >& xListener ) throw (uno::RuntimeException)
|
|
{
|
|
for ( std::list< uno::Reference
|
|
< awt::XTabListener > >::iterator it
|
|
= mxTabListeners.begin(); it != mxTabListeners.end(); ++it )
|
|
{
|
|
if ( *it == xListener )
|
|
{
|
|
mxTabListeners.erase( it );
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
void SAL_CALL VCLXTabControl::setTabProps( sal_Int32 ID, const uno::Sequence< NamedValue >& Properties ) throw (uno::RuntimeException, IndexOutOfBoundsException)
|
|
{
|
|
TabControl *pTabControl = getTabControl();
|
|
if ( pTabControl->GetTabPage( sal::static_int_cast< sal_uInt16 >( ID ) ) == NULL )
|
|
throw IndexOutOfBoundsException();
|
|
|
|
for ( int i = 0; i < Properties.getLength(); i++ )
|
|
{
|
|
const rtl::OUString &name = Properties[i].Name;
|
|
const uno::Any &value = Properties[i].Value;
|
|
|
|
if ( name == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ) )
|
|
{
|
|
rtl::OUString title = value.get<rtl::OUString>();
|
|
pTabControl->SetPageText( sal::static_int_cast< sal_uInt16 >( ID ), title.getStr() );
|
|
}
|
|
}
|
|
}
|
|
|
|
uno::Sequence< NamedValue > SAL_CALL VCLXTabControl::getTabProps( sal_Int32 ID )
|
|
throw (IndexOutOfBoundsException, uno::RuntimeException)
|
|
{
|
|
TabControl *pTabControl = getTabControl();
|
|
if ( pTabControl->GetTabPage( sal::static_int_cast< sal_uInt16 >( ID ) ) == NULL )
|
|
throw IndexOutOfBoundsException();
|
|
|
|
#define ADD_PROP( seq, i, name, val ) { \
|
|
NamedValue value; \
|
|
value.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( name ) ); \
|
|
value.Value = uno::makeAny( val ); \
|
|
seq[i] = value; \
|
|
}
|
|
|
|
uno::Sequence< NamedValue > props( 2 );
|
|
ADD_PROP( props, 0, "Title", rtl::OUString( pTabControl->GetPageText( sal::static_int_cast< sal_uInt16 >( ID ) ) ) );
|
|
ADD_PROP( props, 1, "Position", pTabControl->GetPagePos( sal::static_int_cast< sal_uInt16 >( ID ) ) );
|
|
#undef ADD_PROP
|
|
return props;
|
|
}
|
|
|
|
// TODO: draw tab border here
|
|
void SAL_CALL VCLXTabControl::draw( sal_Int32 nX, sal_Int32 nY ) throw(uno::RuntimeException)
|
|
{
|
|
SolarMutexGuard aGuard;
|
|
|
|
TabControl *pTabControl = getTabControl();
|
|
TabPage *pTabPage = pTabControl->GetTabPage( sal::static_int_cast< sal_uInt16 >( getActiveTabID() ) );
|
|
if ( pTabPage )
|
|
{
|
|
::Point aPos( nX, nY );
|
|
::Size aSize = pTabPage->GetSizePixel();
|
|
|
|
OutputDevice* pDev = VCLUnoHelper::GetOutputDevice( getGraphics() );
|
|
aPos = pDev->PixelToLogic( aPos );
|
|
aSize = pDev->PixelToLogic( aSize );
|
|
|
|
pTabPage->Draw( pDev, aPos, aSize, 0 );
|
|
}
|
|
|
|
VCLXWindow::draw( nX, nY );
|
|
}
|
|
|
|
void VCLXTabControl::AddChild (uno::Reference< awt::XLayoutConstrains > const& xChild)
|
|
|
|
{
|
|
#ifndef __SUNPRO_CC
|
|
OSL_TRACE ("%s: children: %d", __PRETTY_FUNCTION__, maChildren.size ());
|
|
#endif
|
|
mIdMap[ xChild ] = mTabId++;
|
|
Box_Base::AddChild( xChild );
|
|
#ifndef __SUNPRO_CC
|
|
OSL_TRACE ("%s: children: %d", __PRETTY_FUNCTION__, maChildren.size ());
|
|
#endif
|
|
}
|
|
|
|
void SAL_CALL VCLXTabControl::addChild(
|
|
const uno::Reference< awt::XLayoutConstrains > &xChild )
|
|
throw (uno::RuntimeException, awt::MaxChildrenException)
|
|
{
|
|
mIdMap[ xChild ] = insertTab();
|
|
Box_Base::addChild( xChild );
|
|
}
|
|
|
|
void SAL_CALL VCLXTabControl::removeChild( const uno::Reference< awt::XLayoutConstrains > &xChild )
|
|
throw (uno::RuntimeException)
|
|
{
|
|
removeTab( mIdMap[xChild] );
|
|
mIdMap[ xChild ] = -1;
|
|
Box_Base::removeChild( xChild );
|
|
}
|
|
|
|
static void setChildrenVisible( uno::Reference < awt::XLayoutConstrains > xChild, bool visible )
|
|
{
|
|
uno::Reference< awt::XWindow > xWin( xChild, uno::UNO_QUERY);
|
|
if ( xWin.is() )
|
|
{
|
|
xWin->setVisible( visible );
|
|
}
|
|
|
|
uno::Reference < awt::XLayoutContainer > xCont( xChild, uno::UNO_QUERY );
|
|
if ( xCont.is())
|
|
{
|
|
uno::Sequence< uno::Reference < awt::XLayoutConstrains > > children = xCont->getChildren();
|
|
for ( int i = 0; i < children.getLength(); i++ )
|
|
{
|
|
setChildrenVisible( children[i], visible );
|
|
}
|
|
}
|
|
}
|
|
|
|
void SAL_CALL VCLXTabControl::allocateArea (awt::Rectangle const &area)
|
|
throw (uno::RuntimeException)
|
|
{
|
|
#ifndef __SUNPRO_CC
|
|
OSL_TRACE ("\n%s", __PRETTY_FUNCTION__);
|
|
#endif
|
|
maAllocation = area;
|
|
|
|
TabControl *pTabControl = getTabControl();
|
|
|
|
// FIXME: this is wrong. We just want to set tab controls pos/size for
|
|
// the tabs menu, otherwise, it gets events that should go to children
|
|
// (I guess we could solve this by making the tabcontrol as the actual
|
|
// XWindow parent of its children, when importing...) Not sure about
|
|
// TabPage drawing... That doesn't work on gtk+; just ignoring that.
|
|
// LATER: Nah, the proper fix is to get the XWindow hierarchy
|
|
// straight.
|
|
|
|
awt::Size currentSize = getSize();
|
|
awt::Size requestedSize (area.Width, area.Height);
|
|
// requestedSize.Height = getHeightForWidth( area.Width );
|
|
|
|
awt::Size minimumSize = getMinimumSize();
|
|
if (requestedSize.Width < minimumSize.Width)
|
|
requestedSize.Width = minimumSize.Width;
|
|
if (requestedSize.Height < minimumSize.Height)
|
|
requestedSize.Height = minimumSize.Height;
|
|
|
|
Size pageSize = static_cast<TabControl*> (GetWindow ())->GetTabPageSizePixel ();
|
|
awt::Size pageBasedSize (0, 0);
|
|
pageBasedSize.Width = pageSize.Width ();
|
|
pageBasedSize.Height = pageSize.Height ();
|
|
|
|
const int wc = 0;
|
|
const int hc = 20;
|
|
static int pwc = 0;
|
|
static int phc = 40;
|
|
|
|
if (requestedSize.Width < pageBasedSize.Width)
|
|
requestedSize.Width = pageBasedSize.Width + wc;
|
|
if (requestedSize.Height < pageBasedSize.Height)
|
|
requestedSize.Height = pageBasedSize.Height + hc;
|
|
|
|
Window *parent = GetWindow()->GetParent();
|
|
Size parentSize = parent->GetSizePixel();
|
|
|
|
#ifndef __SUNPRO_CC
|
|
#ifdef GCC_MAJOR
|
|
OSL_TRACE ("\n%s", __PRETTY_FUNCTION__);
|
|
#endif /* GCC_MAJOR */
|
|
OSL_TRACE ("%s: cursize: %d ,%d", __FUNCTION__, currentSize.Width, currentSize.Height );
|
|
OSL_TRACE ("%s: area: %d, %d", __FUNCTION__, area.Width, area.Height );
|
|
OSL_TRACE ("%s: minimum: %d, %d", __FUNCTION__, minimumSize.Width, minimumSize.Height );
|
|
OSL_TRACE ("%s: requestedSize: %d, %d", __FUNCTION__, requestedSize.Width, requestedSize.Height );
|
|
OSL_TRACE ("%s: pageBasedSize: %d, %d", __FUNCTION__, pageBasedSize.Width, pageBasedSize.Height );
|
|
#endif
|
|
|
|
//bRealized = false;
|
|
if (!bRealized)
|
|
{
|
|
setPosSize( area.X, area.Y, requestedSize.Width, requestedSize.Height, awt::PosSize::POSSIZE );
|
|
bRealized = true;
|
|
}
|
|
else
|
|
{
|
|
if ( requestedSize.Width > currentSize.Width + 10)
|
|
setPosSize( 0, 0, requestedSize.Width, 0, awt::PosSize::WIDTH );
|
|
if ( requestedSize.Height > currentSize.Height + 10)
|
|
setPosSize( 0, 0, 0, requestedSize.Height, awt::PosSize::HEIGHT );
|
|
}
|
|
|
|
if (pageBasedSize.Width > parentSize.Width ()
|
|
|| pageBasedSize.Height > parentSize.Height ())
|
|
//parent->SetSizePixel ( Size (pageBasedSize.Width, pageBasedSize.Height));
|
|
//parent->SetSizePixel ( Size (pageBasedSize.Width + pwc, pageBasedSize.Height + phc));
|
|
parent->SetSizePixel ( Size (requestedSize.Width + pwc, requestedSize.Height + phc));
|
|
|
|
// FIXME: we can save cycles by setting visibility more sensibly. Having
|
|
// it here does makes it easier when changing tabs (just needs a recalc())
|
|
unsigned i = 0;
|
|
for ( std::list<Box_Base::ChildData *>::const_iterator it
|
|
= maChildren.begin(); it != maChildren.end(); ++it, ++i )
|
|
{
|
|
ChildData *child = static_cast<VCLXTabControl::ChildData*> ( *it );
|
|
uno::Reference
|
|
< awt::XLayoutConstrains > xChild( child->mxChild );
|
|
if ( xChild.is() )
|
|
{
|
|
uno::Reference< awt::XWindow > xWin( xChild, uno::UNO_QUERY );
|
|
bool active = (i+1 == (unsigned) getActiveTabID());
|
|
|
|
// HACK: since our layout:: container don't implement XWindow, we have no easy
|
|
// way to set them invisible; lets just set all their children as such :P
|
|
setChildrenVisible( xChild, active );
|
|
|
|
if ( active )
|
|
{
|
|
::Rectangle label_rect = pTabControl->GetTabBounds( sal::static_int_cast< sal_uInt16 >( i+1 ) );
|
|
::Rectangle page_rect = pTabControl->GetTabPageBounds( sal::static_int_cast< sal_uInt16 >( i+1 ) );
|
|
|
|
awt::Rectangle childRect;
|
|
childRect.X = page_rect.Left();
|
|
childRect.Y = SAL_MAX( label_rect.Bottom(), page_rect.Top() );
|
|
childRect.Width = page_rect.Right() - page_rect.Left();
|
|
childRect.Height = page_rect.Bottom() - childRect.Y;
|
|
|
|
allocateChildAt( xChild, childRect );
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
awt::Size SAL_CALL VCLXTabControl::getMinimumSize()
|
|
throw(uno::RuntimeException)
|
|
{
|
|
awt::Size requestedSize = VCLXWindow::getMinimumSize();
|
|
awt::Size childrenSize( 0, 0 );
|
|
|
|
TabControl* pTabControl = static_cast< TabControl* >( GetWindow() );
|
|
if ( !pTabControl )
|
|
return requestedSize;
|
|
|
|
// calculate size to accomodate all children
|
|
unsigned i = 0;
|
|
for ( std::list<Box_Base::ChildData *>::const_iterator it
|
|
= maChildren.begin(); it != maChildren.end(); ++it, ++i )
|
|
{
|
|
ChildData *child = static_cast<VCLXTabControl::ChildData*> ( *it );
|
|
if ( child->mxChild.is() )
|
|
{
|
|
// set the title prop here...
|
|
pTabControl->SetPageText( sal::static_int_cast< sal_uInt16 >( i+1 ), child->maTitle.getStr() );
|
|
|
|
awt::Size childSize( child->mxChild->getMinimumSize() );
|
|
childrenSize.Width = SAL_MAX( childSize.Width, childrenSize.Width );
|
|
childrenSize.Height = SAL_MAX( childSize.Height, childrenSize.Height );
|
|
}
|
|
}
|
|
|
|
#ifndef __SUNPRO_CC
|
|
#ifdef GCC_MAJOR
|
|
OSL_TRACE ("\n%s", __PRETTY_FUNCTION__);
|
|
#endif /* GCC_MAJOR */
|
|
OSL_TRACE ("%s: children: %d", __FUNCTION__, i);
|
|
OSL_TRACE ("%s: childrenSize: %d, %d", __FUNCTION__, childrenSize.Width, childrenSize.Height );
|
|
#endif
|
|
|
|
requestedSize.Width += childrenSize.Width;
|
|
requestedSize.Height += childrenSize.Height + 20;
|
|
|
|
maRequisition = requestedSize;
|
|
return requestedSize;
|
|
}
|
|
|
|
void VCLXTabControl::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent )
|
|
{
|
|
SolarMutexClearableGuard aGuard;
|
|
TabControl* pTabControl = static_cast< TabControl* >( GetWindow() );
|
|
if ( !pTabControl )
|
|
return;
|
|
|
|
switch ( _rVclWindowEvent.GetId() )
|
|
{
|
|
case VCLEVENT_TABPAGE_ACTIVATE:
|
|
forceRecalc();
|
|
case VCLEVENT_TABPAGE_DEACTIVATE:
|
|
case VCLEVENT_TABPAGE_INSERTED:
|
|
case VCLEVENT_TABPAGE_REMOVED:
|
|
case VCLEVENT_TABPAGE_REMOVEDALL:
|
|
case VCLEVENT_TABPAGE_PAGETEXTCHANGED:
|
|
{
|
|
sal_uLong page = (sal_uLong) _rVclWindowEvent.GetData();
|
|
for ( std::list< uno::Reference
|
|
< awt::XTabListener > >::iterator it
|
|
= mxTabListeners.begin(); it != mxTabListeners.end(); ++it )
|
|
{
|
|
uno::Reference
|
|
< awt::XTabListener > listener = *it;
|
|
|
|
switch ( _rVclWindowEvent.GetId() )
|
|
{
|
|
|
|
case VCLEVENT_TABPAGE_ACTIVATE:
|
|
listener->activated( page );
|
|
break;
|
|
case VCLEVENT_TABPAGE_DEACTIVATE:
|
|
listener->deactivated( page );
|
|
break;
|
|
case VCLEVENT_TABPAGE_INSERTED:
|
|
listener->inserted( page );
|
|
break;
|
|
case VCLEVENT_TABPAGE_REMOVED:
|
|
listener->removed( page );
|
|
break;
|
|
case VCLEVENT_TABPAGE_REMOVEDALL:
|
|
for ( int i = 1; i < mTabId; i++)
|
|
{
|
|
if ( pTabControl->GetTabPage( sal::static_int_cast< sal_uInt16 >( i ) ) )
|
|
listener->removed( i );
|
|
}
|
|
break;
|
|
case VCLEVENT_TABPAGE_PAGETEXTCHANGED:
|
|
listener->changed( page, getTabProps( page ) );
|
|
break;
|
|
}
|
|
}
|
|
break;
|
|
}
|
|
default:
|
|
aGuard.clear();
|
|
VCLXWindow::ProcessWindowEvent( _rVclWindowEvent );
|
|
break;
|
|
}
|
|
}
|
|
|
|
void SAL_CALL VCLXTabControl::setProperty( const ::rtl::OUString& PropertyName, const uno::Any &Value ) throw(uno::RuntimeException)
|
|
{
|
|
VCLXWindow::setProperty( PropertyName, Value );
|
|
}
|
|
|
|
uno::Any SAL_CALL VCLXTabControl::getProperty( const ::rtl::OUString& PropertyName ) throw(uno::RuntimeException)
|
|
{
|
|
return VCLXWindow::getProperty( PropertyName );
|
|
}
|
|
|
|
} // namespace layoutimpl
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|