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
628 lines
30 KiB
C++
628 lines
30 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_canvas.hxx"
|
|
|
|
#include <canvas/debug.hxx>
|
|
#include <tools/diagnose_ex.h>
|
|
#include <rtl/math.hxx>
|
|
|
|
#include <com/sun/star/rendering/TexturingMode.hpp>
|
|
|
|
#include <basegfx/matrix/b2dhommatrix.hxx>
|
|
#include <basegfx/point/b2dpoint.hxx>
|
|
#include <basegfx/range/b2drectangle.hxx>
|
|
#include <basegfx/numeric/ftools.hxx>
|
|
#include <basegfx/polygon/b2dpolygontools.hxx>
|
|
#include <basegfx/tools/tools.hxx>
|
|
#include <basegfx/tools/lerp.hxx>
|
|
#include <basegfx/tools/keystoplerp.hxx>
|
|
#include <basegfx/tools/canvastools.hxx>
|
|
#include <basegfx/matrix/b2dhommatrixtools.hxx>
|
|
|
|
#include <canvas/parametricpolypolygon.hxx>
|
|
|
|
#include "dx_spritecanvas.hxx"
|
|
#include "dx_canvashelper.hxx"
|
|
#include "dx_impltools.hxx"
|
|
|
|
#include <boost/scoped_ptr.hpp>
|
|
#include <boost/bind.hpp>
|
|
#include <boost/tuple/tuple.hpp>
|
|
|
|
|
|
using namespace ::com::sun::star;
|
|
|
|
namespace dxcanvas
|
|
{
|
|
namespace
|
|
{
|
|
typedef ::boost::shared_ptr< Gdiplus::PathGradientBrush > PathGradientBrushSharedPtr;
|
|
|
|
bool fillLinearGradient( GraphicsSharedPtr& rGraphics,
|
|
const ::canvas::ParametricPolyPolygon::Values& /*rValues*/,
|
|
const std::vector< Gdiplus::Color >& rColors,
|
|
const std::vector< Gdiplus::REAL >& rStops,
|
|
const GraphicsPathSharedPtr& rFillPath,
|
|
const rendering::Texture& texture )
|
|
{
|
|
// setup a linear gradient with given colors
|
|
// -----------------------------------------
|
|
|
|
Gdiplus::LinearGradientBrush aBrush(
|
|
Gdiplus::PointF(0.0f,
|
|
0.5f),
|
|
Gdiplus::PointF(1.0f,
|
|
0.5f),
|
|
rColors[0],
|
|
rColors[1] );
|
|
|
|
aBrush.SetInterpolationColors(&rColors[0],
|
|
&rStops[0],
|
|
rColors.size());
|
|
|
|
// render background color, as LinearGradientBrush does not
|
|
// properly support the WrapModeClamp repeat mode
|
|
Gdiplus::SolidBrush aBackgroundBrush( rColors[0] );
|
|
rGraphics->FillPath( &aBackgroundBrush, rFillPath.get() );
|
|
|
|
// TODO(F2): This does not yet support other repeat modes
|
|
// except clamp, and probably also no multi-texturing
|
|
|
|
// calculate parallelogram of gradient in object space, extend
|
|
// top and bottom of it such that they cover the whole fill
|
|
// path bound area
|
|
::basegfx::B2DHomMatrix aTextureTransform;
|
|
::basegfx::unotools::homMatrixFromAffineMatrix( aTextureTransform,
|
|
texture.AffineTransform );
|
|
|
|
::basegfx::B2DPoint aLeftTop( 0.0, 0.0 );
|
|
::basegfx::B2DPoint aLeftBottom( 0.0, 1.0 );
|
|
::basegfx::B2DPoint aRightTop( 1.0, 0.0 );
|
|
::basegfx::B2DPoint aRightBottom( 1.0, 1.0 );
|
|
|
|
aLeftTop *= aTextureTransform;
|
|
aLeftBottom *= aTextureTransform;
|
|
aRightTop *= aTextureTransform;
|
|
aRightBottom*= aTextureTransform;
|
|
|
|
Gdiplus::RectF aBounds;
|
|
rFillPath->GetBounds( &aBounds, NULL, NULL );
|
|
|
|
// now, we potentially have to enlarge our gradient area
|
|
// atop and below the transformed [0,1]x[0,1] unit rect,
|
|
// for the gradient to fill the complete bound rect.
|
|
::basegfx::tools::infiniteLineFromParallelogram( aLeftTop,
|
|
aLeftBottom,
|
|
aRightTop,
|
|
aRightBottom,
|
|
tools::b2dRangeFromGdiPlusRectF( aBounds ) );
|
|
|
|
// calc length of bound rect diagonal
|
|
const double nDiagonalLength(
|
|
hypot( aBounds.Width,
|
|
aBounds.Height ) );
|
|
|
|
// generate a path which covers the 'right' side of the
|
|
// gradient, extending two times the bound rect diagonal to
|
|
// the right (and thus covering the whole half plane 'right'
|
|
// of the gradient). Take the middle of the gradient as the
|
|
// 'left' side of the polygon, to not fall victim to rounding
|
|
// errors at the edge.
|
|
::basegfx::B2DVector aDirection( aLeftTop - aLeftBottom );
|
|
aDirection = ::basegfx::getNormalizedPerpendicular( aDirection );
|
|
aDirection *= nDiagonalLength;
|
|
|
|
const ::basegfx::B2DPoint aHalfPlaneLeftTop( (aLeftTop + aRightTop) * 0.5 );
|
|
const ::basegfx::B2DPoint aHalfPlaneLeftBottom( (aLeftBottom + aRightBottom) * 0.5 );
|
|
const ::basegfx::B2DPoint aHalfPlaneRightTop( aRightTop + aDirection );
|
|
const ::basegfx::B2DPoint aHalfPlaneRightBottom( aRightBottom + aDirection );
|
|
|
|
Gdiplus::GraphicsPath aSolidFillPath;
|
|
aSolidFillPath.AddLine( static_cast<Gdiplus::REAL>(aHalfPlaneLeftTop.getX()),
|
|
static_cast<Gdiplus::REAL>(aHalfPlaneLeftTop.getY()),
|
|
static_cast<Gdiplus::REAL>(aHalfPlaneRightTop.getX()),
|
|
static_cast<Gdiplus::REAL>(aHalfPlaneRightTop.getY()) );
|
|
aSolidFillPath.AddLine( static_cast<Gdiplus::REAL>(aHalfPlaneRightBottom.getX()),
|
|
static_cast<Gdiplus::REAL>(aHalfPlaneRightBottom.getY()),
|
|
static_cast<Gdiplus::REAL>(aHalfPlaneLeftBottom.getX()),
|
|
static_cast<Gdiplus::REAL>(aHalfPlaneLeftBottom.getY()) );
|
|
aSolidFillPath.CloseFigure();
|
|
|
|
// limit output to fill path, we've just generated a path that
|
|
// might be substantially larger
|
|
if( Gdiplus::Ok != rGraphics->SetClip( rFillPath.get(),
|
|
Gdiplus::CombineModeIntersect ) )
|
|
{
|
|
return false;
|
|
}
|
|
|
|
Gdiplus::SolidBrush aBackgroundBrush2( rColors.back() );
|
|
rGraphics->FillPath( &aBackgroundBrush2, &aSolidFillPath );
|
|
|
|
// generate clip polygon from the extended parallelogram
|
|
// (exploit the feature that distinct lines in a figure are
|
|
// automatically closed by a straight line)
|
|
Gdiplus::GraphicsPath aClipPath;
|
|
aClipPath.AddLine( static_cast<Gdiplus::REAL>(aLeftTop.getX()),
|
|
static_cast<Gdiplus::REAL>(aLeftTop.getY()),
|
|
static_cast<Gdiplus::REAL>(aRightTop.getX()),
|
|
static_cast<Gdiplus::REAL>(aRightTop.getY()) );
|
|
aClipPath.AddLine( static_cast<Gdiplus::REAL>(aRightBottom.getX()),
|
|
static_cast<Gdiplus::REAL>(aRightBottom.getY()),
|
|
static_cast<Gdiplus::REAL>(aLeftBottom.getX()),
|
|
static_cast<Gdiplus::REAL>(aLeftBottom.getY()) );
|
|
aClipPath.CloseFigure();
|
|
|
|
// limit output to a _single_ strip of the gradient (have to
|
|
// clip here, since GDI+ wrapmode clamp does not work here)
|
|
if( Gdiplus::Ok != rGraphics->SetClip( &aClipPath,
|
|
Gdiplus::CombineModeIntersect ) )
|
|
{
|
|
return false;
|
|
}
|
|
|
|
// now, finally, output the gradient
|
|
Gdiplus::Matrix aMatrix;
|
|
tools::gdiPlusMatrixFromAffineMatrix2D( aMatrix,
|
|
texture.AffineTransform );
|
|
aBrush.SetTransform( &aMatrix );
|
|
|
|
rGraphics->FillRectangle( &aBrush, aBounds );
|
|
|
|
return true;
|
|
}
|
|
|
|
int numColorSteps( const Gdiplus::Color& rColor1, const Gdiplus::Color& rColor2 )
|
|
{
|
|
return ::std::max(
|
|
labs( rColor1.GetRed() - rColor2.GetRed() ),
|
|
::std::max(
|
|
labs( rColor1.GetGreen() - rColor2.GetGreen() ),
|
|
labs( rColor1.GetBlue() - rColor2.GetBlue() ) ) );
|
|
}
|
|
|
|
bool fillPolygonalGradient( const ::canvas::ParametricPolyPolygon::Values& rValues,
|
|
const std::vector< Gdiplus::Color >& rColors,
|
|
const std::vector< Gdiplus::REAL >& rStops,
|
|
GraphicsSharedPtr& rGraphics,
|
|
const GraphicsPathSharedPtr& rPath,
|
|
const rendering::ViewState& viewState,
|
|
const rendering::RenderState& renderState,
|
|
const rendering::Texture& texture )
|
|
{
|
|
// copy original fill path object, might have to change it
|
|
// below
|
|
GraphicsPathSharedPtr pFillPath( rPath );
|
|
const ::basegfx::B2DPolygon& rGradientPoly( rValues.maGradientPoly );
|
|
|
|
PathGradientBrushSharedPtr pGradientBrush;
|
|
|
|
// fill background uniformly with end color
|
|
Gdiplus::SolidBrush aBackgroundBrush( rColors[0] );
|
|
rGraphics->FillPath( &aBackgroundBrush, pFillPath.get() );
|
|
|
|
Gdiplus::Matrix aMatrix;
|
|
// scale focus according to aspect ratio: for wider-than-tall
|
|
// bounds (nAspectRatio > 1.0), the focus must have non-zero
|
|
// width. Specifically, a bound rect twice as wide as tall has
|
|
// a focus of half it's width.
|
|
if( !::rtl::math::approxEqual(rValues.mnAspectRatio,
|
|
1.0) )
|
|
{
|
|
// KLUDGE 1:
|
|
//
|
|
// And here comes the greatest shortcoming of the GDI+
|
|
// gradients ever: SetFocusScales completely ignores
|
|
// transformations, both when set at the PathGradientBrush
|
|
// and for the world coordinate system. Thus, to correctly
|
|
// display anisotrophic path gradients, we have to render
|
|
// them by hand. WTF.
|
|
|
|
// TODO(F2): This does not yet support other repeat modes
|
|
// except clamp, and probably also no multi-texturing
|
|
|
|
// limit output to to-be-filled polygon
|
|
if( Gdiplus::Ok != rGraphics->SetClip( pFillPath.get(),
|
|
Gdiplus::CombineModeIntersect ) )
|
|
{
|
|
return false;
|
|
}
|
|
|
|
// disable anti-aliasing, if any
|
|
const Gdiplus::SmoothingMode eOldAAMode( rGraphics->GetSmoothingMode() );
|
|
rGraphics->SetSmoothingMode( Gdiplus::SmoothingModeHighSpeed );
|
|
|
|
|
|
// determine number of steps to use
|
|
// --------------------------------
|
|
|
|
// TODO(Q2): Unify step calculations with VCL canvas
|
|
int nColorSteps = 0;
|
|
for( size_t i=0; i<rColors.size()-1; ++i )
|
|
nColorSteps += numColorSteps(rColors[i],rColors[i+1]);
|
|
::basegfx::B2DHomMatrix aTotalTransform;
|
|
const int nStepCount=
|
|
::canvas::tools::calcGradientStepCount(aTotalTransform,
|
|
viewState,
|
|
renderState,
|
|
texture,
|
|
nColorSteps);
|
|
|
|
::basegfx::B2DHomMatrix aTextureTransform;
|
|
::basegfx::unotools::homMatrixFromAffineMatrix( aTextureTransform,
|
|
texture.AffineTransform );
|
|
// determine overall transformation for inner polygon (might
|
|
// have to be prefixed by anisotrophic scaling)
|
|
::basegfx::B2DHomMatrix aInnerPolygonTransformMatrix;
|
|
|
|
// For performance reasons, we create a temporary VCL polygon
|
|
// here, keep it all the way and only change the vertex values
|
|
// in the loop below (as ::Polygon is a pimpl class, creating
|
|
// one every loop turn would really stress the mem allocator)
|
|
::basegfx::B2DPolygon aOuterPoly( rGradientPoly );
|
|
::basegfx::B2DPolygon aInnerPoly;
|
|
|
|
// subdivide polygon _before_ rendering, would otherwise have
|
|
// to be performed on every loop turn.
|
|
if( aOuterPoly.areControlPointsUsed() )
|
|
aOuterPoly = ::basegfx::tools::adaptiveSubdivideByAngle(aOuterPoly);
|
|
|
|
aInnerPoly = aOuterPoly;
|
|
aOuterPoly.transform(aTextureTransform);
|
|
|
|
|
|
// apply scaling (possibly anisotrophic) to inner polygon
|
|
// ------------------------------------------------------
|
|
|
|
// scale inner polygon according to aspect ratio: for
|
|
// wider-than-tall bounds (nAspectRatio > 1.0), the inner
|
|
// polygon, representing the gradient focus, must have
|
|
// non-zero width. Specifically, a bound rect twice as wide as
|
|
// tall has a focus polygon of half it's width.
|
|
const double nAspectRatio( rValues.mnAspectRatio );
|
|
if( nAspectRatio > 1.0 )
|
|
{
|
|
// width > height case
|
|
aInnerPolygonTransformMatrix.scale( 1.0 - 1.0/nAspectRatio,
|
|
0.0 );
|
|
}
|
|
else if( nAspectRatio < 1.0 )
|
|
{
|
|
// width < height case
|
|
aInnerPolygonTransformMatrix.scale( 0.0,
|
|
1.0 - nAspectRatio );
|
|
}
|
|
else
|
|
{
|
|
// isotrophic case
|
|
aInnerPolygonTransformMatrix.scale( 0.0, 0.0 );
|
|
}
|
|
|
|
// and finally, add texture transform to it.
|
|
aInnerPolygonTransformMatrix *= aTextureTransform;
|
|
|
|
// apply final matrix to polygon
|
|
aInnerPoly.transform( aInnerPolygonTransformMatrix );
|
|
|
|
Gdiplus::GraphicsPath aCurrPath;
|
|
Gdiplus::SolidBrush aFillBrush( rColors[0] );
|
|
const sal_uInt32 nNumPoints( aOuterPoly.count() );
|
|
basegfx::tools::KeyStopLerp aLerper(rValues.maStops);
|
|
for( int i=1; i<nStepCount; ++i )
|
|
{
|
|
std::ptrdiff_t nIndex;
|
|
double fAlpha;
|
|
const double fT( i/double(nStepCount) );
|
|
boost::tuples::tie(nIndex,fAlpha)=aLerper.lerp(fT);
|
|
|
|
const Gdiplus::Color aFillColor(
|
|
static_cast<BYTE>( basegfx::tools::lerp(rColors[nIndex].GetRed(),rColors[nIndex+1].GetRed(),fAlpha) ),
|
|
static_cast<BYTE>( basegfx::tools::lerp(rColors[nIndex].GetGreen(),rColors[nIndex+1].GetGreen(),fAlpha) ),
|
|
static_cast<BYTE>( basegfx::tools::lerp(rColors[nIndex].GetBlue(),rColors[nIndex+1].GetBlue(),fAlpha) ) );
|
|
|
|
aFillBrush.SetColor( aFillColor );
|
|
aCurrPath.Reset(); aCurrPath.StartFigure();
|
|
for( unsigned int p=1; p<nNumPoints; ++p )
|
|
{
|
|
const ::basegfx::B2DPoint& rOuterPoint1( aOuterPoly.getB2DPoint(p-1) );
|
|
const ::basegfx::B2DPoint& rInnerPoint1( aInnerPoly.getB2DPoint(p-1) );
|
|
const ::basegfx::B2DPoint& rOuterPoint2( aOuterPoly.getB2DPoint(p) );
|
|
const ::basegfx::B2DPoint& rInnerPoint2( aInnerPoly.getB2DPoint(p) );
|
|
|
|
aCurrPath.AddLine(
|
|
Gdiplus::REAL(fT*rInnerPoint1.getX() + (1-fT)*rOuterPoint1.getX()),
|
|
Gdiplus::REAL(fT*rInnerPoint1.getY() + (1-fT)*rOuterPoint1.getY()),
|
|
Gdiplus::REAL(fT*rInnerPoint2.getX() + (1-fT)*rOuterPoint2.getX()),
|
|
Gdiplus::REAL(fT*rInnerPoint2.getY() + (1-fT)*rOuterPoint2.getY()));
|
|
}
|
|
aCurrPath.CloseFigure();
|
|
|
|
rGraphics->FillPath( &aFillBrush, &aCurrPath );
|
|
}
|
|
|
|
// reset to old anti-alias mode
|
|
rGraphics->SetSmoothingMode( eOldAAMode );
|
|
}
|
|
else
|
|
{
|
|
// KLUDGE 2:
|
|
//
|
|
// We're generating a PathGradientBrush from scratch here,
|
|
// and put in a transformed GraphicsPath (transformed with
|
|
// the texture transform). This is because the
|
|
// straight-forward approach to store a Brush pointer at
|
|
// this class and set a texture transform via
|
|
// PathGradientBrush::SetTransform() is spoiled by MS: it
|
|
// seems that _either_ the texture transform, _or_ the
|
|
// transform at the Graphics can be set, but not both. If
|
|
// one sets both, only the translational components of the
|
|
// texture is respected.
|
|
|
|
tools::gdiPlusMatrixFromAffineMatrix2D( aMatrix,
|
|
texture.AffineTransform );
|
|
GraphicsPathSharedPtr pGradientPath(
|
|
tools::graphicsPathFromB2DPolygon( rValues.maGradientPoly ));
|
|
pGradientPath->Transform( &aMatrix );
|
|
|
|
pGradientBrush.reset(
|
|
new Gdiplus::PathGradientBrush( pGradientPath.get() ) );
|
|
pGradientBrush->SetInterpolationColors( &rColors[0],
|
|
&rStops[0],
|
|
rStops.size() );
|
|
|
|
// explicitely setup center point. Since the center of GDI+
|
|
// gradients are by default the _centroid_ of the path
|
|
// (i.e. the weighted sum of edge points), it will not
|
|
// necessarily coincide with our notion of center.
|
|
Gdiplus::PointF aCenterPoint(0, 0);
|
|
aMatrix.TransformPoints( &aCenterPoint );
|
|
pGradientBrush->SetCenterPoint( aCenterPoint );
|
|
|
|
const bool bTileX( texture.RepeatModeX != rendering::TexturingMode::CLAMP );
|
|
const bool bTileY( texture.RepeatModeY != rendering::TexturingMode::CLAMP );
|
|
|
|
if( bTileX && bTileY )
|
|
pGradientBrush->SetWrapMode( Gdiplus::WrapModeTile );
|
|
else
|
|
{
|
|
OSL_ENSURE( bTileY == bTileX,
|
|
"ParametricPolyPolygon::fillPolygonalGradient(): Cannot have repeat x and repeat y differ!" );
|
|
|
|
pGradientBrush->SetWrapMode( Gdiplus::WrapModeClamp );
|
|
}
|
|
|
|
// render actual gradient
|
|
rGraphics->FillPath( pGradientBrush.get(), pFillPath.get() );
|
|
}
|
|
|
|
#if defined(VERBOSE) && defined(DBG_UTIL)
|
|
Gdiplus::Pen aPen( Gdiplus::Color( 255, 255, 0, 0 ),
|
|
0.0001f );
|
|
|
|
rGraphics->DrawRectangle( &aPen,
|
|
Gdiplus::RectF( 0.0f, 0.0f,
|
|
1.0f, 1.0f ) );
|
|
#endif
|
|
|
|
return true;
|
|
}
|
|
|
|
bool fillGradient( const ::canvas::ParametricPolyPolygon::Values& rValues,
|
|
const std::vector< Gdiplus::Color >& rColors,
|
|
const std::vector< Gdiplus::REAL >& rStops,
|
|
GraphicsSharedPtr& rGraphics,
|
|
const GraphicsPathSharedPtr& rPath,
|
|
const rendering::ViewState& viewState,
|
|
const rendering::RenderState& renderState,
|
|
const rendering::Texture& texture )
|
|
{
|
|
switch( rValues.meType )
|
|
{
|
|
case ::canvas::ParametricPolyPolygon::GRADIENT_LINEAR:
|
|
fillLinearGradient( rGraphics,
|
|
rValues,
|
|
rColors,
|
|
rStops,
|
|
rPath,
|
|
texture );
|
|
break;
|
|
|
|
case ::canvas::ParametricPolyPolygon::GRADIENT_ELLIPTICAL:
|
|
// FALLTHROUGH intended
|
|
case ::canvas::ParametricPolyPolygon::GRADIENT_RECTANGULAR:
|
|
fillPolygonalGradient( rValues,
|
|
rColors,
|
|
rStops,
|
|
rGraphics,
|
|
rPath,
|
|
viewState,
|
|
renderState,
|
|
texture );
|
|
break;
|
|
|
|
default:
|
|
ENSURE_OR_THROW( false,
|
|
"CanvasHelper::fillGradient(): Unexpected case" );
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
void fillBitmap( const uno::Reference< rendering::XBitmap >& xBitmap,
|
|
GraphicsSharedPtr& rGraphics,
|
|
const GraphicsPathSharedPtr& rPath,
|
|
const rendering::Texture& rTexture )
|
|
{
|
|
OSL_ENSURE( rTexture.RepeatModeX ==
|
|
rTexture.RepeatModeY,
|
|
"CanvasHelper::fillBitmap(): GDI+ cannot handle differing X/Y repeat mode." );
|
|
|
|
const bool bClamp( rTexture.RepeatModeX == rendering::TexturingMode::NONE &&
|
|
rTexture.RepeatModeY == rendering::TexturingMode::NONE );
|
|
|
|
const geometry::IntegerSize2D aBmpSize( xBitmap->getSize() );
|
|
ENSURE_ARG_OR_THROW( aBmpSize.Width != 0 &&
|
|
aBmpSize.Height != 0,
|
|
"CanvasHelper::fillBitmap(): zero-sized texture bitmap" );
|
|
|
|
// TODO(P3): Detect case that path is rectangle and
|
|
// bitmap is just scaled into that. Then, we can
|
|
// render directly, without generating a temporary
|
|
// GDI+ bitmap (this is significant, because drawing
|
|
// layer presents background object bitmap in that
|
|
// way!)
|
|
BitmapSharedPtr pBitmap(
|
|
tools::bitmapFromXBitmap( xBitmap ) );
|
|
|
|
TextureBrushSharedPtr pBrush;
|
|
if( ::rtl::math::approxEqual( rTexture.Alpha,
|
|
1.0 ) )
|
|
{
|
|
pBrush.reset(
|
|
new Gdiplus::TextureBrush(
|
|
pBitmap.get(),
|
|
bClamp ? Gdiplus::WrapModeClamp : Gdiplus::WrapModeTile ) );
|
|
}
|
|
else
|
|
{
|
|
Gdiplus::ImageAttributes aImgAttr;
|
|
|
|
tools::setModulateImageAttributes( aImgAttr,
|
|
1.0,
|
|
1.0,
|
|
1.0,
|
|
rTexture.Alpha );
|
|
|
|
Gdiplus::Rect aRect(0,0,
|
|
aBmpSize.Width,
|
|
aBmpSize.Height);
|
|
pBrush.reset(
|
|
new Gdiplus::TextureBrush(
|
|
pBitmap.get(),
|
|
aRect,
|
|
&aImgAttr ) );
|
|
|
|
pBrush->SetWrapMode(
|
|
bClamp ? Gdiplus::WrapModeClamp : Gdiplus::WrapModeTile );
|
|
}
|
|
|
|
Gdiplus::Matrix aTextureTransform;
|
|
tools::gdiPlusMatrixFromAffineMatrix2D( aTextureTransform,
|
|
rTexture.AffineTransform );
|
|
|
|
// scale down bitmap to [0,1]x[0,1] rect, as required
|
|
// from the XCanvas interface.
|
|
pBrush->MultiplyTransform( &aTextureTransform );
|
|
pBrush->ScaleTransform( static_cast< Gdiplus::REAL >(1.0/aBmpSize.Width),
|
|
static_cast< Gdiplus::REAL >(1.0/aBmpSize.Height) );
|
|
|
|
// TODO(F1): FillRule
|
|
ENSURE_OR_THROW(
|
|
Gdiplus::Ok == rGraphics->FillPath( pBrush.get(),
|
|
rPath.get() ),
|
|
"CanvasHelper::fillTexturedPolyPolygon(): GDI+ call failed" );
|
|
}
|
|
}
|
|
|
|
// -------------------------------------------------------------
|
|
|
|
uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillTexturedPolyPolygon( const rendering::XCanvas* /*pCanvas*/,
|
|
const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon,
|
|
const rendering::ViewState& viewState,
|
|
const rendering::RenderState& renderState,
|
|
const uno::Sequence< rendering::Texture >& textures )
|
|
{
|
|
ENSURE_OR_THROW( xPolyPolygon.is(),
|
|
"CanvasHelper::fillTexturedPolyPolygon: polygon is NULL");
|
|
ENSURE_OR_THROW( textures.getLength(),
|
|
"CanvasHelper::fillTexturedPolyPolygon: empty texture sequence");
|
|
|
|
if( needOutput() )
|
|
{
|
|
GraphicsSharedPtr pGraphics( mpGraphicsProvider->getGraphics() );
|
|
|
|
setupGraphicsState( pGraphics, viewState, renderState );
|
|
|
|
// TODO(F1): Multi-texturing
|
|
if( textures[0].Gradient.is() )
|
|
{
|
|
// try to cast XParametricPolyPolygon2D reference to
|
|
// our implementation class.
|
|
::canvas::ParametricPolyPolygon* pGradient =
|
|
dynamic_cast< ::canvas::ParametricPolyPolygon* >( textures[0].Gradient.get() );
|
|
|
|
if( pGradient )
|
|
{
|
|
const ::canvas::ParametricPolyPolygon::Values& rValues(
|
|
pGradient->getValues() );
|
|
|
|
OSL_ASSERT(rValues.maColors.getLength() == rValues.maStops.getLength()
|
|
&& rValues.maColors.getLength() > 1);
|
|
|
|
std::vector< Gdiplus::Color > aColors(rValues.maColors.getLength());
|
|
std::transform(&rValues.maColors[0],
|
|
&rValues.maColors[0]+rValues.maColors.getLength(),
|
|
aColors.begin(),
|
|
boost::bind(
|
|
(Gdiplus::ARGB (*)( const uno::Sequence< double >& ))(
|
|
&tools::sequenceToArgb),
|
|
_1));
|
|
std::vector< Gdiplus::REAL > aStops;
|
|
comphelper::sequenceToContainer(aStops,rValues.maStops);
|
|
|
|
// TODO(E1): Return value
|
|
// TODO(F1): FillRule
|
|
fillGradient( rValues,
|
|
aColors,
|
|
aStops,
|
|
pGraphics,
|
|
tools::graphicsPathFromXPolyPolygon2D( xPolyPolygon ),
|
|
viewState,
|
|
renderState,
|
|
textures[0] );
|
|
}
|
|
}
|
|
else if( textures[0].Bitmap.is() )
|
|
{
|
|
// TODO(E1): Return value
|
|
// TODO(F1): FillRule
|
|
fillBitmap( textures[0].Bitmap,
|
|
pGraphics,
|
|
tools::graphicsPathFromXPolyPolygon2D( xPolyPolygon ),
|
|
textures[0] );
|
|
}
|
|
}
|
|
|
|
// TODO(P1): Provide caching here.
|
|
return uno::Reference< rendering::XCachedPrimitive >(NULL);
|
|
}
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|