67d2af6fac
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
978 lines
34 KiB
C++
978 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_vcl.hxx"
|
|
|
|
// bootstrap stuff
|
|
#include <rtl/bootstrap.hxx>
|
|
#include <comphelper/processfactory.hxx>
|
|
#include <comphelper/regpathhelper.hxx>
|
|
#include <cppuhelper/servicefactory.hxx>
|
|
#include <cppuhelper/bootstrap.hxx>
|
|
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
|
|
#include <com/sun/star/lang/XInitialization.hpp>
|
|
#include <com/sun/star/registry/XSimpleRegistry.hpp>
|
|
|
|
#include <ucbhelper/contentbroker.hxx>
|
|
#include <ucbhelper/configurationkeys.hxx>
|
|
|
|
#include <vcl/svapp.hxx>
|
|
#include <vcl/dialog.hxx>
|
|
#include <vcl/outdev.hxx>
|
|
#include <vcl/virdev.hxx>
|
|
#include <vcl/hatch.hxx>
|
|
#include <vcl/bitmap.hxx>
|
|
#include <vcl/wall.hxx>
|
|
#include <vcl/image.hxx>
|
|
#include <vcl/gdimtf.hxx>
|
|
#include <vcl/metaact.hxx>
|
|
#include <vcl/bitmapex.hxx>
|
|
#include <vcl/gradient.hxx>
|
|
#include <vcl/lineinfo.hxx>
|
|
#include <tools/string.hxx>
|
|
|
|
#include <osl/time.h>
|
|
|
|
#include <boost/function.hpp>
|
|
#include <boost/bind.hpp>
|
|
|
|
#include <stdio.h>
|
|
#include <unistd.h>
|
|
|
|
using namespace ::com::sun::star;
|
|
|
|
|
|
namespace
|
|
{
|
|
|
|
class GrindApp : public Application
|
|
{
|
|
public:
|
|
virtual int Main();
|
|
virtual sal_uInt16 Exception( sal_uInt16 nError );
|
|
};
|
|
|
|
class TestWindow : public Dialog
|
|
{
|
|
public:
|
|
TestWindow() : Dialog( (Window *) NULL )
|
|
{
|
|
SetText( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OutDev grinding")) );
|
|
SetSizePixel( Size( 1024, 1024 ) );
|
|
EnablePaint( true );
|
|
Show();
|
|
}
|
|
|
|
virtual ~TestWindow() {}
|
|
virtual void Paint( const Rectangle& rRect );
|
|
};
|
|
|
|
//----------------------------------------------------------------------------------
|
|
|
|
typedef boost::function1<void, OutputDevice*> functor_type;
|
|
typedef std::vector< std::pair<const char*,
|
|
functor_type> > functor_vector_type;
|
|
|
|
template< typename Functor > void add( functor_vector_type& res,
|
|
const char* pStr,
|
|
const Functor& func )
|
|
{
|
|
res.push_back( std::make_pair(pStr,functor_type(func)) );
|
|
}
|
|
|
|
void setupMethodStubs( functor_vector_type& res )
|
|
{
|
|
const Color aWhiteColor( COL_WHITE );
|
|
const Color aBlackColor( COL_BLACK );
|
|
|
|
const Point aPt1(10,10);
|
|
const Point aPt2(500,500);
|
|
const Point aPt3(0,0);
|
|
const Point aPt4(450,450);
|
|
|
|
const Rectangle aRect(aPt1,aPt2);
|
|
const Rectangle aRect2(aPt3,aPt4);
|
|
const Polygon aPoly(aRect);
|
|
const Polygon aPoly2(aRect2);
|
|
PolyPolygon aPolyPoly(aPoly);
|
|
aPolyPoly.Insert( aPoly2 );
|
|
Polygon aPoly3(aPoly2);
|
|
aPoly3.Rotate( aPoly3.GetBoundRect().Center(),
|
|
900 );
|
|
|
|
const String aString( ByteString("This is a test"),
|
|
RTL_TEXTENCODING_ASCII_US );
|
|
const LineInfo aLineInfo(LINE_SOLID,5);
|
|
|
|
// unfortunately, VDevs have inaccessible copy constructors
|
|
static VirtualDevice aVDev;
|
|
static VirtualDevice aVDevBW(1);
|
|
|
|
const Size aVDevSize;
|
|
aVDev.SetOutputSizePixel(aVDevSize);
|
|
aVDevBW.SetOutputSizePixel(aVDevSize);
|
|
|
|
const Bitmap aBitmap( aVDev.GetBitmap(aPt1,aVDevSize) );
|
|
const Bitmap aBitmapBW( aVDevBW.GetBitmap(aPt1,aVDevSize) );
|
|
const Bitmap aBitmapAlien( aVDevSize, 8 );
|
|
|
|
const BitmapEx aBitmapEx( aBitmap, aBitmapBW );
|
|
const BitmapEx aBitmapExBW( aBitmapBW, aBitmapBW );
|
|
const BitmapEx aBitmapExAlien( aBitmapAlien, aBitmapBW );
|
|
const BitmapEx aBitmapExAlpha( aBitmap, aBitmapAlien );
|
|
const BitmapEx aBitmapExAlphaAlien( aBitmapAlien, aBitmapAlien );
|
|
|
|
const Image aImage( aBitmapEx );
|
|
const Gradient aGradient(GRADIENT_ELLIPTICAL,aBlackColor,aWhiteColor);
|
|
const Hatch aHatch(HatchStyle_TRIPLE,aBlackColor,4,450);
|
|
const Wallpaper aWallpaper( aWhiteColor );
|
|
|
|
GDIMetaFile aMtf;
|
|
aMtf.AddAction( new MetaFillColorAction(Color(COL_RED),sal_True) );
|
|
aMtf.AddAction( new MetaRectAction(aRect) );
|
|
|
|
/* void DrawText( const Point& rStartPt, const XubString& rStr,
|
|
xub_StrLen nIndex = 0, xub_StrLen nLen = STRING_LEN,
|
|
MetricVector* pVector = NULL, String* pDisplayText = NULL );
|
|
*/
|
|
// add(res,
|
|
// "DrawText",
|
|
// boost::bind(
|
|
// &OutputDevice::DrawText,
|
|
// _1,
|
|
// aPt1, aString, (sal_uInt16)0, aString.Len(), (MetricVector*)0, (String*)0, (vcl::ITextLayout*)0 ));
|
|
|
|
/* void DrawTextArray( const Point& rStartPt, const XubString& rStr,
|
|
const sal_Int32* pDXAry = NULL,
|
|
xub_StrLen nIndex = 0,
|
|
xub_StrLen nLen = STRING_LEN );
|
|
*/
|
|
add(res,
|
|
"DrawTextArray",
|
|
boost::bind(
|
|
&OutputDevice::DrawTextArray,
|
|
_1,
|
|
aPt1, aString, (const sal_Int32*)0, (sal_uInt16)0, aString.Len() ));
|
|
|
|
/* void DrawPixel( const Point& rPt, const Color& rColor ); */
|
|
add(res,
|
|
"DrawPixel",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Point&, const Color& ))(
|
|
&OutputDevice::DrawPixel),
|
|
_1,
|
|
aPt1, aBlackColor ));
|
|
|
|
/* void DrawLine( const Point& rStartPt, const Point& rEndPt ); */
|
|
add(res,
|
|
"DrawLine",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Point&, const Point& ))(
|
|
&OutputDevice::DrawLine),
|
|
_1,
|
|
aPt1, aPt2 ));
|
|
|
|
/* void DrawLine( const Point& rStartPt, const Point& rEndPt,
|
|
const LineInfo& rLineInfo );
|
|
*/
|
|
add(res,
|
|
"DrawLine(LineInfo)",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Point&, const Point&,const LineInfo& ))(
|
|
&OutputDevice::DrawLine),
|
|
_1,
|
|
aPt1, aPt2, aLineInfo ));
|
|
|
|
/* void DrawPolyLine( const Polygon& rPoly ); */
|
|
add(res,
|
|
"DrawPolyLine",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Polygon& ))(
|
|
&OutputDevice::DrawPolyLine),
|
|
_1,
|
|
aPoly ));
|
|
|
|
/* void DrawPolyLine( const Polygon& rPoly,
|
|
const LineInfo& rLineInfo );
|
|
*/
|
|
add(res,
|
|
"DrawPolyLine(LineInfo)",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Polygon&, const LineInfo& ))(
|
|
&OutputDevice::DrawPolyLine),
|
|
_1,
|
|
aPoly, aLineInfo ));
|
|
|
|
/* void DrawPolygon( const Polygon& rPoly ); */
|
|
add(res,
|
|
"DrawPolygon",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Polygon& ))
|
|
&OutputDevice::DrawPolygon,
|
|
_1,
|
|
aPoly ));
|
|
|
|
/* void DrawPolyPolygon( const PolyPolygon& rPolyPoly ); */
|
|
add(res,
|
|
"DrawPolyPolygon",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const PolyPolygon& ))
|
|
&OutputDevice::DrawPolyPolygon,
|
|
_1,
|
|
aPolyPoly ));
|
|
|
|
/* void DrawRect( const Rectangle& rRect ); */
|
|
add(res,
|
|
"DrawRect",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Rectangle& ))(
|
|
&OutputDevice::DrawRect),
|
|
_1,
|
|
aRect ));
|
|
|
|
/* void DrawRect( const Rectangle& rRect,
|
|
sal_uLong nHorzRount, sal_uLong nVertRound );
|
|
*/
|
|
add(res,
|
|
"DrawRect(round corners)",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Rectangle&, sal_uLong nHorzRount, sal_uLong nVertRound ))(
|
|
&OutputDevice::DrawRect),
|
|
_1,
|
|
aRect2,
|
|
4,4));
|
|
|
|
/* void DrawEllipse( const Rectangle& rRect ); */
|
|
add(res,
|
|
"DrawEllipse",
|
|
boost::bind(
|
|
&OutputDevice::DrawEllipse,
|
|
_1,
|
|
aRect ));
|
|
|
|
/* void DrawArc( const Rectangle& rRect,
|
|
const Point& rStartPt, const Point& rEndPt );
|
|
*/
|
|
add(res,
|
|
"DrawArc",
|
|
boost::bind(
|
|
&OutputDevice::DrawArc,
|
|
_1,
|
|
aRect,aPt1,aPt2 ));
|
|
|
|
/* void DrawPie( const Rectangle& rRect,
|
|
const Point& rStartPt, const Point& rEndPt );
|
|
*/
|
|
add(res,
|
|
"DrawPie",
|
|
boost::bind(
|
|
&OutputDevice::DrawPie,
|
|
_1,
|
|
aRect2,aPt3,aPt4 ));
|
|
|
|
/* void DrawChord( const Rectangle& rRect,
|
|
const Point& rStartPt, const Point& rEndPt );
|
|
*/
|
|
add(res,
|
|
"DrawChord",
|
|
boost::bind(
|
|
&OutputDevice::DrawChord,
|
|
_1,
|
|
aRect2,aPt3,aPt4 ));
|
|
|
|
/* void DrawOutDev( const Point& rDestPt, const Size& rDestSize,
|
|
const Point& rSrcPt, const Size& rSrcSize );
|
|
*/
|
|
add(res,
|
|
"DrawOutDev",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Point&, const Size&,
|
|
const Point&, const Size& ))(
|
|
&OutputDevice::DrawOutDev),
|
|
_1,
|
|
aRect2.TopLeft(), aRect2.GetSize(),
|
|
aRect.TopLeft(), aRect.GetSize()));
|
|
|
|
/* void DrawOutDev( const Point& rDestPt, const Size& rDestSize,
|
|
const Point& rSrcPt, const Size& rSrcSize,
|
|
const OutputDevice& rOutDev );
|
|
*/
|
|
add(res,
|
|
"DrawOutDev(foreign source)",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Point&, const Size&,
|
|
const Point&, const Size&,
|
|
const OutputDevice& ))(
|
|
&OutputDevice::DrawOutDev),
|
|
_1,
|
|
aRect2.TopLeft(), aRect2.GetSize(),
|
|
aRect.TopLeft(), aRect.GetSize(),
|
|
boost::cref(aVDevBW) ));
|
|
|
|
/* void DrawOutDev( const Point& rDestPt, const Size& rDestSize,
|
|
const Point& rSrcPt, const Size& rSrcSize,
|
|
const OutputDevice& rOutDev );
|
|
*/
|
|
add(res,
|
|
"DrawOutDev(foreign source, scaled)",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Point&, const Size&,
|
|
const Point&, const Size&,
|
|
const OutputDevice& ))(
|
|
&OutputDevice::DrawOutDev),
|
|
_1,
|
|
aRect2.TopLeft(), aRect2.GetSize(),
|
|
aRect.TopLeft(), aRect.GetSize(),
|
|
boost::cref(aVDev) ));
|
|
|
|
/* void CopyArea( const Point& rDestPt,
|
|
const Point& rSrcPt, const Size& rSrcSize,
|
|
sal_uInt16 nFlags = 0 );
|
|
*/
|
|
add(res,
|
|
"CopyArea",
|
|
boost::bind(
|
|
&OutputDevice::CopyArea,
|
|
_1,
|
|
aPt1,aPt3,aRect2.GetSize(),(sal_uInt16)0 ));
|
|
|
|
/* void DrawBitmap( const Point& rDestPt,
|
|
const Bitmap& rBitmap );
|
|
*/
|
|
add(res,
|
|
"DrawBitmap(alien source)",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Point&,
|
|
const Bitmap& ))(
|
|
&OutputDevice::DrawBitmap),
|
|
_1,
|
|
aPt1,aBitmapAlien ));
|
|
|
|
/* void DrawBitmap( const Point& rDestPt,
|
|
const Bitmap& rBitmap );
|
|
*/
|
|
add(res,
|
|
"DrawBitmap",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Point&,
|
|
const Bitmap& ))(
|
|
&OutputDevice::DrawBitmap),
|
|
_1,
|
|
aPt1,aBitmap ));
|
|
|
|
/* void DrawBitmap( const Point& rDestPt, const Size& rDestSize,
|
|
const Bitmap& rBitmap );
|
|
*/
|
|
add(res,
|
|
"DrawBitmap(scaled,alien source)",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Point&,
|
|
const Size&,
|
|
const Bitmap& ))(
|
|
&OutputDevice::DrawBitmap),
|
|
_1,
|
|
aPt1,aRect.GetSize(),aBitmapAlien ));
|
|
|
|
/* void DrawBitmap( const Point& rDestPt, const Size& rDestSize,
|
|
const Bitmap& rBitmap );
|
|
*/
|
|
add(res,
|
|
"DrawBitmap(scaled)",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Point&,
|
|
const Size&,
|
|
const Bitmap& ))(
|
|
&OutputDevice::DrawBitmap),
|
|
_1,
|
|
aPt1,aRect.GetSize(),aBitmap ));
|
|
|
|
/* void DrawBitmap( const Point& rDestPt, const Size& rDestSize,
|
|
const Point& rSrcPtPixel, const Size& rSrcSizePixel,
|
|
const Bitmap& rBitmap );
|
|
*/
|
|
add(res,
|
|
"DrawBitmap(scaled subset,alien source)",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Point&,
|
|
const Size&,
|
|
const Point&,
|
|
const Size&,
|
|
const Bitmap& ))(
|
|
&OutputDevice::DrawBitmap),
|
|
_1,
|
|
aPt1,aRect.GetSize(),aPt3,aRect2.GetSize(),aBitmapAlien ));
|
|
|
|
/* void DrawBitmap( const Point& rDestPt, const Size& rDestSize,
|
|
const Point& rSrcPtPixel, const Size& rSrcSizePixel,
|
|
const Bitmap& rBitmap );
|
|
*/
|
|
add(res,
|
|
"DrawBitmap(scaled subset)",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Point&,
|
|
const Size&,
|
|
const Point&,
|
|
const Size&,
|
|
const Bitmap& ))(
|
|
&OutputDevice::DrawBitmap),
|
|
_1,
|
|
aPt1,aRect.GetSize(),aPt3,aRect2.GetSize(),aBitmap ));
|
|
|
|
/* void DrawBitmapEx( const Point& rDestPt,
|
|
const BitmapEx& rBitmapEx );
|
|
*/
|
|
add(res,
|
|
"DrawBitmapEx(alien source)",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Point&,
|
|
const BitmapEx& ))(
|
|
&OutputDevice::DrawBitmapEx),
|
|
_1,
|
|
aPt1,aBitmapExAlien ));
|
|
|
|
/* void DrawBitmapEx( const Point& rDestPt,
|
|
const BitmapEx& rBitmapEx );
|
|
*/
|
|
add(res,
|
|
"DrawBitmapEx",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Point&,
|
|
const BitmapEx& ))(
|
|
&OutputDevice::DrawBitmapEx),
|
|
_1,
|
|
aPt1,aBitmapEx ));
|
|
|
|
/* void DrawBitmapEx( const Point& rDestPt,
|
|
const BitmapEx& rBitmapEx );
|
|
*/
|
|
add(res,
|
|
"DrawBitmapEx(alpha)",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Point&,
|
|
const BitmapEx& ))(
|
|
&OutputDevice::DrawBitmapEx),
|
|
_1,
|
|
aPt1,aBitmapExAlpha ));
|
|
|
|
/* void DrawBitmapEx( const Point& rDestPt,
|
|
const BitmapEx& rBitmapEx );
|
|
*/
|
|
add(res,
|
|
"DrawBitmapEx(alpha, alien source)",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Point&,
|
|
const BitmapEx& ))(
|
|
&OutputDevice::DrawBitmapEx),
|
|
_1,
|
|
aPt1,aBitmapExAlphaAlien ));
|
|
|
|
/* void DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
|
|
const BitmapEx& rBitmapEx );
|
|
*/
|
|
add(res,
|
|
"DrawBitmapEx(scaled,alien source)",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Point&,
|
|
const Size&,
|
|
const BitmapEx& ))(
|
|
&OutputDevice::DrawBitmapEx),
|
|
_1,
|
|
aPt1,aRect.GetSize(),aBitmapExAlien ));
|
|
|
|
/* void DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
|
|
const BitmapEx& rBitmapEx );
|
|
*/
|
|
add(res,
|
|
"DrawBitmapEx(scaled)",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Point&,
|
|
const Size&,
|
|
const BitmapEx& ))(
|
|
&OutputDevice::DrawBitmapEx),
|
|
_1,
|
|
aPt1,aRect.GetSize(),aBitmapEx ));
|
|
|
|
/* void DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
|
|
const BitmapEx& rBitmapEx );
|
|
*/
|
|
add(res,
|
|
"DrawBitmapEx(scaled alpha)",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Point&,
|
|
const Size&,
|
|
const BitmapEx& ))(
|
|
&OutputDevice::DrawBitmapEx),
|
|
_1,
|
|
aPt1,aRect.GetSize(),aBitmapExAlpha ));
|
|
|
|
/* void DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
|
|
const BitmapEx& rBitmapEx );
|
|
*/
|
|
add(res,
|
|
"DrawBitmapEx(scaled alpha, alien source)",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Point&,
|
|
const Size&,
|
|
const BitmapEx& ))(
|
|
&OutputDevice::DrawBitmapEx),
|
|
_1,
|
|
aPt1,aRect.GetSize(),aBitmapExAlphaAlien ));
|
|
|
|
/* void DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
|
|
const Point& rSrcPtPixel, const Size& rSrcSizePixel,
|
|
const BitmapEx& rBitmapEx );
|
|
*/
|
|
add(res,
|
|
"DrawBitmapEx(scaled subset,alien source)",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Point&,
|
|
const Size&,
|
|
const Point&,
|
|
const Size&,
|
|
const BitmapEx& ))(
|
|
&OutputDevice::DrawBitmapEx),
|
|
_1,
|
|
aPt1,aRect.GetSize(),aPt3,aRect2.GetSize(),aBitmapExAlien ));
|
|
|
|
/* void DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
|
|
const Point& rSrcPtPixel, const Size& rSrcSizePixel,
|
|
const BitmapEx& rBitmapEx );
|
|
*/
|
|
add(res,
|
|
"DrawBitmapEx(scaled subset)",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Point&,
|
|
const Size&,
|
|
const Point&,
|
|
const Size&,
|
|
const BitmapEx& ))(
|
|
&OutputDevice::DrawBitmapEx),
|
|
_1,
|
|
aPt1,aRect.GetSize(),aPt3,aRect2.GetSize(),aBitmapEx ));
|
|
|
|
/* void DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
|
|
const Point& rSrcPtPixel, const Size& rSrcSizePixel,
|
|
const BitmapEx& rBitmapEx );
|
|
*/
|
|
add(res,
|
|
"DrawBitmapEx(scaled subset, alpha)",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Point&,
|
|
const Size&,
|
|
const Point&,
|
|
const Size&,
|
|
const BitmapEx& ))(
|
|
&OutputDevice::DrawBitmapEx),
|
|
_1,
|
|
aPt1,aRect.GetSize(),aPt3,aRect2.GetSize(),aBitmapExAlpha ));
|
|
|
|
/* void DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
|
|
const Point& rSrcPtPixel, const Size& rSrcSizePixel,
|
|
const BitmapEx& rBitmapEx );
|
|
*/
|
|
add(res,
|
|
"DrawBitmapEx(scaled subset, alpha alien source)",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Point&,
|
|
const Size&,
|
|
const Point&,
|
|
const Size&,
|
|
const BitmapEx& ))(
|
|
&OutputDevice::DrawBitmapEx),
|
|
_1,
|
|
aPt1,aRect.GetSize(),aPt3,aRect2.GetSize(),aBitmapExAlphaAlien ));
|
|
|
|
/* void DrawMask( const Point& rDestPt,
|
|
const Bitmap& rBitmap, const Color& rMaskColor );
|
|
*/
|
|
add(res,
|
|
"DrawMask(alien source)",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Point&,
|
|
const Bitmap&,
|
|
const Color& ))(
|
|
&OutputDevice::DrawMask),
|
|
_1,
|
|
aPt1,aBitmapAlien,aBlackColor ));
|
|
|
|
/* void DrawMask( const Point& rDestPt,
|
|
const Bitmap& rBitmap, const Color& rMaskColor );
|
|
*/
|
|
add(res,
|
|
"DrawMask",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Point&,
|
|
const Bitmap&,
|
|
const Color& ))(
|
|
&OutputDevice::DrawMask),
|
|
_1,
|
|
aPt1,aBitmap,aBlackColor ));
|
|
|
|
/* void DrawMask( const Point& rDestPt, const Size& rDestSize,
|
|
const Bitmap& rBitmap, const Color& rMaskColor );
|
|
*/
|
|
add(res,
|
|
"DrawMask(scaled,alien source)",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Point&,
|
|
const Size&,
|
|
const Bitmap&,
|
|
const Color& ))(
|
|
&OutputDevice::DrawMask),
|
|
_1,
|
|
aPt1,aRect.GetSize(),aBitmapAlien, aBlackColor ));
|
|
|
|
/* void DrawMask( const Point& rDestPt, const Size& rDestSize,
|
|
const Bitmap& rBitmap, const Color& rMaskColor );
|
|
*/
|
|
add(res,
|
|
"DrawMask(scaled)",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Point&,
|
|
const Size&,
|
|
const Bitmap&,
|
|
const Color& ))(
|
|
&OutputDevice::DrawMask),
|
|
_1,
|
|
aPt1,aRect.GetSize(),aBitmap,aBlackColor ));
|
|
|
|
/* void DrawMask( const Point& rDestPt, const Size& rDestSize,
|
|
const Point& rSrcPtPixel, const Size& rSrcSizePixel,
|
|
const Bitmap& rBitmap, const Color& rMaskColor );
|
|
*/
|
|
add(res,
|
|
"DrawMask(scaled subset,alien source)",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Point&,
|
|
const Size&,
|
|
const Point&,
|
|
const Size&,
|
|
const Bitmap&,
|
|
const Color& ))(
|
|
&OutputDevice::DrawMask),
|
|
_1,
|
|
aPt1,aRect.GetSize(),aPt3,aRect2.GetSize(),aBitmapAlien,aBlackColor ));
|
|
|
|
/* void DrawMask( const Point& rDestPt, const Size& rDestSize,
|
|
const Point& rSrcPtPixel, const Size& rSrcSizePixel,
|
|
const Bitmap& rBitmap, const Color& rMaskColor );
|
|
*/
|
|
add(res,
|
|
"DrawMask(scaled subset)",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Point&,
|
|
const Size&,
|
|
const Point&,
|
|
const Size&,
|
|
const Bitmap&,
|
|
const Color& ))(
|
|
&OutputDevice::DrawMask),
|
|
_1,
|
|
aPt1,aRect.GetSize(),aPt3,aRect2.GetSize(),aBitmap,aBlackColor ));
|
|
|
|
/* void DrawImage( const Point& rPos,
|
|
const Image& rImage, sal_uInt16 nStyle = 0 );
|
|
*/
|
|
add(res,
|
|
"DrawImage",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Point&,
|
|
const Image&,
|
|
sal_uInt16 nStyle ))(
|
|
&OutputDevice::DrawImage),
|
|
_1,
|
|
aPt1,aImage,(sal_uInt16)0 ));
|
|
|
|
/* void DrawImage( const Point& rPos, const Size& rSize,
|
|
const Image& rImage, sal_uInt16 nStyle = 0 );
|
|
*/
|
|
add(res,
|
|
"DrawImage(scaled)",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Point&,
|
|
const Size&,
|
|
const Image&,
|
|
sal_uInt16 nStyle ))(
|
|
&OutputDevice::DrawImage),
|
|
_1,
|
|
aPt1,aRect.GetSize(),aImage,(sal_uInt16)0 ));
|
|
|
|
/* void DrawGradient( const Rectangle& rRect, const Gradient& rGradient ); */
|
|
add(res,
|
|
"DrawGradient",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const Rectangle&, const Gradient& ))(
|
|
&OutputDevice::DrawGradient),
|
|
_1,
|
|
aRect,aGradient ));
|
|
|
|
/* void DrawGradient( const PolyPolygon& rPolyPoly, const Gradient& rGradient ); */
|
|
add(res,
|
|
"DrawGradient(polygon)",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const PolyPolygon&, const Gradient& ))(
|
|
&OutputDevice::DrawGradient),
|
|
_1,
|
|
aPoly3,aGradient ));
|
|
|
|
/* void DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch ); */
|
|
add(res,
|
|
"DrawHatch",
|
|
boost::bind(
|
|
&OutputDevice::DrawHatch,
|
|
_1,
|
|
aPoly3,aHatch ));
|
|
|
|
/* void DrawWallpaper( const Rectangle& rRect, const Wallpaper& rWallpaper ); */
|
|
add(res,
|
|
"DrawWallpaper",
|
|
boost::bind(
|
|
&OutputDevice::DrawWallpaper,
|
|
_1,
|
|
aRect2,aWallpaper ));
|
|
|
|
/* void DrawWaveLine( const Point& rStartPos, const Point& rEndPos, sal_uInt16 nStyle ); */
|
|
add(res,
|
|
"DrawWaveLine",
|
|
boost::bind(
|
|
&OutputDevice::DrawWaveLine,
|
|
_1,
|
|
aPt1,aPt2,(sal_uInt16)WAVE_NORMAL ));
|
|
|
|
/* void DrawGrid( const Rectangle& rRect, const Size& rDist, sal_uLong nFlags ); */
|
|
add(res,
|
|
"DrawGrid",
|
|
boost::bind(
|
|
&OutputDevice::DrawGrid,
|
|
_1,
|
|
aRect,Size(10,20),GRID_HORZLINES|GRID_VERTLINES ));
|
|
|
|
/* void DrawTransparent( const PolyPolygon& rPolyPoly,
|
|
sal_uInt16 nTransparencePercent );
|
|
*/
|
|
add(res,
|
|
"DrawTransparent",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const PolyPolygon&, sal_uInt16 ))(
|
|
&OutputDevice::DrawTransparent),
|
|
_1,
|
|
aPoly3,(sal_uInt16)50 ));
|
|
|
|
/* void DrawTransparent( const GDIMetaFile& rMtf,
|
|
const Point& rPos, const Size& rSize,
|
|
const Gradient& rTransparenceGradient );
|
|
*/
|
|
add(res,
|
|
"DrawTransparent(metafile)",
|
|
boost::bind(
|
|
(void (OutputDevice::*)( const GDIMetaFile&,
|
|
const Point&,
|
|
const Size&,
|
|
const Gradient& ))(
|
|
&OutputDevice::DrawTransparent),
|
|
_1,
|
|
aMtf,aPt1,aRect.GetSize(),aGradient ));
|
|
|
|
/* void Erase(); */
|
|
add(res,
|
|
"Erase",
|
|
boost::bind(
|
|
&OutputDevice::Erase,
|
|
_1 ));
|
|
|
|
}
|
|
|
|
//----------------------------------------------------------------------------------
|
|
|
|
void grindFunc( OutputDevice& rTarget,
|
|
functor_vector_type::const_iterator iter,
|
|
sal_Int32 nTurns,
|
|
const char* pMsg )
|
|
{
|
|
const sal_uInt32 nStartTime( osl_getGlobalTimer() );
|
|
|
|
for( sal_Int32 i=0; i<nTurns; ++i )
|
|
iter->second(&rTarget);
|
|
|
|
if( rTarget.GetOutDevType() == OUTDEV_WINDOW )
|
|
static_cast<Window&>(rTarget).Sync();
|
|
|
|
fprintf( stdout,
|
|
"Duration: %d ms (%d repetitions)\tOperation: %s\tSetup: %s\n",
|
|
(int)(osl_getGlobalTimer() - nStartTime),
|
|
(int)(nTurns),
|
|
iter->first,
|
|
pMsg );
|
|
}
|
|
|
|
//----------------------------------------------------------------------------------
|
|
|
|
/** Call OutputDevice render methods repeatedly, and output elapsed
|
|
time to stdout
|
|
*/
|
|
void outDevGrind( OutputDevice& rTarget, sal_Int32 nTurns=100 )
|
|
{
|
|
// TODO(F1): also profile pure complex clip setup times!
|
|
|
|
// State: fill/line color, draw mode, w/o clip, rect clip, complex clip
|
|
functor_vector_type aMethods;
|
|
setupMethodStubs( aMethods );
|
|
|
|
const Rectangle aClipRect(10,10,1000,1000);
|
|
const Polygon aPoly1( aClipRect );
|
|
Polygon aPoly2( aClipRect );
|
|
aPoly2.Rotate(aClipRect.Center(),450);
|
|
PolyPolygon aClipPoly(aPoly1);
|
|
aClipPoly.Insert(aPoly2);
|
|
|
|
functor_vector_type::const_iterator iter = aMethods.begin();
|
|
const functor_vector_type::const_iterator end = aMethods.end();
|
|
while( iter != end )
|
|
{
|
|
rTarget.SetLineColor( Color(COL_BLACK) );
|
|
rTarget.SetFillColor( Color(COL_GREEN) );
|
|
rTarget.SetRasterOp( ROP_OVERPAINT );
|
|
rTarget.SetClipRegion();
|
|
grindFunc( rTarget, iter, nTurns, "w/o clip, w/o xor" );
|
|
|
|
rTarget.SetLineColor( Color(COL_BLACK) );
|
|
rTarget.SetFillColor( Color(COL_GREEN) );
|
|
rTarget.SetRasterOp( ROP_OVERPAINT );
|
|
rTarget.SetClipRegion( aClipRect );
|
|
grindFunc( rTarget, iter, nTurns, "with rect clip, w/o xor" );
|
|
|
|
rTarget.SetLineColor( Color(COL_BLACK) );
|
|
rTarget.SetFillColor( Color(COL_GREEN) );
|
|
rTarget.SetRasterOp( ROP_OVERPAINT );
|
|
rTarget.SetClipRegion( aClipPoly );
|
|
grindFunc( rTarget, iter, nTurns, "with complex clip, w/o xor" );
|
|
|
|
rTarget.SetLineColor( Color(COL_BLACK) );
|
|
rTarget.SetFillColor( Color(COL_GREEN) );
|
|
rTarget.SetRasterOp( ROP_XOR );
|
|
rTarget.SetClipRegion();
|
|
grindFunc( rTarget, iter, nTurns, "w/o clip, with xor" );
|
|
|
|
rTarget.SetLineColor( Color(COL_BLACK) );
|
|
rTarget.SetFillColor( Color(COL_GREEN) );
|
|
rTarget.SetRasterOp( ROP_XOR );
|
|
rTarget.SetClipRegion( aClipRect );
|
|
grindFunc( rTarget, iter, nTurns, "with rect clip, with xor" );
|
|
|
|
rTarget.SetLineColor( Color(COL_BLACK) );
|
|
rTarget.SetFillColor( Color(COL_GREEN) );
|
|
rTarget.SetRasterOp( ROP_XOR );
|
|
rTarget.SetClipRegion( aClipPoly );
|
|
grindFunc( rTarget, iter, nTurns, "with complex clip, with xor" );
|
|
|
|
++iter;
|
|
}
|
|
}
|
|
|
|
//----------------------------------------------------------------------------------
|
|
|
|
void TestWindow::Paint( const Rectangle& )
|
|
{
|
|
outDevGrind( *this );
|
|
fflush( stdout );
|
|
}
|
|
|
|
sal_uInt16 GrindApp::Exception( sal_uInt16 nError )
|
|
{
|
|
switch( nError & EXC_MAJORTYPE )
|
|
{
|
|
case EXC_RSCNOTLOADED:
|
|
Abort( String::CreateFromAscii(
|
|
"Error: could not load language resources.\nPlease check your installation.\n" ) );
|
|
break;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
int GrindApp::Main()
|
|
{
|
|
bool bHelp = false;
|
|
|
|
for( sal_uInt16 i = 0; i < GetCommandLineParamCount(); i++ )
|
|
{
|
|
::rtl::OUString aParam = GetCommandLineParam( i );
|
|
|
|
if( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "--help" ) ) ||
|
|
aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-h" ) ) )
|
|
bHelp = true;
|
|
}
|
|
|
|
if( bHelp )
|
|
{
|
|
printf( "outdevgrind - Profile OutputDevice\n" );
|
|
return EXIT_SUCCESS;
|
|
}
|
|
|
|
//-------------------------------------------------
|
|
// create the global service-manager
|
|
//-------------------------------------------------
|
|
uno::Reference< lang::XMultiServiceFactory > xFactory;
|
|
try
|
|
{
|
|
uno::Reference< uno::XComponentContext > xCtx = ::cppu::defaultBootstrap_InitialComponentContext();
|
|
xFactory = uno::Reference< lang::XMultiServiceFactory >( xCtx->getServiceManager(),
|
|
uno::UNO_QUERY );
|
|
if( xFactory.is() )
|
|
::comphelper::setProcessServiceFactory( xFactory );
|
|
}
|
|
catch( uno::Exception& )
|
|
{
|
|
}
|
|
|
|
if( !xFactory.is() )
|
|
{
|
|
fprintf( stderr,
|
|
"Could not bootstrap UNO, installation must be in disorder. Exiting.\n" );
|
|
exit( 1 );
|
|
}
|
|
|
|
// Create UCB.
|
|
uno::Sequence< uno::Any > aArgs( 2 );
|
|
aArgs[ 0 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL ));
|
|
aArgs[ 1 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE ));
|
|
::ucbhelper::ContentBroker::initialize( xFactory, aArgs );
|
|
|
|
TestWindow pWindow;
|
|
pWindow.Execute();
|
|
|
|
// clean up UCB
|
|
::ucbhelper::ContentBroker::deinitialize();
|
|
return EXIT_SUCCESS;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
GrindApp aGrindApp;
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|