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
583 lines
19 KiB
C++
583 lines
19 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 "svpgdi.hxx"
|
|
#include "svpbmp.hxx"
|
|
|
|
#include <vcl/sysdata.hxx>
|
|
#include <vcl/region.h>
|
|
#include <basegfx/range/b2drange.hxx>
|
|
#include <basegfx/range/b2irange.hxx>
|
|
#include <basegfx/polygon/b2dpolypolygon.hxx>
|
|
#include <basegfx/polygon/b2dpolygon.hxx>
|
|
#include <basegfx/polygon/b2dpolygontools.hxx>
|
|
#include <basebmp/scanlineformats.hxx>
|
|
|
|
#include <tools/debug.hxx>
|
|
|
|
#if OSL_DEBUG_LEVEL > 2
|
|
#include <basebmp/debug.hxx>
|
|
#include <fstream>
|
|
#include <rtl/strbuf.hxx>
|
|
#include <sys/stat.h>
|
|
#endif
|
|
|
|
#include <svppspgraphics.hxx>
|
|
|
|
using namespace basegfx;
|
|
using namespace basebmp;
|
|
|
|
inline void dbgOut( const BitmapDeviceSharedPtr&
|
|
#if OSL_DEBUG_LEVEL > 2
|
|
rDevice
|
|
#endif
|
|
)
|
|
{
|
|
#if OSL_DEBUG_LEVEL > 2
|
|
static int dbgStreamNum = 0;
|
|
rtl::OStringBuffer aBuf( 256 );
|
|
aBuf.append( "debug" );
|
|
mkdir( aBuf.getStr(), 0777 );
|
|
aBuf.append( "/" );
|
|
aBuf.append( sal_Int64(reinterpret_cast<sal_IntPtr>(rDevice.get())), 16 );
|
|
mkdir( aBuf.getStr(), 0777 );
|
|
aBuf.append( "/bmp" );
|
|
aBuf.append( sal_Int32(dbgStreamNum++) );
|
|
std::fstream bmpstream( aBuf.getStr(), std::ios::out );
|
|
debugDump( rDevice, bmpstream );
|
|
#endif
|
|
}
|
|
|
|
// ===========================================================================
|
|
|
|
bool SvpSalGraphics::drawAlphaBitmap( const SalTwoRect&, const SalBitmap& /*rSourceBitmap*/, const SalBitmap& /*rAlphaBitmap*/ )
|
|
{
|
|
// TODO(P3) implement alpha blending
|
|
return false;
|
|
}
|
|
|
|
bool SvpSalGraphics::drawAlphaRect( long /*nX*/, long /*nY*/, long /*nWidth*/, long /*nHeight*/, sal_uInt8 /*nTransparency*/ )
|
|
{
|
|
// TODO(P3) implement alpha blending
|
|
return false;
|
|
}
|
|
|
|
SvpSalGraphics::SvpSalGraphics() :
|
|
m_bUseLineColor( true ),
|
|
m_aLineColor( COL_BLACK ),
|
|
m_bUseFillColor( false ),
|
|
m_aFillColor( COL_WHITE ),
|
|
m_aTextColor( COL_BLACK ),
|
|
m_aDrawMode( DrawMode_PAINT ),
|
|
m_eTextFmt( Format::EIGHT_BIT_GREY )
|
|
{
|
|
for( int i = 0; i < MAX_FALLBACK; ++i )
|
|
m_pServerFont[i] = NULL;
|
|
}
|
|
|
|
SvpSalGraphics::~SvpSalGraphics()
|
|
{
|
|
}
|
|
|
|
void SvpSalGraphics::setDevice( BitmapDeviceSharedPtr& rDevice )
|
|
{
|
|
m_aDevice = rDevice;
|
|
m_aOrigDevice = rDevice;
|
|
m_aClipMap.reset();
|
|
|
|
// determine matching bitmap format for masks
|
|
sal_uInt32 nDeviceFmt = m_aDevice->getScanlineFormat();
|
|
DBG_ASSERT( (nDeviceFmt <= (sal_uInt32)Format::MAX), "SVP::setDevice() with invalid bitmap format" );
|
|
switch( nDeviceFmt )
|
|
{
|
|
case Format::EIGHT_BIT_GREY:
|
|
case Format::SIXTEEN_BIT_LSB_TC_MASK:
|
|
case Format::SIXTEEN_BIT_MSB_TC_MASK:
|
|
case Format::TWENTYFOUR_BIT_TC_MASK:
|
|
case Format::THIRTYTWO_BIT_TC_MASK:
|
|
m_eTextFmt = Format::EIGHT_BIT_GREY;
|
|
break;
|
|
default:
|
|
m_eTextFmt = Format::ONE_BIT_LSB_GREY;
|
|
break;
|
|
}
|
|
}
|
|
|
|
void SvpSalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY )
|
|
{
|
|
rDPIX = rDPIY = 96;
|
|
}
|
|
|
|
sal_uInt16 SvpSalGraphics::GetBitCount() const
|
|
{
|
|
return SvpElement::getBitCountFromScanlineFormat( m_aDevice->getScanlineFormat() );
|
|
}
|
|
|
|
long SvpSalGraphics::GetGraphicsWidth() const
|
|
{
|
|
if( m_aDevice.get() )
|
|
{
|
|
B2IVector aSize = m_aDevice->getSize();
|
|
return aSize.getX();
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
void SvpSalGraphics::ResetClipRegion()
|
|
{
|
|
m_aDevice = m_aOrigDevice;
|
|
m_aClipMap.reset();
|
|
}
|
|
|
|
bool SvpSalGraphics::setClipRegion( const Region& i_rClip )
|
|
{
|
|
if( i_rClip.IsEmpty() )
|
|
m_aClipMap.reset();
|
|
else if( i_rClip.GetRectCount() == 1 )
|
|
{
|
|
m_aClipMap.reset();
|
|
Rectangle aBoundRect( i_rClip.GetBoundRect() );
|
|
m_aDevice = basebmp::subsetBitmapDevice( m_aOrigDevice,
|
|
basegfx::B2IRange(aBoundRect.Left(),aBoundRect.Top(),aBoundRect.Right(),aBoundRect.Bottom()) );
|
|
}
|
|
else
|
|
{
|
|
m_aDevice = m_aOrigDevice;
|
|
B2IVector aSize = m_aDevice->getSize();
|
|
m_aClipMap = createBitmapDevice( aSize, false, Format::ONE_BIT_MSB_GREY );
|
|
m_aClipMap->clear( basebmp::Color(0xFFFFFFFF) );
|
|
|
|
ImplRegionInfo aInfo;
|
|
long nX, nY, nW, nH;
|
|
bool bRegionRect = i_rClip.ImplGetFirstRect(aInfo, nX, nY, nW, nH );
|
|
while( bRegionRect )
|
|
{
|
|
if ( nW && nH )
|
|
{
|
|
B2DPolyPolygon aFull;
|
|
aFull.append( tools::createPolygonFromRect( B2DRectangle( nX, nY, nX+nW, nY+nH ) ) );
|
|
m_aClipMap->fillPolyPolygon( aFull, basebmp::Color(0), DrawMode_PAINT );
|
|
}
|
|
bRegionRect = i_rClip.ImplGetNextRect( aInfo, nX, nY, nW, nH );
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
void SvpSalGraphics::SetLineColor()
|
|
{
|
|
m_bUseLineColor = false;
|
|
}
|
|
|
|
void SvpSalGraphics::SetLineColor( SalColor nSalColor )
|
|
{
|
|
m_bUseLineColor = true;
|
|
m_aLineColor = basebmp::Color( nSalColor );
|
|
}
|
|
|
|
void SvpSalGraphics::SetFillColor()
|
|
{
|
|
m_bUseFillColor = false;
|
|
}
|
|
|
|
void SvpSalGraphics::SetFillColor( SalColor nSalColor )
|
|
{
|
|
m_bUseFillColor = true;
|
|
m_aFillColor = basebmp::Color( nSalColor );
|
|
}
|
|
|
|
void SvpSalGraphics::SetXORMode( bool bSet, bool )
|
|
{
|
|
m_aDrawMode = bSet ? DrawMode_XOR : DrawMode_PAINT;
|
|
}
|
|
|
|
void SvpSalGraphics::SetROPLineColor( SalROPColor nROPColor )
|
|
{
|
|
m_bUseLineColor = true;
|
|
switch( nROPColor )
|
|
{
|
|
case SAL_ROP_0:
|
|
m_aLineColor = basebmp::Color( 0 );
|
|
break;
|
|
case SAL_ROP_1:
|
|
m_aLineColor = basebmp::Color( 0xffffff );
|
|
break;
|
|
case SAL_ROP_INVERT:
|
|
m_aLineColor = basebmp::Color( 0xffffff );
|
|
break;
|
|
}
|
|
}
|
|
|
|
void SvpSalGraphics::SetROPFillColor( SalROPColor nROPColor )
|
|
{
|
|
m_bUseFillColor = true;
|
|
switch( nROPColor )
|
|
{
|
|
case SAL_ROP_0:
|
|
m_aFillColor = basebmp::Color( 0 );
|
|
break;
|
|
case SAL_ROP_1:
|
|
m_aFillColor = basebmp::Color( 0xffffff );
|
|
break;
|
|
case SAL_ROP_INVERT:
|
|
m_aFillColor = basebmp::Color( 0xffffff );
|
|
break;
|
|
}
|
|
}
|
|
|
|
void SvpSalGraphics::SetTextColor( SalColor nSalColor )
|
|
{
|
|
m_aTextColor = basebmp::Color( nSalColor );
|
|
}
|
|
|
|
void SvpSalGraphics::drawPixel( long nX, long nY )
|
|
{
|
|
if( m_bUseLineColor )
|
|
m_aDevice->setPixel( B2IPoint( nX, nY ),
|
|
m_aLineColor,
|
|
m_aDrawMode,
|
|
m_aClipMap
|
|
);
|
|
dbgOut( m_aDevice );
|
|
}
|
|
|
|
void SvpSalGraphics::drawPixel( long nX, long nY, SalColor nSalColor )
|
|
{
|
|
basebmp::Color aColor( nSalColor );
|
|
m_aDevice->setPixel( B2IPoint( nX, nY ),
|
|
aColor,
|
|
m_aDrawMode,
|
|
m_aClipMap
|
|
);
|
|
dbgOut( m_aDevice );
|
|
}
|
|
|
|
void SvpSalGraphics::drawLine( long nX1, long nY1, long nX2, long nY2 )
|
|
{
|
|
if( m_bUseLineColor )
|
|
m_aDevice->drawLine( B2IPoint( nX1, nY1 ),
|
|
B2IPoint( nX2, nY2 ),
|
|
m_aLineColor,
|
|
m_aDrawMode,
|
|
m_aClipMap );
|
|
dbgOut( m_aDevice );
|
|
}
|
|
|
|
void SvpSalGraphics::drawRect( long nX, long nY, long nWidth, long nHeight )
|
|
{
|
|
if( m_bUseLineColor || m_bUseFillColor )
|
|
{
|
|
B2DPolygon aRect = tools::createPolygonFromRect( B2DRectangle( nX, nY, nX+nWidth, nY+nHeight ) );
|
|
if( m_bUseFillColor )
|
|
{
|
|
B2DPolyPolygon aPolyPoly( aRect );
|
|
m_aDevice->fillPolyPolygon( aPolyPoly, m_aFillColor, m_aDrawMode, m_aClipMap );
|
|
}
|
|
if( m_bUseLineColor )
|
|
m_aDevice->drawPolygon( aRect, m_aLineColor, m_aDrawMode, m_aClipMap );
|
|
}
|
|
dbgOut( m_aDevice );
|
|
}
|
|
|
|
void SvpSalGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry )
|
|
{
|
|
if( m_bUseLineColor && nPoints )
|
|
{
|
|
B2DPolygon aPoly;
|
|
aPoly.append( B2DPoint( pPtAry->mnX, pPtAry->mnY ), nPoints );
|
|
for( sal_uLong i = 1; i < nPoints; i++ )
|
|
aPoly.setB2DPoint( i, B2DPoint( pPtAry[i].mnX, pPtAry[i].mnY ) );
|
|
aPoly.setClosed( false );
|
|
m_aDevice->drawPolygon( aPoly, m_aLineColor, m_aDrawMode, m_aClipMap );
|
|
}
|
|
dbgOut( m_aDevice );
|
|
}
|
|
|
|
void SvpSalGraphics::drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry )
|
|
{
|
|
if( ( m_bUseLineColor || m_bUseFillColor ) && nPoints )
|
|
{
|
|
B2DPolygon aPoly;
|
|
aPoly.append( B2DPoint( pPtAry->mnX, pPtAry->mnY ), nPoints );
|
|
for( sal_uLong i = 1; i < nPoints; i++ )
|
|
aPoly.setB2DPoint( i, B2DPoint( pPtAry[i].mnX, pPtAry[i].mnY ) );
|
|
if( m_bUseFillColor )
|
|
{
|
|
aPoly.setClosed( true );
|
|
m_aDevice->fillPolyPolygon( B2DPolyPolygon(aPoly), m_aFillColor, m_aDrawMode, m_aClipMap );
|
|
}
|
|
if( m_bUseLineColor )
|
|
{
|
|
aPoly.setClosed( false );
|
|
m_aDevice->drawPolygon( aPoly, m_aLineColor, m_aDrawMode, m_aClipMap );
|
|
}
|
|
}
|
|
dbgOut( m_aDevice );
|
|
}
|
|
|
|
void SvpSalGraphics::drawPolyPolygon( sal_uInt32 nPoly,
|
|
const sal_uInt32* pPointCounts,
|
|
PCONSTSALPOINT* pPtAry )
|
|
{
|
|
if( ( m_bUseLineColor || m_bUseFillColor ) && nPoly )
|
|
{
|
|
B2DPolyPolygon aPolyPoly;
|
|
for( sal_uInt32 nPolygon = 0; nPolygon < nPoly; nPolygon++ )
|
|
{
|
|
sal_uInt32 nPoints = pPointCounts[nPolygon];
|
|
if( nPoints )
|
|
{
|
|
PCONSTSALPOINT pPoints = pPtAry[nPolygon];
|
|
B2DPolygon aPoly;
|
|
aPoly.append( B2DPoint( pPoints->mnX, pPoints->mnY ), nPoints );
|
|
for( sal_uInt32 i = 1; i < nPoints; i++ )
|
|
aPoly.setB2DPoint( i, B2DPoint( pPoints[i].mnX, pPoints[i].mnY ) );
|
|
|
|
aPolyPoly.append( aPoly );
|
|
}
|
|
}
|
|
if( m_bUseFillColor )
|
|
{
|
|
aPolyPoly.setClosed( true );
|
|
m_aDevice->fillPolyPolygon( aPolyPoly, m_aFillColor, m_aDrawMode, m_aClipMap );
|
|
}
|
|
if( m_bUseLineColor )
|
|
{
|
|
aPolyPoly.setClosed( false );
|
|
nPoly = aPolyPoly.count();
|
|
for( sal_uInt32 i = 0; i < nPoly; i++ )
|
|
m_aDevice->drawPolygon( aPolyPoly.getB2DPolygon(i), m_aLineColor, m_aDrawMode, m_aClipMap );
|
|
}
|
|
}
|
|
dbgOut( m_aDevice );
|
|
}
|
|
|
|
bool SvpSalGraphics::drawPolyLine( const ::basegfx::B2DPolygon&, double /*fTransparency*/, const ::basegfx::B2DVector& /*rLineWidths*/, basegfx::B2DLineJoin /*eJoin*/ )
|
|
{
|
|
// TODO: implement and advertise OutDevSupport_B2DDraw support
|
|
return false;
|
|
}
|
|
|
|
sal_Bool SvpSalGraphics::drawPolyLineBezier( sal_uLong,
|
|
const SalPoint*,
|
|
const sal_uInt8* )
|
|
{
|
|
return sal_False;
|
|
}
|
|
|
|
sal_Bool SvpSalGraphics::drawPolygonBezier( sal_uLong,
|
|
const SalPoint*,
|
|
const sal_uInt8* )
|
|
{
|
|
return sal_False;
|
|
}
|
|
|
|
sal_Bool SvpSalGraphics::drawPolyPolygonBezier( sal_uInt32,
|
|
const sal_uInt32*,
|
|
const SalPoint* const*,
|
|
const sal_uInt8* const* )
|
|
{
|
|
return sal_False;
|
|
}
|
|
|
|
bool SvpSalGraphics::drawPolyPolygon( const basegfx::B2DPolyPolygon&, double /*fTransparency*/ )
|
|
{
|
|
// TODO: maybe BaseBmp can draw B2DPolyPolygons directly
|
|
return false;
|
|
}
|
|
|
|
void SvpSalGraphics::copyArea( long nDestX,
|
|
long nDestY,
|
|
long nSrcX,
|
|
long nSrcY,
|
|
long nSrcWidth,
|
|
long nSrcHeight,
|
|
sal_uInt16 /*nFlags*/ )
|
|
{
|
|
B2IRange aSrcRect( nSrcX, nSrcY, nSrcX+nSrcWidth, nSrcY+nSrcHeight );
|
|
B2IRange aDestRect( nDestX, nDestY, nDestX+nSrcWidth, nDestY+nSrcHeight );
|
|
m_aDevice->drawBitmap( m_aOrigDevice, aSrcRect, aDestRect, DrawMode_PAINT, m_aClipMap );
|
|
dbgOut( m_aDevice );
|
|
}
|
|
|
|
void SvpSalGraphics::copyBits( const SalTwoRect* pPosAry,
|
|
SalGraphics* pSrcGraphics )
|
|
{
|
|
SvpSalGraphics* pSrc = pSrcGraphics ?
|
|
static_cast<SvpSalGraphics*>(pSrcGraphics) : this;
|
|
B2IRange aSrcRect( pPosAry->mnSrcX, pPosAry->mnSrcY,
|
|
pPosAry->mnSrcX+pPosAry->mnSrcWidth,
|
|
pPosAry->mnSrcY+pPosAry->mnSrcHeight );
|
|
B2IRange aDestRect( pPosAry->mnDestX, pPosAry->mnDestY,
|
|
pPosAry->mnDestX+pPosAry->mnDestWidth,
|
|
pPosAry->mnDestY+pPosAry->mnDestHeight );
|
|
m_aDevice->drawBitmap( pSrc->m_aOrigDevice, aSrcRect, aDestRect, DrawMode_PAINT, m_aClipMap );
|
|
dbgOut( m_aDevice );
|
|
}
|
|
|
|
void SvpSalGraphics::drawBitmap( const SalTwoRect* pPosAry,
|
|
const SalBitmap& rSalBitmap )
|
|
{
|
|
const SvpSalBitmap& rSrc = static_cast<const SvpSalBitmap&>(rSalBitmap);
|
|
B2IRange aSrcRect( pPosAry->mnSrcX, pPosAry->mnSrcY,
|
|
pPosAry->mnSrcX+pPosAry->mnSrcWidth,
|
|
pPosAry->mnSrcY+pPosAry->mnSrcHeight );
|
|
B2IRange aDestRect( pPosAry->mnDestX, pPosAry->mnDestY,
|
|
pPosAry->mnDestX+pPosAry->mnDestWidth,
|
|
pPosAry->mnDestY+pPosAry->mnDestHeight );
|
|
m_aDevice->drawBitmap( rSrc.getBitmap(), aSrcRect, aDestRect, DrawMode_PAINT, m_aClipMap );
|
|
dbgOut( m_aDevice );
|
|
}
|
|
|
|
void SvpSalGraphics::drawBitmap( const SalTwoRect*,
|
|
const SalBitmap&,
|
|
SalColor )
|
|
{
|
|
// SNI, as in X11 plugin
|
|
}
|
|
|
|
void SvpSalGraphics::drawBitmap( const SalTwoRect* pPosAry,
|
|
const SalBitmap& rSalBitmap,
|
|
const SalBitmap& rTransparentBitmap )
|
|
{
|
|
const SvpSalBitmap& rSrc = static_cast<const SvpSalBitmap&>(rSalBitmap);
|
|
const SvpSalBitmap& rSrcTrans = static_cast<const SvpSalBitmap&>(rTransparentBitmap);
|
|
B2IRange aSrcRect( pPosAry->mnSrcX, pPosAry->mnSrcY,
|
|
pPosAry->mnSrcX+pPosAry->mnSrcWidth,
|
|
pPosAry->mnSrcY+pPosAry->mnSrcHeight );
|
|
B2IRange aDestRect( pPosAry->mnDestX, pPosAry->mnDestY,
|
|
pPosAry->mnDestX+pPosAry->mnDestWidth,
|
|
pPosAry->mnDestY+pPosAry->mnDestHeight );
|
|
m_aDevice->drawMaskedBitmap( rSrc.getBitmap(), rSrcTrans.getBitmap(), aSrcRect, aDestRect, DrawMode_PAINT, m_aClipMap );
|
|
dbgOut( m_aDevice );
|
|
}
|
|
|
|
void SvpSalGraphics::drawMask( const SalTwoRect* pPosAry,
|
|
const SalBitmap& rSalBitmap,
|
|
SalColor nMaskColor )
|
|
{
|
|
const SvpSalBitmap& rSrc = static_cast<const SvpSalBitmap&>(rSalBitmap);
|
|
B2IRange aSrcRect( pPosAry->mnSrcX, pPosAry->mnSrcY,
|
|
pPosAry->mnSrcX+pPosAry->mnSrcWidth,
|
|
pPosAry->mnSrcY+pPosAry->mnSrcHeight );
|
|
B2IPoint aDestPoint( pPosAry->mnDestX, pPosAry->mnDestY );
|
|
|
|
// BitmapDevice::drawMaskedColor works with 0==transparent,
|
|
// 255==opaque. drawMask() semantic is the other way
|
|
// around. Therefore, invert mask.
|
|
BitmapDeviceSharedPtr aCopy =
|
|
cloneBitmapDevice( B2IVector( pPosAry->mnSrcWidth, pPosAry->mnSrcHeight ),
|
|
rSrc.getBitmap() );
|
|
basebmp::Color aBgColor( COL_WHITE );
|
|
aCopy->clear(aBgColor);
|
|
basebmp::Color aFgColor( COL_BLACK );
|
|
aCopy->drawMaskedColor( aFgColor, rSrc.getBitmap(), aSrcRect, B2IPoint() );
|
|
|
|
basebmp::Color aColor( nMaskColor );
|
|
B2IRange aSrcRect2( 0, 0, pPosAry->mnSrcWidth, pPosAry->mnSrcHeight );
|
|
m_aDevice->drawMaskedColor( aColor, aCopy, aSrcRect, aDestPoint, m_aClipMap );
|
|
dbgOut( m_aDevice );
|
|
}
|
|
|
|
SalBitmap* SvpSalGraphics::getBitmap( long nX, long nY, long nWidth, long nHeight )
|
|
{
|
|
BitmapDeviceSharedPtr aCopy =
|
|
cloneBitmapDevice( B2IVector( nWidth, nHeight ),
|
|
m_aDevice );
|
|
B2IRange aSrcRect( nX, nY, nX+nWidth, nY+nHeight );
|
|
B2IRange aDestRect( 0, 0, nWidth, nHeight );
|
|
aCopy->drawBitmap( m_aOrigDevice, aSrcRect, aDestRect, DrawMode_PAINT );
|
|
|
|
SvpSalBitmap* pBitmap = new SvpSalBitmap();
|
|
pBitmap->setBitmap( aCopy );
|
|
return pBitmap;
|
|
}
|
|
|
|
SalColor SvpSalGraphics::getPixel( long nX, long nY )
|
|
{
|
|
basebmp::Color aColor( m_aDevice->getPixel( B2IPoint( nX, nY ) ) );
|
|
return aColor.toInt32();
|
|
}
|
|
|
|
void SvpSalGraphics::invert( long nX, long nY, long nWidth, long nHeight, SalInvert /*nFlags*/ )
|
|
{
|
|
// FIXME: handle SAL_INVERT_50 and SAL_INVERT_TRACKFRAME
|
|
B2DPolygon aRect = tools::createPolygonFromRect( B2DRectangle( nX, nY, nX+nWidth, nY+nHeight ) );
|
|
B2DPolyPolygon aPolyPoly( aRect );
|
|
m_aDevice->fillPolyPolygon( aPolyPoly, basebmp::Color( 0xffffff ), DrawMode_XOR, m_aClipMap );
|
|
dbgOut( m_aDevice );
|
|
}
|
|
|
|
void SvpSalGraphics::invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert /*nFlags*/ )
|
|
{
|
|
// FIXME: handle SAL_INVERT_50 and SAL_INVERT_TRACKFRAME
|
|
B2DPolygon aPoly;
|
|
aPoly.append( B2DPoint( pPtAry->mnX, pPtAry->mnY ), nPoints );
|
|
for( sal_uLong i = 1; i < nPoints; i++ )
|
|
aPoly.setB2DPoint( i, B2DPoint( pPtAry[i].mnX, pPtAry[i].mnY ) );
|
|
aPoly.setClosed( true );
|
|
m_aDevice->fillPolyPolygon( B2DPolyPolygon(aPoly), basebmp::Color( 0xffffff ), DrawMode_XOR, m_aClipMap );
|
|
dbgOut( m_aDevice );
|
|
}
|
|
|
|
sal_Bool SvpSalGraphics::drawEPS( long, long, long, long, void*, sal_uLong )
|
|
{
|
|
return sal_False;
|
|
}
|
|
|
|
SystemFontData SvpSalGraphics::GetSysFontData( int nFallbacklevel ) const
|
|
{
|
|
SystemFontData aSysFontData;
|
|
|
|
if (nFallbacklevel >= MAX_FALLBACK) nFallbacklevel = MAX_FALLBACK - 1;
|
|
if (nFallbacklevel < 0 ) nFallbacklevel = 0;
|
|
|
|
aSysFontData.nSize = sizeof( SystemFontData );
|
|
aSysFontData.nFontId = 0;
|
|
aSysFontData.nFontFlags = 0;
|
|
aSysFontData.bFakeBold = false;
|
|
aSysFontData.bFakeItalic = false;
|
|
aSysFontData.bAntialias = true;
|
|
return aSysFontData;
|
|
}
|
|
|
|
SystemGraphicsData SvpSalGraphics::GetGraphicsData() const
|
|
{
|
|
SystemGraphicsData aRes;
|
|
aRes.nSize = sizeof(aRes);
|
|
aRes.hDrawable = 0;
|
|
aRes.pXRenderFormat = 0;
|
|
return aRes;
|
|
}
|
|
|
|
bool SvpSalGraphics::supportsOperation( OutDevSupportType ) const
|
|
{
|
|
return false;
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|