Merge commit 'ooo/DEV300_m101' into intm101

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

5 files changed, 210 insertions, 76 deletions

diff --git a/vcl/source/src/images.src b/vcl/source/src/images.src
index 871cd6af2b29..541ac34c29e7 100644
--- a/vcl/source/src/images.src
+++ b/vcl/source/src/images.src
@@ -38,25 +38,6 @@ Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_STDOFFSET)
     File = "check.png";
 };
 
-Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_WINOFFSET)
-{
-    File = "checkwin.png";
-};
-
-Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_OS2OFFSET)
-{
-    File = "checkos2.png";
-};
-
-Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_MACOFFSET)
-{
-    File = "checkmac.png";
-};
-
-Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_UNIXOFFSET)
-{
-    File = "checkunx.png";
-};
 
 Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_MONOOFFSET)
 {
@@ -80,26 +61,6 @@ Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_STDOFFSET)
     File = "radio.png";
 };
 
-Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_WINOFFSET)
-{
-    File = "radiowin.png";
-};
-
-Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_OS2OFFSET)
-{
-    File = "radioos2.png";
-};
-
-Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_MACOFFSET)
-{
-    File = "radiomac.png";
-};
-
-Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_UNIXOFFSET)
-{
-    File = "radiounx.png";
-};
-
 Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_MONOOFFSET)
 {
     File = "radiomono.bmp";
diff --git a/vcl/source/src/makefile.mk b/vcl/source/src/makefile.mk
index 40b7d4e75dfe..2db77b7ffc74 100644
--- a/vcl/source/src/makefile.mk
+++ b/vcl/source/src/makefile.mk
@@ -44,7 +44,7 @@ SRC1FILES=			images.src			\
                     helptext.src		\
                     units.src		    \
                     btntext.src         \
-                    print.src
+                    print.src           \
 
 RESLIB1NAME=		$(RESTARGET)
 RESLIB1IMAGES= $(PRJ)$/source/src
diff --git a/vcl/source/src/print.src b/vcl/source/src/print.src
index 01d3c64f7fdb..b4f4d56029e1 100644
--- a/vcl/source/src/print.src
+++ b/vcl/source/src/print.src
@@ -29,6 +29,7 @@
 
 ModalDialog SV_DLG_PRINT
 {
+    HelpID = ".HelpID:vcl:PrintDialog:Dialog";
     Text [en-US] = "Print";
     Closeable = TRUE;
     Sizeable = TRUE;
@@ -44,16 +45,19 @@ ModalDialog SV_DLG_PRINT
         Pos = MAP_APPFONT( 240, 195 );
         Size = MAP_APPFONT( 50, 15 );
         Text [en-US] = "~Print";
+        HelpID = ".HelpID:vcl:PrintDialog:OK";
     };
     CancelButton SV_PRINT_CANCEL
     {
         Pos = MAP_APPFONT( 295, 195 );
         Size = MAP_APPFONT( 50, 15 );
+        HelpID = ".HelpID:vcl:PrintDialog:Cancel";
     };
     HelpButton SV_PRINT_HELP
     {
         Pos = MAP_APPFONT( 5, 5 );
         Size = MAP_APPFONT( 50, 15 );
+        HelpID = ".HelpID:vcl:PrintDialog:Help";
     };
 
     Window SV_PRINT_PAGE_PREVIEW
@@ -61,6 +65,7 @@ ModalDialog SV_DLG_PRINT
         Pos = MAP_APPFONT( 5, 5 );
         Size = MAP_APPFONT( 130, 130 );
         Border = FALSE;
+        HelpID = ".HelpID:vcl:PrintDialog:Preview";
     };
     NumericField SV_PRINT_PAGE_EDIT
     {
@@ -69,7 +74,7 @@ ModalDialog SV_DLG_PRINT
         SVLook = TRUE;
         Spin = FALSE;
         Border = TRUE;
-        HelpText [en-US] = "Select page to display in preview.";
+        HelpID = ".HelpID:vcl:PrintDialog:PageEdit";
     };
     FixedText SV_PRINT_PAGE_TXT
     {
@@ -77,23 +82,25 @@ ModalDialog SV_DLG_PRINT
         Size = MAP_APPFONT( 30, 12 );
         Text [ en-US ] = "/ %n";
         VCenter = TRUE;
+        HelpID = ".HelpID:vcl:PrintDialog:NumPagesText";
     };
     PushButton SV_PRINT_PAGE_FORWARD
     {
         Pos = MAP_APPFONT( 95, 140 );
         Size = MAP_APPFONT( 15, 12 );
-        HelpText [en-US] = "Scroll one page forward.";
+        HelpID = ".HelpID:vcl:PrintDialog:ForwardBtn";
     };
     PushButton SV_PRINT_PAGE_BACKWARD
     {
         Pos = MAP_APPFONT( 80, 140 );
         Size = MAP_APPFONT( 15, 12 );
-        HelpText [en-US] = "Scroll one page backward.";
+        HelpID = ".HelpID:vcl:PrintDialog:BackwardBtn";
     };
     TabControl SV_PRINT_TABCTRL
     {
         Pos = MAP_APPFONT( 140, 5 );
         Size = MAP_APPFONT( 205, 175 );
+        HelpID = ".HelpID:vcl:PrintDialog:TabPages";
     };
     FixedLine SV_PRINT_BUTTONLINE
     {
@@ -123,6 +130,7 @@ ModalDialog SV_DLG_PRINT
 
     TabPage SV_PRINT_TAB_NUP
     {
+        HelpID = ".HelpID:vcl:PrintDialog:NUpPage";
         Text [en-US] = "Page Layout";
         Hide = TRUE;
 
@@ -132,34 +140,28 @@ ModalDialog SV_DLG_PRINT
             Size = MAP_APPFONT( 150, 10 );
             Text [en-US] = "Layout";
         };
-        RadioButton SV_PRINT_PRT_NUP_DEFAULT_BTN
-        {
-            Pos = MAP_APPFONT( 0, 0 );
-            Size = MAP_APPFONT( 10, 10 );
-            Text [en-US] = "~Default";
-            HelpText [en-US] = "Print one page per sheet of paper.";
-        };
         RadioButton SV_PRINT_PRT_NUP_BROCHURE_BTN
         {
+            HelpID = ".HelpID:vcl:PrintDialog:NUpPage:Brochure";
             Pos = MAP_APPFONT( 0, 0 );
             Size = MAP_APPFONT( 10, 10 );
             Text = "";
         };
         RadioButton SV_PRINT_PRT_NUP_PAGES_BTN
         {
+            HelpID = ".HelpID:vcl:PrintDialog:NUpPage:PagesPerSheet";
             Pos = MAP_APPFONT( 0, 0 );
             Size = MAP_APPFONT( 10, 10 );
             Text [en-US] = "Pa~ges per sheet";
-            HelpText [en-US] = "Print multiple pages per sheet of paper.";
         };
         ListBox SV_PRINT_PRT_NUP_PAGES_BOX
         {
+            HelpID = ".HelpID:vcl:PrintDialog:NUpPage:PagesPerSheetBox";
             Pos = MAP_APPFONT( 0, 0 );
             Size = MAP_APPFONT( 10, 80 );
             Border = TRUE;
             DropDown = TRUE;
             CurPos = 0;
-            HelpText [en-US] = "Select how many pages to print per sheet of paper.";
             StringList [en-US] =
             {
                 < "1"; 1; >;
@@ -180,6 +182,7 @@ ModalDialog SV_DLG_PRINT
         };
         NumericField SV_PRINT_PRT_NUP_COLS_EDT
         {
+            HelpID = ".HelpID:vcl:PrintDialog:NUpPage:ColumnsBox";
             Pos = MAP_APPFONT( 55, 20 );
             Size = MAP_APPFONT( 40, 12 );
             Border = TRUE;
@@ -187,7 +190,6 @@ ModalDialog SV_DLG_PRINT
             Minimum = 1;
             Maximum = 32;
             Value = 1;
-            HelpText [en-US] = "Select number of columns.";
         };
         FixedText SV_PRINT_PRT_NUP_TIMES_TXT
         {
@@ -198,6 +200,7 @@ ModalDialog SV_DLG_PRINT
         };
         NumericField SV_PRINT_PRT_NUP_ROWS_EDT
         {
+            HelpID = ".HelpID:vcl:PrintDialog:NUpPage:RowsBox";
             Pos = MAP_APPFONT( 55, 35 );
             Size = MAP_APPFONT( 40, 12 );
             Border = TRUE;
@@ -205,7 +208,6 @@ ModalDialog SV_DLG_PRINT
             Minimum = 1;
             Maximum = 32;
             Value = 1;
-            HelpText [en-US] = "Select number of rows.";
         };
         FixedText SV_PRINT_PRT_NUP_MARGINS_PAGES_1_TXT
         {
@@ -215,13 +217,13 @@ ModalDialog SV_DLG_PRINT
         };
         MetricField SV_PRINT_PRT_NUP_MARGINS_PAGES_EDT
         {
+            HelpID = ".HelpID:vcl:PrintDialog:NUpPage:PageMarginBox";
             Pos = MAP_APPFONT( 55, 95 );
             Size = MAP_APPFONT( 40, 12 );
             Spin = TRUE;
             Border = TRUE;
             Value = 0;
             Unit = FUNIT_MM;
-            HelpText [en-US] = "Select margin between individual pages on each sheet of paper.";
         };
         FixedText SV_PRINT_PRT_NUP_MARGINS_PAGES_2_TXT
         {
@@ -237,13 +239,13 @@ ModalDialog SV_DLG_PRINT
         };
         MetricField SV_PRINT_PRT_NUP_MARGINS_SHEET_EDT
         {
+            HelpID = ".HelpID:vcl:PrintDialog:NUpPage:SheetMarginBox";
             Pos = MAP_APPFONT( 155, 95 );
             Size = MAP_APPFONT( 40, 12 );
             Spin = TRUE;
             Border = TRUE;
             Value = 0;
             Unit = FUNIT_MM;
-            HelpText [en-US] = "Select margin between the printed pages and paper edge.";
         };
         FixedText SV_PRINT_PRT_NUP_MARGINS_SHEET_2_TXT
         {
@@ -259,6 +261,7 @@ ModalDialog SV_DLG_PRINT
         };
         ListBox SV_PRINT_PRT_NUP_ORIENTATION_BOX
         {
+            HelpID = ".HelpID:vcl:PrintDialog:NUpPage:OrientationBox";
             Pos = MAP_APPFONT( 0, 0 );
             Size = MAP_APPFONT( 10, 40 );
             Border = TRUE;
@@ -270,7 +273,6 @@ ModalDialog SV_DLG_PRINT
                 < "Portrait"; SV_PRINT_PRT_NUP_ORIENTATION_PORTRAIT; >;
                 < "Landscape"; SV_PRINT_PRT_NUP_ORIENTATION_LANDSCAPE; >;
             };
-            HelpText [en-US] = "Select the orientation of the paper.";
         };
         FixedText SV_PRINT_PRT_NUP_ORDER_TXT
         {
@@ -280,29 +282,32 @@ ModalDialog SV_DLG_PRINT
         };
         ListBox SV_PRINT_PRT_NUP_ORDER_BOX
         {
+            HelpID = ".HelpID:vcl:PrintDialog:NUpPage:OrderBox";
             Pos = MAP_APPFONT( 0, 0 );
-            Size = MAP_APPFONT( 10, 20 );
+            Size = MAP_APPFONT( 10, 50 );
             DropDown = TRUE;
             Border = TRUE;
             CurPos = 0;
             StringList [en-US] =
             {
-                < "left to right, then down"; SV_PRINT_PRT_NUP_ORDER_LRTD; >;
-                < "top to bottom, then right"; SV_PRINT_PRT_NUP_ORDER_TDLR; >;
+                < "left to right, then down"; SV_PRINT_PRT_NUP_ORDER_LRTB; >;
+                < "top to bottom, then right"; SV_PRINT_PRT_NUP_ORDER_TBLR; >;
+                < "top to bottom, then left"; SV_PRINT_PRT_NUP_ORDER_TBRL; >;
+                < "right to left, then down"; SV_PRINT_PRT_NUP_ORDER_RLTB; >;
             };
-            HelpText [en-US] = "Select order in which pages are to be printed.";
         };
         CheckBox SV_PRINT_PRT_NUP_BORDER_CB
         {
+            HelpID = ".HelpID:vcl:PrintDialog:NUpPage:BorderBox";
             Pos = MAP_APPFONT( 10, 65 );
             Size = MAP_APPFONT( 150, 12 );
             Text [en-US] = "Draw a border around each page";
-            HelpText [en-US] = "Check to draw a border around each page.";
         };
     };
 
     TabPage SV_PRINT_TAB_JOB
     {
+        HelpID = ".HelpID:vcl:PrintDialog:JobPage";
         Text [en-US] = "General";
         Hide = TRUE;
 
@@ -314,18 +319,18 @@ ModalDialog SV_DLG_PRINT
         };
         ListBox SV_PRINT_PRINTERS
         {
+            HelpID = ".HelpID:vcl:PrintDialog:JobPage:PrinterList";
             Pos = MAP_APPFONT( 5, 5 );
             Size = MAP_APPFONT( 100, 80 );
             Border = TRUE;
             Sort = TRUE;
-            HelpText [en-US] = "Select the printer to print on.";
         };
         CheckBox SV_PRINT_DETAILS_BTN
         {
+            HelpID = ".HelpID:vcl:PrintDialog:JobPage:DetailsBtn";
             Pos = MAP_APPFONT( 5, 5 );
             Size = MAP_APPFONT( 5, 5 );
             Text [en-US] = "Details";
-            HelpText [en-US] = "Show/Hide detailed information of the selected printer.";
         };
         FixedText SV_PRINT_STATUS_TXT
         {
@@ -347,10 +352,10 @@ ModalDialog SV_DLG_PRINT
         };
         PushButton SV_PRINT_PRT_SETUP
         {
+            HelpID = ".HelpID:vcl:PrintDialog:JobPage:Properties";
             Pos = MAP_APPFONT( 115, 5 );
             Size = MAP_APPFONT( 50, 15 );
             Text [en-US] = "Properties...";
-            HelpText [en-US] = "Call the setup dialog of the selected printer.";
         };
         FixedLine SV_PRINT_COPIES
         {
@@ -366,6 +371,7 @@ ModalDialog SV_DLG_PRINT
         };
         NumericField SV_PRINT_COPYCOUNT_FIELD
         {
+            HelpID = ".HelpID:vcl:PrintDialog:JobPage:Copies";
             Pos = MAP_APPFONT( 10, 56 );
             Size = MAP_APPFONT( 40, 12 );
             Border = TRUE;
@@ -373,7 +379,6 @@ ModalDialog SV_DLG_PRINT
             Minimum = 1;
             Maximum = 16384;
             Value = 1;
-            HelpText [en-US] = "Select the number of copies to be produced.";
         };
         FixedImage SV_PRINT_COLLATE_IMAGE
         {
@@ -382,10 +387,10 @@ ModalDialog SV_DLG_PRINT
         };
         CheckBox SV_PRINT_COLLATE
         {
+            HelpID = ".HelpID:vcl:PrintDialog:JobPage:Collate";
             Pos = MAP_APPFONT( 95, 45 );
             Size = MAP_APPFONT( 70, 10 );
             Text [en-US] = "Collate";
-            HelpText [en-US] = "Select whether copies should be collated or not.";
         };
 
         Image SV_PRINT_COLLATE_IMG
