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
author: Jan Holesovsky <kendy@suse.cz> 2011-03-11 14:24:23 +0100
committer: Jan Holesovsky <kendy@suse.cz> 2011-03-11 14:24:23 +0100
commit: 67d2af6fac2d9bad52a6b1f6e0cbd1229eb88a42 (patch)
tree: 898019746162b464578da9c8345158a74321c904 /padmin
parent: 86fb5fff88be611785b7908aac2a44475d77705f (diff)
parent: e2a3d487efb2bd5e582eb10e4150530c3f7377c5 (diff)
27 files changed, 668 insertions, 290 deletions
diff --git a/padmin/AllLangResTarget_spa.mk b/padmin/AllLangResTarget_spa.mk
new file mode 100644
index 000000000000..1fd6e42dad56
--- /dev/null
+++ b/padmin/AllLangResTarget_spa.mk
@@ -0,0 +1,48 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,spa))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,spa,padmin))
+
+$(eval $(call gb_AllLangResTarget_add_srs,spa,\
+    padmin/source \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,padmin/source))
+
+$(eval $(call gb_SrsTarget_set_include,padmin/source,\
+    $$(INCLUDE) \
+))
+
+$(eval $(call gb_SrsTarget_add_files,padmin/source,\
+    padmin/source/padialog.src \
+    padmin/source/rtsetup.src \
+))
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/padmin/Executable_spadmin.bin.mk b/padmin/Executable_spadmin.bin.mk
new file mode 100644
index 000000000000..ae677c1c86b4
--- /dev/null
+++ b/padmin/Executable_spadmin.bin.mk
@@ -0,0 +1,70 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Executable_Executable,spadmin.bin))
+
+$(eval $(call gb_Executable_set_include,spadmin.bin,\
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Executable_set_cxxflags,spadmin.bin,\
+    $$(CXXFLAGS) \
+))
+
+$(eval $(call gb_Executable_add_linked_static_libs,spadmin.bin,\
+    vclmain \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,spadmin.bin,\
+    spa \
+    svt \
+    vcl \
+    utl \
+    ucbhelper \
+    comphelper \
+    tl \
+    cppuhelper \
+    cppu \
+    sal \
+    stl \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,spadmin.bin,\
+    padmin/source/desktopcontext \
+    padmin/source/pamain \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Executable_add_linked_libs,spadmin.bin,\
+    dl \
+    pthread \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/padmin/Library_spa.mk b/padmin/Library_spa.mk
new file mode 100644
index 000000000000..6827729d5d8d
--- /dev/null
+++ b/padmin/Library_spa.mk
@@ -0,0 +1,73 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,spa))
+
+$(eval $(call gb_Library_set_include,spa,\
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,spa,\
+    $$(DEFS) \
+    -DSPA_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,spa,\
+    svt \
+    vcl \
+    utl \
+    tl \
+    basegfx \
+    comphelper \
+    i18nisolang1 \
+    cppu \
+    sal \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,spa,\
+    padmin/source/adddlg \
+    padmin/source/cmddlg \
+    padmin/source/fontentry \
+    padmin/source/helper \
+    padmin/source/newppdlg \
+    padmin/source/padialog \
+    padmin/source/progress \
+    padmin/source/prtsetup \
+    padmin/source/titlectrl \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,spa,\
+    dl \
+    m \
+    pthread \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/padmin/Makefile b/padmin/Makefile
new file mode 100644
index 000000000000..a79aff831024
--- /dev/null
+++ b/padmin/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/padmin/Module_padmin.mk b/padmin/Module_padmin.mk
new file mode 100644
index 000000000000..01fd4c99af19
--- /dev/null
+++ b/padmin/Module_padmin.mk
@@ -0,0 +1,41 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+
+$(eval $(call gb_Module_Module,padmin))
+
+ifeq ($(GUIBASE),unx)
+
+$(eval $(call gb_Module_add_targets,padmin,\
+    Executable_spadmin.bin \
+    Library_spa \
+    AllLangResTarget_spa \
+    Package_inc \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/padmin/Package_inc.mk b/padmin/Package_inc.mk
new file mode 100644
index 000000000000..3a2a3a3177e1
--- /dev/null
+++ b/padmin/Package_inc.mk
@@ -0,0 +1,30 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,padmin_src,$(SRCDIR)/padmin/source))
+$(eval $(call gb_Package_add_file,padmin_src,bin/spadmin,spadmin.sh))
+
diff --git a/padmin/prj/build.lst b/padmin/prj/build.lst
index 9aaab83cf7de..0e505f92f2a2 100644
--- a/padmin/prj/build.lst
+++ b/padmin/prj/build.lst
@@ -1,3 +1,3 @@
 pd	padmin	:	vcl svtools NULL
 pd	padmin									usr1	-	all	pd_mkout NULL
-pd	padmin\source							nmake	-	all	pd_source NULL
+pd	padmin\prj							nmake	-	all	pd_prj NULL
diff --git a/padmin/prj/d.lst b/padmin/prj/d.lst
index 3b86822c24e8..8b137891791f 100644
--- a/padmin/prj/d.lst
+++ b/padmin/prj/d.lst
@@ -1,8 +1 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
 
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
-..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
-..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%\lib*.dylib
-..\%__SRC%\misc\spadmin.sh %_DEST%\bin%_EXT%\spadmin
diff --git a/padmin/prj/makefile.mk b/padmin/prj/makefile.mk
new file mode 100644
index 000000000000..c73a3d944bbf
--- /dev/null
+++ b/padmin/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)
diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx
index d5fff0703c62..31e06881519a 100644
--- a/padmin/source/adddlg.cxx
+++ b/padmin/source/adddlg.cxx
@@ -66,18 +66,18 @@ APChooseDevicePage::APChooseDevicePage( AddPrinterDialog* pParent ) :
         m_aOverTxt( this, PaResId( RID_ADDP_CHDEV_TXT_OVER ) )
 {
     FreeResource();
-    m_aPrinterBtn.Check( TRUE );
-    m_aFaxBtn.Check( FALSE );
-    m_aPDFBtn.Check( FALSE );
-    m_aOldBtn.Check( FALSE );
+    m_aPrinterBtn.Check( sal_True );
+    m_aFaxBtn.Check( sal_False );
+    m_aPDFBtn.Check( sal_False );
+    m_aOldBtn.Check( sal_False );
     if( ! AddPrinterDialog::getOldPrinterLocation().Len() )
-        m_aOldBtn.Enable( FALSE );
+        m_aOldBtn.Enable( sal_False );
     if( ! PrinterInfoManager::get().addOrRemovePossible() )
     {
-        m_aPrinterBtn.Check( FALSE );
-        m_aFaxBtn.Check( TRUE );
-        m_aPrinterBtn.Enable( FALSE );
-        m_aOldBtn.Enable( FALSE );
+        m_aPrinterBtn.Check( sal_False );
+        m_aFaxBtn.Check( sal_True );
+        m_aPrinterBtn.Enable( sal_False );
+        m_aOldBtn.Enable( sal_False );
     }
 }
 
@@ -134,7 +134,7 @@ bool APChooseDriverPage::check()
 
 void APChooseDriverPage::fill( PrinterInfo& rInfo )
 {
-    USHORT nPos = m_aDriverBox.GetSelectEntryPos();
+    sal_uInt16 nPos = m_aDriverBox.GetSelectEntryPos();
     String* pDriver = (String*)m_aDriverBox.GetEntryData( nPos );
     rInfo.m_aDriverName = *pDriver;
 #if OSL_DEBUG_LEVEL > 1
@@ -337,15 +337,15 @@ APNamePage::APNamePage( AddPrinterDialog* pParent, const String& rInitName, Devi
 {
     FreeResource();
     if( eKind != DeviceKind::Printer )
-        m_aDefaultBox.Show( FALSE );
+        m_aDefaultBox.Show( sal_False );
     else
         m_aNameEdt.SetText( rInitName );
     if( eKind != DeviceKind::Fax )
-        m_aFaxSwallowBox.Show( FALSE );
+        m_aFaxSwallowBox.Show( sal_False );
 
     m_aNameEdt.SetText( AddPrinterDialog::uniquePrinterName( m_aNameEdt.GetText() ) );
-    m_aDefaultBox.Check( FALSE );
-    m_aFaxSwallowBox.Check( FALSE );
+    m_aDefaultBox.Check( sal_False );
+    m_aFaxSwallowBox.Check( sal_False );
 }
 
 APNamePage::~APNamePage()
@@ -379,16 +379,16 @@ APCommandPage::APCommandPage( AddPrinterDialog* pParent, DeviceKind::type eKind
     ::std::list< String > aCommands;
     if( m_eKind == DeviceKind::Printer )
     {
-        m_aHelpBtn.Show( FALSE );
+        m_aHelpBtn.Show( sal_False );
         Size aSize = m_aCommandTxt.GetSizePixel();
         aSize.Width() = m_aCommandBox.GetSizePixel().Width();
         m_aCommandTxt.SetSizePixel( aSize );
     }
     if( m_eKind != DeviceKind::Pdf )
     {
-        m_aPdfDirBtn.Show( FALSE );
-        m_aPdfDirEdt.Show( FALSE );
-        m_aPdfDirTxt.Show( FALSE );
+        m_aPdfDirBtn.Show( sal_False );
+        m_aPdfDirEdt.Show( sal_False );
+        m_aPdfDirTxt.Show( sal_False );
     }
     switch( m_eKind )
     {
@@ -680,8 +680,8 @@ APFaxDriverPage::APFaxDriverPage( AddPrinterDialog* pParent )
 {
     FreeResource();
 
-    m_aDefBtn.Check( TRUE );
-    m_aSelectBtn.Check( FALSE );
+    m_aDefBtn.Check( sal_True );
+    m_aSelectBtn.Check( sal_False );
     m_aSelectBtn.SetStyle( m_aSelectBtn.GetStyle() | WB_WORDBREAK );
 }
 
@@ -713,9 +713,9 @@ APPdfDriverPage::APPdfDriverPage( AddPrinterDialog* pParent )
 {
     FreeResource();
 
-    m_aDefBtn.Check( TRUE );
-    m_aDistBtn.Check( FALSE );
-    m_aSelectBtn.Check( FALSE );
+    m_aDefBtn.Check( sal_True );
+    m_aDistBtn.Check( sal_False );
+    m_aSelectBtn.Check( sal_False );
     m_aSelectBtn.SetStyle( m_aSelectBtn.GetStyle() | WB_WORDBREAK );
 }
 
@@ -763,9 +763,9 @@ AddPrinterDialog::AddPrinterDialog( Window* pParent )
 {
     FreeResource();
     m_pCurrentPage = m_pChooseDevicePage = new APChooseDevicePage( this );
-    m_pCurrentPage->Show( TRUE );
-    m_aFinishPB.Enable( FALSE );
-    m_aPrevPB.Enable( FALSE );
+    m_pCurrentPage->Show( sal_True );
+    m_aFinishPB.Enable( sal_False );
+    m_aPrevPB.Enable( sal_False );
 
     m_aNextPB.SetClickHdl( LINK( this, AddPrinterDialog, ClickBtnHdl ) );
     m_aPrevPB.SetClickHdl( LINK( this, AddPrinterDialog, ClickBtnHdl ) );
@@ -824,7 +824,7 @@ void AddPrinterDialog::DataChanged( const DataChangedEvent& rEv )
 
 void AddPrinterDialog::advance()
 {
-    m_pCurrentPage->Show( FALSE );
+    m_pCurrentPage->Show( sal_False );
     if( m_pCurrentPage == m_pChooseDevicePage )
     {
         if( m_pChooseDevicePage->isPrinter() )
@@ -832,30 +832,30 @@ void AddPrinterDialog::advance()
             if( ! m_pChooseDriverPage )
                 m_pChooseDriverPage = new APChooseDriverPage( this );
             m_pCurrentPage = m_pChooseDriverPage;
-            m_aPrevPB.Enable( TRUE );
+            m_aPrevPB.Enable( sal_True );
         }
         else if( m_pChooseDevicePage->isOld() )
         {
             if( ! m_pOldPrinterPage )
                 m_pOldPrinterPage = new APOldPrinterPage( this );
             m_pCurrentPage = m_pOldPrinterPage;
-            m_aPrevPB.Enable( TRUE );
-            m_aFinishPB.Enable( TRUE );
-            m_aNextPB.Enable( FALSE );
+            m_aPrevPB.Enable( sal_True );
+            m_aFinishPB.Enable( sal_True );
+            m_aNextPB.Enable( sal_False );
         }
         else if( m_pChooseDevicePage->isFax() )
         {
             if( ! m_pFaxDriverPage )
                 m_pFaxDriverPage = new APFaxDriverPage( this );
             m_pCurrentPage = m_pFaxDriverPage;
-            m_aPrevPB.Enable( TRUE );
+            m_aPrevPB.Enable( sal_True );
         }
         else if( m_pChooseDevicePage->isPDF() )
         {
             if( ! m_pPdfDriverPage )
                 m_pPdfDriverPage = new APPdfDriverPage( this );
             m_pCurrentPage = m_pPdfDriverPage;
-            m_aPrevPB.Enable( TRUE );
+            m_aPrevPB.Enable( sal_True );
         }
     }
     else if( m_pCurrentPage == m_pChooseDriverPage )
@@ -871,8 +871,8 @@ void AddPrinterDialog::advance()
         else
             m_pNamePage->setText( m_aPrinter.m_aPrinterName );
         m_pCurrentPage = m_pNamePage;
-        m_aFinishPB.Enable( TRUE );
-        m_aNextPB.Enable( FALSE );
+        m_aFinishPB.Enable( sal_True );
+        m_aNextPB.Enable( sal_False );
     }
     else if( m_pCurrentPage == m_pFaxDriverPage )
     {
@@ -900,8 +900,8 @@ void AddPrinterDialog::advance()
         if( ! m_pFaxNamePage )
             m_pFaxNamePage = new APNamePage( this, String(), DeviceKind::Fax );
         m_pCurrentPage = m_pFaxNamePage;
-        m_aNextPB.Enable( FALSE );
-        m_aFinishPB.Enable( TRUE );
+        m_aNextPB.Enable( sal_False );
+        m_aFinishPB.Enable( sal_True );
     }
     else if( m_pCurrentPage == m_pPdfDriverPage )
     {
@@ -929,26 +929,26 @@ void AddPrinterDialog::advance()
         if( ! m_pPdfNamePage )
             m_pPdfNamePage = new APNamePage( this, String(), DeviceKind::Pdf );
         m_pCurrentPage = m_pPdfNamePage;
-        m_aNextPB.Enable( FALSE );
-        m_aFinishPB.Enable( TRUE );
+        m_aNextPB.Enable( sal_False );
+        m_aFinishPB.Enable( sal_True );
     }
 
-    m_pCurrentPage->Show( TRUE );
+    m_pCurrentPage->Show( sal_True );
     m_aTitleImage.SetText( m_pCurrentPage->getTitle() );
 }
 
 void AddPrinterDialog::back()
 {
-    m_pCurrentPage->Show( FALSE );
+    m_pCurrentPage->Show( sal_False );
     if( m_pCurrentPage == m_pChooseDriverPage )
     {
         m_pCurrentPage = m_pChooseDevicePage;
-        m_aPrevPB.Enable( FALSE );
+        m_aPrevPB.Enable( sal_False );
     }
     else if( m_pCurrentPage == m_pNamePage )
     {
         m_pCurrentPage = m_pCommandPage;
-        m_aNextPB.Enable( TRUE );
+        m_aNextPB.Enable( sal_True );
     }
     else if( m_pCurrentPage == m_pCommandPage )
     {
@@ -957,13 +957,13 @@ void AddPrinterDialog::back()
     else if( m_pCurrentPage == m_pOldPrinterPage )
     {
         m_pCurrentPage = m_pChooseDevicePage;
-        m_aPrevPB.Enable( FALSE );
-        m_aNextPB.Enable( TRUE );
+        m_aPrevPB.Enable( sal_False );
+        m_aNextPB.Enable( sal_True );
     }
     else if( m_pCurrentPage == m_pFaxDriverPage )
     {
         m_pCurrentPage = m_pChooseDevicePage;
-        m_aPrevPB.Enable( FALSE );
+        m_aPrevPB.Enable( sal_False );
     }
     else if( m_pCurrentPage == m_pFaxSelectDriverPage )
     {
@@ -972,17 +972,17 @@ void AddPrinterDialog::back()
     else if( m_pCurrentPage == m_pFaxNamePage )
     {
         m_pCurrentPage = m_pFaxCommandPage;
-        m_aNextPB.Enable( TRUE );
+        m_aNextPB.Enable( sal_True );
     }
     else if( m_pCurrentPage == m_pFaxCommandPage )
     {
         m_pCurrentPage = m_pFaxDriverPage->isDefault() ? (APTabPage*)m_pFaxDriverPage : (APTabPage*)m_pFaxSelectDriverPage;
-        m_aNextPB.Enable( TRUE );
+        m_aNextPB.Enable( sal_True );
     }
     else if( m_pCurrentPage == m_pPdfDriverPage )
     {
         m_pCurrentPage = m_pChooseDevicePage;
-        m_aPrevPB.Enable( FALSE );
+        m_aPrevPB.Enable( sal_False );
     }
     else if( m_pCurrentPage == m_pPdfSelectDriverPage )
     {
@@ -991,14 +991,14 @@ void AddPrinterDialog::back()
     else if( m_pCurrentPage == m_pPdfNamePage )
     {
         m_pCurrentPage = m_pPdfCommandPage;
-        m_aNextPB.Enable( TRUE );
+        m_aNextPB.Enable( sal_True );
     }
     else if( m_pCurrentPage == m_pPdfCommandPage )
     {
         m_pCurrentPage = m_pPdfDriverPage->isDefault() || m_pPdfDriverPage->isDist() ? (APTabPage*)m_pPdfDriverPage : (APTabPage*)m_pPdfSelectDriverPage;
-        m_aNextPB.Enable( TRUE );
+        m_aNextPB.Enable( sal_True );
     }
-    m_pCurrentPage->Show( TRUE );
+    m_pCurrentPage->Show( sal_True );
     m_aTitleImage.SetText( m_pCurrentPage->getTitle() );
 }
 
diff --git a/padmin/source/cmddlg.cxx b/padmin/source/cmddlg.cxx
index e986b7d94f6f..be87417891f4 100644
--- a/padmin/source/cmddlg.cxx
+++ b/padmin/source/cmddlg.cxx
@@ -270,10 +270,10 @@ RTSCommandPage::RTSCommandPage( RTSDialog* pParent ) :
     m_aPdfDirectoryButton.SetClickHdl( LINK( this, RTSCommandPage, ClickBtnHdl ) );
     m_aExternalCB.SetToggleHdl( LINK( this, RTSCommandPage, ClickBtnHdl ) );
 
-    m_aPdfDirectoryButton.Show( FALSE );
-    m_aPdfDirectoryEdit.Show( FALSE );
-    m_aPdfDirectoryText.Show( FALSE );
-    m_aFaxSwallowBox.Show( FALSE );
+    m_aPdfDirectoryButton.Show( sal_False );
+    m_aPdfDirectoryEdit.Show( sal_False );
+    m_aPdfDirectoryText.Show( sal_False );
+    m_aFaxSwallowBox.Show( sal_False );
     m_aCommandsCB.SetText( m_pParent->m_aJobData.m_aCommand );
     m_aQuickCB.SetText( m_pParent->m_aJobData.m_aQuickCommand );
 
@@ -287,9 +287,9 @@ RTSCommandPage::RTSCommandPage( RTSDialog* pParent ) :
         if( ! aToken.compareToAscii( "fax", 3 ) )
         {
             m_bWasFax = true;
-            m_aFaxSwallowBox.Show( TRUE );
+            m_aFaxSwallowBox.Show( sal_True );
             sal_Int32 nPos = 0;
-            m_aFaxSwallowBox.Check( ! aToken.getToken( 1, '=', nPos ).compareToAscii( "swallow", 7 ) ? TRUE : FALSE );
+            m_aFaxSwallowBox.Check( ! aToken.getToken( 1, '=', nPos ).compareToAscii( "swallow", 7 ) ? sal_True : sal_False );
             m_aConfigureBox.SelectEntryPos( m_nFaxEntry );
         }
         else if( ! aToken.compareToAscii( "pdf=", 4 ) )
@@ -297,9 +297,9 @@ RTSCommandPage::RTSCommandPage( RTSDialog* pParent ) :
             m_bWasPdf = true;
             sal_Int32 nPos = 0;
             m_aPdfDirectoryEdit.SetText( aToken.getToken( 1, '=', nPos ) );
-            m_aPdfDirectoryEdit.Show( TRUE );
-            m_aPdfDirectoryButton.Show( TRUE );
-            m_aPdfDirectoryText.Show( TRUE );
+            m_aPdfDirectoryEdit.Show( sal_True );
+            m_aPdfDirectoryButton.Show( sal_True );
+            m_aPdfDirectoryText.Show( sal_True );
             m_aConfigureBox.SelectEntryPos( m_nPdfEntry );
         }
         else if( ! aToken.compareToAscii( "external_dialog" ) )
@@ -421,17 +421,17 @@ IMPL_LINK( RTSCommandPage, SelectHdl, Control*, pBox )
 {
     if( pBox == &m_aConfigureBox )
     {
-        BOOL bEnable = m_aConfigureBox.GetSelectEntryPos() == m_nPdfEntry ? TRUE : FALSE;
+        sal_Bool bEnable = m_aConfigureBox.GetSelectEntryPos() == m_nPdfEntry ? sal_True : sal_False;
         m_aPdfDirectoryButton.Show( bEnable );
         m_aPdfDirectoryEdit.Show( bEnable );
         m_aPdfDirectoryText.Show( bEnable );
-        bEnable = m_aConfigureBox.GetSelectEntryPos() == m_nFaxEntry ? TRUE : FALSE;
+        bEnable = m_aConfigureBox.GetSelectEntryPos() == m_nFaxEntry ? sal_True : sal_False;
         m_aFaxSwallowBox.Show( bEnable );
         UpdateCommands();
     }
     else if( pBox == &m_aCommandsCB )
     {
-        m_aRemovePB.Enable( TRUE );
+        m_aRemovePB.Enable( sal_True );
     }
 
     return 0;
diff --git a/padmin/source/cmddlg.hxx b/padmin/source/cmddlg.hxx
index 8c47530dab39..4dd49e59e391 100644
--- a/padmin/source/cmddlg.hxx
+++ b/padmin/source/cmddlg.hxx
@@ -78,9 +78,9 @@ private:
 
     FixedText                       m_aConfigureText;
     ListBox                         m_aConfigureBox;
-    USHORT                          m_nPrinterEntry;
-    USHORT                          m_nFaxEntry;
-    USHORT                          m_nPdfEntry;
+    sal_uInt16                          m_nPrinterEntry;
+    sal_uInt16                          m_nFaxEntry;
+    sal_uInt16                          m_nPdfEntry;
     FixedText                       m_aPdfDirectoryText;
     PushButton                      m_aPdfDirectoryButton;
     Edit                            m_aPdfDirectoryEdit;
diff --git a/padmin/source/fontentry.cxx b/padmin/source/fontentry.cxx
index a660550589e1..14376e45b2ca 100644
--- a/padmin/source/fontentry.cxx
+++ b/padmin/source/fontentry.cxx
@@ -63,7 +63,7 @@ FontNameDlg::FontNameDlg( Window *pParent ) :
 {
     FreeResource();
 
-    m_aFontBox.EnableMultiSelection( TRUE );
+    m_aFontBox.EnableMultiSelection( sal_True );
 
     m_aOKButton.SetClickHdl( LINK( this, FontNameDlg, ClickBtnHdl ) );
     m_aRenameButton.SetClickHdl( LINK( this, FontNameDlg, ClickBtnHdl ) );
@@ -176,8 +176,8 @@ void FontNameDlg::init()
     ::std::list< fontID > aFonts;
     m_rFontManager.getFontList( aFonts );
     m_aFontBox.Clear();
-    m_aRemoveButton.Enable( FALSE );
-    m_aRenameButton.Enable( FALSE );
+    m_aRemoveButton.Enable( sal_False );
+    m_aRenameButton.Enable( sal_False );
 
     ::boost::unordered_map< OUString, int, OUStringHash > aFamilies;
     ::std::list< fontID >::iterator font_it;
@@ -220,7 +220,7 @@ void FontNameDlg::init()
             }
             else
                 aEntry = fillFontEntry( aInfo, String( ByteString( aFile ), osl_getThreadTextEncoding() ), aFamilies[ aInfo.m_aFamilyName ] > 1  );
-            USHORT nEntry = m_aFontBox.InsertEntry( aEntry );
+            sal_uInt16 nEntry = m_aFontBox.InsertEntry( aEntry );
             m_aFontBox.SetEntryData( nEntry, (void*)(sal_IntPtr)(*font_it) );
         }
     }
@@ -230,7 +230,7 @@ IMPL_LINK( FontNameDlg, SelectHdl, ListBox*, pBox )
 {
     if( pBox == &m_aFontBox )
     {
-        BOOL bEnable = m_aFontBox.GetSelectEntryCount() ? TRUE : FALSE;
+        sal_Bool bEnable = m_aFontBox.GetSelectEntryCount() ? sal_True : sal_False;
         m_aRemoveButton.Enable( bEnable );
         m_aRenameButton.Enable( bEnable );
     }
@@ -362,7 +362,7 @@ FontImportDialog::FontImportDialog( Window* pParent ) :
 {
     FreeResource();
 
-    m_aNewFontsBox.EnableMultiSelection( TRUE );
+    m_aNewFontsBox.EnableMultiSelection( sal_True );
 
     m_aOKBtn.SetClickHdl( LINK( this, FontImportDialog, ClickBtnHdl ) );
     m_aSelectAllBtn.SetClickHdl( LINK( this, FontImportDialog, ClickBtnHdl ) );
@@ -370,8 +370,8 @@ FontImportDialog::FontImportDialog( Window* pParent ) :
     m_aFromDirEdt.SetModifyHdl( LINK( this, FontImportDialog, ModifyHdl ) );
     m_aRefreshTimer.SetTimeoutHdl( LINK( this, FontImportDialog, RefreshTimeoutHdl ) );
     m_aRefreshTimer.SetTimeout( 2000 );
-    m_aLinkOnlyBox.Check( FALSE );
-    m_aSubDirsBox.Check( TRUE );
+    m_aLinkOnlyBox.Check( sal_False );
+    m_aSubDirsBox.Check( sal_True );
     m_aSubDirsBox.SetToggleHdl( LINK( this, FontImportDialog, ToggleHdl ) );
 
     Config& rPadminRC( getPadminRC() );
@@ -515,7 +515,7 @@ void FontImportDialog::fillFontBox()
             aEntry = FontNameDlg::fillFontEntry( it->second.front(), aFile, aFamilies[ it->second.front().m_aFamilyName ] > 1 );
         else
             aEntry = FontNameDlg::fillFontEntry( it->second, aFile );
-        USHORT nPos = m_aNewFontsBox.InsertEntry( aEntry );
+        sal_uInt16 nPos = m_aNewFontsBox.InsertEntry( aEntry );
         m_aNewFontsBox.SetEntryData( nPos, (void*)&(it->first) );
     }
 }
@@ -536,12 +536,12 @@ void FontImportDialog::copyFonts()
         m_pProgress = new ProgressDialog( this );
         m_pProgress->setRange( 0, aFiles.size() );
         m_pProgress->startOperation( m_aImportOperation );
-        m_pProgress->Show( TRUE );
+        m_pProgress->Show( sal_True );
         m_pProgress->setValue( 0 );
         m_pProgress->Invalidate();
         m_pProgress->Sync();
         nSuccess = m_rFontManager.importFonts( aFiles, m_aLinkOnlyBox.IsChecked() ? true : false, this );
-        m_pProgress->Show( FALSE );
+        m_pProgress->Show( sal_False );
         delete m_pProgress;
         m_pProgress = NULL;
     }
@@ -569,10 +569,10 @@ IMPL_LINK( FontImportDialog, ClickBtnHdl, Button*, pButton )
     }
     else if( pButton == &m_aSelectAllBtn )
     {
-        m_aNewFontsBox.SetUpdateMode( FALSE );
+        m_aNewFontsBox.SetUpdateMode( sal_False );
         for( int i = 0; i < m_aNewFontsBox.GetEntryCount(); i++ )
-            m_aNewFontsBox.SelectEntryPos( i, TRUE );
-        m_aNewFontsBox.SetUpdateMode( TRUE );
+            m_aNewFontsBox.SelectEntryPos( i, sal_True );
+        m_aNewFontsBox.SetUpdateMode( sal_True );
     }
     return 0;
 }
diff --git a/padmin/source/helper.cxx b/padmin/source/helper.cxx
index 2a51c30bd0d3..41950f8b1864 100644
--- a/padmin/source/helper.cxx
+++ b/padmin/source/helper.cxx
@@ -215,13 +215,13 @@ QueryString::QueryString( Window* pParent, String& rQuery, String& rRet, const :
         m_aComboBox.InsertEntry( m_rReturnValue );
         for( ::std::list<String>::const_iterator it = rChoices.begin(); it != rChoices.end(); ++it )
             m_aComboBox.InsertEntry( *it );
-        m_aEdit.Show( FALSE );
+        m_aEdit.Show( sal_False );
         m_bUseEdit = false;
     }
     else
     {
         m_aEdit.SetText( m_rReturnValue );
-        m_aComboBox.Show( FALSE );
+        m_aComboBox.Show( sal_False );
         m_bUseEdit = true;
     }
     SetText( Application::GetDisplayName() );
@@ -247,13 +247,13 @@ IMPL_LINK( QueryString, ClickBtnHdl, Button*, pButton )
  *  AreYouSure
  */
 
-BOOL padmin::AreYouSure( Window* pParent, int nRid )
+sal_Bool padmin::AreYouSure( Window* pParent, int nRid )
 {
     if( nRid == -1 )
         nRid = RID_YOU_SURE;
     QueryBox aQueryBox( pParent, WB_YES_NO | WB_DEF_NO,
                         String( PaResId( nRid ) ) );
-    return aQueryBox.Execute() == RET_NO ? FALSE : TRUE;
+    return aQueryBox.Execute() == RET_NO ? sal_False : sal_True;
 }
 
 /*
diff --git a/padmin/source/helper.hxx b/padmin/source/helper.hxx
index 503de2dda960..14cee58531bd 100644
--- a/padmin/source/helper.hxx
+++ b/padmin/source/helper.hxx
@@ -41,6 +41,13 @@
 #include <vcl/lstbox.hxx>
 #include <vcl/combobox.hxx>
 
+#if defined SPA_DLLIMPLEMENTATION
+#define SPA_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define SPA_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+
+
 class Config;
 
 #define PSPRINT_PPDDIR "driver"
@@ -105,7 +112,7 @@ public:
     ~QueryString();
 };
 
-BOOL AreYouSure( Window*, int nRid = -1 );
+sal_Bool AreYouSure( Window*, int nRid = -1 );
 
 ResId PaResId( sal_uInt32 nId );
 
diff --git a/padmin/source/makefile.mk b/padmin/source/makefile.mk
deleted file mode 100644
index 8bcbd51ef832..000000000000
--- a/padmin/source/makefile.mk
+++ /dev/null
@@ -1,115 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-.IF "$(GUIBASE)"=="aqua"
-
-dummy:
-    @echo "Nothing to build for GUIBASE aqua."
-
-.ELSE
-
-PRJ=..
-PRJNAME=padmin
-TARGET=padmin
-TARGETTYPE=GUI
-ENABLE_EXCEPTIONS=TRUE
-LIBTARGET=NO
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE: settings.mk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES=padialog.src rtsetup.src
-
-RESLIB1NAME=spa
-RESLIB1IMAGES=$(PRJ)$/source
-RESLIB1SRSFILES= $(SRS)$/padmin.srs
-RESLIB1DEPN=\
-    padialog.src	\
-    padialog.hrc	\
-    rtsetup.src		\
-    rtsetup.hrc
-
-.IF "$(GUI)" == "UNX"
-
-SLOFILES=\
-    $(SLO)$/padialog.obj		\
-    $(SLO)$/cmddlg.obj			\
-    $(SLO)$/progress.obj		\
-    $(SLO)$/newppdlg.obj		\
-    $(SLO)$/prtsetup.obj		\
-    $(SLO)$/fontentry.obj		\
-    $(SLO)$/helper.obj			\
-    $(SLO)$/adddlg.obj			\
-    $(SLO)$/titlectrl.obj
-
-
-OBJFILES=\
-    $(OBJ)/pamain.obj
-
-SHL1TARGET= spa$(DLLPOSTFIX)
-SHL1OBJS=$(SLOFILES)
-SHL1STDLIBS=\
-    $(SVTOOLLIB)					\
-    $(VCLLIB)						\
-    $(UNOTOOLSLIB)					\
-    $(TOOLSLIB)						\
-    $(COMPHELPERLIB)				\
-    $(CPPULIB)						\
-    $(SALLIB)
-
-APP1TARGET=spadmin.bin
-APP1DEPN+=$(SHL1TARGETN)
-
-APP1OBJS=\
-    $(OBJ)$/desktopcontext.obj  \
-    $(OBJ)/pamain.obj
-
-APP1STDLIBS=	\
-    -l$(SHL1TARGET)		\
-    $(VCLLIB)			\
-    $(UNOTOOLSLIB)		\
-    $(TOOLSLIB)			\
-    $(UCBHELPERLIB)		\
-    $(COMPHELPERLIB)	\
-    $(CPPUHELPERLIB)	\
-    $(CPPULIB)			\
-    $(SALLIB)
-
-UNIXTEXT = $(MISC)$/spadmin.sh
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.ENDIF # GUIBASE==aqua
-
diff --git a/padmin/source/newppdlg.cxx b/padmin/source/newppdlg.cxx
index 68c99eee4b78..6382ae1359dd 100644
--- a/padmin/source/newppdlg.cxx
+++ b/padmin/source/newppdlg.cxx
@@ -155,7 +155,7 @@ void PPDImportDialog::Import()
             continue;
         }
 
-        USHORT nPos = m_aDriverLB.InsertEntry( aPrinterName );
+        sal_uInt16 nPos = m_aDriverLB.InsertEntry( aPrinterName );
         m_aDriverLB.SetEntryData( nPos, new String( aPath.PathToFileName() ) );
     }
 }
diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx
index a5ce16bcc55e..67b84a41716d 100644
--- a/padmin/source/padialog.cxx
+++ b/padmin/source/padialog.cxx
@@ -72,12 +72,12 @@ using namespace com::sun::star::beans;
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
 
-PADialog* PADialog::Create( Window* pParent, BOOL bAdmin )
+PADialog* PADialog::Create( Window* pParent, sal_Bool bAdmin )
 {
     return new PADialog( pParent, bAdmin );
 }
 
-PADialog::PADialog( Window* pParent, BOOL /*bAdmin*/ ) :
+PADialog::PADialog( Window* pParent, sal_Bool /*bAdmin*/ ) :
         ModalDialog( pParent, PaResId( RID_PADIALOG ) ),
         m_aDevicesLB( this, PaResId( RID_PA_LB_DEV ) ),
         m_aConfPB( this, PaResId( RID_PA_BTN_CONF ) ),
@@ -125,7 +125,7 @@ void PADialog::Init()
     UpdateDevice();
     UpdateText();
 
-    m_aRemPB.Enable( FALSE );
+    m_aRemPB.Enable( sal_False );
 
     m_aDevicesLB.SetDoubleClickHdl( LINK( this, PADialog, DoubleClickHdl ) );
     m_aDevicesLB.SetSelectHdl( LINK( this, PADialog, SelectHdl ) );
@@ -141,11 +141,25 @@ void PADialog::Init()
 
     ::psp::PrintFontManager& rFontManager( ::psp::PrintFontManager::get() );
     if( ! rFontManager.checkImportPossible() )
-        m_aFontsPB.Enable( FALSE );
+        m_aFontsPB.Enable( sal_False );
     if( rFontManager.hasFontconfig() )
     {
-        m_aFontsPB.Enable( FALSE );
-        m_aFontsPB.Show( FALSE );
+        m_aFontsPB.Enable( sal_False );
+        m_aFontsPB.Show( sal_False );
+    }
+
+    // at this point no actual changes will be  written
+    // but the write will have checked whether any writeable config exists
+    if( ! m_rPIManager.writePrinterConfig() )
+    {
+        m_aAddPB.Enable( sal_False );
+        m_aRemPB.Enable( sal_False );
+        m_aConfPB.Enable( sal_False );
+        m_aRenamePB.Enable( sal_False );
+        m_aStdPB.Enable( sal_False );
+        m_aCUPSCB.Enable( sal_False );
+        ErrorBox aBox( GetParent(), WB_OK | WB_DEF_OK, String( PaResId( RID_ERR_NOWRITE ) ) );
+        aBox.Execute();
     }
 }
 
