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
700 lines
27 KiB
C++
700 lines
27 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 <math.h>
|
|
|
|
#include <canvas/debug.hxx>
|
|
#include <canvas/verbosetrace.hxx>
|
|
#include <tools/diagnose_ex.h>
|
|
|
|
#include <vcl/metric.hxx>
|
|
#include <vcl/virdev.hxx>
|
|
|
|
#ifdef WNT
|
|
#include <prewin.h>
|
|
#include <postwin.h>
|
|
#ifdef max
|
|
#undef max
|
|
#endif
|
|
#ifdef min
|
|
#undef min
|
|
#endif
|
|
#endif
|
|
#include <vcl/sysdata.hxx>
|
|
|
|
#include <basegfx/matrix/b2dhommatrix.hxx>
|
|
#include <basegfx/numeric/ftools.hxx>
|
|
|
|
#include <boost/scoped_array.hpp>
|
|
|
|
#include "cairo_textlayout.hxx"
|
|
#include "cairo_spritecanvas.hxx"
|
|
|
|
#ifdef CAIRO_HAS_QUARTZ_SURFACE
|
|
# include "cairo_quartz_cairo.hxx"
|
|
#elif defined CAIRO_HAS_WIN32_SURFACE
|
|
# include "cairo_win32_cairo.hxx"
|
|
# include <cairo-win32.h>
|
|
#elif defined CAIRO_HAS_XLIB_SURFACE
|
|
# include "cairo_xlib_cairo.hxx"
|
|
# include <cairo-ft.h>
|
|
#else
|
|
# error Native API needed.
|
|
#endif
|
|
|
|
using namespace ::cairo;
|
|
using namespace ::com::sun::star;
|
|
|
|
namespace cairocanvas
|
|
{
|
|
namespace
|
|
{
|
|
void setupLayoutMode( OutputDevice& rOutDev,
|
|
sal_Int8 nTextDirection )
|
|
{
|
|
// TODO(P3): avoid if already correctly set
|
|
sal_uLong nLayoutMode;
|
|
switch( nTextDirection )
|
|
{
|
|
default:
|
|
nLayoutMode = 0;
|
|
break;
|
|
case rendering::TextDirection::WEAK_LEFT_TO_RIGHT:
|
|
nLayoutMode = TEXT_LAYOUT_BIDI_LTR;
|
|
break;
|
|
case rendering::TextDirection::STRONG_LEFT_TO_RIGHT:
|
|
nLayoutMode = TEXT_LAYOUT_BIDI_LTR | TEXT_LAYOUT_BIDI_STRONG;
|
|
break;
|
|
case rendering::TextDirection::WEAK_RIGHT_TO_LEFT:
|
|
nLayoutMode = TEXT_LAYOUT_BIDI_RTL;
|
|
break;
|
|
case rendering::TextDirection::STRONG_RIGHT_TO_LEFT:
|
|
nLayoutMode = TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_BIDI_STRONG;
|
|
break;
|
|
}
|
|
|
|
// set calculated layout mode. Origin is always the left edge,
|
|
// as required at the API spec
|
|
rOutDev.SetLayoutMode( nLayoutMode | TEXT_LAYOUT_TEXTORIGIN_LEFT );
|
|
}
|
|
|
|
bool compareFallbacks(const SystemGlyphData&rA, const SystemGlyphData &rB)
|
|
{
|
|
return rA.fallbacklevel < rB.fallbacklevel;
|
|
}
|
|
}
|
|
|
|
TextLayout::TextLayout( const rendering::StringContext& aText,
|
|
sal_Int8 nDirection,
|
|
sal_Int64 /*nRandomSeed*/,
|
|
const CanvasFont::Reference& rFont,
|
|
const SurfaceProviderRef& rRefDevice ) :
|
|
TextLayout_Base( m_aMutex ),
|
|
maText( aText ),
|
|
maLogicalAdvancements(),
|
|
mpFont( rFont ),
|
|
mpRefDevice( rRefDevice ),
|
|
mnTextDirection( nDirection )
|
|
{
|
|
}
|
|
|
|
TextLayout::~TextLayout()
|
|
{
|
|
}
|
|
|
|
void SAL_CALL TextLayout::disposing()
|
|
{
|
|
::osl::MutexGuard aGuard( m_aMutex );
|
|
|
|
mpFont.reset();
|
|
mpRefDevice.clear();
|
|
}
|
|
|
|
// XTextLayout
|
|
uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > > SAL_CALL TextLayout::queryTextShapes( ) throw (uno::RuntimeException)
|
|
{
|
|
::osl::MutexGuard aGuard( m_aMutex );
|
|
|
|
// TODO
|
|
return uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > >();
|
|
}
|
|
|
|
uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryInkMeasures( ) throw (uno::RuntimeException)
|
|
{
|
|
::osl::MutexGuard aGuard( m_aMutex );
|
|
|
|
// TODO
|
|
return uno::Sequence< geometry::RealRectangle2D >();
|
|
}
|
|
|
|
uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryMeasures( ) throw (uno::RuntimeException)
|
|
{
|
|
::osl::MutexGuard aGuard( m_aMutex );
|
|
|
|
// TODO
|
|
return uno::Sequence< geometry::RealRectangle2D >();
|
|
}
|
|
|
|
uno::Sequence< double > SAL_CALL TextLayout::queryLogicalAdvancements( ) throw (uno::RuntimeException)
|
|
{
|
|
::osl::MutexGuard aGuard( m_aMutex );
|
|
|
|
return maLogicalAdvancements;
|
|
}
|
|
|
|
void SAL_CALL TextLayout::applyLogicalAdvancements( const uno::Sequence< double >& aAdvancements ) throw (lang::IllegalArgumentException, uno::RuntimeException)
|
|
{
|
|
::osl::MutexGuard aGuard( m_aMutex );
|
|
|
|
if( aAdvancements.getLength() != maText.Length )
|
|
{
|
|
OSL_TRACE( "TextLayout::applyLogicalAdvancements(): mismatching number of advancements" );
|
|
throw lang::IllegalArgumentException();
|
|
}
|
|
|
|
maLogicalAdvancements = aAdvancements;
|
|
}
|
|
|
|
geometry::RealRectangle2D SAL_CALL TextLayout::queryTextBounds( ) throw (uno::RuntimeException)
|
|
{
|
|
::osl::MutexGuard aGuard( m_aMutex );
|
|
|
|
OutputDevice* pOutDev = mpRefDevice->getOutputDevice();
|
|
if( !pOutDev )
|
|
return geometry::RealRectangle2D();
|
|
|
|
VirtualDevice aVDev( *pOutDev );
|
|
aVDev.SetFont( mpFont->getVCLFont() );
|
|
|
|
// need metrics for Y offset, the XCanvas always renders
|
|
// relative to baseline
|
|
const ::FontMetric& aMetric( aVDev.GetFontMetric() );
|
|
|
|
setupLayoutMode( aVDev, mnTextDirection );
|
|
|
|
const sal_Int32 nAboveBaseline( -aMetric.GetIntLeading() - aMetric.GetAscent() );
|
|
const sal_Int32 nBelowBaseline( aMetric.GetDescent() );
|
|
|
|
if( maLogicalAdvancements.getLength() )
|
|
{
|
|
return geometry::RealRectangle2D( 0, nAboveBaseline,
|
|
maLogicalAdvancements[ maLogicalAdvancements.getLength()-1 ],
|
|
nBelowBaseline );
|
|
}
|
|
else
|
|
{
|
|
return geometry::RealRectangle2D( 0, nAboveBaseline,
|
|
aVDev.GetTextWidth(
|
|
maText.Text,
|
|
::canvas::tools::numeric_cast<USHORT>(maText.StartPosition),
|
|
::canvas::tools::numeric_cast<USHORT>(maText.Length) ),
|
|
nBelowBaseline );
|
|
}
|
|
}
|
|
|
|
double SAL_CALL TextLayout::justify( double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException)
|
|
{
|
|
::osl::MutexGuard aGuard( m_aMutex );
|
|
|
|
// TODO
|
|
return 0.0;
|
|
}
|
|
|
|
double SAL_CALL TextLayout::combinedJustify( const uno::Sequence< uno::Reference< rendering::XTextLayout > >& /*aNextLayouts*/,
|
|
double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException)
|
|
{
|
|
::osl::MutexGuard aGuard( m_aMutex );
|
|
|
|
// TODO
|
|
return 0.0;
|
|
}
|
|
|
|
rendering::TextHit SAL_CALL TextLayout::getTextHit( const geometry::RealPoint2D& /*aHitPoint*/ ) throw (uno::RuntimeException)
|
|
{
|
|
::osl::MutexGuard aGuard( m_aMutex );
|
|
|
|
// TODO
|
|
return rendering::TextHit();
|
|
}
|
|
|
|
rendering::Caret SAL_CALL TextLayout::getCaret( sal_Int32 /*nInsertionIndex*/,
|
|
sal_Bool /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
|
|
{
|
|
::osl::MutexGuard aGuard( m_aMutex );
|
|
|
|
// TODO
|
|
return rendering::Caret();
|
|
}
|
|
|
|
sal_Int32 SAL_CALL TextLayout::getNextInsertionIndex( sal_Int32 /*nStartIndex*/,
|
|
sal_Int32 /*nCaretAdvancement*/,
|
|
sal_Bool /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
|
|
{
|
|
::osl::MutexGuard aGuard( m_aMutex );
|
|
|
|
// TODO
|
|
return 0;
|
|
}
|
|
|
|
uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryVisualHighlighting( sal_Int32 /*nStartIndex*/,
|
|
sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
|
|
{
|
|
::osl::MutexGuard aGuard( m_aMutex );
|
|
|
|
// TODO
|
|
return uno::Reference< rendering::XPolyPolygon2D >();
|
|
}
|
|
|
|
uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryLogicalHighlighting( sal_Int32 /*nStartIndex*/,
|
|
sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
|
|
{
|
|
::osl::MutexGuard aGuard( m_aMutex );
|
|
|
|
// TODO
|
|
return uno::Reference< rendering::XPolyPolygon2D >();
|
|
}
|
|
|
|
double SAL_CALL TextLayout::getBaselineOffset( ) throw (uno::RuntimeException)
|
|
{
|
|
::osl::MutexGuard aGuard( m_aMutex );
|
|
|
|
// TODO
|
|
return 0.0;
|
|
}
|
|
|
|
sal_Int8 SAL_CALL TextLayout::getMainTextDirection( ) throw (uno::RuntimeException)
|
|
{
|
|
::osl::MutexGuard aGuard( m_aMutex );
|
|
|
|
return mnTextDirection;
|
|
}
|
|
|
|
uno::Reference< rendering::XCanvasFont > SAL_CALL TextLayout::getFont( ) throw (uno::RuntimeException)
|
|
{
|
|
::osl::MutexGuard aGuard( m_aMutex );
|
|
|
|
return mpFont.getRef();
|
|
}
|
|
|
|
rendering::StringContext SAL_CALL TextLayout::getText( ) throw (uno::RuntimeException)
|
|
{
|
|
::osl::MutexGuard aGuard( m_aMutex );
|
|
|
|
return maText;
|
|
}
|
|
|
|
void TextLayout::useFont( Cairo* pCairo )
|
|
{
|
|
rendering::FontRequest aFontRequest = mpFont->getFontRequest();
|
|
rendering::FontInfo aFontInfo = aFontRequest.FontDescription;
|
|
|
|
cairo_select_font_face( pCairo, ::rtl::OUStringToOString( aFontInfo.FamilyName, RTL_TEXTENCODING_UTF8 ), CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL );
|
|
cairo_set_font_size( pCairo, aFontRequest.CellSize );
|
|
}
|
|
|
|
/** TextLayout:draw
|
|
*
|
|
* This function uses the "toy" api of the cairo library
|
|
*
|
|
**/
|
|
bool TextLayout::draw( Cairo* pCairo )
|
|
{
|
|
::osl::MutexGuard aGuard( m_aMutex );
|
|
|
|
::rtl::OUString aSubText = maText.Text.copy( maText.StartPosition, maText.Length );
|
|
::rtl::OString aUTF8String = ::rtl::OUStringToOString( aSubText, RTL_TEXTENCODING_UTF8 );
|
|
|
|
cairo_save( pCairo );
|
|
/* move to 0, 0 as cairo_show_text advances current point and current point is not restored by cairo_restore.
|
|
before we were depending on unmodified current point which I believed was preserved by save/restore */
|
|
cairo_move_to( pCairo, 0, 0 );
|
|
useFont( pCairo );
|
|
cairo_show_text( pCairo, aUTF8String );
|
|
cairo_restore( pCairo );
|
|
|
|
return true;
|
|
}
|
|
|
|
|
|
/**
|
|
* TextLayout::isCairoRenderable
|
|
*
|
|
* Features currenly not supported by Cairo (VCL rendering is used as fallback):
|
|
* - vertical glyphs
|
|
*
|
|
* @return true, if text/font can be rendered with cairo
|
|
**/
|
|
bool TextLayout::isCairoRenderable(SystemFontData aSysFontData) const
|
|
{
|
|
#if defined UNX && !defined QUARTZ
|
|
// is font usable?
|
|
if (!aSysFontData.nFontId) return false;
|
|
#endif
|
|
|
|
// vertical glyph rendering is not supported in cairo for now
|
|
if (aSysFontData.bVerticalCharacterType) {
|
|
OSL_TRACE(":cairocanvas::TextLayout::isCairoRenderable(): ***************** VERTICAL CHARACTER STYLE!!! ****************");
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* TextLayout::draw
|
|
*
|
|
* Cairo-based text rendering. Draw text directly on the cairo surface with cairo fonts.
|
|
* Avoid using VCL VirtualDevices for that, bypassing VCL DrawText functions, when possible
|
|
*
|
|
* Note: some text effects are not rendered due to lacking generic canvas or cairo canvas
|
|
* implementation. See issues 92657, 92658, 92659, 92660, 97529
|
|
*
|
|
* @return true, if successful
|
|
**/
|
|
bool TextLayout::draw( SurfaceSharedPtr& pSurface,
|
|
OutputDevice& rOutDev,
|
|
const Point& rOutpos,
|
|
const rendering::ViewState& viewState,
|
|
const rendering::RenderState& renderState ) const
|
|
{
|
|
::osl::MutexGuard aGuard( m_aMutex );
|
|
SystemTextLayoutData aSysLayoutData;
|
|
#if (defined CAIRO_HAS_WIN32_SURFACE) && (OSL_DEBUG_LEVEL > 1)
|
|
LOGFONTW logfont;
|
|
#endif
|
|
setupLayoutMode( rOutDev, mnTextDirection );
|
|
|
|
// TODO(P2): cache that
|
|
::boost::scoped_array< sal_Int32 > aOffsets(new sal_Int32[maLogicalAdvancements.getLength()]);
|
|
|
|
if( maLogicalAdvancements.getLength() )
|
|
{
|
|
setupTextOffsets( aOffsets.get(), maLogicalAdvancements, viewState, renderState );
|
|
|
|
// TODO(F3): ensure correct length and termination for DX
|
|
// array (last entry _must_ contain the overall width)
|
|
}
|
|
|
|
aSysLayoutData = rOutDev.GetSysTextLayoutData(rOutpos, maText.Text,
|
|
::canvas::tools::numeric_cast<USHORT>(maText.StartPosition),
|
|
::canvas::tools::numeric_cast<USHORT>(maText.Length),
|
|
maLogicalAdvancements.getLength() ? aOffsets.get() : NULL);
|
|
|
|
// Sort them so that all glyphs on the same glyph fallback level are consecutive
|
|
std::sort(aSysLayoutData.rGlyphData.begin(), aSysLayoutData.rGlyphData.end(), compareFallbacks);
|
|
bool bCairoRenderable = true;
|
|
|
|
//Pull all the fonts we need to render the text
|
|
typedef std::pair<SystemFontData,int> FontLevel;
|
|
typedef std::vector<FontLevel> FontLevelVector;
|
|
FontLevelVector aFontData;
|
|
SystemGlyphDataVector::const_iterator aIter=aSysLayoutData.rGlyphData.begin();
|
|
const SystemGlyphDataVector::const_iterator aEnd=aSysLayoutData.rGlyphData.end();
|
|
for( ; aIter != aEnd; ++aIter )
|
|
{
|
|
if( aFontData.empty() || aIter->fallbacklevel != aFontData.back().second )
|
|
{
|
|
aFontData.push_back(FontLevel(rOutDev.GetSysFontData(aIter->fallbacklevel),
|
|
aIter->fallbacklevel));
|
|
if( !isCairoRenderable(aFontData.back().first) )
|
|
{
|
|
bCairoRenderable = false;
|
|
OSL_TRACE(":cairocanvas::TextLayout::draw(S,O,p,v,r): VCL FALLBACK %s%s%s%s - %s",
|
|
maLogicalAdvancements.getLength() ? "ADV " : "",
|
|
aFontData.back().first.bAntialias ? "AA " : "",
|
|
aFontData.back().first.bFakeBold ? "FB " : "",
|
|
aFontData.back().first.bFakeItalic ? "FI " : "",
|
|
::rtl::OUStringToOString( maText.Text.copy( maText.StartPosition, maText.Length ),
|
|
RTL_TEXTENCODING_UTF8 ).getStr());
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
// The ::GetSysTextLayoutData(), i.e. layouting of text to glyphs can change the font being used.
|
|
// The fallback checks need to be done after final font is known.
|
|
if (!bCairoRenderable) // VCL FALLBACKS
|
|
{
|
|
if (maLogicalAdvancements.getLength()) // VCL FALLBACK - with glyph advances
|
|
{
|
|
rOutDev.DrawTextArray( rOutpos, maText.Text, aOffsets.get(),
|
|
::canvas::tools::numeric_cast<USHORT>(maText.StartPosition),
|
|
::canvas::tools::numeric_cast<USHORT>(maText.Length) );
|
|
return true;
|
|
}
|
|
else // VCL FALLBACK - without advances
|
|
{
|
|
rOutDev.DrawText( rOutpos, maText.Text,
|
|
::canvas::tools::numeric_cast<USHORT>(maText.StartPosition),
|
|
::canvas::tools::numeric_cast<USHORT>(maText.Length) );
|
|
return true;
|
|
}
|
|
}
|
|
|
|
if (aSysLayoutData.rGlyphData.empty()) return false; //??? false?
|
|
|
|
/**
|
|
* Setup platform independent glyph vector into cairo-based glyphs vector.
|
|
**/
|
|
|
|
// Loop through the fonts used and render the matching glyphs for each
|
|
FontLevelVector::const_iterator aFontDataIter = aFontData.begin();
|
|
const FontLevelVector::const_iterator aFontDataEnd = aFontData.end();
|
|
for( ; aFontDataIter != aFontDataEnd; ++aFontDataIter )
|
|
{
|
|
const SystemFontData &rSysFontData = aFontDataIter->first;
|
|
|
|
// setup glyphs
|
|
std::vector<cairo_glyph_t> cairo_glyphs;
|
|
cairo_glyphs.reserve( 256 );
|
|
|
|
SystemGlyphDataVector::const_iterator aIter=aSysLayoutData.rGlyphData.begin();
|
|
const SystemGlyphDataVector::const_iterator aEnd=aSysLayoutData.rGlyphData.end();
|
|
for( ; aIter != aEnd; ++aIter )
|
|
{
|
|
SystemGlyphData systemGlyph = *aIter;
|
|
if( systemGlyph.fallbacklevel != aFontDataIter->second )
|
|
continue;
|
|
|
|
cairo_glyph_t aGlyph;
|
|
aGlyph.index = systemGlyph.index;
|
|
#ifdef CAIRO_HAS_WIN32_SURFACE
|
|
// Cairo requires standard glyph indexes (ETO_GLYPH_INDEX), while vcl/win/* uses ucs4 chars.
|
|
// Convert to standard indexes
|
|
aGlyph.index = cairo::ucs4toindex((unsigned int) aGlyph.index, rSysFontData.hFont);
|
|
#endif
|
|
aGlyph.x = systemGlyph.x;
|
|
aGlyph.y = systemGlyph.y;
|
|
cairo_glyphs.push_back(aGlyph);
|
|
}
|
|
|
|
if (cairo_glyphs.empty())
|
|
continue;
|
|
|
|
/**
|
|
* Setup font
|
|
**/
|
|
cairo_font_face_t* font_face = NULL;
|
|
|
|
#ifdef CAIRO_HAS_QUARTZ_SURFACE
|
|
// TODO: use cairo_quartz_font_face_create_for_cgfont(cgFont)
|
|
// when CGFont (Mac OS X 10.5 API) is provided by the AQUA VCL backend.
|
|
font_face = cairo_quartz_font_face_create_for_atsu_font_id((ATSUFontID) rSysFontData.aATSUFontID);
|
|
|
|
#elif defined CAIRO_HAS_WIN32_SURFACE
|
|
#if (OSL_DEBUG_LEVEL > 1)
|
|
GetObjectW( rSysFontData.hFont, sizeof(logfont), &logfont );
|
|
#endif
|
|
// Note: cairo library uses logfont fallbacks when lfEscapement, lfOrientation and lfWidth are not zero.
|
|
// VCL always has non-zero value for lfWidth
|
|
font_face = cairo_win32_font_face_create_for_hfont(rSysFontData.hFont);
|
|
|
|
#elif defined CAIRO_HAS_XLIB_SURFACE
|
|
font_face = cairo_ft_font_face_create_for_ft_face((FT_Face)rSysFontData.nFontId,
|
|
rSysFontData.nFontFlags);
|
|
#else
|
|
# error Native API needed.
|
|
#endif
|
|
|
|
CairoSharedPtr pSCairo = pSurface->getCairo();
|
|
|
|
cairo_set_font_face( pSCairo.get(), font_face);
|
|
|
|
// create default font options. cairo_get_font_options() does not retrieve the surface defaults,
|
|
// only what has been set before with cairo_set_font_options()
|
|
cairo_font_options_t* options = cairo_font_options_create();
|
|
if (rSysFontData.bAntialias) {
|
|
// CAIRO_ANTIALIAS_GRAY provides more similar result to VCL Canvas,
|
|
// so we're not using CAIRO_ANTIALIAS_SUBPIXEL
|
|
cairo_font_options_set_antialias(options, CAIRO_ANTIALIAS_GRAY);
|
|
}
|
|
cairo_set_font_options( pSCairo.get(), options);
|
|
|
|
// Font color
|
|
Color mTextColor = rOutDev.GetTextColor();
|
|
cairo_set_source_rgb(pSCairo.get(),
|
|
mTextColor.GetRed()/255.0,
|
|
mTextColor.GetGreen()/255.0,
|
|
mTextColor.GetBlue()/255.0);
|
|
|
|
// Font rotation and scaling
|
|
cairo_matrix_t m;
|
|
Font aFont = rOutDev.GetFont();
|
|
FontMetric aMetric( rOutDev.GetFontMetric(aFont) );
|
|
long nWidth = 0;
|
|
|
|
// width calculation is deep magic and platform/font dependant.
|
|
// width == 0 means no scaling, and usually width == height means the same.
|
|
// Other values mean horizontal scaling (narrow or stretching)
|
|
// see issue #101566
|
|
|
|
//proper scale calculation across platforms
|
|
if (aFont.GetWidth() == 0) {
|
|
nWidth = aFont.GetHeight();
|
|
} else {
|
|
// any scaling needs to be relative to the platform-dependent definition
|
|
// of height of the font
|
|
nWidth = aFont.GetWidth() * aFont.GetHeight() / aMetric.GetHeight();
|
|
}
|
|
|
|
cairo_matrix_init_identity(&m);
|
|
|
|
if (aSysLayoutData.orientation) cairo_matrix_rotate(&m, (3600 - aSysLayoutData.orientation) * M_PI / 1800.0);
|
|
|
|
cairo_matrix_scale(&m, nWidth, aFont.GetHeight());
|
|
|
|
//faux italics
|
|
if (rSysFontData.bFakeItalic) m.xy = -m.xx * 0x6000L / 0x10000L;
|
|
|
|
cairo_set_font_matrix(pSCairo.get(), &m);
|
|
|
|
OSL_TRACE("\r\n:cairocanvas::TextLayout::draw(S,O,p,v,r): Size:(%d,%d), W:%d->%d, Pos (%d,%d), G(%d,%d,%d) %s%s%s%s || Name:%s - %s",
|
|
aFont.GetWidth(),
|
|
aFont.GetHeight(),
|
|
aMetric.GetWidth(),
|
|
nWidth,
|
|
(int) rOutpos.X(),
|
|
(int) rOutpos.Y(),
|
|
cairo_glyphs[0].index, cairo_glyphs[1].index, cairo_glyphs[2].index,
|
|
maLogicalAdvancements.getLength() ? "ADV " : "",
|
|
rSysFontData.bAntialias ? "AA " : "",
|
|
rSysFontData.bFakeBold ? "FB " : "",
|
|
rSysFontData.bFakeItalic ? "FI " : "",
|
|
#if (defined CAIRO_HAS_WIN32_SURFACE) && (OSL_DEBUG_LEVEL > 1)
|
|
::rtl::OUStringToOString( reinterpret_cast<const sal_Unicode*> (logfont.lfFaceName), RTL_TEXTENCODING_UTF8 ).getStr(),
|
|
#else
|
|
::rtl::OUStringToOString( aFont.GetName(), RTL_TEXTENCODING_UTF8 ).getStr(),
|
|
#endif
|
|
::rtl::OUStringToOString( maText.Text.copy( maText.StartPosition, maText.Length ),
|
|
RTL_TEXTENCODING_UTF8 ).getStr()
|
|
);
|
|
|
|
cairo_show_glyphs(pSCairo.get(), &cairo_glyphs[0], cairo_glyphs.size());
|
|
|
|
//faux bold
|
|
if (rSysFontData.bFakeBold) {
|
|
double bold_dx = 0.5 * sqrt( 0.7 * aFont.GetHeight() );
|
|
int total_steps = 2 * ((int) (bold_dx + 0.5));
|
|
|
|
// loop to draw the text for every half pixel of displacement
|
|
for (int nSteps = 0; nSteps < total_steps; nSteps++) {
|
|
for(int nGlyphIdx = 0; nGlyphIdx < (int) cairo_glyphs.size(); nGlyphIdx++) {
|
|
cairo_glyphs[nGlyphIdx].x += bold_dx * nSteps / total_steps;
|
|
}
|
|
cairo_show_glyphs(pSCairo.get(), &cairo_glyphs[0], cairo_glyphs.size());
|
|
}
|
|
OSL_TRACE(":cairocanvas::TextLayout::draw(S,O,p,v,r): FAKEBOLD - dx:%d", (int) bold_dx);
|
|
}
|
|
|
|
cairo_restore( pSCairo.get() );
|
|
cairo_font_face_destroy(font_face);
|
|
}
|
|
return true;
|
|
}
|
|
|
|
|
|
namespace
|
|
{
|
|
class OffsetTransformer
|
|
{
|
|
public:
|
|
OffsetTransformer( const ::basegfx::B2DHomMatrix& rMat ) :
|
|
maMatrix( rMat )
|
|
{
|
|
}
|
|
|
|
sal_Int32 operator()( const double& rOffset )
|
|
{
|
|
// This is an optimization of the normal rMat*[x,0]
|
|
// transformation of the advancement vector (in x
|
|
// direction), followed by a length calculation of the
|
|
// resulting vector: advancement' =
|
|
// ||rMat*[x,0]||. Since advancements are vectors, we
|
|
// can ignore translational components, thus if [x,0],
|
|
// it follows that rMat*[x,0]=[x',0] holds. Thus, we
|
|
// just have to calc the transformation of the x
|
|
// component.
|
|
|
|
// TODO(F2): Handle non-horizontal advancements!
|
|
return ::basegfx::fround( hypot(maMatrix.get(0,0)*rOffset,
|
|
maMatrix.get(1,0)*rOffset) );
|
|
}
|
|
|
|
private:
|
|
::basegfx::B2DHomMatrix maMatrix;
|
|
};
|
|
}
|
|
|
|
void TextLayout::setupTextOffsets( sal_Int32* outputOffsets,
|
|
const uno::Sequence< double >& inputOffsets,
|
|
const rendering::ViewState& viewState,
|
|
const rendering::RenderState& renderState ) const
|
|
{
|
|
ENSURE_OR_THROW( outputOffsets!=NULL,
|
|
"TextLayout::setupTextOffsets offsets NULL" );
|
|
|
|
::basegfx::B2DHomMatrix aMatrix;
|
|
|
|
::canvas::tools::mergeViewAndRenderTransform(aMatrix,
|
|
viewState,
|
|
renderState);
|
|
|
|
// fill integer offsets
|
|
::std::transform( const_cast< uno::Sequence< double >& >(inputOffsets).getConstArray(),
|
|
const_cast< uno::Sequence< double >& >(inputOffsets).getConstArray()+inputOffsets.getLength(),
|
|
outputOffsets,
|
|
OffsetTransformer( aMatrix ) );
|
|
}
|
|
|
|
#define SERVICE_NAME "com.sun.star.rendering.TextLayout"
|
|
#define IMPLEMENTATION_NAME "CairoCanvas::TextLayout"
|
|
|
|
::rtl::OUString SAL_CALL TextLayout::getImplementationName() throw( uno::RuntimeException )
|
|
{
|
|
return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATION_NAME ) );
|
|
}
|
|
|
|
sal_Bool SAL_CALL TextLayout::supportsService( const ::rtl::OUString& ServiceName ) throw( uno::RuntimeException )
|
|
{
|
|
return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME ) );
|
|
}
|
|
|
|
uno::Sequence< ::rtl::OUString > SAL_CALL TextLayout::getSupportedServiceNames() throw( uno::RuntimeException )
|
|
{
|
|
uno::Sequence< ::rtl::OUString > aRet(1);
|
|
aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
|
|
|
|
return aRet;
|
|
}
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|