@@ -397,12 +402,21 @@ ModalDialog SV_DLG_PRINT
         {
             ImageBitmap = Bitmap { File = "ncollate.png" ; };
         };
+
+        CheckBox SV_PRINT_OPT_REVERSE
+        {
+            HelpID = ".HelpID:vcl:PrintDialog:OptPage:ToReverse";
+            Pos = MAP_APPFONT( 10, 50 );
+            Size = MAP_APPFONT( 200, 12 );
+            Text [en-US] = "Print in ~reverse page order";
+        };
     };
 
     TabPage SV_PRINT_TAB_OPT
     {
         Text [en-US] = "Options";
         Hide = TRUE;
+        HelpID = ".HelpID:vcl:PrintDialog:OptPage";
 
         FixedLine SV_PRINT_OPT_PRINT_FL
         {
@@ -412,30 +426,24 @@ ModalDialog SV_DLG_PRINT
         };
         CheckBox SV_PRINT_OPT_TOFILE
         {
+            HelpID = ".HelpID:vcl:PrintDialog:OptPage:ToFile";
             Pos = MAP_APPFONT( 10, 20 );
             Size = MAP_APPFONT( 200, 12 );
             Text [en-US] = "Print to ~file";
-            HelpText [en-US] = "Check to send output to a file instead of the actual printer.";
         };
         CheckBox SV_PRINT_OPT_SINGLEJOBS
         {
+            HelpID = ".HelpID:vcl:PrintDialog:OptPage:SingleJobs";
             Pos = MAP_APPFONT( 10, 35 );
             Size = MAP_APPFONT( 200, 12 );
             Text [en-US] = "~Create single print jobs for collated output";
-            HelpText [en-US] = "Check to not rely on the printer to create collated copies but create a print job for each copy instead.";
-        };
-        CheckBox SV_PRINT_OPT_REVERSE
-        {
-            Pos = MAP_APPFONT( 10, 50 );
-            Size = MAP_APPFONT( 200, 12 );
-            Text [en-US] = "Print in ~reverse page order";
-            HelpText [en-US] = "Check to print pages in reverse order.";
         };
     };
 };
 
 ModelessDialog SV_DLG_PRINT_PROGRESS
 {
+    HelpID = "vcl:ModelessDialog:SV_DLG_PRINT_PROGRESS";
     Text [en-US] = "Printing";
     Closeable = FALSE;
     Sizeable = FALSE;
@@ -478,5 +486,51 @@ StringArray SV_PRINT_NATIVE_STRINGS
         < "Page number"; >;
         < "Number of pages"; >;
         < "More"; >;
+        < "Print selection only"; >;
+    };
+};
+
+StringArray RID_STR_PAPERNAMES
+{
+    ItemList [en-US] =
+    {
+        < "A0"; >;
+        < "A1"; >;
+        < "A2"; >;
+        < "A3"; >;
+        < "A4"; >;
+        < "A5"; >;
+        < "B4 (ISO)"; >;
+        < "B5 (ISO)"; >;
+        < "Letter"; >;
+        < "Legal"; >;
+        < "Tabloid"; >;
+        < "User Defined"; >;
+        < "B6 (ISO)"; >;
+        < "C4 Envelope"; >;
+        < "C5 Envelope"; >;
+        < "C6 Envelope"; >;
+        < "C6/5 Envelope"; >;
+        < "DL Envelope"; >;
+        < "Dia Slide"; >;
+        < "Screen"; >;
+        < "C"; >;
+        < "D"; >;
+        < "E"; >;
+        < "Executive"; >;
+        < "Long Bond"; >;
+        < "#8 (Monarch) Envelope"; >;
+        < "#6 3/4 (Personal) Envelope"; >;
+        < "#9 Envelope"; >;
+        < "#10 Envelope"; >;
+        < "#11 Envelope"; >;
+        < "#12 Envelope"; >;
+        < "16 Kai"; >;
+        < "32 Kai"; >;
+        < "Big 32 Kai"; >;
+        < "B4 (JIS)"; >;
+        < "B5 (JIS)"; >;
+        < "B6 (JIS)"; >;
     };
 };