@@ -241,9 +255,9 @@ IMPL_LINK( PADialog, SelectHdl, ListBox*, pListBox )
         String sSelect = getSelectedDevice();
         String sDefPrt = m_rPIManager.getDefaultPrinter();
         if( sDefPrt == sSelect || ! m_rPIManager.removePrinter( sSelect, true ) )
-            m_aRemPB.Enable( FALSE );
+            m_aRemPB.Enable( sal_False );
         else
-            m_aRemPB.Enable( TRUE );
+            m_aRemPB.Enable( sal_True );
         UpdateText();
     }
     return 0;
@@ -258,7 +272,7 @@ void PADialog::UpdateDefPrt()
 
     if( m_aRemPB.HasFocus() )
         m_aDevicesLB.GetFocus();
-    m_aRemPB.Enable( FALSE );
+    m_aRemPB.Enable( sal_False );
 }
 
 void PADialog::UpdateText()
@@ -312,7 +326,7 @@ static Point project( const Point& rPoint )
 static Color approachColor( const Color& rFrom, const Color& rTo )
 {
     Color aColor;
-    UINT8 nDiff;
+    sal_uInt8 nDiff;
     // approach red
     if( rFrom.GetRed() < rTo.GetRed() )
     {
@@ -437,7 +451,7 @@ void SpaPrinterController::printPage( int ) const
     static const struct
     {
             const char* const pDirect;
-            USHORT nResId;
+            sal_uInt16 nResId;
     } aResIds[] =
         {
             { NULL, RID_TXT_TESTPAGE_NAME },
@@ -634,7 +648,7 @@ void PADialog::RemDevice()
     {
         if( m_aDevicesLB.GetEntry( i ).CompareTo( aDefPrinter, aDefPrinter.Len() ) == COMPARE_EQUAL )
         {
-            m_aDevicesLB.SelectEntryPos( i, TRUE );
+            m_aDevicesLB.SelectEntryPos( i, sal_True );
             UpdateText();
             break;
         }
@@ -643,7 +657,7 @@ void PADialog::RemDevice()
     m_aDevicesLB.GetFocus();
 
     if( m_aDevicesLB.GetEntryCount() < 2 )
-        m_aRemPB.Enable( FALSE );
+        m_aRemPB.Enable( sal_False );
 }
 
 void PADialog::ConfigureDevice()
diff --git a/padmin/source/padialog.hxx b/padmin/source/padialog.hxx
index 915158bc6eca..42f034b781b5 100644
--- a/padmin/source/padialog.hxx
+++ b/padmin/source/padialog.hxx
@@ -49,7 +49,7 @@ class Printer;
 
 namespace padmin {
 
-    class PADialog : public ModalDialog
+    class SPA_DLLPUBLIC PADialog : public ModalDialog
     {
     private:
         DelListBox                          m_aDevicesLB;
@@ -91,7 +91,7 @@ namespace padmin {
         DECL_LINK( SelectHdl, ListBox* );
         DECL_LINK( DelPressedHdl, ListBox* );
 
-        PADialog( Window*,  BOOL );
+        PADialog( Window*,  sal_Bool );
         void Init();
 
         void UpdateDefPrt();
@@ -111,7 +111,7 @@ namespace padmin {
     public:
         ~PADialog();
 
-        static PADialog* Create( Window*,  BOOL );
+        static PADialog* Create( Window*,  sal_Bool );
     };
 
 } // namespace
diff --git a/padmin/source/padialog.src b/padmin/source/padialog.src
index 620411d72ddf..b3b46f5131f7 100644
--- a/padmin/source/padialog.src
+++ b/padmin/source/padialog.src
@@ -29,6 +29,7 @@
 
 ModalDialog RID_FONTIMPORT_DIALOG
 {
+    HelpID = "padmin:ModalDialog:RID_FONTIMPORT_DIALOG";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 230 , 185 );
@@ -37,6 +38,7 @@ ModalDialog RID_FONTIMPORT_DIALOG
 
     ListBox RID_FIMP_BOX_NEWFONTS
     {
+        HelpID = "padmin:ListBox:RID_FONTIMPORT_DIALOG:RID_FIMP_BOX_NEWFONTS";
         Border = TRUE;
         Sort=TRUE;
         AutoHScroll = TRUE;
@@ -58,18 +60,21 @@ ModalDialog RID_FONTIMPORT_DIALOG
     };
     Edit RID_FIMP_EDT_FROM
     {
+        HelpID = "padmin:Edit:RID_FONTIMPORT_DIALOG:RID_FIMP_EDT_FROM";
         Border = TRUE;
         Pos = MAP_APPFONT( 10, 97 );
         Size = MAP_APPFONT( 130, 12 );
     };
     PushButton RID_FIMP_BTN_FROM
     {
+        HelpID = "padmin:PushButton:RID_FONTIMPORT_DIALOG:RID_FIMP_BTN_FROM";
         Pos = MAP_APPFONT( 145, 97 );
         Size = MAP_APPFONT( 15, 12 );
         Text = "...";
     };
     CheckBox RID_FIMP_BOX_SUBDIRS
     {
+        HelpID = "padmin:CheckBox:RID_FONTIMPORT_DIALOG:RID_FIMP_BOX_SUBDIRS";
         Pos = MAP_APPFONT( 10, 115 );
         Size = MAP_APPFONT( 145, 10 );
         Text [ en-US ] = "Sea~rch Subdirectories";
@@ -83,6 +88,7 @@ ModalDialog RID_FONTIMPORT_DIALOG
 
     CheckBox RID_FIMP_BOX_LINKONLY
     {
+        HelpID = "padmin:CheckBox:RID_FONTIMPORT_DIALOG:RID_FIMP_BOX_LINKONLY";
         Pos = MAP_APPFONT( 10, 140 );
         Size = MAP_APPFONT( 145, 10 );
         Text [ en-US ] = "Create ~soft links only";
@@ -100,6 +106,7 @@ ModalDialog RID_FONTIMPORT_DIALOG
     };
     PushButton RID_FIMP_BTN_SELECTALL
     {
+        HelpID = "padmin:PushButton:RID_FONTIMPORT_DIALOG:RID_FIMP_BTN_SELECTALL";
         Pos = MAP_APPFONT( 175, 44 );
         Size = MAP_APPFONT( 50, 12 );
         Text [ en-US ] = "~Select All";
@@ -146,6 +153,7 @@ ModalDialog RID_FONTIMPORT_DIALOG
 
 ModalDialog RID_PADIALOG
 {
+    HelpID = "padmin:ModalDialog:RID_PADIALOG";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 260 , 198 ) ;
@@ -160,6 +168,7 @@ ModalDialog RID_PADIALOG
     };
     CheckBox RID_PA_CB_CUPSUSAGE
     {
+        HelpID = "padmin:CheckBox:RID_PADIALOG:RID_PA_CB_CUPSUSAGE";
         Pos = MAP_APPFONT( 12, 158 );
         Size = MAP_APPFONT( 168, 8 );
         Text [ en-US ] = "Disable CUPS Support";
@@ -186,6 +195,7 @@ ModalDialog RID_PADIALOG
     };
     ListBox RID_PA_LB_DEV
     {
+        HelpID = "padmin:ListBox:RID_PADIALOG:RID_PA_LB_DEV";
         Pos = MAP_APPFONT( 12, 15 );
         Size = MAP_APPFONT( 168, 80 );
         Border = TRUE;
@@ -237,30 +247,35 @@ ModalDialog RID_PADIALOG
     };
     PushButton RID_PA_BTN_CONF
     {
+        HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_CONF";
         Pos = MAP_APPFONT( 190, 15 );
         Size = MAP_APPFONT( 60, 12 );
         Text [ en-US ] = "Properties...";
     };
     PushButton RID_PA_BTN_RENAME
     {
+        HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_RENAME";
         Pos = MAP_APPFONT( 190, 32 );
         Size = MAP_APPFONT( 60, 12 );
         Text [ en-US ] = "R~ename...";
     };
     PushButton RID_PA_BTN_STD
     {
+        HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_STD";
         Pos = MAP_APPFONT( 190, 49 );
         Size = MAP_APPFONT( 60, 12 );
         Text [ en-US ] = "~Default";
     };
     PushButton RID_PA_BTN_DEL
     {
+        HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_DEL";
         Pos = MAP_APPFONT( 190, 66 );
         Size = MAP_APPFONT( 60, 12 );
         Text [ en-US ] = "Remo~ve...";
     };
     PushButton RID_PA_TESTPAGE
     {
+        HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_TESTPAGE";
         Pos = MAP_APPFONT( 190, 83 );
         Size = MAP_APPFONT( 60, 12 );
         Text [ en-US ] = "Test ~Page";
@@ -268,12 +283,14 @@ ModalDialog RID_PADIALOG
 
     PushButton RID_PA_BTN_FONTS
     {
+        HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_FONTS";
         Pos = MAP_APPFONT( 80, 181 );
         Size = MAP_APPFONT( 70, 12 );
         Text [ en-US ] = "Fon~ts...";
     };
     PushButton RID_PA_BTN_ADD
     {
+        HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_ADD";
         Pos = MAP_APPFONT( 5, 181 );
         Size = MAP_APPFONT( 70, 12 );
         Text [ en-US ] = "New Printer...";
@@ -292,6 +309,7 @@ ModalDialog RID_PADIALOG
 
 ModalDialog RID_STRINGQUERYDLG
 {
+    HelpID = "padmin:ModalDialog:RID_STRINGQUERYDLG";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 10 , 10 ) ;
@@ -306,12 +324,14 @@ ModalDialog RID_STRINGQUERYDLG
     };
     Edit RID_STRQRY_EDT_NEWNAME
     {
+        HelpID = "padmin:Edit:RID_STRINGQUERYDLG:RID_STRQRY_EDT_NEWNAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 23 ) ;
         Size = MAP_APPFONT ( 130 , 12 ) ;
     };
     ComboBox RID_STRQRY_BOX_NEWNAME
     {
+        HelpID = "padmin:ComboBox:RID_STRINGQUERYDLG:RID_STRQRY_BOX_NEWNAME";
         Border = TRUE ;
         DropDown = TRUE;
         Pos = MAP_APPFONT ( 6 , 23 ) ;
@@ -340,6 +360,11 @@ String RID_PA_TXT_TESTPAGE_PRINTED
     Text [ en-US ] = "The test page was printed succesfully. Please check the result.";
 };
 
+String RID_ERR_NOWRITE
+{
+    Text [en-US] = "No printers can be installed, because the file system is read-only.\nPlease contact your system administrator.";
+};
+
 String RID_QRY_PRTNAME
 {
     Text [ en-US ] = "~New printer name";
@@ -378,6 +403,7 @@ String RID_TXT_TESTPAGE_TIME
 
 ModalDialog RID_FONTNAMEDIALOG
 {
+    HelpID = "padmin:ModalDialog:RID_FONTNAMEDIALOG";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 255 , 110 ) ;
@@ -392,24 +418,28 @@ ModalDialog RID_FONTNAMEDIALOG
     };
     PushButton RID_FNTNM_BTN_RENAME
     {
+        HelpID = "padmin:PushButton:RID_FONTNAMEDIALOG:RID_FNTNM_BTN_RENAME";
         Pos = MAP_APPFONT( 196, 31 );
         Size = MAP_APPFONT( 50, 12 );
         Text [ en-US ] = "Re~name...";
     };
     PushButton RID_FNTNM_BTN_REMOVE
     {
+        HelpID = "padmin:PushButton:RID_FONTNAMEDIALOG:RID_FNTNM_BTN_REMOVE";
         Pos = MAP_APPFONT ( 196 , 48 ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
         Text [ en-US ] = "~Remove...";
     };
     PushButton RID_FNTNM_BTN_IMPORT
     {
+        HelpID = "padmin:PushButton:RID_FONTNAMEDIALOG:RID_FNTNM_BTN_IMPORT";
         Pos = MAP_APPFONT ( 196 , 65 ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
         Text [ en-US ] = "~Add...";
     };
     ListBox RID_FNTNM_LB_FONTS
     {
+        HelpID = "padmin:ListBox:RID_FONTNAMEDIALOG:RID_FNTNM_LB_FONTS";
         Border = TRUE ;
         Sort = TRUE ;
         AutoHScroll = TRUE;
@@ -455,27 +485,27 @@ String RID_YOU_SURE
 
 Bitmap RID_BUTTERFLY
 {
-    File = "butter.png" ;
+    File = "source/butter.png" ;
 };
 
 Bitmap RID_BMP_SMALL_PRINTER
 {
-    File = "print.png";
+    File = "source/print.png";
 };
 
 Bitmap RID_BMP_SMALL_FAX
 {
-    File = "fax.png";
+    File = "source/fax.png";
 };
 
 Bitmap RID_BMP_SMALL_PDF
 {
-    File = "pdf.png";
+    File = "source/pdf.png";
 };
 
 Bitmap RID_BMP_PRINTER
 {
-    File = "printer_large.png";
+    File = "source/printer_large.png";
 };
 
 String RID_AFMERROR_OK
@@ -525,6 +555,7 @@ String RID_AFMERROR_BOX_TXT
 
 ModelessDialog RID_PROGRESS_DLG
 {
+    HelpID = "padmin:ModelessDialog:RID_PROGRESS_DLG";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 10 , 10 ) ;
@@ -570,6 +601,7 @@ String RID_OPERATION_CONVERTMETRIC
 
 ModalDialog RID_PPDIMPORT_DLG
 {
+    HelpID = "padmin:ModalDialog:RID_PPDIMPORT_DLG";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 265 , 225 ) ;
@@ -590,6 +622,7 @@ ModalDialog RID_PPDIMPORT_DLG
     };
     ComboBox RID_PPDIMP_LB_PATH
     {
+        HelpID = "padmin:ComboBox:RID_PPDIMPORT_DLG:RID_PPDIMP_LB_PATH";
         Dropdown = TRUE;
         Border = TRUE;
         Sort = TRUE;
@@ -599,6 +632,7 @@ ModalDialog RID_PPDIMPORT_DLG
     };
     PushButton RID_PPDIMP_BTN_SEARCH
     {
+        HelpID = "padmin:PushButton:RID_PPDIMPORT_DLG:RID_PPDIMP_BTN_SEARCH";
         Pos = MAP_APPFONT( 145, 15 );
         Size = MAP_APPFONT( 50, 14 );
         Text [ en-US ] = "Browse...";
@@ -612,6 +646,7 @@ ModalDialog RID_PPDIMPORT_DLG
     };
     MultiListBox RID_PPDIMP_LB_DRIVER
     {
+        HelpID = "padmin:MultiListBox:RID_PPDIMPORT_DLG:RID_PPDIMP_LB_DRIVER";
         Border = TRUE;
         Sort = TRUE;
         SimpleMode = TRUE;
@@ -707,6 +742,7 @@ String RID_TXT_PRINTERADDFAILED
 
 ModalDialog RID_ADD_PRINTER_DIALOG
 {
+    HelpID = "padmin:ModalDialog:RID_ADD_PRINTER_DIALOG";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 240 , 172 ) ;
@@ -736,12 +772,14 @@ ModalDialog RID_ADD_PRINTER_DIALOG
     };
     PushButton RID_ADDP_BTN_NEXT
     {
+        HelpID = "padmin:PushButton:RID_ADD_PRINTER_DIALOG:RID_ADDP_BTN_NEXT";
         Pos = MAP_APPFONT( 130, 155 );
         Size = MAP_APPFONT( 50, 12 );
         Text [ en-US ] = "~Next >>";
     };
     PushButton RID_ADDP_BTN_PREV
     {
+        HelpID = "padmin:PushButton:RID_ADD_PRINTER_DIALOG:RID_ADDP_BTN_PREV";
         Pos = MAP_APPFONT( 75, 155 );
         Size = MAP_APPFONT( 50, 12 );
         Text [ en-US ] = "<< ~Back";
@@ -751,6 +789,7 @@ ModalDialog RID_ADD_PRINTER_DIALOG
 
 TabPage RID_ADDP_PAGE_CHOOSEDRIVER
 {
+    HelpID = "padmin:TabPage:RID_ADDP_PAGE_CHOOSEDRIVER";
     Hide = TRUE;
     Pos = MAP_APPFONT( 0, 30 );
     Size = MAP_APPFONT( 240, 120 );
@@ -766,6 +805,7 @@ TabPage RID_ADDP_PAGE_CHOOSEDRIVER
     };
     ListBox RID_ADDP_CHDRV_BOX_DRIVER
     {
+        HelpID = "padmin:ListBox:RID_ADDP_PAGE_CHOOSEDRIVER:RID_ADDP_CHDRV_BOX_DRIVER";
         Pos = MAP_APPFONT( 5, 15 );
         Size = MAP_APPFONT( 175, 100 );
         Border = TRUE;
@@ -773,12 +813,14 @@ TabPage RID_ADDP_PAGE_CHOOSEDRIVER
     };
     PushButton RID_ADDP_CHDRV_BTN_ADD
     {
+        HelpID = "padmin:PushButton:RID_ADDP_PAGE_CHOOSEDRIVER:RID_ADDP_CHDRV_BTN_ADD";
         Pos = MAP_APPFONT( 185, 15 );
         Size = MAP_APPFONT( 50, 12 );
         Text [ en-US ] = "~Import...";
     };
     PushButton RID_ADDP_CHDRV_BTN_REMOVE
     {
+        HelpID = "padmin:PushButton:RID_ADDP_PAGE_CHOOSEDRIVER:RID_ADDP_CHDRV_BTN_REMOVE";
         Pos = MAP_APPFONT( 185, 32 );
         Size = MAP_APPFONT( 50, 12 );
         Text [ en-US ] = "~Delete";
@@ -791,6 +833,7 @@ TabPage RID_ADDP_PAGE_CHOOSEDRIVER
 
 TabPage RID_ADDP_PAGE_CHOOSEDEV
 {
+    HelpID = "padmin:TabPage:RID_ADDP_PAGE_CHOOSEDEV";
     Hide = TRUE;
     Pos = MAP_APPFONT( 0, 30 );
     Size = MAP_APPFONT( 240, 120 );
@@ -806,24 +849,28 @@ TabPage RID_ADDP_PAGE_CHOOSEDEV
     };
     RadioButton RID_ADDP_CHDEV_BTN_PRINTER
     {
+        HelpID = "padmin:RadioButton:RID_ADDP_PAGE_CHOOSEDEV:RID_ADDP_CHDEV_BTN_PRINTER";
         Pos = MAP_APPFONT ( 40, 40 );
         Size = MAP_APPFONT( 180, 10 );
         Text [ en-US ] = "Add a ~printer";
     };
     RadioButton RID_ADDP_CHDEV_BTN_FAX
     {
+        HelpID = "padmin:RadioButton:RID_ADDP_PAGE_CHOOSEDEV:RID_ADDP_CHDEV_BTN_FAX";
         Pos = MAP_APPFONT ( 40, 50 );
         Size = MAP_APPFONT( 180, 10 );
         Text [ en-US ] = "Connect a fa~x device";
     };
     RadioButton RID_ADDP_CHDEV_BTN_PDF
     {
+        HelpID = "padmin:RadioButton:RID_ADDP_PAGE_CHOOSEDEV:RID_ADDP_CHDEV_BTN_PDF";
         Pos = MAP_APPFONT ( 40, 60 );
         Size = MAP_APPFONT( 180, 10 );
         Text [ en-US ] = "Connect a P~DF converter";
     };
     RadioButton RID_ADDP_CHDEV_BTN_OLD
     {
+        HelpID = "padmin:RadioButton:RID_ADDP_PAGE_CHOOSEDEV:RID_ADDP_CHDEV_BTN_OLD";
         Pos = MAP_APPFONT ( 40, 70 );
         Size = MAP_APPFONT( 180, 10 );
         Text [ en-US ] = "~Import printers from a StarOffice installation";
@@ -832,6 +879,7 @@ TabPage RID_ADDP_PAGE_CHOOSEDEV
 
 TabPage RID_ADDP_PAGE_NAME
 {
+    HelpID = "padmin:TabPage:RID_ADDP_PAGE_NAME";
     Hide = TRUE;
     Pos = MAP_APPFONT( 0, 30 );
     Size = MAP_APPFONT( 240, 120 );
@@ -859,12 +907,14 @@ TabPage RID_ADDP_PAGE_NAME
     };
     Edit RID_ADDP_NAME_EDT_NAME
     {
+        HelpID = "padmin:Edit:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_EDT_NAME";
         Pos = MAP_APPFONT( 40, 35 );
         Size = MAP_APPFONT( 160, 12 );
         Border = TRUE;
     };
     Edit RID_ADDP_NAME_EDT_FAXNAME
     {
+        HelpID = "padmin:Edit:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_EDT_FAXNAME";
         Pos = MAP_APPFONT( 40, 35 );
         Size = MAP_APPFONT( 160, 12 );
         Border = TRUE;
@@ -872,6 +922,7 @@ TabPage RID_ADDP_PAGE_NAME
     };
     Edit RID_ADDP_NAME_EDT_PDFNAME
     {
+        HelpID = "padmin:Edit:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_EDT_PDFNAME";
         Pos = MAP_APPFONT( 40, 35 );
         Size = MAP_APPFONT( 160, 12 );
         Border = TRUE;
@@ -879,12 +930,14 @@ TabPage RID_ADDP_PAGE_NAME
     };
     CheckBox RID_ADDP_NAME_BOX_DEFAULT
     {
+        HelpID = "padmin:CheckBox:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_BOX_DEFAULT";
         Pos = MAP_APPFONT( 40, 50 );
         Size = MAP_APPFONT( 160, 12 );
         Text [ en-US ] = "~Use as default printer";
     };
     CheckBox RID_ADDP_NAME_BOX_FAXSWALLOW
     {
+        HelpID = "padmin:CheckBox:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_BOX_FAXSWALLOW";
         Pos = MAP_APPFONT( 40, 50 );
         Size = MAP_APPFONT( 160, 12 );
         Text [ en-US ] = "Remo~ve fax number from output";
@@ -893,6 +946,7 @@ TabPage RID_ADDP_PAGE_NAME
 
 TabPage RID_ADDP_PAGE_COMMAND
 {
+    HelpID = "padmin:TabPage:RID_ADDP_PAGE_COMMAND";
     Hide = TRUE;
     Pos = MAP_APPFONT( 0, 30 );
     Size = MAP_APPFONT( 240, 120 );
@@ -909,12 +963,14 @@ TabPage RID_ADDP_PAGE_COMMAND
     };
     ComboBox RID_ADDP_CMD_BOX_COMMAND
     {
+        HelpID = "padmin:ComboBox:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_BOX_COMMAND";
         Pos = MAP_APPFONT( 10, 30);
         Size = MAP_APPFONT( 220, 85 );
         Border = TRUE;
     };
     ComboBox RID_ADDP_CMD_BOX_PDFCOMMAND
     {
+        HelpID = "padmin:ComboBox:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_BOX_PDFCOMMAND";
         Pos = MAP_APPFONT( 10, 30);
         Size = MAP_APPFONT( 220, 60 );
         Border = TRUE;
@@ -927,18 +983,21 @@ TabPage RID_ADDP_PAGE_COMMAND
     };
     Edit RID_ADDP_CMD_EDT_PDFDIR
     {
+        HelpID = "padmin:Edit:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_EDT_PDFDIR";
         Border = TRUE;
         Pos = MAP_APPFONT( 10, 104 );
         Size = MAP_APPFONT( 190, 12 );
     };
     PushButton RID_ADDP_CMD_BTN_PDFDIR
     {
+        HelpID = "padmin:PushButton:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_BTN_PDFDIR";
         Pos = MAP_APPFONT( 205, 104 );
         Size = MAP_APPFONT( 25, 12 );
         Text = "~...";
     };
     PushButton RID_ADDP_CMD_BTN_HELP
     {
+        HelpID = "padmin:PushButton:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_BTN_HELP";
         Pos = MAP_APPFONT( 180, 2 );
         Size = MAP_APPFONT( 50, 12 );
         Text [ en-US ] = "~Help";
@@ -955,6 +1014,7 @@ TabPage RID_ADDP_PAGE_COMMAND
 
 TabPage RID_ADDP_PAGE_OLDPRINTERS
 {
+    HelpID = "padmin:TabPage:RID_ADDP_PAGE_OLDPRINTERS";
     Hide = TRUE;
     Pos = MAP_APPFONT( 0, 30 );
     Size = MAP_APPFONT( 240, 120 );
@@ -971,12 +1031,14 @@ TabPage RID_ADDP_PAGE_OLDPRINTERS
     };
     MultiListBox RID_ADDP_OLD_BOX_PRINTERS
     {
+        HelpID = "padmin:MultiListBox:RID_ADDP_PAGE_OLDPRINTERS:RID_ADDP_OLD_BOX_PRINTERS";
         Pos = MAP_APPFONT( 10, 35 );
         Size = MAP_APPFONT( 165, 80 );
         Border = TRUE;
     };
     PushButton RID_ADDP_OLD_BTN_SELECTALL
     {
+        HelpID = "padmin:PushButton:RID_ADDP_PAGE_OLDPRINTERS:RID_ADDP_OLD_BTN_SELECTALL";
         Pos = MAP_APPFONT( 180, 35 );
         Size = MAP_APPFONT( 50, 12 );
         Text [ en-US ] = "~Select All";
@@ -985,6 +1047,7 @@ TabPage RID_ADDP_PAGE_OLDPRINTERS
 
 TabPage RID_ADDP_PAGE_FAXDRIVER
 {
+    HelpID = "padmin:TabPage:RID_ADDP_PAGE_FAXDRIVER";
     Hide = TRUE;
     Pos = MAP_APPFONT( 0, 30 );
     Size = MAP_APPFONT( 240, 120 );
@@ -1001,12 +1064,14 @@ TabPage RID_ADDP_PAGE_FAXDRIVER
     };
     RadioButton RID_ADDP_FAXDRV_BTN_DEFAULT
     {
+        HelpID = "padmin:RadioButton:RID_ADDP_PAGE_FAXDRIVER:RID_ADDP_FAXDRV_BTN_DEFAULT";
         Pos = MAP_APPFONT( 40,40 );
         Size = MAP_APPFONT( 160, 10 );
         Text [ en-US ] = "T~he default driver";
     };
     RadioButton RID_ADDP_FAXDRV_BTN_SELECT
     {
+        HelpID = "padmin:RadioButton:RID_ADDP_PAGE_FAXDRIVER:RID_ADDP_FAXDRV_BTN_SELECT";
         Pos = MAP_APPFONT( 40, 50 );
         Size = MAP_APPFONT( 160,24 );
         Text [ en-US ] = "A speci~fic driver, to adapt the format to another printer";
@@ -1015,6 +1080,7 @@ TabPage RID_ADDP_PAGE_FAXDRIVER
 
 TabPage RID_ADDP_PAGE_PDFDRIVER
 {
+    HelpID = "padmin:TabPage:RID_ADDP_PAGE_PDFDRIVER";
     Hide = TRUE;
     Pos = MAP_APPFONT( 0, 30 );
     Size = MAP_APPFONT( 240, 120 );
@@ -1031,18 +1097,21 @@ TabPage RID_ADDP_PAGE_PDFDRIVER
     };
     RadioButton RID_ADDP_PDFDRV_BTN_DEFAULT
     {
+        HelpID = "padmin:RadioButton:RID_ADDP_PAGE_PDFDRIVER:RID_ADDP_PDFDRV_BTN_DEFAULT";
         Pos = MAP_APPFONT( 40, 40 );
         Size = MAP_APPFONT( 160, 10 );
         Text [ en-US ] = "T~he default driver";
     };
     RadioButton RID_ADDP_PDFDRV_BTN_DIST
     {
+        HelpID = "padmin:RadioButton:RID_ADDP_PAGE_PDFDRIVER:RID_ADDP_PDFDRV_BTN_DIST";
         Pos = MAP_APPFONT( 40,50 );
         Size = MAP_APPFONT( 160, 10 );
         Text [ en-US ] = "The Adobe D~istiller(tm) driver";
     };
     RadioButton RID_ADDP_PDFDRV_BTN_SELECT
     {
+        HelpID = "padmin:RadioButton:RID_ADDP_PAGE_PDFDRIVER:RID_ADDP_PDFDRV_BTN_SELECT";
         Pos = MAP_APPFONT( 40, 60 );
         Size = MAP_APPFONT( 160, 24 );
         Text [ en-US ] = "A spec~ific driver, to adapt the format to another printer";
diff --git a/padmin/source/pamain.cxx b/padmin/source/pamain.cxx
index 0ea2ae14dcbd..7e47e4264d8c 100644
--- a/padmin/source/pamain.cxx
+++ b/padmin/source/pamain.cxx
@@ -61,7 +61,7 @@ class MyApp : public Application
 {
 public:
     int Main();
-    virtual USHORT  Exception( USHORT nError );
+    virtual sal_uInt16  Exception( sal_uInt16 nError );
 
     static void ReadStringHook( String& );
 };
@@ -84,7 +84,7 @@ void MyApp::ReadStringHook( String& rStr )
 
 // -----------------------------------------------------------------------
 
-USHORT MyApp::Exception( USHORT nError )
+sal_uInt16 MyApp::Exception( sal_uInt16 nError )
 {
     switch( nError & EXC_MAJORTYPE )
     {
@@ -151,7 +151,7 @@ int MyApp::Main()
 
     if( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() )
     {
-        BOOL bQuitApp;
+        sal_Bool bQuitApp;
         if( !InitAccessBridge( true, bQuitApp ) )
             if( bQuitApp )
                 return EXIT_FAILURE;
@@ -162,7 +162,7 @@ int MyApp::Main()
 
     ResMgr::SetReadStringHook( MyApp::ReadStringHook );
 
-    pPADialog = PADialog::Create( NULL , FALSE );
+    pPADialog = PADialog::Create( NULL , sal_False );
     Application::SetDisplayName( pPADialog->GetText() );
     pPADialog->SetIcon(501);
     pPADialog->Execute();
diff --git a/padmin/source/progress.cxx b/padmin/source/progress.cxx
index 8d191d816eaf..86055578ace3 100644
--- a/padmin/source/progress.cxx
+++ b/padmin/source/progress.cxx
@@ -39,7 +39,7 @@
 using namespace padmin;
 
 ProgressDialog::ProgressDialog( Window* pParent,
-                                BOOL bCancelable,
+                                sal_Bool bCancelable,
                                 int nMin, int nMax ) :
         ModelessDialog( pParent, PaResId( RID_PROGRESS_DLG ) ),
         maOperation( this, PaResId( RID_PROGRESS_OPERATION_TXT ) ),
@@ -49,7 +49,7 @@ ProgressDialog::ProgressDialog( Window* pParent,
         maProgressBar( this, PaResId( RID_PROGRESS_STATUSBAR ) ),
         mnMax( nMax ),
         mnMin( nMin ),
-        mbCanceled( FALSE )
+        mbCanceled( sal_False )
 {
     maFilename.SetStyle( maFilename.GetStyle() | WB_PATHELLIPSIS );
     if( ! bCancelable )
@@ -73,9 +73,9 @@ void ProgressDialog::startOperation( const String& rOperation )
 {
     maOperation.SetText( rOperation );
     maProgressBar.SetValue( 0 );
-    mbCanceled = FALSE;
+    mbCanceled = sal_False;
     if( ! IsVisible() )
-        Show( TRUE );
+        Show( sal_True );
 }
 
 void ProgressDialog::setValue( int nValue )
@@ -95,7 +95,7 @@ IMPL_LINK( ProgressDialog, ClickBtnHdl, Button*, pButton )
 {
     if( pButton == &maCancelButton )
     {
-        mbCanceled = TRUE;
+        mbCanceled = sal_True;
     }
     return 0;
 }
diff --git a/padmin/source/progress.hxx b/padmin/source/progress.hxx
index 50449ac6d520..06394a5a1c45 100644
--- a/padmin/source/progress.hxx
+++ b/padmin/source/progress.hxx
@@ -46,10 +46,10 @@ namespace padmin {
         ProgressBar                     maProgressBar;
 
         int mnMax, mnMin;
-        BOOL mbCanceled;
+        sal_Bool mbCanceled;
 
     public:
-        ProgressDialog( Window*, BOOL bCancelable = TRUE, int nMin = 0, int nMax = 100 );
+        ProgressDialog( Window*, sal_Bool bCancelable = sal_True, int nMin = 0, int nMax = 100 );
         ~ProgressDialog();
 
         DECL_LINK( ClickBtnHdl, Button* );
@@ -59,7 +59,7 @@ namespace padmin {
         void startOperation( const String& );
         void setFilename( const String& );
 
-        BOOL isCanceled() { return mbCanceled; }
+        sal_Bool isCanceled() { return mbCanceled; }
     };
 
 } // namespace
diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx
index ec9718880032..201f0875adc2 100644
--- a/padmin/source/prtsetup.cxx
+++ b/padmin/source/prtsetup.cxx
@@ -51,7 +51,7 @@ void RTSDialog::insertAllPPDValues( ListBox& rBox, const PPDParser* pParser, con
         return;
 
     const PPDValue* pValue = NULL;
-    USHORT nPos = 0;
+    sal_uInt16 nPos = 0;
     String aOptionText;
 
     for( int i = 0; i < pKey->countValues(); i++ )
@@ -154,7 +154,7 @@ IMPL_LINK( RTSDialog, ActivatePage, TabControl*, pTabCtrl )
     if( pTabCtrl != &m_aTabControl )
         return 0;
 
-    USHORT nId = m_aTabControl.GetCurPageId();
+    sal_uInt16 nId = m_aTabControl.GetCurPageId();
 
     if ( ! m_aTabControl.GetTabPage( nId ) )
     {
@@ -202,6 +202,7 @@ IMPL_LINK( RTSDialog, ClickButton, Button*, pButton )
             m_aJobData.m_nColorDepth    = m_pDevicePage->getDepth();
             m_aJobData.m_nColorDevice   = m_pDevicePage->getColorDevice();
             m_aJobData.m_nPSLevel       = m_pDevicePage->getLevel();
+            m_aJobData.m_nPDFDevice     = m_pDevicePage->getPDFDevice();
         }
         if( m_pOtherPage )
             // write other settings
@@ -245,7 +246,7 @@ RTSPaperPage::RTSPaperPage( RTSDialog* pParent ) :
 
     FreeResource();
 
-    USHORT nPos = 0;
+    sal_uInt16 nPos = 0;
 
     m_aOrientBox.InsertEntry( PORTRAIT_STRING );
     m_aOrientBox.InsertEntry( LSCAPE_STRING );
@@ -287,8 +288,8 @@ void RTSPaperPage::update()
     }
     else
     {
-        m_aDuplexText.Enable( FALSE );
-        m_aDuplexBox.Enable( FALSE );
+        m_aDuplexText.Enable( sal_False );
+        m_aDuplexBox.Enable( sal_False );
     }
 
     // paper
@@ -299,8 +300,8 @@ void RTSPaperPage::update()
     }
     else
     {
-        m_aPaperText.Enable( FALSE );
-        m_aPaperBox.Enable( FALSE );
+        m_aPaperText.Enable( sal_False );
+        m_aPaperBox.Enable( sal_False );
     }
 
     // input slots
@@ -311,8 +312,8 @@ void RTSPaperPage::update()
     }
     else
     {
-        m_aSlotText.Enable( FALSE );
-        m_aSlotBox.Enable( FALSE );
+        m_aSlotText.Enable( sal_False );
+        m_aSlotBox.Enable( sal_False );
     }
 }
 
@@ -367,8 +368,8 @@ RTSDevicePage::RTSDevicePage( RTSDialog* pParent ) :
         m_aPPDKeyBox( this, PaResId( RID_RTS_DEVICE_PPDKEY_BOX ) ),
         m_aPPDValueText( this, PaResId( RID_RTS_DEVICE_PPDVALUE_TXT ) ),
         m_aPPDValueBox( this, PaResId( RID_RTS_DEVICE_PPDVALUE_BOX ) ),
-        m_aLevelText( this, PaResId( RID_RTS_DEVICE_LEVEL_TXT ) ),
-        m_aLevelBox( this, PaResId( RID_RTS_DEVICE_LEVEL_BOX ) ),
+        m_aLevelText( this, PaResId( RID_RTS_DEVICE_PRINTLANG_TXT ) ),
+        m_aLevelBox( this, PaResId( RID_RTS_DEVICE_PRINTLANG_BOX ) ),
         m_aSpaceText( this, PaResId( RID_RTS_DEVICE_SPACE_TXT ) ),
         m_aSpaceBox( this, PaResId( RID_RTS_DEVICE_SPACE_BOX ) ),
         m_aDepthText( this, PaResId( RID_RTS_DEVICE_DEPTH_TXT ) ),
@@ -389,13 +390,19 @@ RTSDevicePage::RTSDevicePage( RTSDialog* pParent ) :
         case  1: m_aSpaceBox.SelectEntry( m_aSpaceColor );break;
     }
 
-    m_aLevelBox.InsertEntry( m_pParent->m_aFromDriverString );
-    m_aLevelBox.InsertEntry( String( RTL_CONSTASCII_USTRINGPARAM( "1" ) ) );
-    m_aLevelBox.InsertEntry( String( RTL_CONSTASCII_USTRINGPARAM( "2" ) ) );
-    if( m_pParent->m_aJobData.m_nPSLevel == 0 )
-        m_aLevelBox.SelectEntry( m_pParent->m_aFromDriverString );
+    sal_uLong nLevelEntryData = 0;
+    if( m_pParent->m_aJobData.m_nPDFDevice > 0 )
+        nLevelEntryData = 10;
     else
-        m_aLevelBox.SelectEntry( String::CreateFromInt32( m_pParent->m_aJobData.m_nPSLevel ) );
+        nLevelEntryData = m_pParent->m_aJobData.m_nPSLevel+1;
+    for( sal_uInt16 i = 0; i < m_aLevelBox.GetEntryCount(); i++ )
+    {
+        if( (sal_uLong)m_aLevelBox.GetEntryData( i ) == nLevelEntryData )
+        {
+            m_aLevelBox.SelectEntryPos( i );
+            break;
+        }
+    }
 
     m_aDepthBox.SelectEntry( String::CreateFromInt32( m_pParent->m_aJobData.m_nColorDepth ).AppendAscii( " Bit" ) );
 
@@ -413,7 +420,7 @@ RTSDevicePage::RTSDevicePage( RTSDialog* pParent ) :
                 )
             {
                 String aEntry( m_pParent->m_aJobData.m_pParser->translateKey( pKey->getKey() ) );
-                USHORT nPos = m_aPPDKeyBox.InsertEntry( aEntry );
+                sal_uInt16 nPos = m_aPPDKeyBox.InsertEntry( aEntry );
                 m_aPPDKeyBox.SetEntryData( nPos, (void*)pKey );
             }
         }
@@ -434,6 +441,22 @@ void RTSDevicePage::update()
 
 // ------------------------------------------------------------------
 
+sal_uLong RTSDevicePage::getLevel()
+{
+    sal_uLong nLevel = (sal_uLong)m_aLevelBox.GetEntryData( m_aLevelBox.GetSelectEntryPos() );
+    return nLevel < 10 ? nLevel-1 : 0;
+}
+
+// ------------------------------------------------------------------
+
+sal_uLong RTSDevicePage::getPDFDevice()
+{
+    sal_uLong nLevel = (sal_uLong)m_aLevelBox.GetEntryData( m_aLevelBox.GetSelectEntryPos() );
+    return nLevel > 9 ? 1 : 0;
+}
+
+// ------------------------------------------------------------------
+
 IMPL_LINK( RTSDevicePage, SelectHdl, ListBox*, pBox )
 {
     if( pBox == &m_aPPDKeyBox )
@@ -471,7 +494,7 @@ void RTSDevicePage::FillValueBox( const PPDKey* pKey )
             m_pParent->m_aJobData.m_pParser )
         {
             String aEntry( m_pParent->m_aJobData.m_pParser->translateOption( pKey->getKey(), pValue->m_aOption ) );
-            USHORT nPos = m_aPPDValueBox.InsertEntry( aEntry );
+            sal_uInt16 nPos = m_aPPDValueBox.InsertEntry( aEntry );
             m_aPPDValueBox.SetEntryData( nPos, (void*)pValue );
         }
     }
@@ -502,10 +525,10 @@ RTSOtherPage::RTSOtherPage( RTSDialog* pParent ) :
 {
     FreeResource();
 
-    m_aTopLB.EnableEmptyFieldValue( TRUE );
-    m_aBottomLB.EnableEmptyFieldValue( TRUE );
-    m_aLeftLB.EnableEmptyFieldValue( TRUE );
-    m_aRightLB.EnableEmptyFieldValue( TRUE );
+    m_aTopLB.EnableEmptyFieldValue( sal_True );
+    m_aBottomLB.EnableEmptyFieldValue( sal_True );
+    m_aLeftLB.EnableEmptyFieldValue( sal_True );
+    m_aRightLB.EnableEmptyFieldValue( sal_True );
 
     m_aDefaultBtn.SetClickHdl( LINK( this, RTSOtherPage, ClickBtnHdl ) );
 
@@ -639,16 +662,16 @@ RTSFontSubstPage::RTSFontSubstPage( RTSDialog* pParent ) :
     }
 
     m_aEnableBox.Check( m_pParent->m_aJobData.m_bPerformFontSubstitution );
-    m_aRemoveButton.Enable( FALSE );
+    m_aRemoveButton.Enable( sal_False );
     if( ! m_pParent->m_aJobData.m_bPerformFontSubstitution )
     {
-        m_aSubstitutionsBox.Enable( FALSE );
-        m_aSubstitutionsText.Enable( FALSE );
-        m_aAddButton.Enable( FALSE );
-        m_aToFontBox.Enable( FALSE );
-        m_aToFontText.Enable( FALSE );
-        m_aFromFontBox.Enable( FALSE );
-        m_aFromFontText.Enable( FALSE );
+        m_aSubstitutionsBox.Enable( sal_False );
+        m_aSubstitutionsText.Enable( sal_False );
+        m_aAddButton.Enable( sal_False );
+        m_aToFontBox.Enable( sal_False );
+        m_aToFontText.Enable( sal_False );
+        m_aFromFontBox.Enable( sal_False );
+        m_aFromFontText.Enable( sal_False );
     }
 
     update();
@@ -667,7 +690,7 @@ RTSFontSubstPage::~RTSFontSubstPage()
 void RTSFontSubstPage::update()
 {
     m_aSubstitutionsBox.Clear();
-    m_aRemoveButton.Enable( FALSE );
+    m_aRemoveButton.Enable( sal_False );
     // fill substitutions box
     ::boost::unordered_map< OUString, OUString, OUStringHash >::const_iterator it;
     for( it = m_pParent->m_aJobData.m_aFontSubstitutes.begin();
@@ -709,7 +732,7 @@ IMPL_LINK( RTSFontSubstPage, ClickBtnHdl, Button*, pButton )
         for( int i = 0; i < m_aSubstitutionsBox.GetSelectEntryCount(); i++ )
         {
             String aEntry( m_aSubstitutionsBox.GetSelectEntry( i ) );
-            USHORT nPos = aEntry.SearchAscii( " -> " );
+            sal_uInt16 nPos = aEntry.SearchAscii( " -> " );
             aEntry.Erase( nPos );
             m_pParent->m_aJobData.m_aFontSubstitutes.erase( aEntry );
         }
@@ -783,7 +806,7 @@ OString RTSPWDialog::getPassword() const
 
 extern "C" {
 
-    int Sal_SetupPrinterDriver( ::psp::PrinterInfo& rJobData )
+    int SPA_DLLPUBLIC Sal_SetupPrinterDriver( ::psp::PrinterInfo& rJobData )
     {
         int nRet = 0;
         RTSDialog aDialog( rJobData, rJobData.m_aPrinterName, false );
@@ -797,14 +820,14 @@ extern "C" {
         return nRet;
     }
 
-    int Sal_queryFaxNumber( String& rNumber )
+    int SPA_DLLPUBLIC Sal_queryFaxNumber( String& rNumber )
     {
         String aTmpString( PaResId( RID_TXT_QUERYFAXNUMBER ) );
         QueryString aQuery( NULL, aTmpString, rNumber );
         return aQuery.Execute();
     }
 
-    bool Sal_authenticateQuery( const OString& rServer, OString& rUserName, OString& rPassword )
+    bool SPA_DLLPUBLIC Sal_authenticateQuery( const OString& rServer, OString& rUserName, OString& rPassword )
     {
         bool bRet = false;
 
diff --git a/padmin/source/prtsetup.hxx b/padmin/source/prtsetup.hxx
index 10a7b57e857b..b6de919cee04 100644
--- a/padmin/source/prtsetup.hxx
+++ b/padmin/source/prtsetup.hxx
@@ -148,9 +148,10 @@ public:
 
     void update();
 
-    ULONG getLevel() { return m_aLevelBox.GetSelectEntry().ToInt32(); }
-    ULONG getDepth() { return m_aDepthBox.GetSelectEntry().ToInt32(); }
-    ULONG getColorDevice()
+    sal_uLong getLevel();
+    sal_uLong getPDFDevice();
+    sal_uLong getDepth() { return m_aDepthBox.GetSelectEntry().ToInt32(); }
+    sal_uLong getColorDevice()
     {
         String aSpace( m_aSpaceBox.GetSelectEntry() );
         return aSpace == m_aSpaceColor ? 1 : ( aSpace == m_aSpaceGray ? -1 : 0 );
diff --git a/padmin/source/rtsetup.hrc b/padmin/source/rtsetup.hrc
index 30439088de8e..7b6677de7ec4 100644
--- a/padmin/source/rtsetup.hrc
+++ b/padmin/source/rtsetup.hrc
@@ -48,13 +48,13 @@
 
 #define RID_RTS_DEVICEPAGE                  4003
 #define RID_RTS_DEVICE_COLOR_TXT            1
-#define RID_RTS_DEVICE_GRAY_TXT         2
+#define RID_RTS_DEVICE_GRAY_TXT             2
 #define RID_RTS_DEVICE_PPDKEY_TXT           3
 #define RID_RTS_DEVICE_PPDKEY_BOX           4
-#define RID_RTS_DEVICE_PPDVALUE_TXT     5
-#define RID_RTS_DEVICE_PPDVALUE_BOX     6
-#define RID_RTS_DEVICE_LEVEL_TXT            7
-#define RID_RTS_DEVICE_LEVEL_BOX            8
+#define RID_RTS_DEVICE_PPDVALUE_TXT         5
+#define RID_RTS_DEVICE_PPDVALUE_BOX         6
+#define RID_RTS_DEVICE_PRINTLANG_TXT        7
+#define RID_RTS_DEVICE_PRINTLANG_BOX        8
 #define RID_RTS_DEVICE_SPACE_TXT            9
 #define RID_RTS_DEVICE_SPACE_BOX            10
 #define RID_RTS_DEVICE_DEPTH_TXT            11
diff --git a/padmin/source/rtsetup.src b/padmin/source/rtsetup.src
index e04374a72245..38f3bf224a13 100644
--- a/padmin/source/rtsetup.src
+++ b/padmin/source/rtsetup.src
@@ -78,6 +78,7 @@ TabDialog RID_RTS_RTSDIALOG
 
 TabPage RID_RTS_PAPERPAGE
 {
+    HelpID = "padmin:TabPage:RID_RTS_PAPERPAGE";
     Hide = TRUE;
     Size = MAP_APPFONT( 230, 175 );
     FixedText RID_RTS_PAPER_PAPER_TXT
@@ -88,6 +89,7 @@ TabPage RID_RTS_PAPERPAGE
     };
     ListBox RID_RTS_PAPER_PAPER_BOX
     {
+        HelpID = "padmin:ListBox:RID_RTS_PAPERPAGE:RID_RTS_PAPER_PAPER_BOX";
         Border = TRUE;
         DropDown = TRUE;
         Pos = MAP_APPFONT( 115, 5 );
@@ -101,6 +103,7 @@ TabPage RID_RTS_PAPERPAGE
     };
     ListBox RID_RTS_PAPER_ORIENTATION_BOX
     {
+        HelpID = "padmin:ListBox:RID_RTS_PAPERPAGE:RID_RTS_PAPER_ORIENTATION_BOX";
         Border = TRUE;
         DropDown = TRUE;
         Pos = MAP_APPFONT( 115, 20 );
@@ -114,6 +117,7 @@ TabPage RID_RTS_PAPERPAGE
     };
     ListBox RID_RTS_PAPER_DUPLEX_BOX
     {
+        HelpID = "padmin:ListBox:RID_RTS_PAPERPAGE:RID_RTS_PAPER_DUPLEX_BOX";
         Border = TRUE;
         DropDown = TRUE;
         Pos = MAP_APPFONT( 115, 35 );
@@ -127,6 +131,7 @@ TabPage RID_RTS_PAPERPAGE
     };
     ListBox RID_RTS_PAPER_SLOT_BOX
     {
+        HelpID = "padmin:ListBox:RID_RTS_PAPERPAGE:RID_RTS_PAPER_SLOT_BOX";
         Border = TRUE;
         DropDown = TRUE;
         Pos = MAP_APPFONT( 115, 50 );
@@ -136,6 +141,7 @@ TabPage RID_RTS_PAPERPAGE
 
 TabPage RID_RTS_DEVICEPAGE
 {
+    HelpID = "padmin:TabPage:RID_RTS_DEVICEPAGE";
     Hide = TRUE;
     Size = MAP_APPFONT( 230, 175 );
 
@@ -156,6 +162,7 @@ TabPage RID_RTS_DEVICEPAGE
     };
     ListBox RID_RTS_DEVICE_PPDKEY_BOX
     {
+        HelpID = "padmin:ListBox:RID_RTS_DEVICEPAGE:RID_RTS_DEVICE_PPDKEY_BOX";
         Border = TRUE;
         Pos = MAP_APPFONT( 5, 14 );
         Size = MAP_APPFONT( 105, 111 );
@@ -168,22 +175,32 @@ TabPage RID_RTS_DEVICEPAGE
     };
     ListBox RID_RTS_DEVICE_PPDVALUE_BOX
     {
+        HelpID = "padmin:ListBox:RID_RTS_DEVICEPAGE:RID_RTS_DEVICE_PPDVALUE_BOX";
         Border = TRUE;
         Pos = MAP_APPFONT( 120, 14 );
         Size = MAP_APPFONT( 105, 111 );
     };
 
-    FixedText RID_RTS_DEVICE_LEVEL_TXT
+    FixedText RID_RTS_DEVICE_PRINTLANG_TXT
     {
         Pos = MAP_APPFONT( 5, 130 );
         Size = MAP_APPFONT( 80, 8 );
-        Text [ en-US ] = "PostScript ~Level";
+        Text [ en-US ] = "Printer ~Language type";
     };
-    ListBox RID_RTS_DEVICE_LEVEL_BOX
+    ListBox RID_RTS_DEVICE_PRINTLANG_BOX
     {
+        HelpID = "padmin:ListBox:RID_RTS_DEVICEPAGE:RID_RTS_DEVICE_LEVEL_BOX";
         DropDown = TRUE;
         Pos = MAP_APPFONT( 120, 130 );
         Size = MAP_APPFONT( 105, 200 );
+        StringList [en-US] =
+        {
+            < "PostScript (Level from driver)" ; 1; > ;
+            < "PostScript Level 1" ; 2; > ;
+            < "PostScript Level 2"; 3; > ;
+            < "PostScript Level 3"; 3; > ;
+            < "PDF"; 10; > ;
+        };
     };
     FixedText RID_RTS_DEVICE_SPACE_TXT
     {
@@ -193,6 +210,7 @@ TabPage RID_RTS_DEVICEPAGE
     };
     ListBox RID_RTS_DEVICE_SPACE_BOX
     {
+        HelpID = "padmin:ListBox:RID_RTS_DEVICEPAGE:RID_RTS_DEVICE_SPACE_BOX";
         DropDown = TRUE;
         Pos = MAP_APPFONT( 120,  145 );
         Size = MAP_APPFONT( 105, 200 );
@@ -205,6 +223,7 @@ TabPage RID_RTS_DEVICEPAGE
     };
     ListBox RID_RTS_DEVICE_DEPTH_BOX
     {
+        HelpID = "padmin:ListBox:RID_RTS_DEVICEPAGE:RID_RTS_DEVICE_DEPTH_BOX";
         DropDown = TRUE;
         Pos = MAP_APPFONT( 120, 160 );
         Size = MAP_APPFONT( 105, 200 );
@@ -218,11 +237,13 @@ TabPage RID_RTS_DEVICEPAGE
 
 TabPage RID_RTS_FONTSUBSTPAGE
 {
+    HelpID = "padmin:TabPage:RID_RTS_FONTSUBSTPAGE";
     Hide = TRUE;
     Size = MAP_APPFONT( 230, 175 );
 
     CheckBox RID_RTS_FS_ENABLE_BTN
     {
+        HelpID = "padmin:CheckBox:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_ENABLE_BTN";
         Pos = MAP_APPFONT( 5, 5 );
         Size = MAP_APPFONT( 180, 10 );
         Text [ en-US ] = "~Enable font replacement";
@@ -236,6 +257,7 @@ TabPage RID_RTS_FONTSUBSTPAGE
     };
     MultiListBox RID_RTS_FS_SUBST_BOX
     {
+        HelpID = "padmin:MultiListBox:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_SUBST_BOX";
         AutoHScroll = TRUE;
         Border = TRUE;
         Sort = TRUE;
@@ -245,12 +267,14 @@ TabPage RID_RTS_FONTSUBSTPAGE
     };
     PushButton RID_RTS_FS_ADD_BTN
     {
+        HelpID = "padmin:PushButton:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_ADD_BTN";
         Pos = MAP_APPFONT( 5, 125 );
         Size = MAP_APPFONT( 107, 12 );
         Text [ en-US ] = "~Add";
     };
     PushButton RID_RTS_FS_REMOVE_BTN
     {
+        HelpID = "padmin:PushButton:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_REMOVE_BTN";
         Pos = MAP_APPFONT( 117, 125 );
         Size = MAP_APPFONT( 107, 12 );
         Text [ en-US ] = "~Remove";
@@ -263,6 +287,7 @@ TabPage RID_RTS_FONTSUBSTPAGE
     };
     ComboBox RID_RTS_FS_FROM_BOX
     {
+        HelpID = "padmin:ComboBox:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_FROM_BOX";
         Border = TRUE;
         DropDown = TRUE;
         Sort = TRUE;
@@ -277,6 +302,7 @@ TabPage RID_RTS_FONTSUBSTPAGE
     };
     ListBox RID_RTS_FS_TO_BOX
     {
+        HelpID = "padmin:ListBox:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_TO_BOX";
         Border = TRUE;
         DropDown = TRUE;
         Sort = TRUE;
@@ -287,11 +313,13 @@ TabPage RID_RTS_FONTSUBSTPAGE
 
 TabPage RID_RTS_COMMANDPAGE
 {
+    HelpID = "padmin:TabPage:RID_RTS_COMMANDPAGE";
     Hide = TRUE;
     Size = MAP_APPFONT( 230, 175 );
 
     ComboBox RID_RTS_CMD_CB_COMMANDS
     {
+        HelpID = "padmin:ComboBox:RID_RTS_COMMANDPAGE:RID_RTS_CMD_CB_COMMANDS";
         Border = TRUE ;
         Sort = TRUE ;
         Dropdown = TRUE;
@@ -300,6 +328,7 @@ TabPage RID_RTS_COMMANDPAGE
     };
     CheckBox RID_RTS_CMD_CB_EXTERNAL
     {
+        HelpID = "padmin:CheckBox:RID_RTS_COMMANDPAGE:RID_RTS_CMD_CB_EXTERNAL";
         Pos = MAP_APPFONT( 11, 95 );
         Size = MAP_APPFONT( 220, 10 );
         Text [ en-US ] = "~Use system print dialog, disable %PRODUCTNAME's print dialog";
@@ -313,6 +342,7 @@ TabPage RID_RTS_COMMANDPAGE
     };
     ComboBox RIT_RTS_CMD_CB_QUICKCMD
     {
+        HelpID = "padmin:ComboBox:RID_RTS_COMMANDPAGE:RIT_RTS_CMD_CB_QUICKCMD";
         Border = TRUE;
         Sort = TRUE;
         Dropdown = TRUE;
@@ -340,6 +370,7 @@ TabPage RID_RTS_COMMANDPAGE
 
     ListBox RID_RTS_CMD_LB_CONFIGURE
     {
+        HelpID = "padmin:ListBox:RID_RTS_COMMANDPAGE:RID_RTS_CMD_LB_CONFIGURE";
         DropDown = true;
         Border = true;
         Pos = MAP_APPFONT( 101, 56 );
@@ -354,6 +385,7 @@ TabPage RID_RTS_COMMANDPAGE
 
     CheckBox RID_RTS_CMD_BOX_SWALLOWFAXNO
     {
+        HelpID = "padmin:CheckBox:RID_RTS_COMMANDPAGE:RID_RTS_CMD_BOX_SWALLOWFAXNO";
         Pos = MAP_APPFONT( 11, 146 );
         Size = MAP_APPFONT( 130, 8 );
         Text [ en-US ] = "~Fax number will be removed from output";
@@ -366,12 +398,14 @@ TabPage RID_RTS_COMMANDPAGE
     };
     Edit RID_RTS_CMD_EDT_PDFDIR
     {
+        HelpID = "padmin:Edit:RID_RTS_COMMANDPAGE:RID_RTS_CMD_EDT_PDFDIR";
         Border = TRUE;
         Pos = MAP_APPFONT( 11, 155 );
         Size = MAP_APPFONT( 130, 12 );
     };
     PushButton RID_RTS_CMD_BTN_PDFDIR
     {
+        HelpID = "padmin:PushButton:RID_RTS_COMMANDPAGE:RID_RTS_CMD_BTN_PDFDIR";
         Pos = MAP_APPFONT( 146, 155 );
         Size = MAP_APPFONT( 15, 12 );
         Text = "...";
@@ -395,12 +429,14 @@ TabPage RID_RTS_COMMANDPAGE
     };
     PushButton RID_RTS_CMD_BTN_HELP
     {
+        HelpID = "padmin:PushButton:RID_RTS_COMMANDPAGE:RID_RTS_CMD_BTN_HELP";
         Pos = MAP_APPFONT( 170, 55 );
         Size = MAP_APPFONT( 50, 12 );
         Text [ en-US ] = "~Help";
     };
     PushButton RID_RTS_CMD_BTN_REMOVE
     {
+        HelpID = "padmin:PushButton:RID_RTS_COMMANDPAGE:RID_RTS_CMD_BTN_REMOVE";
         Pos = MAP_APPFONT( 170, 72 );
         Size = MAP_APPFONT( 50, 12 );
         Text [ en-US ] = "~Remove";
@@ -421,6 +457,7 @@ TabPage RID_RTS_COMMANDPAGE
 
 TabPage RID_RTS_OTHERPAGE
 {
+    HelpID = "padmin:TabPage:RID_RTS_OTHERPAGE";
     Hide = TRUE;
     Size = MAP_APPFONT( 230, 175 );
 
@@ -432,6 +469,7 @@ TabPage RID_RTS_OTHERPAGE
     };
     MetricField RID_RTS_OTHER_LEFTMARGIN_BOX
     {
+        HelpID = "padmin:MetricField:RID_RTS_OTHERPAGE:RID_RTS_OTHER_LEFTMARGIN_BOX";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 100 , 5 ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
@@ -448,6 +486,7 @@ TabPage RID_RTS_OTHERPAGE
     };
     MetricField RID_RTS_OTHER_TOPMARGIN_BOX
     {
+        HelpID = "padmin:MetricField:RID_RTS_OTHERPAGE:RID_RTS_OTHER_TOPMARGIN_BOX";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 100 , 20 ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
@@ -464,6 +503,7 @@ TabPage RID_RTS_OTHERPAGE
     };
     MetricField RID_RTS_OTHER_RIGHTMARGIN_BOX
     {
+        HelpID = "padmin:MetricField:RID_RTS_OTHERPAGE:RID_RTS_OTHER_RIGHTMARGIN_BOX";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 100 , 35 ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
@@ -480,6 +520,7 @@ TabPage RID_RTS_OTHERPAGE
     };
     MetricField RID_RTS_OTHER_BOTTOMMARGIN_BOX
     {
+        HelpID = "padmin:MetricField:RID_RTS_OTHERPAGE:RID_RTS_OTHER_BOTTOMMARGIN_BOX";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 100 , 50 ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
@@ -496,12 +537,14 @@ TabPage RID_RTS_OTHERPAGE
     };
     Edit RID_RTS_OTHER_COMMENT_EDT
     {
+        HelpID = "padmin:Edit:RID_RTS_OTHERPAGE:RID_RTS_OTHER_COMMENT_EDT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 5 , 75 ) ;
         Size = MAP_APPFONT ( 220 , 12 ) ;
     };
     PushButton RID_RTS_OTHER_DEFAULT_BTN
     {
+        HelpID = "padmin:PushButton:RID_RTS_OTHERPAGE:RID_RTS_OTHER_DEFAULT_BTN";
         Pos = MAP_APPFONT( 175, 5 );
         Size = MAP_APPFONT( 50, 12 );
         Text [ en-US ] = "~Default";
@@ -515,6 +558,7 @@ String RID_TXT_QUERYFAXNUMBER
 
 ModalDialog RID_RTS_PWDIALOG
 {
+    HelpID = "padmin:ModalDialog:RID_RTS_PWDIALOG";
     Text [ en-US ] = "Authentication request";
     OutputSize = TRUE ;
     SVLook = TRUE ;
@@ -537,6 +581,7 @@ ModalDialog RID_RTS_PWDIALOG
     };
     Edit RID_RTS_PWDIALOG_USER_EDT
     {
+        HelpID = "padmin:Edit:RID_RTS_PWDIALOG:RID_RTS_PWDIALOG_USER_EDT";
         Pos = MAP_APPFONT( 70, 29 );
         Size = MAP_APPFONT( 75, 12 );
         Border = TRUE;
@@ -549,6 +594,7 @@ ModalDialog RID_RTS_PWDIALOG
     };
     Edit RID_RTS_PWDIALOG_PASS_EDT
     {
+        HelpID = "padmin:Edit:RID_RTS_PWDIALOG:RID_RTS_PWDIALOG_PASS_EDT";
         Pos = MAP_APPFONT( 70, 44 );
         Size = MAP_APPFONT( 75, 12 );
         Border = TRUE;
author	Jan Holesovsky <kendy@suse.cz>	2011-03-11 14:24:23 +0100
committer	Jan Holesovsky <kendy@suse.cz>	2011-03-11 14:24:23 +0100
commit	67d2af6fac2d9bad52a6b1f6e0cbd1229eb88a42 (patch)
tree	898019746162b464578da9c8345158a74321c904 /padmin
parent	86fb5fff88be611785b7908aac2a44475d77705f (diff)
parent	e2a3d487efb2bd5e582eb10e4150530c3f7377c5 (diff)