+
diff --git a/vcl/source/src/stdtext.src b/vcl/source/src/stdtext.src
index 2c6574220a5f..1b95f7bb1d72 100644
--- a/vcl/source/src/stdtext.src
+++ b/vcl/source/src/stdtext.src
@@ -101,6 +101,11 @@ String SV_ACCESSERROR_TURNAROUND_MSG
     Text [ en-US ] = "The Java Access Bridge could not be started.";
 };
 
+String SV_ACCESSERROR_NO_FONTS
+{
+    Text [ en-US ] = "No fonts could be found on the system.";
+};
+
 String SV_STDTEXT_ABOUT
 {
     Text [ en-US ] = "About %PRODUCTNAME";
diff --git a/vcl/source/src/throbber.src b/vcl/source/src/throbber.src
new file mode 100755
index 000000000000..d3c5ea44035c
--- /dev/null
+++ b/vcl/source/src/throbber.src
@@ -0,0 +1,114 @@
+/*************************************************************************
+ * 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.
+ *
+ ************************************************************************/
+
+// TODO: we need a mechanism to add images to images.zip, *without*
+// referring them in resource files. The below resources are never loaded
+// at runtime, instead, the images in images.zip are accessed via
+// private:graphicrepository/* URLs.
+
+Resource 1000
+{
+    Image 1 { ImageBitmap = Bitmap{ file = "shared/spinner-16-01.png"; }; };
+    Image 2 { ImageBitmap = Bitmap{ file = "shared/spinner-16-02.png"; }; };
+    Image 3 { ImageBitmap = Bitmap{ file = "shared/spinner-16-03.png"; }; };
+    Image 4 { ImageBitmap = Bitmap{ file = "shared/spinner-16-04.png"; }; };
+    Image 5 { ImageBitmap = Bitmap{ file = "shared/spinner-16-05.png"; }; };
+    Image 6 { ImageBitmap = Bitmap{ file = "shared/spinner-16-06.png"; }; };
+};
+
+Resource 1001
+{
+    Image 1 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-16-01.png"; }; };
+    Image 2 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-16-02.png"; }; };
+    Image 3 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-16-03.png"; }; };
+    Image 4 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-16-04.png"; }; };
+    Image 5 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-16-05.png"; }; };
+    Image 6 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-16-06.png"; }; };
+};
+
+Resource 1002
+{
+    Image  1 { ImageBitmap = Bitmap{ file = "shared/spinner-32-01.png"; }; };
+    Image  2 { ImageBitmap = Bitmap{ file = "shared/spinner-32-02.png"; }; };
+    Image  3 { ImageBitmap = Bitmap{ file = "shared/spinner-32-03.png"; }; };
+    Image  4 { ImageBitmap = Bitmap{ file = "shared/spinner-32-04.png"; }; };
+    Image  5 { ImageBitmap = Bitmap{ file = "shared/spinner-32-05.png"; }; };
+    Image  6 { ImageBitmap = Bitmap{ file = "shared/spinner-32-06.png"; }; };
+    Image  7 { ImageBitmap = Bitmap{ file = "shared/spinner-32-07.png"; }; };
+    Image  8 { ImageBitmap = Bitmap{ file = "shared/spinner-32-08.png"; }; };
+    Image  9 { ImageBitmap = Bitmap{ file = "shared/spinner-32-09.png"; }; };
+    Image 10 { ImageBitmap = Bitmap{ file = "shared/spinner-32-10.png"; }; };
+    Image 11 { ImageBitmap = Bitmap{ file = "shared/spinner-32-11.png"; }; };
+    Image 12 { ImageBitmap = Bitmap{ file = "shared/spinner-32-12.png"; }; };
+};
+
+Resource 1003
+{
+    Image  1 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-32-01.png"; }; };
+    Image  2 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-32-02.png"; }; };
+    Image  3 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-32-03.png"; }; };
+    Image  4 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-32-04.png"; }; };
+    Image  5 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-32-05.png"; }; };
+    Image  6 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-32-06.png"; }; };
+    Image  7 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-32-07.png"; }; };
+    Image  8 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-32-08.png"; }; };
+    Image  9 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-32-09.png"; }; };
+    Image 10 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-32-10.png"; }; };
+    Image 11 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-32-11.png"; }; };
+    Image 12 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-32-12.png"; }; };
+};
+
+Resource 1004
+{
+    Image  1 { ImageBitmap = Bitmap{ file = "shared/spinner-64-01.png"; }; };
+    Image  2 { ImageBitmap = Bitmap{ file = "shared/spinner-64-02.png"; }; };
+    Image  3 { ImageBitmap = Bitmap{ file = "shared/spinner-64-03.png"; }; };
+    Image  4 { ImageBitmap = Bitmap{ file = "shared/spinner-64-04.png"; }; };
+    Image  5 { ImageBitmap = Bitmap{ file = "shared/spinner-64-05.png"; }; };
+    Image  6 { ImageBitmap = Bitmap{ file = "shared/spinner-64-06.png"; }; };
+    Image  7 { ImageBitmap = Bitmap{ file = "shared/spinner-64-07.png"; }; };
+    Image  8 { ImageBitmap = Bitmap{ file = "shared/spinner-64-08.png"; }; };
+    Image  9 { ImageBitmap = Bitmap{ file = "shared/spinner-64-09.png"; }; };
+    Image 10 { ImageBitmap = Bitmap{ file = "shared/spinner-64-10.png"; }; };
+    Image 11 { ImageBitmap = Bitmap{ file = "shared/spinner-64-11.png"; }; };
+    Image 12 { ImageBitmap = Bitmap{ file = "shared/spinner-64-12.png"; }; };
+};
+
+Resource 1005
+{
+    Image  1 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-64-01.png"; }; };
+    Image  2 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-64-02.png"; }; };
+    Image  3 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-64-03.png"; }; };
+    Image  4 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-64-04.png"; }; };
+    Image  5 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-64-05.png"; }; };
+    Image  6 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-64-06.png"; }; };
+    Image  7 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-64-07.png"; }; };
+    Image  8 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-64-08.png"; }; };
+    Image  9 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-64-09.png"; }; };
+    Image 10 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-64-10.png"; }; };
+    Image 11 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-64-11.png"; }; };
+    Image 12 { ImageBitmap = Bitmap{ file = "hicontrast/shared/spinner-64-12.png"; }; };
+};