summaryrefslogtreecommitdiff
path: root/rsc
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-03-11 14:24:23 +0100
committerJan Holesovsky <kendy@suse.cz>2011-03-11 14:24:23 +0100
commit67d2af6fac2d9bad52a6b1f6e0cbd1229eb88a42 (patch)
tree898019746162b464578da9c8345158a74321c904 /rsc
parent86fb5fff88be611785b7908aac2a44475d77705f (diff)
parente2a3d487efb2bd5e582eb10e4150530c3f7377c5 (diff)
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
Diffstat (limited to 'rsc')
-rw-r--r--rsc/inc/rsc/rscsfx.hxx (renamed from rsc/inc/rscsfx.hxx)0
-rw-r--r--rsc/inc/rscall.h2
-rw-r--r--rsc/inc/rscarray.hxx14
-rw-r--r--rsc/inc/rscclass.hxx34
-rw-r--r--rsc/inc/rscclobj.hxx16
-rw-r--r--rsc/inc/rscconst.hxx26
-rw-r--r--rsc/inc/rsccont.hxx36
-rw-r--r--rsc/inc/rscdb.hxx46
-rw-r--r--rsc/inc/rscdef.hxx138
-rw-r--r--rsc/inc/rscerror.h6
-rw-r--r--rsc/inc/rscflag.hxx28
-rw-r--r--rsc/inc/rscinst.hxx60
-rw-r--r--rsc/inc/rsckey.hxx8
-rw-r--r--rsc/inc/rsclst.hxx8
-rw-r--r--rsc/inc/rscmgr.hxx16
-rw-r--r--rsc/inc/rscpar.hxx24
-rw-r--r--rsc/inc/rscrange.hxx90
-rw-r--r--rsc/inc/rscrsc.hxx4
-rw-r--r--rsc/inc/rscstr.hxx12
-rw-r--r--rsc/inc/rsctools.hxx12
-rw-r--r--rsc/inc/rsctop.hxx30
-rw-r--r--rsc/inc/rsctree.hxx6
-rw-r--r--rsc/inc/vclrsc.hxx179
-rw-r--r--rsc/prj/d.lst2
-rw-r--r--rsc/source/misc/rscdbl.cxx6
-rw-r--r--rsc/source/misc/rsclst.cxx4
-rw-r--r--rsc/source/parser/erscerr.cxx2
-rw-r--r--rsc/source/parser/rscdb.cxx79
-rw-r--r--rsc/source/parser/rscibas.cxx32
-rw-r--r--rsc/source/parser/rscicpx.cxx61
-rw-r--r--rsc/source/parser/rscinit.cxx108
-rw-r--r--rsc/source/parser/rsckey.cxx10
-rwxr-xr-x[-rw-r--r--]rsc/source/parser/rsclex.cxx43
-rw-r--r--rsc/source/parser/rsclex.hxx2
-rw-r--r--rsc/source/parser/rscpar.cxx12
-rw-r--r--rsc/source/parser/rscyacc.cxx22
-rw-r--r--rsc/source/parser/rscyacc.y42
-rw-r--r--rsc/source/prj/start.cxx38
-rw-r--r--rsc/source/res/rscall.cxx4
-rw-r--r--rsc/source/res/rscarray.cxx40
-rw-r--r--rsc/source/res/rscclass.cxx142
-rw-r--r--rsc/source/res/rscclobj.cxx24
-rw-r--r--rsc/source/res/rscconst.cxx38
-rw-r--r--rsc/source/res/rsccont.cxx66
-rw-r--r--rsc/source/res/rscflag.cxx54
-rw-r--r--rsc/source/res/rscmgr.cxx30
-rw-r--r--rsc/source/res/rscrange.cxx102
-rw-r--r--rsc/source/res/rscstr.cxx28
-rw-r--r--rsc/source/res/rsctop.cxx38
-rw-r--r--rsc/source/rsc/rsc.cxx188
-rw-r--r--rsc/source/tools/rscchar.cxx10
-rw-r--r--rsc/source/tools/rscdef.cxx187
-rw-r--r--rsc/source/tools/rsctools.cxx20
-rw-r--r--rsc/source/tools/rsctree.cxx28
54 files changed, 1032 insertions, 1225 deletions
diff --git a/rsc/inc/rscsfx.hxx b/rsc/inc/rsc/rscsfx.hxx
index 36babfb8c520..36babfb8c520 100644
--- a/rsc/inc/rscsfx.hxx
+++ b/rsc/inc/rsc/rscsfx.hxx
diff --git a/rsc/inc/rscall.h b/rsc/inc/rscall.h
index d66f3aa325d6..fed155cc90d3 100644
--- a/rsc/inc/rscall.h
+++ b/rsc/inc/rscall.h
@@ -96,7 +96,7 @@ struct RSCINST {
pClass = pCl;
pData = pClassData;
}
- BOOL IsInst() const { return( pData != NULL ); }
+ sal_Bool IsInst() const { return( pData != NULL ); }
};
/********************** S U B I N F O S T R U C T ************************/
diff --git a/rsc/inc/rscarray.hxx b/rsc/inc/rscarray.hxx
index 9d91534728ce..52ef742b55f7 100644
--- a/rsc/inc/rscarray.hxx
+++ b/rsc/inc/rscarray.hxx
@@ -81,9 +81,9 @@ public:
pTypeClass = pClass;
}
virtual RscTop * GetTypeClass() const;
- RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, BOOL );
+ RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool );
void Destroy( const RSCINST & rInst );
- virtual ERRTYPE GetValueEle( const RSCINST & rInst, INT32 lValue,
+ virtual ERRTYPE GetValueEle( const RSCINST & rInst, sal_Int32 lValue,
RscTop * pCreateClass,
RSCINST * pGetInst );
virtual ERRTYPE GetArrayEle( const RSCINST & rInst, Atom nId,
@@ -93,10 +93,10 @@ public:
// Gibt die Groesse der Klasse in Bytes
sal_uInt32 Size(){ return( nSize ); };
- BOOL IsConsistent( const RSCINST & rInst );
+ sal_Bool IsConsistent( const RSCINST & rInst );
virtual void SetToDefault( const RSCINST & rInst );
- BOOL IsDefault( const RSCINST & rInst );
- BOOL IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
+ sal_Bool IsDefault( const RSCINST & rInst );
+ sal_Bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
virtual void WriteSrcHeader( const RSCINST & rInst, FILE * fOutput,
RscTypCont * pTC, sal_uInt32 nTab,
@@ -104,7 +104,7 @@ public:
void WriteSrc( const RSCINST & rInst, FILE * fOutput,
RscTypCont * pTC, sal_uInt32 nTab, const char * );
ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, BOOL bExtra );
+ RscTypCont * pTC, sal_uInt32, sal_Bool bExtra );
virtual void WriteRcAccess( FILE * fOutput, RscTypCont * pTC,
const char * );
};
@@ -122,7 +122,7 @@ public:
RscTypCont * pTC, sal_uInt32 nTab, const char * );
virtual ERRTYPE WriteRcHeader( const RSCINST & rInst, RscWriteRc & aMem,
RscTypCont * pTC, const RscId & aId,
- sal_uInt32 nDeep, BOOL bExtra );
+ sal_uInt32 nDeep, sal_Bool bExtra );
};
diff --git a/rsc/inc/rscclass.hxx b/rsc/inc/rscclass.hxx
index 49d8250af0a7..7dc3e95488ad 100644
--- a/rsc/inc/rscclass.hxx
+++ b/rsc/inc/rscclass.hxx
@@ -38,7 +38,7 @@ class RscClass : public RscTop
{
protected:
struct RscClassInst{
- ULONG nVarDflt;
+ sal_uLong nVarDflt;
};
struct VARTYPE_STRUCT {
Atom nVarName; // Variablenname
@@ -55,13 +55,13 @@ protected:
sal_uInt32 nEntries; // Eintraege in pVarTypeList
VARTYPE_STRUCT * pVarTypeList; // Variablenliste
RSCINST GetInstData( CLASS_DATA pData, sal_uInt32 nEle,
- BOOL bGetCopy = FALSE );
+ sal_Bool bGetCopy = sal_False );
CLASS_DATA GetDfltData( sal_uInt32 nEle );
- BOOL IsDflt( CLASS_DATA pData, sal_uInt32 nEle );
- BOOL IsValueDflt( CLASS_DATA pData, sal_uInt32 nEle );
+ sal_Bool IsDflt( CLASS_DATA pData, sal_uInt32 nEle );
+ sal_Bool IsValueDflt( CLASS_DATA pData, sal_uInt32 nEle );
void SetVarDflt( CLASS_DATA pData, sal_uInt32 nEle,
- BOOL bSet );
- INT32 GetCorrectValues( const RSCINST & rInst, sal_uInt32 nVarPos,
+ sal_Bool bSet );
+ sal_Int32 GetCorrectValues( const RSCINST & rInst, sal_uInt32 nVarPos,
sal_uInt32 nTupelIdx, RscTypCont * pTC );
public:
RscClass( Atom nId, sal_uInt32 nTypId, RscTop * pSuperCl );
@@ -77,29 +77,29 @@ public:
virtual void EnumVariables( void * pData, VarEnumCallbackProc );
RSCINST GetVariable( const RSCINST & rInst, Atom nVarName,
const RSCINST & rInitInst,
- BOOL nInitDflt = FALSE,
+ sal_Bool nInitDflt = sal_False,
RscTop * pCreateClass = NULL );
RSCINST GetCopyVar( const RSCINST & rInst, Atom nVarName );
// Gibt die Groesse der Klasse in Bytes
sal_uInt32 Size(){ return( nSize ); };
- BOOL IsConsistent( const RSCINST & rInst );
+ sal_Bool IsConsistent( const RSCINST & rInst );
void SetToDefault( const RSCINST & rInst );
- BOOL IsDefault( const RSCINST & rInst );
- BOOL IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
+ sal_Bool IsDefault( const RSCINST & rInst );
+ sal_Bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
void SetDefault( const RSCINST & rData, Atom nVarId );
using RscTop::GetDefault;
RSCINST GetDefault( Atom nVarId );
- RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, BOOL );
+ RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool );
void Destroy( const RSCINST & rInst );
void WriteSrc( const RSCINST & rInst, FILE * fOutput,
RscTypCont * pTC, sal_uInt32 nTab, const char * );
ERRTYPE WriteInstRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, BOOL bExtra );
+ RscTypCont * pTC, sal_uInt32, sal_Bool bExtra );
ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, BOOL bExtra );
+ RscTypCont * pTC, sal_uInt32, sal_Bool bExtra );
void WriteSyntax( FILE * fOutput, RscTypCont * pTC );
void WriteRcAccess( FILE * fOutput, RscTypCont * pTC,
@@ -112,10 +112,10 @@ class RscSysDepend : public RscClass
public:
RscSysDepend( Atom nId, sal_uInt32 nTypId, RscTop * pSuper );
ERRTYPE WriteSysDependRc( const RSCINST &, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, BOOL bExtra,
- BOOL bFirst = FALSE );
+ RscTypCont * pTC, sal_uInt32, sal_Bool bExtra,
+ sal_Bool bFirst = sal_False );
ERRTYPE WriteRc( const RSCINST &, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, BOOL bExtra );
+ RscTypCont * pTC, sal_uInt32, sal_Bool bExtra );
};
class RscFirstSysDepend : public RscSysDepend
@@ -124,7 +124,7 @@ public:
RscFirstSysDepend( Atom nId, sal_uInt32 nTypId,
RscTop * pSuper );
ERRTYPE WriteRc( const RSCINST &, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, BOOL bExtra );
+ RscTypCont * pTC, sal_uInt32, sal_Bool bExtra );
};
class RscTupel : public RscClass
diff --git a/rsc/inc/rscclobj.hxx b/rsc/inc/rscclobj.hxx
index b75ab715feb6..3a6006501b7a 100644
--- a/rsc/inc/rscclobj.hxx
+++ b/rsc/inc/rscclobj.hxx
@@ -36,23 +36,23 @@
class ObjNode : public IdNode{
RscId aRscId; // Id der Resource
CLASS_DATA pRscObj;// pointer to a resourceobject
- ULONG lFileKey;// Dateischluessel
+ sal_uLong lFileKey;// Dateischluessel
protected:
using NameNode::Search;
public:
using NameNode::Insert;
- ObjNode( const RscId & rId, CLASS_DATA pData, ULONG lKey );
- ObjNode * DelObjNode( RscTop * pClass, ULONG lFileKey );
+ ObjNode( const RscId & rId, CLASS_DATA pData, sal_uLong lKey );
+ ObjNode * DelObjNode( RscTop * pClass, sal_uLong lFileKey );
sal_uInt32 GetId() const;
RscId GetRscId(){ return( aRscId ); }
- ULONG GetFileKey(){ return lFileKey; };
+ sal_uLong GetFileKey(){ return lFileKey; };
ObjNode* Search( const RscId &rName ) const{
// search the index in the b-tree
return( (ObjNode *)IdNode::Search( rName ) );
}
- BOOL Insert( ObjNode* pTN ){
+ sal_Bool Insert( ObjNode* pTN ){
// insert a new node in the b-tree
return( IdNode::Insert( (IdNode *)pTN ) );
}
@@ -60,7 +60,7 @@ public:
// get the Object from this Node
return( pRscObj );
}
- BOOL IsConsistent();
+ sal_Bool IsConsistent();
};
/******************* R e f N o d e ***************************************/
@@ -79,11 +79,11 @@ public:
// search the index in the b-tree
return( (RefNode *)IdNode::Search( typ ) );
};
- BOOL Insert( RefNode* pTN ){
+ sal_Bool Insert( RefNode* pTN ){
// insert a new node in the b-tree
return( IdNode::Insert( (IdNode *)pTN ) );
};
- BOOL PutObjNode( ObjNode * pPutObject );
+ sal_Bool PutObjNode( ObjNode * pPutObject );
// insert new node in b-tree pObjBiTree
ObjNode * GetObjNode( const RscId &rRscId );
diff --git a/rsc/inc/rscconst.hxx b/rsc/inc/rscconst.hxx
index 6e13728f0448..d1ebeeff87d3 100644
--- a/rsc/inc/rscconst.hxx
+++ b/rsc/inc/rscconst.hxx
@@ -39,7 +39,7 @@ class RscConst : public RscTop
protected:
struct VarEle {
Atom nId; // Name der Konstante
- INT32 lValue; // Wert der Konstante
+ sal_Int32 lValue; // Wert der Konstante
};
VarEle * pVarArray; // Zeiger auf das Feld mit Konstanten
sal_uInt32 nEntries; // Anzahle der Eintraege im Feld
@@ -49,10 +49,10 @@ public:
virtual RSCCLASS_TYPE GetClassType() const;
sal_uInt32 GetEntryCount() const { return nEntries; }
// Die erlaubten Werte werden gesetzt
- ERRTYPE SetConstant( Atom nVarName, INT32 lValue );
+ ERRTYPE SetConstant( Atom nVarName, sal_Int32 lValue );
Atom GetConstant( sal_uInt32 nPos );
- BOOL GetConstValue( Atom nConstId, INT32 * pVal ) const;
- BOOL GetValueConst( INT32 nValue, Atom * pConstId ) const;
+ sal_Bool GetConstValue( Atom nConstId, sal_Int32 * pVal ) const;
+ sal_Bool GetValueConst( sal_Int32 nValue, Atom * pConstId ) const;
sal_uInt32 GetConstPos( Atom nConstId );
virtual void WriteSyntax( FILE * fOutput, RscTypCont * pTC );
virtual void WriteRcAccess( FILE * fOutput, RscTypCont * pTC,
@@ -63,34 +63,34 @@ public:
class RscEnum : public RscConst {
struct RscEnumInst {
sal_uInt32 nValue; // Position der Konstanten im Array
- BOOL bDflt; // Ist Default
+ sal_Bool bDflt; // Ist Default
};
sal_uInt32 nSize;
public:
RscEnum( Atom nId, sal_uInt32 nTypId );
- RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, BOOL );
+ RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, sal_Bool );
sal_uInt32 Size(){ return nSize; }
virtual void SetToDefault( const RSCINST & rInst )
{
- ((RscEnumInst*)rInst.pData)->bDflt = TRUE;
+ ((RscEnumInst*)rInst.pData)->bDflt = sal_True;
}
- BOOL IsDefault( const RSCINST & rInst )
+ sal_Bool IsDefault( const RSCINST & rInst )
{
return( ((RscEnumInst*)rInst.pData)->bDflt );
};
// Als Default setzen
- BOOL IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
+ sal_Bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
ERRTYPE SetConst( const RSCINST & rInst, Atom nValueId,
- INT32 nValue );
- ERRTYPE SetNumber( const RSCINST & rInst, INT32 nValue );
+ sal_Int32 nValue );
+ ERRTYPE SetNumber( const RSCINST & rInst, sal_Int32 nValue );
ERRTYPE GetConst( const RSCINST & rInst, Atom * );
- ERRTYPE GetNumber( const RSCINST & rInst, INT32 * nValue );
+ ERRTYPE GetNumber( const RSCINST & rInst, sal_Int32 * nValue );
void WriteSrc( const RSCINST &rInst, FILE * fOutput,
RscTypCont * pTC, sal_uInt32 nTab, const char * );
ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, BOOL bExtra );
+ RscTypCont * pTC, sal_uInt32, sal_Bool bExtra );
};
class RscNameTable;
diff --git a/rsc/inc/rsccont.hxx b/rsc/inc/rsccont.hxx
index 07977cabbd52..3c34377bbe1a 100644
--- a/rsc/inc/rsccont.hxx
+++ b/rsc/inc/rsccont.hxx
@@ -42,7 +42,7 @@ struct ENTRY_STRUCT {
struct RscBaseContInst {
sal_uInt32 nEntries;
ENTRY_STRUCT * pEntries;
- BOOL bDflt;
+ sal_Bool bDflt;
};
class RscBaseCont : public RscTop
@@ -50,7 +50,7 @@ class RscBaseCont : public RscTop
protected:
RscTop * pTypeClass; // Typ der Eintraege
RscTop * pTypeClass1;// Zwei verschiedene Typen moeglich
- BOOL bNoId; // Keine Identifier
+ sal_Bool bNoId; // Keine Identifier
sal_uInt32 nSize; // Groesse der Instanzdaten dieser Klasse
// mit Superklassen
sal_uInt32 nOffInstData;// Offset auf eigen Instanzdaten
@@ -61,13 +61,13 @@ protected:
void ContWriteSrc( const RSCINST & rInst, FILE * fOutput,
RscTypCont * pTC, sal_uInt32 nTab, const char * );
ERRTYPE ContWriteRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, BOOL bExtra );
+ RscTypCont * pTC, sal_uInt32, sal_Bool bExtra );
void ContWriteRcAccess( FILE * fOutput, RscTypCont * pTC,
- const char *, BOOL nWriteSize );
+ const char *, sal_Bool nWriteSize );
public:
RscBaseCont( Atom nId, sal_uInt32 nTypId,
RscTop * pSuper = NULL,
- BOOL bNoId = TRUE );
+ sal_Bool bNoId = sal_True );
~RscBaseCont();
virtual RSCCLASS_TYPE GetClassType() const;
void SetTypeClass( RscTop * pClass, RscTop * pClass1 = NULL )
@@ -75,7 +75,7 @@ public:
pTypeClass = pClass;
pTypeClass1 = pClass1;
};
- RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, BOOL );
+ RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool );
void Destroy( const RSCINST & rInst );
ERRTYPE GetElement( const RSCINST & rInst, const RscId & rEleName,
RscTop * pCreateClass, const RSCINST & rCreateInst,
@@ -90,19 +90,19 @@ public:
const RscId & rRscId);
SUBINFO_STRUCT GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos );
ERRTYPE SetString( const RSCINST &, const char * pStr );
- ERRTYPE SetNumber( const RSCINST &, INT32 lValue );
- ERRTYPE SetBool( const RSCINST & rInst, BOOL bValue );
+ ERRTYPE SetNumber( const RSCINST &, sal_Int32 lValue );
+ ERRTYPE SetBool( const RSCINST & rInst, sal_Bool bValue );
ERRTYPE SetConst( const RSCINST & rInst, Atom nValueId,
- INT32 nValue );
+ sal_Int32 nValue );
ERRTYPE SetRef( const RSCINST & rInst, const RscId & rRefId );
// Gibt die Groesse der Klasse in Bytes
sal_uInt32 Size(){ return( nSize ); };
- BOOL IsConsistent( const RSCINST & rInst );
+ sal_Bool IsConsistent( const RSCINST & rInst );
void SetToDefault( const RSCINST & rInst );
- BOOL IsDefault( const RSCINST & rInst );
- BOOL IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
+ sal_Bool IsDefault( const RSCINST & rInst );
+ sal_Bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
void Delete( const RSCINST & rInst, RscTop * pClass,
const RscId & rId );
@@ -111,7 +111,7 @@ public:
void WriteSrc( const RSCINST & rInst, FILE * fOutput,
RscTypCont * pTC, sal_uInt32 nTab, const char * );
ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32 , BOOL bExtra);
+ RscTypCont * pTC, sal_uInt32 , sal_Bool bExtra);
ERRTYPE WriteHxx( const RSCINST & rInst, FILE * fOutput,
RscTypCont * pTC, const RscId & rId );
ERRTYPE WriteCxx( const RSCINST & rInst, FILE * fOutput,
@@ -124,7 +124,7 @@ class RscContWriteSrc : public RscBaseCont
public:
RscContWriteSrc( Atom nId, sal_uInt32 nTypId,
RscTop * pSuper = NULL,
- BOOL bNoId = TRUE );
+ sal_Bool bNoId = sal_True );
void WriteSrc( const RSCINST & rInst, FILE * fOutput,
RscTypCont * pTC, sal_uInt32 nTab, const char * );
};
@@ -134,9 +134,9 @@ class RscCont : public RscContWriteSrc {
public:
RscCont( Atom nId, sal_uInt32 nTypId,
RscTop * pSuper = NULL,
- BOOL bNoId = TRUE );
+ sal_Bool bNoId = sal_True );
ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, BOOL bExtra );
+ RscTypCont * pTC, sal_uInt32, sal_Bool bExtra );
void WriteRcAccess( FILE * fOutput, RscTypCont * pTC,
const char * );
};
@@ -146,9 +146,9 @@ class RscContExtraData : public RscContWriteSrc {
public:
RscContExtraData( Atom nId, sal_uInt32 nTypId,
RscTop * pSuper = NULL,
- BOOL bNoId = TRUE );
+ sal_Bool bNoId = sal_True );
ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, BOOL bExtra );
+ RscTypCont * pTC, sal_uInt32, sal_Bool bExtra );
};
#endif //_RSCCONT_HXX
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 8f939e33f3e1..54c386dab315 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -81,7 +81,7 @@ class RscTypCont
ByteString aSearchPath; // Suchen der Bitmap, Icon, Pointer
ByteString aSysSearchPath; // aSearchPath plus language specific paths
sal_uInt32 nUniqueId; // eindeutiger Id fuer Systemresourcen
- ULONG nFilePos; // Position in der Datei ( MTF )
+ sal_uLong nFilePos; // Position in der Datei ( MTF )
sal_uInt32 nPMId; // eindeutiger Id fuer PM-Rseourcefile
// muss groesser als RSC_VERSIONCONTROL_ID sein
RscTop * pRoot; // Zeiger auf die Wurzel vom Typenbaum
@@ -145,12 +145,11 @@ class RscTypCont
Atom nTopImageId;
Atom nNoLabelId;
Atom nVertId;
- Atom nSingleLineId;
Atom nSysWinId;
void Init(); // Initialisiert Klassen und Tabelle
- void SETCONST( RscConst *, const char *, UINT32 );
- void SETCONST( RscConst *, Atom, UINT32 );
+ void SETCONST( RscConst *, const char *, sal_uInt32 );
+ void SETCONST( RscConst *, Atom, sal_uInt32 );
RscEnum * InitLangType();
RscEnum * InitFieldUnitsType();
RscEnum * InitTimeFieldFormat();
@@ -269,7 +268,7 @@ class RscTypCont
void InsWinBit( RscTop * pClass, const ByteString & rName,
Atom nVal );
- void WriteInc( FILE * fOutput, ULONG lKey );
+ void WriteInc( FILE * fOutput, sal_uLong lKey );
public:
RscBool aBool;
@@ -288,6 +287,7 @@ public:
RscRange a0to9999Short;
RscIdRange aIdLong;
RscString aString;
+ RscString aStringLiteral;
RscFlag aWinBits;
RscLangEnum aLangType;
RscLangArray aLangString;
@@ -299,7 +299,7 @@ public:
RscNameTable aNmTb; // Tabelle fuer Namen
RscFileTab aFileTab; // Tabelle der Dateinamen
sal_uInt32 nFlags;
- std::map<sal_uInt64, ULONG> aIdTranslator; //Ordnet Resourcetypen und Id's einen Id zu
+ std::map<sal_uInt64, sal_uLong> aIdTranslator; //Ordnet Resourcetypen und Id's einen Id zu
//(unter PM), oder eine Dateiposition (MTF)
RscTypCont( RscError *, RSCBYTEORDER_TYPE, const ByteString & rSearchPath, sal_uInt32 nFlags );
@@ -307,14 +307,14 @@ public:
Atom AddLanguage( const char* );
- BOOL IsPreload() const
- { return (nFlags & PRELOAD_FLAG) ? TRUE : FALSE; }
- BOOL IsSmart() const
- { return (nFlags & SMART_FLAG) ? TRUE : FALSE; }
- BOOL IsSysResTest() const
- { return (nFlags & NOSYSRESTEST_FLAG) ? FALSE : TRUE; }
- BOOL IsSrsDefault() const
- { return (nFlags & SRSDEFAULT_FLAG) ? TRUE : FALSE; }
+ sal_Bool IsPreload() const
+ { return (nFlags & PRELOAD_FLAG) ? sal_True : sal_False; }
+ sal_Bool IsSmart() const
+ { return (nFlags & SMART_FLAG) ? sal_True : sal_False; }
+ sal_Bool IsSysResTest() const
+ { return (nFlags & NOSYSRESTEST_FLAG) ? sal_False : sal_True; }
+ sal_Bool IsSrsDefault() const
+ { return (nFlags & SRSDEFAULT_FLAG) ? sal_True : sal_False; }
ByteString ChangeLanguage( const ByteString& rNewLang );
const std::vector< sal_uInt32 >& GetFallbacks() const
{ return aLangFallbacks; }
@@ -340,23 +340,23 @@ public:
CLASS_DATA Search( Atom typ, const RscId & rId );
void Delete( Atom typ, const RscId & rId );
// loescht alle Resourceobjekte diese Datei
- void Delete( ULONG lFileKey );
+ void Delete( sal_uLong lFileKey );
RscTop * GetRoot() { return( pRoot ); };
sal_uInt32 PutSysName( sal_uInt32 nRscTyp, char * pName, sal_uInt32 nConst,
- sal_uInt32 nId, BOOL bFirst );
+ sal_uInt32 nId, sal_Bool bFirst );
void ClearSysNames();
ERRTYPE WriteRc( WriteRcContext& rContext );
- void WriteSrc( FILE * fOutput, ULONG nFileIndex,
- CharSet nCharSet, BOOL bName = TRUE );
- ERRTYPE WriteHxx( FILE * fOutput, ULONG nFileKey);
- ERRTYPE WriteCxx( FILE * fOutput, ULONG nFileKey,
+ void WriteSrc( FILE * fOutput, sal_uLong nFileIndex,
+ CharSet nCharSet, sal_Bool bName = sal_True );
+ ERRTYPE WriteHxx( FILE * fOutput, sal_uLong nFileKey);
+ ERRTYPE WriteCxx( FILE * fOutput, sal_uLong nFileKey,
const ByteString & rHxxName );
void WriteSyntax( FILE * fOutput );
void WriteRcCtor( FILE * fOutput );
- void FillNameIdList( REResourceList * pList, ULONG lFileKey );
- BOOL MakeConsistent();
+ void FillNameIdList( REResourceList * pList, sal_uLong lFileKey );
+ sal_Bool MakeConsistent();
sal_uInt32 PutTranslatorKey( sal_uInt64 nKey );
- void IncFilePos( ULONG nOffset ){ nFilePos += nOffset; }
+ void IncFilePos( sal_uLong nOffset ){ nFilePos += nOffset; }
};
#endif
diff --git a/rsc/inc/rscdef.hxx b/rsc/inc/rscdef.hxx
index 3e6c21288fbe..4ff5e2201dd6 100644
--- a/rsc/inc/rscdef.hxx
+++ b/rsc/inc/rscdef.hxx
@@ -56,37 +56,37 @@ public:
} aExp;
char cType;
char cUnused;
- BOOL IsNumber() const { return( RSCEXP_LONG == cType ); }
- BOOL IsExpression()const { return( RSCEXP_EXP == cType ); }
- BOOL IsDefinition()const { return( RSCEXP_DEF == cType ); }
- BOOL IsNothing() const { return( RSCEXP_NOTHING == cType ); }
- void SetLong( INT32 lValue ){
+ sal_Bool IsNumber() const { return( RSCEXP_LONG == cType ); }
+ sal_Bool IsExpression()const { return( RSCEXP_EXP == cType ); }
+ sal_Bool IsDefinition()const { return( RSCEXP_DEF == cType ); }
+ sal_Bool IsNothing() const { return( RSCEXP_NOTHING == cType ); }
+ void SetLong( sal_Int32 lValue ){
aExp.aLong.nHi = (short)(lValue >> 16);
aExp.aLong.nLo = (unsigned short)lValue;
cType = RSCEXP_LONG;
}
- INT32 GetLong() const{
+ sal_Int32 GetLong() const{
return aExp.aLong.nLo |
- ((INT32)aExp.aLong.nHi << 16);
+ ((sal_Int32)aExp.aLong.nHi << 16);
}
- BOOL Evaluate( INT32 * pValue ) const;
+ sal_Bool Evaluate( sal_Int32 * pValue ) const;
void GetMacro( ByteString & ) const;
};
/*********** R s c I d ***************************************************/
class RscId
{
- static BOOL bNames;// FALSE, bei den Namenoperation nur Zahlen
+ static sal_Bool bNames;// sal_False, bei den Namenoperation nur Zahlen
public:
RscExpType aExp; // Zahl, Define oder Ausdruck
- INT32 GetNumber() const;
+ sal_Int32 GetNumber() const;
void Create( const RscExpType & rExpType );
void Create(){ aExp.cType = RSCEXP_NOTHING; }
RscId() { Create(); }
RscId( RscDefine * pEle );
- RscId( INT32 lNumber )
+ RscId( sal_Int32 lNumber )
{ aExp.SetLong( lNumber ); }
RscId( const RscExpType & rExpType )
@@ -102,19 +102,19 @@ public:
RscId& operator = ( const RscId& rRscId );
- static BOOL IsSetNames();
- static void SetNames( BOOL bSet = TRUE );
- operator INT32() const; // Gibt Nummer zurueck
+ static sal_Bool IsSetNames();
+ static void SetNames( sal_Bool bSet = sal_True );
+ operator sal_Int32() const; // Gibt Nummer zurueck
ByteString GetName() const; // Gibt den Namen des Defines zurueck
ByteString GetMacro() const; // Gibt das Macro zurueck
- BOOL operator < ( const RscId& rRscId ) const;
- BOOL operator > ( const RscId& rRscId ) const;
- BOOL operator == ( const RscId& rRscId ) const;
- BOOL operator <= ( const RscId& rRscId ) const
+ sal_Bool operator < ( const RscId& rRscId ) const;
+ sal_Bool operator > ( const RscId& rRscId ) const;
+ sal_Bool operator == ( const RscId& rRscId ) const;
+ sal_Bool operator <= ( const RscId& rRscId ) const
{ return !(operator > ( rRscId )); }
- BOOL operator >= ( const RscId& rRscId ) const
+ sal_Bool operator >= ( const RscId& rRscId ) const
{ return !(operator < ( rRscId )); }
- BOOL IsId() const { return !aExp.IsNothing(); }
+ sal_Bool IsId() const { return !aExp.IsNothing(); }
};
/*********** R s c D e f i n e *******************************************/
@@ -125,15 +125,15 @@ friend class RscDefineList;
friend class RscDefTree;
friend class RscExpression;
friend class RscId;
- ULONG lFileKey; // zu welcher Datei gehoert das Define
+ sal_uLong lFileKey; // zu welcher Datei gehoert das Define
sal_uInt32 nRefCount; // Wieviele Referenzen auf dieses Objekt
- INT32 lId; // Identifier
+ sal_Int32 lId; // Identifier
RscExpression * pExp; // Ausdruck
protected:
- RscDefine( ULONG lFileKey, const ByteString & rDefName,
- INT32 lDefId );
- RscDefine( ULONG lFileKey, const ByteString & rDefName,
+ RscDefine( sal_uLong lFileKey, const ByteString & rDefName,
+ sal_Int32 lDefId );
+ RscDefine( sal_uLong lFileKey, const ByteString & rDefName,
RscExpression * pExpression );
~RscDefine();
void IncRef(){ nRefCount++; }
@@ -142,14 +142,14 @@ protected:
void DefineToNumber();
void SetName( const ByteString & rNewName ){ aName = rNewName; }
void ChangeMacro( RscExpression * pExpression );
- void ChangeMacro( INT32 lIdentifier );
+ void ChangeMacro( sal_Int32 lIdentifier );
using StringNode::Search;
public:
RscDefine * Search( const char * );
- ULONG GetFileKey() const { return lFileKey; }
- BOOL Evaluate();
- INT32 GetNumber() const { return lId; }
+ sal_uLong GetFileKey() const { return lFileKey; }
+ sal_Bool Evaluate();
+ sal_Int32 GetNumber() const { return lId; }
ByteString GetMacro();
};
@@ -161,14 +161,14 @@ friend class RscFileTab;
private:
RscSubDefList maList;
// pExpression wird auf jedenfall Eigentum der Liste
- RscDefine * New( ULONG lFileKey, const ByteString & rDefName,
- INT32 lDefId, size_t lPos );
- RscDefine * New( ULONG lFileKey, const ByteString & rDefName,
+ RscDefine * New( sal_uLong lFileKey, const ByteString & rDefName,
+ sal_Int32 lDefId, size_t lPos );
+ RscDefine * New( sal_uLong lFileKey, const ByteString & rDefName,
RscExpression * pExpression, size_t lPos );
- BOOL Befor( const RscDefine * pFree, const RscDefine * pDepend );
- BOOL Remove( RscDefine * pDef );
- BOOL Remove( size_t nIndex );
- BOOL Remove();
+ sal_Bool Befor( const RscDefine * pFree, const RscDefine * pDepend );
+ sal_Bool Remove( RscDefine * pDef );
+ sal_Bool Remove( size_t nIndex );
+ sal_Bool Remove();
size_t GetPos( RscDefine* item ) {
for ( size_t i = 0, n = maList.size(); i < n; ++i )
if ( maList[ i ] == item )
@@ -189,16 +189,16 @@ public:
RscExpression( RscExpType aLE, char cOp,
RscExpType aRE );
~RscExpression();
- BOOL Evaluate( INT32 * pValue );
+ sal_Bool Evaluate( sal_Int32 * pValue );
ByteString GetMacro();
};
/********************** R S C F I L E ************************************/
class RscDepend {
- ULONG lKey;
+ sal_uLong lKey;
public:
- RscDepend( ULONG lIncKey ){ lKey = lIncKey; };
- ULONG GetFileKey(){ return lKey; }
+ RscDepend( sal_uLong lIncKey ){ lKey = lIncKey; };
+ sal_uLong GetFileKey(){ return lKey; }
};
typedef ::std::vector< RscDepend* > RscDependList;
@@ -207,11 +207,11 @@ typedef ::std::vector< RscDepend* > RscDependList;
class RscFile
{
friend class RscFileTab;
- BOOL bIncFile; // Ist es eine Include-Datei
+ sal_Bool bIncFile; // Ist es eine Include-Datei
public:
- BOOL bLoaded; // Ist die Datei geladen
- BOOL bScanned; // Wurde Datei nach Inclide abgesucht
- BOOL bDirty; // Dirty-Flag
+ sal_Bool bLoaded; // Ist die Datei geladen
+ sal_Bool bScanned; // Wurde Datei nach Inclide abgesucht
+ sal_Bool bDirty; // Dirty-Flag
ByteString aFileName; // Name der Datei
ByteString aPathName; // Pfad und Name der Datei
RscDefineList aDefLst; // Liste der Defines
@@ -219,11 +219,11 @@ public:
RscFile();
~RscFile();
- BOOL InsertDependFile( ULONG lDepFile, size_t lPos );
- void RemoveDependFile( ULONG lDepFile );
- BOOL Depend( ULONG lDepend, ULONG lFree );
- void SetIncFlag(){ bIncFile = TRUE; };
- BOOL IsIncFile(){ return bIncFile; };
+ sal_Bool InsertDependFile( sal_uLong lDepFile, size_t lPos );
+ void RemoveDependFile( sal_uLong lDepFile );
+ sal_Bool Depend( sal_uLong lDepend, sal_uLong lFree );
+ void SetIncFlag(){ bIncFile = sal_True; };
+ sal_Bool IsIncFile(){ return bIncFile; };
};
DECLARE_UNIQUEINDEX( RscSubFileTab, RscFile * )
@@ -232,11 +232,11 @@ DECLARE_UNIQUEINDEX( RscSubFileTab, RscFile * )
class RscDefTree {
RscDefine * pDefRoot;
public:
- static BOOL Evaluate( RscDefine * pDef );
+ static sal_Bool Evaluate( RscDefine * pDef );
RscDefTree(){ pDefRoot = NULL; }
~RscDefTree();
void Remove();
- BOOL Evaluate();
+ sal_Bool Evaluate();
RscDefine * Search( const char * pName );
void Insert( RscDefine * pDef );
void Remove( RscDefine * pDef );
@@ -244,40 +244,40 @@ public:
class RscFileTab : public RscSubFileTab {
RscDefTree aDefTree;
- ULONG Find( const ByteString & rName );
+ sal_uLong Find( const ByteString & rName );
public:
RscFileTab();
~RscFileTab();
RscDefine * FindDef( const char * );
RscDefine * FindDef( const ByteString& rStr ) { return FindDef( rStr.GetBuffer() ); }
- RscDefine * FindDef( ULONG lKey, const ByteString & );
+ RscDefine * FindDef( sal_uLong lKey, const ByteString & );
- BOOL Depend( ULONG lDepend, ULONG lFree );
- BOOL TestDef( ULONG lFileKey, size_t lPos,
+ sal_Bool Depend( sal_uLong lDepend, sal_uLong lFree );
+ sal_Bool TestDef( sal_uLong lFileKey, size_t lPos,
const RscDefine * pDefDec );
- BOOL TestDef( ULONG lFileKey, size_t lPos,
+ sal_Bool TestDef( sal_uLong lFileKey, size_t lPos,
const RscExpression * pExpDec );
- RscDefine * NewDef( ULONG lKey, const ByteString & rDefName,
- INT32 lId, ULONG lPos );
- RscDefine * NewDef( ULONG lKey, const ByteString & rDefName,
- RscExpression *, ULONG lPos );
+ RscDefine * NewDef( sal_uLong lKey, const ByteString & rDefName,
+ sal_Int32 lId, sal_uLong lPos );
+ RscDefine * NewDef( sal_uLong lKey, const ByteString & rDefName,
+ RscExpression *, sal_uLong lPos );
- BOOL ChangeDef( const ByteString & rDefName, INT32 lId );
- BOOL ChangeDef( const ByteString & rDefName, RscExpression * );
+ sal_Bool ChangeDef( const ByteString & rDefName, sal_Int32 lId );
+ sal_Bool ChangeDef( const ByteString & rDefName, RscExpression * );
- BOOL IsDefUsed( const ByteString & );
+ sal_Bool IsDefUsed( const ByteString & );
void DeleteDef( const ByteString & );
- BOOL ChangeDefName( const ByteString & rDefName,
+ sal_Bool ChangeDefName( const ByteString & rDefName,
const ByteString & rNewName );
// Alle Defines die in dieser Datei Definiert sind loeschen
- void DeleteFileContext( ULONG lKey );
- void DeleteFile( ULONG lKey );
- ULONG NewCodeFile( const ByteString & rName );
- ULONG NewIncFile( const ByteString & rName, const ByteString & rPath );
- RscFile * GetFile( ULONG lFileKey ){ return Get( lFileKey ); }
+ void DeleteFileContext( sal_uLong lKey );
+ void DeleteFile( sal_uLong lKey );
+ sal_uLong NewCodeFile( const ByteString & rName );
+ sal_uLong NewIncFile( const ByteString & rName, const ByteString & rPath );
+ RscFile * GetFile( sal_uLong lFileKey ){ return Get( lFileKey ); }
};
#endif // _RSCDEF_HXX
diff --git a/rsc/inc/rscerror.h b/rsc/inc/rscerror.h
index b532df468ca4..bc1516a73c41 100644
--- a/rsc/inc/rscerror.h
+++ b/rsc/inc/rscerror.h
@@ -106,9 +106,9 @@ public:
ERRTYPE( const ERRTYPE & rErr ) { nError = rErr.nError; };
ERRTYPE& operator = ( const ERRTYPE & rError );
operator sal_uInt32() const { return( nError ); }
- BOOL IsError() const { return( nError <= ERR_ERROREND ); }
- BOOL IsOk() const { return( !IsError() ); }
- BOOL IsWarning() const {
+ sal_Bool IsError() const { return( nError <= ERR_ERROREND ); }
+ sal_Bool IsOk() const { return( !IsError() ); }
+ sal_Bool IsWarning() const {
return( nError >= ERR_WARNINGSTART && nError <= ERR_WARNINGEND );
};
void Clear(){ nError = ERR_OK; }
diff --git a/rsc/inc/rscflag.hxx b/rsc/inc/rscflag.hxx
index a176a4f14114..48770605f0a3 100644
--- a/rsc/inc/rscflag.hxx
+++ b/rsc/inc/rscflag.hxx
@@ -42,30 +42,30 @@ class RscFlag : public RscConst {
RSCINST CreateBasic( RSCINST * pInst );
public:
RscFlag( Atom nId, sal_uInt32 nTypId );
- RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, BOOL );
+ RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool );
RSCINST CreateClient( RSCINST * pInst, const RSCINST & rDflt,
- BOOL bOwnClass, Atom nConsId );
+ sal_Bool bOwnClass, Atom nConsId );
sal_uInt32 Size();
virtual void SetToDefault( const RSCINST & rInst );
- BOOL IsDefault( const RSCINST & rInst );
- BOOL IsDefault( const RSCINST & rInst, Atom nConstId );
+ sal_Bool IsDefault( const RSCINST & rInst );
+ sal_Bool IsDefault( const RSCINST & rInst, Atom nConstId );
// Ist das Flag gesetzt
- BOOL IsSet( const RSCINST & rInst, Atom nConstId );
+ sal_Bool IsSet( const RSCINST & rInst, Atom nConstId );
// Als Default setzen
- BOOL IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
- BOOL IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef,
+ sal_Bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
+ sal_Bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef,
Atom nConstId );
ERRTYPE SetConst( const RSCINST & rInst, Atom nValueId,
- INT32 nValue );
+ sal_Int32 nValue );
ERRTYPE SetNotConst( const RSCINST & rInst, Atom nConstId );
void WriteSrc( const RSCINST & rInst, FILE * fOutput,
RscTypCont * pTC, sal_uInt32 nTab, const char * );
ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, BOOL bExtra );
+ RscTypCont * pTC, sal_uInt32, sal_Bool bExtra );
};
/******************* R s c C l i e n t ***********************************/
@@ -77,26 +77,26 @@ public:
RscClient( Atom nId, sal_uInt32 nTypId, RscFlag * pClass,
Atom nConstantId );
virtual RSCCLASS_TYPE GetClassType() const;
- RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, BOOL );
+ RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool );
sal_uInt32 Size(){ return( pRefClass->Size() ); };
// Eine Zuweisung an eine Variable
- BOOL IsDefault( const RSCINST & rInst ){
+ sal_Bool IsDefault( const RSCINST & rInst ){
return( pRefClass->IsDefault( rInst, nConstId ) );
};
// Als Default setzen
- BOOL IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){
+ sal_Bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){
return pRefClass->IsValueDefault( rInst,
pDef, nConstId );
}
- ERRTYPE SetBool( const RSCINST & rInst, BOOL bValue ){
+ ERRTYPE SetBool( const RSCINST & rInst, sal_Bool bValue ){
if( bValue )
return( pRefClass->SetConst( rInst, nConstId, bValue ) );
else
return( pRefClass->
SetNotConst( rInst, nConstId ) );
};
- ERRTYPE GetBool( const RSCINST & rInst, BOOL * pB ){
+ ERRTYPE GetBool( const RSCINST & rInst, sal_Bool * pB ){
*pB = pRefClass->IsSet( rInst, nConstId );
return( ERR_OK );
};
diff --git a/rsc/inc/rscinst.hxx b/rsc/inc/rscinst.hxx
index 962444dd27ab..b64016bfac72 100644
--- a/rsc/inc/rscinst.hxx
+++ b/rsc/inc/rscinst.hxx
@@ -60,7 +60,7 @@ public:
RscInst& operator = ( const RscInst& rRscInst );
~RscInst();
void OverWrite( RscInstCopy & rInst );
- BOOL IsInst() const { return( aInst.IsInst() ); }
+ sal_Bool IsInst() const { return( aInst.IsInst() ); }
// Listen Methoden
ERRTYPE SetElement( const RscId & rName, RscInstCopy & rInst );
@@ -76,17 +76,17 @@ public:
ERRTYPE SetVar( Atom nVarName, RscInstCopy & rInst );
ERRTYPE SetConst( Atom nVarName, Atom nConstId );
- ERRTYPE SetBool( Atom nVarName, BOOL );
+ ERRTYPE SetBool( Atom nVarName, sal_Bool );
// Hack fuer X, Y, Width, Height
static ERRTYPE SetCorrectValues( RSCINST & rInst, RSCINST & rVarInst,
- INT32 lValue, sal_uInt32 nTupelIdx );
- ERRTYPE SetNumber( Atom nVarName, INT32 );
+ sal_Int32 lValue, sal_uInt32 nTupelIdx );
+ ERRTYPE SetNumber( Atom nVarName, sal_Int32 );
ERRTYPE SetString( Atom nVarName, const char * );
ERRTYPE SetConst( Atom nConstId );
- ERRTYPE SetBool( BOOL );
- ERRTYPE SetNumber( INT32 );
+ ERRTYPE SetBool( sal_Bool );
+ ERRTYPE SetNumber( sal_Int32 );
ERRTYPE SetString( const char * );
ERRTYPE SetRef( const RscId & rRscId );
ERRTYPE SetDefault( Atom nVarName );
@@ -94,17 +94,17 @@ public:
RscInst GetVar( Atom nVarName );
Atom GetConst( Atom nVarName = InvalidAtom );
sal_uInt32 GetConstPos( Atom nVarName = InvalidAtom );
- BOOL GetBool( Atom nVarName = InvalidAtom );
+ sal_Bool GetBool( Atom nVarName = InvalidAtom );
// Hack fuer X, Y, Width, Height
- static INT32 GetCorrectValues( RSCINST & rInst, RSCINST & rVarInst,
+ static sal_Int32 GetCorrectValues( RSCINST & rInst, RSCINST & rVarInst,
sal_uInt32 nTupelIdx );
- INT32 GetNumber( Atom nVarName = InvalidAtom );
+ sal_Int32 GetNumber( Atom nVarName = InvalidAtom );
const char *GetString( Atom nVarName = InvalidAtom );
RscId GetRef();
- BOOL IsDefault( Atom nVarName );
- BOOL IsConsistent( RscInconsList * pList );
+ sal_Bool IsDefault( Atom nVarName );
+ sal_Bool IsConsistent( RscInconsList * pList );
Atom GetClassEnum( Atom nVarName, sal_uInt32 nPos );
Atom GetClassEnum( sal_uInt32 nPos );
@@ -149,62 +149,62 @@ public:
// Konvertiert einen Namen in einen Typ
RscTop* GetClassType( Atom nClassName );
// Instanz einer Klasse erzeugen
- BOOL MakeConsistent( RscInconsList * pList );
+ sal_Bool MakeConsistent( RscInconsList * pList );
// Array mit Dateinamen
RscFileTab* GetFileTab();
// Eine Dateinamen-Instanz holen
- RscFile * GetFileStruct( ULONG lKey );
+ RscFile * GetFileStruct( sal_uLong lKey );
- ULONG AddSrcFile( const ByteString & rFileName );
- ULONG AddHrcFile( const ByteString & rFileName );
+ sal_uLong AddSrcFile( const ByteString & rFileName );
+ sal_uLong AddHrcFile( const ByteString & rFileName );
// Traegt die Include-Dateien in die Abhaengigkeitsliste
// von lFileKey ein
- void ScanForIncFiles( ULONG lFileKey );
- void RemoveFile( ULONG lKey );
+ void ScanForIncFiles( sal_uLong lFileKey );
+ void RemoveFile( sal_uLong lKey );
// Suche ueber alle DEFINES
RscDefine * FindDef( const ByteString & rName );
- ULONG GetFileKey( const ByteString & rFileName );
+ sal_uLong GetFileKey( const ByteString & rFileName );
};
class RscHrc
{
protected:
- ULONG lFileKey; // Index der Instanz
+ sal_uLong lFileKey; // Index der Instanz
RscDataBase * pDataBase;// Datenbasis
public:
// Kompilerinstanz erzeugen
- RscHrc( RscDataBase * pDBase, ULONG lKey );
+ RscHrc( RscDataBase * pDBase, sal_uLong lKey );
~RscHrc();
// Daten von Datei uebernehmen
ERRTYPE ReadFile();
- ULONG GetFileKey() const { return lFileKey; }
+ sal_uLong GetFileKey() const { return lFileKey; }
- void SetDirty( BOOL bSet );
- BOOL IsDirty();
+ void SetDirty( sal_Bool bSet );
+ sal_Bool IsDirty();
void SetPathName( const ByteString & );
ByteString GetPathName();
void SetFileName( const ByteString & );
ByteString GetFileName();
//Depend-Datei anhaengen
- void InsertDepend( ULONG lKey, ULONG lPos );
+ void InsertDepend( sal_uLong lKey, sal_uLong lPos );
// DefineList holen
RscDefineList * GetDefineList();
// Suche ueber all DEFINES im Zugriff
RscDefine * FindDef( const ByteString & rName );
- ERRTYPE NewDef( const ByteString & rMacroName, INT32 lValue,
- ULONG lPos );
+ ERRTYPE NewDef( const ByteString & rMacroName, sal_Int32 lValue,
+ sal_uLong lPos );
ERRTYPE NewDef( const ByteString & rMacroName, const ByteString & rMacro,
- ULONG lPos );
- ERRTYPE ChangeDef( const ByteString & rMacroName, INT32 lValue );
+ sal_uLong lPos );
+ ERRTYPE ChangeDef( const ByteString & rMacroName, sal_Int32 lValue );
ERRTYPE ChangeDef( const ByteString & rMacroName,
const ByteString & rMacro );
- BOOL IsDefUsed( const ByteString & );
+ sal_Bool IsDefUsed( const ByteString & );
void DeleteDef( const ByteString & rMacroName );
ERRTYPE ChangeDefName( const ByteString & rMacroName,
const ByteString & rNewName );
@@ -221,7 +221,7 @@ public:
class RscSrc : public RscHrc {
public:
// Kompilerinstanz erzeugen
- RscSrc( RscDataBase * pDBase, ULONG lKey );
+ RscSrc( RscDataBase * pDBase, sal_uLong lKey );
~RscSrc();
diff --git a/rsc/inc/rsckey.hxx b/rsc/inc/rsckey.hxx
index 6548601f0cc5..dd99b68b0fae 100644
--- a/rsc/inc/rsckey.hxx
+++ b/rsc/inc/rsckey.hxx
@@ -40,13 +40,13 @@ typedef struct {
} KEY_STRUCT;
class RscNameTable {
- BOOL bSort; //soll bei jedem einfuegen sortiert werden?
+ sal_Bool bSort; //soll bei jedem einfuegen sortiert werden?
sal_uInt32 nEntries; //Anzahl der Eintr�ge
KEY_STRUCT * pTable;
public:
RscNameTable();
~RscNameTable();
- void SetSort( BOOL bSorted = TRUE );
+ void SetSort( sal_Bool bSorted = sal_True );
Atom Put( Atom nName, sal_uInt32 nTyp, long nValue );
Atom Put( Atom nName, sal_uInt32 nTyp );
Atom Put( const char * pName, sal_uInt32 nTyp, long nValue );
@@ -54,8 +54,8 @@ public:
Atom Put( Atom nName, sal_uInt32 nTyp, RscTop * pClass );
Atom Put( const char * pName, sal_uInt32 nTyp, RscTop * pClass );
- // TRUE, wurde gefunden
- BOOL Get( Atom nName, KEY_STRUCT * pEle );
+ // sal_True, wurde gefunden
+ sal_Bool Get( Atom nName, KEY_STRUCT * pEle );
};
diff --git a/rsc/inc/rsclst.hxx b/rsc/inc/rsclst.hxx
index 0ae101a0c48d..32d64d424006 100644
--- a/rsc/inc/rsclst.hxx
+++ b/rsc/inc/rsclst.hxx
@@ -39,14 +39,14 @@ protected:
REResourceList* pParent;
RscId aRscId; //Id und Name des Resourceobjektes
ByteString aClassName;
- BOOL bVisible;
+ sal_Bool bVisible;
public:
REResourceList();
REResourceList( REResourceList * pParentList,
ByteString& rClassName,
const RscId & rResourceID,
- BOOL bVisible = FALSE );
+ sal_Bool bVisible = sal_False );
~REResourceList();
REResourceList* GetParent() { return pParent; }
@@ -55,9 +55,9 @@ public:
RscId GetRscId() { return aRscId; }
void SetRscId( const RscId & rId ){ aRscId = rId; }
- void SetVisible( BOOL bVis )
+ void SetVisible( sal_Bool bVis )
{ bVisible = bVis; }
- BOOL IsVisible() { return bVisible; }
+ sal_Bool IsVisible() { return bVisible; }
};
#endif // _RSCLST_HXX
diff --git a/rsc/inc/rscmgr.hxx b/rsc/inc/rscmgr.hxx
index fef2712d4e27..09303a4944bb 100644
--- a/rsc/inc/rscmgr.hxx
+++ b/rsc/inc/rscmgr.hxx
@@ -38,8 +38,8 @@
class RscMgr : public RscClass {
struct RscMgrInst {
RscId aRefId; // nRefId = Referenz Identifier
- BOOL bDflt; // Ist Default
- void Create(){ aRefId.Create(); bDflt = TRUE; }
+ sal_Bool bDflt; // Ist Default
+ void Create(){ aRefId.Create(); bDflt = sal_True; }
void Destroy(){ aRefId.Destroy(); }
};
ERRTYPE IsToDeep( const RSCINST & rInst, sal_uInt32 nDeep = 0 );
@@ -47,10 +47,10 @@ public:
RscMgr( Atom nId, sal_uInt32 nTypId, RscTop * pSuperCl );
void SetToDefault( const RSCINST & rInst );
- BOOL IsDefault( const RSCINST & rInst );
- BOOL IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
+ sal_Bool IsDefault( const RSCINST & rInst );
+ sal_Bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
- RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, BOOL );
+ RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool );
void Destroy( const RSCINST & rInst );
sal_uInt32 Size();
void WriteSrcHeader( const RSCINST & aInst, FILE * fOutput,
@@ -61,9 +61,9 @@ public:
RscTypCont * pTC, sal_uInt32 nTab, const char * );
ERRTYPE WriteRcHeader( const RSCINST & rInst, RscWriteRc & aMem,
RscTypCont * pTC, const RscId & rId,
- sal_uInt32, BOOL bExtra );
+ sal_uInt32, sal_Bool bExtra );
ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, BOOL bExtra );
+ RscTypCont * pTC, sal_uInt32, sal_Bool bExtra );
ERRTYPE WriteHxxHeader( const RSCINST & rInst, FILE * fOutput,
RscTypCont * pTC, const RscId & rId );
ERRTYPE WriteHxx( const RSCINST & rInst, FILE * fOutput,
@@ -72,7 +72,7 @@ public:
RscTypCont * pTC, const RscId & rId );
ERRTYPE WriteCxx( const RSCINST & rInst, FILE * fOutput,
RscTypCont * pTC, const RscId & rId );
- BOOL IsConsistent( const RSCINST & rInst );
+ sal_Bool IsConsistent( const RSCINST & rInst );
ERRTYPE GetRef( const RSCINST & rInst, RscId * );
ERRTYPE SetRef( const RSCINST & rInst, const RscId & rRefId );
};
diff --git a/rsc/inc/rscpar.hxx b/rsc/inc/rscpar.hxx
index b235a48a12b0..69037ba8c027 100644
--- a/rsc/inc/rscpar.hxx
+++ b/rsc/inc/rscpar.hxx
@@ -42,10 +42,10 @@ class RscFileInst
ERRTYPE aFirstError;// Erster Fehler
sal_uInt32 nErrorLine; // Zeile des ersten Fehlers
sal_uInt32 nErrorPos; // Position des ersten Fehlers
- BOOL bIncLine; // Muss Zeilennummer incrementiert werden
+ sal_Bool bIncLine; // Muss Zeilennummer incrementiert werden
sal_uInt32 nLineNo; // Zeile in der Eingabedatei
- ULONG lFileIndex; // Index auf Eingabedatei
- ULONG lSrcIndex; // Index auf Basisdatei
+ sal_uLong lFileIndex; // Index auf Eingabedatei
+ sal_uLong lSrcIndex; // Index auf Basisdatei
FILE * fInputFile; // Eingabedatei
char * pInput; // Lesepuffer
sal_uInt32 nInputBufLen; // Laenge des Lesepuffers
@@ -55,20 +55,20 @@ class RscFileInst
sal_uInt32 nLineBufLen;//Lange des Zeilenpuffres
sal_uInt32 nScanPos; // Position in der Zeile
int cLastChar;
- BOOL bEof;
+ sal_Bool bEof;
public:
RscTypCont * pTypCont;
void Init(); // ctor initialisieren
- RscFileInst( RscTypCont * pTC, ULONG lIndexSrc,
- ULONG lFileIndex, FILE * fFile );
- RscFileInst( RscTypCont * pTC, ULONG lIndexSrc,
- ULONG lFileIndex, const ByteString & );
+ RscFileInst( RscTypCont * pTC, sal_uLong lIndexSrc,
+ sal_uLong lFileIndex, FILE * fFile );
+ RscFileInst( RscTypCont * pTC, sal_uLong lIndexSrc,
+ sal_uLong lFileIndex, const ByteString & );
~RscFileInst();
- BOOL IsEof() const { return bEof; }
- void SetFileIndex( ULONG lFIndex ) { lFileIndex = lFIndex; }
- ULONG GetFileIndex() { return( lFileIndex ); }
- ULONG GetSrcIndex() { return( lSrcIndex ); }
+ sal_Bool IsEof() const { return bEof; }
+ void SetFileIndex( sal_uLong lFIndex ) { lFileIndex = lFIndex; }
+ sal_uLong GetFileIndex() { return( lFileIndex ); }
+ sal_uLong GetSrcIndex() { return( lSrcIndex ); }
void SetLineNo( sal_uInt32 nLine ) { nLineNo = nLine; }
sal_uInt32 GetLineNo() { return( nLineNo ); }
sal_uInt32 GetScanPos() { return( nScanPos ); }
diff --git a/rsc/inc/rscrange.hxx b/rsc/inc/rscrange.hxx
index 48d0077e43c8..fc43ae88a388 100644
--- a/rsc/inc/rscrange.hxx
+++ b/rsc/inc/rscrange.hxx
@@ -39,36 +39,36 @@ class RscRange : public RscTop
protected:
struct RscRangeInst {
sal_uInt16 nValue; // nValue = Ausgangswert - nMin
- BOOL bDflt; // Ist Default
+ sal_Bool bDflt; // Ist Default
};
- INT32 nMin; // Minimum des Bereiches
- INT32 nMax; // Maximum des Bereiches
+ sal_Int32 nMin; // Minimum des Bereiches
+ sal_Int32 nMax; // Maximum des Bereiches
sal_uInt32 nSize;
public:
RscRange( Atom nId, sal_uInt32 nTypId );
virtual RSCCLASS_TYPE GetClassType() const;
- RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, BOOL );
+ RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, sal_Bool );
// Der zulaessige Bereich wird gesetzt
- ERRTYPE SetRange( INT32 nMinimum, INT32 nMaximum );
+ ERRTYPE SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum );
// Gibt die Groesse der Klasse in Bytes
sal_uInt32 Size(){ return nSize; }
// Eine Zuweisung an eine Variable
virtual void SetToDefault( const RSCINST & rInst )
{
- ((RscRangeInst*)rInst.pData)->bDflt = TRUE;
+ ((RscRangeInst*)rInst.pData)->bDflt = sal_True;
}
- BOOL IsDefault( const RSCINST & rInst)
+ sal_Bool IsDefault( const RSCINST & rInst)
{
return( ((RscRangeInst*)rInst.pData)->bDflt );
};
// Als Default setzen
- BOOL IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
- ERRTYPE SetNumber( const RSCINST &, INT32 );
- ERRTYPE GetNumber( const RSCINST &, INT32 * );
+ sal_Bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
+ ERRTYPE SetNumber( const RSCINST &, sal_Int32 );
+ ERRTYPE GetNumber( const RSCINST &, sal_Int32 * );
void WriteSrc( const RSCINST &, FILE * fOutput,
RscTypCont * pTC, sal_uInt32 nTab, const char * );
ERRTYPE WriteRc( const RSCINST &, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, BOOL bExtra );
+ RscTypCont * pTC, sal_uInt32, sal_Bool bExtra );
void WriteRcAccess( FILE * fOutput, RscTypCont * pTC,
const char * );
};
@@ -79,37 +79,37 @@ class RscLongRange : public RscTop
protected:
struct RscLongRangeInst
{
- INT32 nValue; // nValue = Ausgangswert - nMin
- BOOL bDflt; // Ist Default
+ sal_Int32 nValue; // nValue = Ausgangswert - nMin
+ sal_Bool bDflt; // Ist Default
};
- INT32 nMin; // Minimum des Bereiches
- INT32 nMax; // Maximum des Bereiches
+ sal_Int32 nMin; // Minimum des Bereiches
+ sal_Int32 nMax; // Maximum des Bereiches
sal_uInt32 nSize;
public:
RscLongRange( Atom nId, sal_uInt32 nTypId );
virtual RSCCLASS_TYPE GetClassType() const;
- RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, BOOL );
+ RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, sal_Bool );
// Der zulaessige Bereich wird gesetzt
- ERRTYPE SetRange( INT32 nMinimum, INT32 nMaximum );
+ ERRTYPE SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum );
// Gibt die Groesse der Klasse in Bytes
sal_uInt32 Size(){ return nSize; }
// Eine Zuweisung an eine Variable
virtual void SetToDefault( const RSCINST & rInst )
{
- ((RscLongRangeInst*)rInst.pData)->bDflt = TRUE;
+ ((RscLongRangeInst*)rInst.pData)->bDflt = sal_True;
}
- BOOL IsDefault( const RSCINST & rInst)
+ sal_Bool IsDefault( const RSCINST & rInst)
{
return( ((RscLongRangeInst*)rInst.pData)->bDflt );
};
// Als Default setzen
- BOOL IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
- ERRTYPE SetNumber( const RSCINST &, INT32 );
- ERRTYPE GetNumber( const RSCINST &, INT32 * );
+ sal_Bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
+ ERRTYPE SetNumber( const RSCINST &, sal_Int32 );
+ ERRTYPE GetNumber( const RSCINST &, sal_Int32 * );
void WriteSrc( const RSCINST &, FILE * fOutput,
RscTypCont * pTC, sal_uInt32 nTab, const char * );
ERRTYPE WriteRc( const RSCINST &, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, BOOL bExtra );
+ RscTypCont * pTC, sal_uInt32, sal_Bool bExtra );
void WriteRcAccess( FILE * fOutput, RscTypCont * pTC,
const char * );
@@ -122,7 +122,7 @@ public:
RscLongEnumRange( Atom nId, sal_uInt32 nTypId );
ERRTYPE SetConst( const RSCINST & rInst, Atom nValueId,
- INT32 nValue );
+ sal_Int32 nValue );
};
/******************* R s c I d R a n g e ***********************************/
@@ -130,41 +130,41 @@ class RscIdRange : public RscTop
{
sal_uInt32 nSize;
protected:
- INT32 nMin; // Minimum des Bereiches
- INT32 nMax; // Maximum des Bereiches
+ sal_Int32 nMin; // Minimum des Bereiches
+ sal_Int32 nMax; // Maximum des Bereiches
public:
RscIdRange( Atom nId, sal_uInt32 nTypId );
virtual RSCCLASS_TYPE GetClassType() const;
// Der zulaessige Bereich wird gesetzt
- ERRTYPE SetRange( INT32 nMinimum, INT32 nMaximum ){
+ ERRTYPE SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum ){
nMin = nMinimum;
nMax = nMaximum;
return ERR_OK;
}
- RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, BOOL );
+ RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, sal_Bool );
void Destroy( const RSCINST & rInst );
sal_uInt32 Size(){ return nSize; }
virtual void SetToDefault( const RSCINST & rInst )
{
- ((RscId*)rInst.pData)->aExp.cUnused = TRUE;
+ ((RscId*)rInst.pData)->aExp.cUnused = sal_True;
}
- BOOL IsDefault( const RSCINST & rInst)
+ sal_Bool IsDefault( const RSCINST & rInst)
{
//cUnused wird fuer Defaultkennung verwendet
return ((RscId*)rInst.pData)->aExp.cUnused
- ? TRUE : FALSE;
+ ? sal_True : sal_False;
}
// Als Default setzen
- BOOL IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
- ERRTYPE SetNumber( const RSCINST &, INT32 );
- ERRTYPE GetNumber( const RSCINST &, INT32 * );
+ sal_Bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
+ ERRTYPE SetNumber( const RSCINST &, sal_Int32 );
+ ERRTYPE GetNumber( const RSCINST &, sal_Int32 * );
ERRTYPE SetRef( const RSCINST &, const RscId & rRscId );
ERRTYPE GetRef( const RSCINST & rInst, RscId * );
void WriteSrc( const RSCINST &, FILE * fOutput,
RscTypCont * pTC, sal_uInt32 nTab, const char * );
ERRTYPE WriteRc( const RSCINST &, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, BOOL bExtra );
- BOOL IsConsistent( const RSCINST & rInst );
+ RscTypCont * pTC, sal_uInt32, sal_Bool bExtra );
+ sal_Bool IsConsistent( const RSCINST & rInst );
void WriteRcAccess( FILE * fOutput, RscTypCont * pTC,
const char * );
@@ -177,14 +177,14 @@ public:
RscBool( Atom nId, sal_uInt32 nTypId );
virtual RSCCLASS_TYPE GetClassType() const;
// Der zulaessige Bereich wird gesetzt
- ERRTYPE SetRange( INT32, INT32 ){
+ ERRTYPE SetRange( sal_Int32, sal_Int32 ){
return( ERR_UNKNOWN_METHOD );
};
- ERRTYPE SetBool( const RSCINST & rInst, BOOL b ){
- return( SetNumber( rInst, (INT32)b ) );
+ ERRTYPE SetBool( const RSCINST & rInst, sal_Bool b ){
+ return( SetNumber( rInst, (sal_Int32)b ) );
};
- ERRTYPE GetBool( const RSCINST & rInst, BOOL * pB){
- INT32 l;
+ ERRTYPE GetBool( const RSCINST & rInst, sal_Bool * pB){
+ sal_Int32 l;
GetNumber( rInst, &l );
*pB = (0 != l);
return( ERR_OK );
@@ -197,14 +197,14 @@ public:
};
class RscBreakRange : public RscRange {
- INT32 nOutRange;
+ sal_Int32 nOutRange;
public:
RscBreakRange( Atom nId, sal_uInt32 nTypId );
- void SetOutRange( INT32 nNumber ){
+ void SetOutRange( sal_Int32 nNumber ){
nOutRange = nNumber;
}
- RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, BOOL );
- ERRTYPE SetNumber( const RSCINST &, INT32 );
+ RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, sal_Bool );
+ ERRTYPE SetNumber( const RSCINST &, sal_Int32 );
};
#endif // _RSCRANGE_HXX
diff --git a/rsc/inc/rscrsc.hxx b/rsc/inc/rscrsc.hxx
index 9d92f90e48b5..367118858918 100644
--- a/rsc/inc/rscrsc.hxx
+++ b/rsc/inc/rscrsc.hxx
@@ -122,8 +122,8 @@ public:
ByteString GetTmpFileName(); // Die Dateien werden geloescht
// Include Statements lesen
- ERRTYPE IncludeParser( ULONG lFileKey );
- ERRTYPE ParseOneFile( ULONG lFileKey, const RscCmdLine::OutputFile* pOutputFile, const WriteRcContext* pContext );
+ ERRTYPE IncludeParser( sal_uLong lFileKey );
+ ERRTYPE ParseOneFile( sal_uLong lFileKey, const RscCmdLine::OutputFile* pOutputFile, const WriteRcContext* pContext );
ERRTYPE Link();
void EndCompile();
};
diff --git a/rsc/inc/rscstr.hxx b/rsc/inc/rscstr.hxx
index 3d3127f2ab5a..7df40992cdce 100644
--- a/rsc/inc/rscstr.hxx
+++ b/rsc/inc/rscstr.hxx
@@ -39,7 +39,7 @@ class RscString : public RscTop
RscTop * pRefClass;
struct RscStringInst {
char * pStr; // Zeiger auf String
- BOOL bDflt; // Ist Default
+ sal_Bool bDflt; // Ist Default
RscId aRefId; // ReferenzName
};
sal_uInt32 nSize;
@@ -51,20 +51,20 @@ public:
{
pRefClass = pClass;
};
- RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, BOOL );
+ RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, sal_Bool );
// Der zulaessige Bereich wird gesetzt
void Destroy( const RSCINST & rInst );
sal_uInt32 Size(){ return nSize; }
void SetToDefault( const RSCINST & rInst )
{
- ((RscStringInst*)rInst.pData)->bDflt = TRUE;
+ ((RscStringInst*)rInst.pData)->bDflt = sal_True;
}
- BOOL IsDefault( const RSCINST & rInst)
+ sal_Bool IsDefault( const RSCINST & rInst)
{
return( ((RscStringInst*)rInst.pData)->bDflt );
};
// Als Default setzen
- BOOL IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
+ sal_Bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
ERRTYPE SetString( const RSCINST &, const char * pStr );
ERRTYPE GetString( const RSCINST &, char ** ppStr );
ERRTYPE GetRef( const RSCINST & rInst, RscId * );
@@ -72,7 +72,7 @@ public:
void WriteSrc( const RSCINST &, FILE * fOutput,
RscTypCont * pTC, sal_uInt32 nTab, const char * );
ERRTYPE WriteRc( const RSCINST &, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32, BOOL bExtra );
+ RscTypCont * pTC, sal_uInt32, sal_Bool bExtra );
virtual void WriteRcAccess( FILE * fOutput, RscTypCont * pTC,
const char * );
};
diff --git a/rsc/inc/rsctools.hxx b/rsc/inc/rsctools.hxx
index 5506412d42f6..b65207dafac3 100644
--- a/rsc/inc/rsctools.hxx
+++ b/rsc/inc/rsctools.hxx
@@ -49,8 +49,8 @@ enum RSCBYTEORDER_TYPE { RSC_BIGENDIAN, RSC_LITTLEENDIAN, RSC_SYSTEMENDIAN };
(nSize + sizeof( void * ) -1) / sizeof( void * ) * sizeof( void * )
/******************* F u n c t i o n F o r w a r d s *******************/
ByteString GetTmpFileName();
-BOOL Append( ByteString aDestFile, ByteString aSourceFile );
-BOOL Append( FILE * fDest, ByteString aSourceFile );
+sal_Bool Append( ByteString aDestFile, ByteString aSourceFile );
+sal_Bool Append( FILE * fDest, ByteString aSourceFile );
ByteString InputFile ( const char * pInput, const char * pExt );
ByteString OutputFile( ByteString aInput, const char * ext );
char * ResponseFile( RscPtrPtr * ppCmd, char ** ppArgv,
@@ -70,7 +70,7 @@ typedef ::std::vector< ByteString* > RscStrList;
class RscChar
{
public:
- static char * MakeUTF8( char * pStr, UINT16 nTextEncoding );
+ static char * MakeUTF8( char * pStr, sal_uInt16 nTextEncoding );
};
/****************** R s c P t r P t r ************************************/
@@ -95,7 +95,7 @@ public:
class RscWriteRc
{
sal_uInt32 nLen;
- BOOL bSwap;
+ sal_Bool bSwap;
RSCBYTEORDER_TYPE nByteOrder;
char * pMem;
char * GetPointer( sal_uInt32 nSize );
@@ -181,7 +181,7 @@ public:
{ Put( (sal_uInt16)nValue ); }
void PutUTF8( char * pData );
- void PutAt( sal_uInt32 nPos, INT32 lVal )
+ void PutAt( sal_uInt32 nPos, sal_Int32 lVal )
{
union
{
@@ -203,7 +203,7 @@ public:
}
void PutAt( sal_uInt32 nPos, sal_uInt32 lVal )
{
- PutAt( nPos, (INT32)lVal);
+ PutAt( nPos, (sal_Int32)lVal);
}
void PutAt( sal_uInt32 nPos, short nVal )
{
diff --git a/rsc/inc/rsctop.hxx b/rsc/inc/rsctop.hxx
index 777f45246aa8..77e32041ac8b 100644
--- a/rsc/inc/rsctop.hxx
+++ b/rsc/inc/rsctop.hxx
@@ -71,8 +71,8 @@ public:
sal_uInt32 GetTypId() const
{ return nTypId; };
// Gibt die Oberklasse zurueck
- BOOL InHierarchy( RscTop * pClass );
- BOOL IsCodeWriteable() const
+ sal_Bool InHierarchy( RscTop * pClass );
+ sal_Bool IsCodeWriteable() const
{
return( 0 != aCallParType.Len() );
}
@@ -115,7 +115,7 @@ public:
// pData, pClass im return koennen NULL sein
virtual RSCINST GetVariable( const RSCINST & rInst, Atom nVarName,
const RSCINST & rInitInst,
- BOOL nInitDflt = FALSE,
+ sal_Bool nInitDflt = sal_False,
RscTop * pCreateClass = NULL );
virtual RSCINST GetCopyVar( const RSCINST & rInst, Atom nVarName );
@@ -130,7 +130,7 @@ public:
// Liefert Instanz aus einem Feld zurueck
// pGetInst im return kann NULL sein
- virtual ERRTYPE GetValueEle( const RSCINST & rInst, INT32 lValue,
+ virtual ERRTYPE GetValueEle( const RSCINST & rInst, sal_Int32 lValue,
RscTop * pCreateClass,
RSCINST * pGetInst );
@@ -162,45 +162,45 @@ public:
virtual sal_uInt32 GetCount( const RSCINST & rInst );
// Eine Zuweisung an eine Variable
- virtual ERRTYPE SetNumber( const RSCINST & rInst, INT32 lValue );
+ virtual ERRTYPE SetNumber( const RSCINST & rInst, sal_Int32 lValue );
// Eine Zuweisung an eine Variable
- virtual ERRTYPE SetBool( const RSCINST & rInst, BOOL bValue );
+ virtual ERRTYPE SetBool( const RSCINST & rInst, sal_Bool bValue );
// Eine Zuweisung an eine Variable
virtual ERRTYPE SetConst( const RSCINST & rInst, Atom nValueId,
- INT32 nValue );
+ sal_Int32 nValue );
// Eine Zuweisung an eine Variable
virtual ERRTYPE SetNotConst( const RSCINST & rInst, Atom nId );
virtual ERRTYPE SetString( const RSCINST & rInst, const char * pStr );
- virtual ERRTYPE GetNumber( const RSCINST & rInst, INT32 * pN );
+ virtual ERRTYPE GetNumber( const RSCINST & rInst, sal_Int32 * pN );
- virtual ERRTYPE GetBool( const RSCINST & rInst, BOOL * pB );
+ virtual ERRTYPE GetBool( const RSCINST & rInst, sal_Bool * pB );
virtual ERRTYPE GetConst( const RSCINST & rInst, Atom * pH );
virtual ERRTYPE GetString( const RSCINST & rInst, char ** ppStr );
virtual RSCINST Create( RSCINST * pInst,
- const RSCINST & rDefInst, BOOL bOwnClass = FALSE );
+ const RSCINST & rDefInst, sal_Bool bOwnClass = sal_False );
// Instanz zerstoeren
virtual void Destroy( const RSCINST & rInst );
// prueft auf konsistenz
- virtual BOOL IsConsistent( const RSCINST & rInst );
+ virtual sal_Bool IsConsistent( const RSCINST & rInst );
// Alles auf Default setzen
virtual void SetToDefault( const RSCINST & rInst );
// Ist Eingabe = Default
- virtual BOOL IsDefault( const RSCINST & rInst );
+ virtual sal_Bool IsDefault( const RSCINST & rInst );
// Gleiche Werte auf Default setzen
- virtual BOOL IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
+ virtual sal_Bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef );
// Instanz auf Default setzen
virtual void SetDefault( const RSCINST & rInst, Atom nVarId );
@@ -222,9 +222,9 @@ public:
RscTypCont * pTC, sal_uInt32 nTab,const char * );
virtual ERRTYPE WriteRcHeader( const RSCINST & rInst, RscWriteRc & aMem,
RscTypCont * pTC, const RscId & aId,
- sal_uInt32 nDeep, BOOL bExtra );
+ sal_uInt32 nDeep, sal_Bool bExtra );
virtual ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont * pTC, sal_uInt32 nDeep, BOOL bExtra );
+ RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra );
// Weiterleitung an Superklassen wird unterbunden
virtual ERRTYPE WriteHxxHeader( const RSCINST & rInst, FILE * fOutput,
diff --git a/rsc/inc/rsctree.hxx b/rsc/inc/rsctree.hxx
index 0ab86dda7fca..0ff82212bbbf 100644
--- a/rsc/inc/rsctree.hxx
+++ b/rsc/inc/rsctree.hxx
@@ -71,15 +71,15 @@ public:
NameNode* Right() const{ return (NameNode *)pRight ; };
NameNode* Search( const NameNode * pName ) const;
// insert a new node in the b-tree
- BOOL Insert( NameNode * pTN, sal_uInt32 * nDepth );
- BOOL Insert( NameNode* pTN );
+ sal_Bool Insert( NameNode * pTN, sal_uInt32 * nDepth );
+ sal_Bool Insert( NameNode* pTN );
virtual COMPARE Compare( const NameNode * ) const;
virtual COMPARE Compare( const void * ) const;
NameNode* SearchParent( const NameNode * ) const;
// return ist neue Root
NameNode* Remove( NameNode * );
void OrderTree();
- BOOL IsOrderTree() const;
+ sal_Bool IsOrderTree() const;
};
diff --git a/rsc/inc/vclrsc.hxx b/rsc/inc/vclrsc.hxx
index d529a70c6d64..6e3ae27eeae0 100644
--- a/rsc/inc/vclrsc.hxx
+++ b/rsc/inc/vclrsc.hxx
@@ -31,158 +31,15 @@
#include <sal/types.h>
#include <tools/solar.h>
-
-// ---------------
-// - Window-Bits -
-// ---------------
-
-// from vcl/inc/wintypes.hxx
-typedef sal_Int64 WinBits;
-
-// Window-Bits fuer Window
-#define WB_CLIPCHILDREN ((WinBits)0x00000001)
-#define WB_DIALOGCONTROL ((WinBits)0x00000002)
-#define WB_NODIALOGCONTROL ((WinBits)0x00000004)
-#define WB_BORDER ((WinBits)0x00000008)
-#define WB_NOBORDER ((WinBits)0x00000010)
-#define WB_SIZEABLE ((WinBits)0x00000020)
-#define WB_3DLOOK ((WinBits)0x00000040)
-#define WB_AUTOSIZE ((WinBits)0x00000080)
-
-// Window-Bits fuer SystemWindows
-#define WB_MOVEABLE ((WinBits)0x00000100)
-#define WB_ROLLABLE ((WinBits)0x00000200)
-#define WB_CLOSEABLE ((WinBits)0x00000400)
-#define WB_STANDALONE ((WinBits)0x00000800)
-#define WB_APP ((WinBits)0x00001000)
-#define WB_PINABLE ((WinBits)0x00002000)
-#define WB_SYSTEMWINDOW ((WinBits)0x40000000)
-#define WB_SIZEMOVE (WB_SIZEABLE | WB_MOVEABLE)
-
-// Standard-Window-Bits fuer ChildWindows
-#define WB_TABSTOP ((WinBits)0x00000100)
-#define WB_NOTABSTOP ((WinBits)0x00000200)
-#define WB_GROUP ((WinBits)0x00000400)
-#define WB_NOGROUP ((WinBits)0x00000800)
-#define WB_HORZ ((WinBits)0x00001000)
-#define WB_VERT ((WinBits)0x00002000)
-#define WB_LEFT ((WinBits)0x00004000)
-#define WB_CENTER ((WinBits)0x00008000)
-#define WB_RIGHT ((WinBits)0x00010000)
-#define WB_TOP ((WinBits)0x00020000)
-#define WB_VCENTER ((WinBits)0x00040000)
-#define WB_BOTTOM ((WinBits)0x00080000)
-#define WB_DRAG ((WinBits)0x00100000)
-#define WB_SPIN ((WinBits)0x00200000)
-#define WB_REPEAT ((WinBits)0x00400000)
-#define WB_NOPOINTERFOCUS ((WinBits)0x00800000)
-#define WB_WORDBREAK ((WinBits)0x01000000)
-#define WB_NOLABEL ((WinBits)0x02000000)
-#define WB_SORT ((WinBits)0x04000000)
-#define WB_DROPDOWN ((WinBits)0x08000000)
-#define WB_AUTOHSCROLL ((WinBits)0x10000000)
-#define WB_DOCKABLE ((WinBits)0x20000000)
-#define WB_AUTOVSCROLL ((WinBits)0x40000000)
-
-#define WB_HIDE ((WinBits)0x80000000)
+#include <tools/wintypes.hxx>
+#include <tools/fldunit.hxx>
+#include <tools/mapunit.hxx>
// system floating window
#define WB_POPUP ((WinBits)0x20000000)
-#define WB_HSCROLL WB_HORZ
-#define WB_VSCROLL WB_VERT
-#define WB_TOPIMAGE WB_TOP
-
-// Window-Bits for PushButtons
-#define WB_DEFBUTTON ((WinBits)0x10000000)
-#define WB_NOLIGHTBORDER ((WinBits)0x20000000)
-#define WB_RECTSTYLE ((WinBits)0x08000000)
-#define WB_SMALLSTYLE ((WinBits)0x04000000)
-
-// Window-Bits for FixedText
-#define WB_INFO ((WinBits)0x20000000)
-#define WB_PATHELLIPSIS ((WinBits)0x00100000)
-
-// Window-Bits for Edit
-#define WB_PASSWORD ((WinBits)0x01000000)
-#define WB_READONLY ((WinBits)0x02000000)
-#define WB_NOHIDESELECTION ((WinBits)SAL_CONST_INT64(0x1000000000))
-
-// Window-Bits for MultiLineEdit
-#define WB_IGNORETAB ((WinBits)0x20000000)
-
-// Window-Bits for ListBox and MultiListBox
-#define WB_SIMPLEMODE ((WinBits)0x20000000)
-
-// Window-Bits for FixedBitmap
-#define WB_FAST ((WinBits)0x04000000)
-#define WB_SCALE ((WinBits)0x08000000)
-#define WB_TOPLEFTVISIBLE ((WinBits)0x10000000)
-
-// Window-Bits for ToolBox
-#define WB_LINESPACING ((WinBits)0x01000000)
-#define WB_SCROLL ((WinBits)0x02000000)
-
-// Window-Bits for TabControl
-#define WB_SINGLELINE ((WinBits)0x02000000)
-
-// Window-Bits for DockingWindows
-#define WB_DOCKBORDER ((WinBits)0x00001000)
-
-// Window-Bits for SplitWindow
-#define WB_NOSPLITDRAW ((WinBits)0x01000000)
-#define WB_FLATSPLITDRAW ((WinBits)0x02000000)
-
-// Window-Bits for MessageBoxen
-#define WB_OK ((WinBits)0x00100000)
-#define WB_OK_CANCEL ((WinBits)0x00200000)
-#define WB_YES_NO ((WinBits)0x00400000)
-#define WB_YES_NO_CANCEL ((WinBits)0x00800000)
-#define WB_RETRY_CANCEL ((WinBits)0x01000000)
-#define WB_DEF_OK ((WinBits)0x02000000)
-#define WB_DEF_CANCEL ((WinBits)0x04000000)
-#define WB_DEF_RETRY ((WinBits)0x08000000)
-#define WB_DEF_YES ((WinBits)0x10000000)
-#define WB_DEF_NO ((WinBits)0x20000000)
-#define WB_ABORT_RETRY_IGNORE ((WinBits)SAL_CONST_INT64(0x1000000000))
-#define WB_DEF_IGNORE ((WinBits)SAL_CONST_INT64(0x2000000000))
-
-// Standard-WinBits
-#define WB_STDWORK (WB_SIZEMOVE | WB_CLOSEABLE)
-#define WB_STDMDI (WB_CLOSEABLE)
-#define WB_STDDOCKWIN (WB_DOCKABLE | WB_MOVEABLE | WB_CLOSEABLE)
-#define WB_STDFLOATWIN (WB_SIZEMOVE | WB_CLOSEABLE | WB_ROLLABLE)
-#define WB_STDDIALOG (WB_MOVEABLE | WB_CLOSEABLE)
-#define WB_STDMODELESS (WB_STDDIALOG)
-#define WB_STDMODAL (WB_STDDIALOG)
-#define WB_STDTABDIALOG (WB_STDDIALOG)
-#define WB_STDTABCONTROL 0
#define WB_STDPOPUP (WB_BORDER | WB_POPUP | WB_SYSTEMWINDOW | WB_3DLOOK | WB_DIALOGCONTROL)
-// For TreeListBox
-#define WB_HASBUTTONS ((WinBits)0x00800000)
-#define WB_HASLINES ((WinBits)0x01000000)
-#define WB_HASLINESATROOT ((WinBits)0x02000000)
-
-// --------------
-// - Help-Types -
-// --------------
-
-// from vcl/inc/help.hxx
-#define OOO_HELP_INDEX ((ULONG)0xFFFFFFFF)
-#define OOO_HELP_HELPONHELP ((ULONG)0xFFFFFFFE)
-
-// --------------
-// - FieldTypes -
-// --------------
-
-// from vcl/inc/fldunit.hxx
-enum FieldUnit { FUNIT_NONE, FUNIT_MM, FUNIT_CM, FUNIT_M, FUNIT_KM,
- FUNIT_TWIP, FUNIT_POINT, FUNIT_PICA,
- FUNIT_INCH, FUNIT_FOOT, FUNIT_MILE, FUNIT_CHAR, FUNIT_LINE, FUNIT_CUSTOM,
- FUNIT_PERCENT, FUNIT_100TH_MM };
-
-
// from vcl/inc/vclenum.hxx
#ifndef ENUM_TIMEFIELDFORMAT_DECLARED
#define ENUM_TIMEFIELDFORMAT_DECLARED
@@ -221,25 +78,6 @@ enum KeyFuncType { KEYFUNC_DONTKNOW, KEYFUNC_NEW, KEYFUNC_OPEN, KEYFUNC_SAVE,
#endif
-// ------------
-// - TriState -
-// ------------
-
-// from vcl/inc/wintypes.hxx
-enum TriState { STATE_NOCHECK, STATE_CHECK, STATE_DONTKNOW };
-
-// -----------------
-// - MapMode-Types -
-// -----------------
-
-// from vcl/inc/mapmod.hxx
-enum MapUnit { MAP_100TH_MM, MAP_10TH_MM, MAP_MM, MAP_CM,
- MAP_1000TH_INCH, MAP_100TH_INCH, MAP_10TH_INCH, MAP_INCH,
- MAP_POINT, MAP_TWIP, MAP_PIXEL, MAP_SYSFONT, MAP_APPFONT,
- MAP_RELATIVE, MAP_REALAPPFONT };
-
-// Das Resourcesystem benutzt den Wert 0xFFFF (freihalten)
-
// --------------------------
// - Bits fuer ToolBoxItems -
@@ -276,14 +114,6 @@ typedef sal_uInt16 WindowBorderStyle;
#define WINDOW_BORDER_MENU ((WindowBorderStyle)0x0010)
#define WINDOW_BORDER_NOBORDER ((WindowBorderStyle)0x1000)
-// ---------------
-// - WindowAlign -
-// ---------------
-
-// from vcl/inc/wintypes.hxx
-enum WindowAlign { WINDOWALIGN_LEFT, WINDOWALIGN_TOP, WINDOWALIGN_RIGHT, WINDOWALIGN_BOTTOM };
-enum ImageAlign { IMAGEALIGN_LEFT, IMAGEALIGN_TOP, IMAGEALIGN_RIGHT, IMAGEALIGN_BOTTOM };
-
// --------------
// - Menu-Types -
// --------------
@@ -342,9 +172,6 @@ typedef sal_uInt16 SymbolType;
#define SYMBOL_DOCK ((SymbolType)32)
#define SYMBOL_HIDE ((SymbolType)33)
#define SYMBOL_HELP ((SymbolType)34)
-#define SYMBOL_OS2CLOSE ((SymbolType)35)
-#define SYMBOL_OS2FLOAT ((SymbolType)36)
-#define SYMBOL_OS2HIDE ((SymbolType)37)
#define SYMBOL_NOSYMBOL (SYMBOL_DONTKNOW)
diff --git a/rsc/prj/d.lst b/rsc/prj/d.lst
index e59c9b2e9f3a..e79c03d9bb63 100644
--- a/rsc/prj/d.lst
+++ b/rsc/prj/d.lst
@@ -6,4 +6,4 @@
..\%__SRC%\bin\rscpp %_DEST%\bin%_EXT%\rscpp
mkdir: %_DEST%\inc%_EXT%\rsc
-..\inc\rscsfx.hxx %_DEST%\inc%_EXT%\rsc\rscsfx.hxx
+..\inc\rsc/rscsfx.hxx %_DEST%\inc%_EXT%\rsc\rscsfx.hxx
diff --git a/rsc/source/misc/rscdbl.cxx b/rsc/source/misc/rscdbl.cxx
index 127a4d38a0e8..5e6faeb47c22 100644
--- a/rsc/source/misc/rscdbl.cxx
+++ b/rsc/source/misc/rscdbl.cxx
@@ -77,7 +77,7 @@ void FillSubList( RSCINST & rInst, REResourceList * pList )
}
void FillListObj( ObjNode * pObjNode, RscTop * pRscTop,
- REResourceList * pList, ULONG lFileKey )
+ REResourceList * pList, sal_uLong lFileKey )
{
if( pObjNode ){
if( pObjNode->GetFileKey() == lFileKey ){
@@ -100,7 +100,7 @@ void FillListObj( ObjNode * pObjNode, RscTop * pRscTop,
};
}
-void FillList( RscTop * pRscTop, REResourceList * pList, ULONG lFileKey ){
+void FillList( RscTop * pRscTop, REResourceList * pList, sal_uLong lFileKey ){
if( pRscTop ){
FillList( (RscTop*)pRscTop->Left(), pList, lFileKey );
@@ -110,7 +110,7 @@ void FillList( RscTop * pRscTop, REResourceList * pList, ULONG lFileKey ){
};
}
-void RscTypCont::FillNameIdList( REResourceList * pList, ULONG lFileKey ){
+void RscTypCont::FillNameIdList( REResourceList * pList, sal_uLong lFileKey ){
FillList( pRoot, pList, lFileKey );
}
diff --git a/rsc/source/misc/rsclst.cxx b/rsc/source/misc/rsclst.cxx
index 422ed80c489f..132b0ae1bcd3 100644
--- a/rsc/source/misc/rsclst.cxx
+++ b/rsc/source/misc/rsclst.cxx
@@ -33,13 +33,13 @@
REResourceList :: REResourceList()
{
- bVisible = FALSE;
+ bVisible = sal_False;
pParent = NULL;
}
REResourceList :: REResourceList( REResourceList* pParentList,
ByteString& rClassName,
- const RscId & rResourceID, BOOL bVis )
+ const RscId & rResourceID, sal_Bool bVis )
{
pParent = pParentList;
aClassName = rClassName;
diff --git a/rsc/source/parser/erscerr.cxx b/rsc/source/parser/erscerr.cxx
index 0b9f6e13e9d1..23337514b2c5 100644
--- a/rsc/source/parser/erscerr.cxx
+++ b/rsc/source/parser/erscerr.cxx
@@ -77,10 +77,8 @@ void RscError::StdOut( const char * pStr, const RscVerbosity _verbosityLevel )
*************************************************************************/
void RscError::StdErr( const char * pStr )
{
-#ifndef WIN
if( pStr )
fprintf( stderr, "%s", pStr );
-#endif
}
/*************************************************************************
diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx
index 8a0c7e517c01..a71b4a51eea2 100644
--- a/rsc/source/parser/rscdb.cxx
+++ b/rsc/source/parser/rscdb.cxx
@@ -64,9 +64,9 @@ RscTypCont :: RscTypCont( RscError * pErrHdl,
nSourceCharSet( RTL_TEXTENCODING_UTF8 ),
nByteOrder( nOrder ),
aSearchPath( rSearchPath ),
- aBool( pHS->getID( "BOOL" ), RSC_NOTYPE ),
+ aBool( pHS->getID( "sal_Bool" ), RSC_NOTYPE ),
aShort( pHS->getID( "short" ), RSC_NOTYPE ),
- aUShort( pHS->getID( "USHORT" ), RSC_NOTYPE ),
+ aUShort( pHS->getID( "sal_uInt16" ), RSC_NOTYPE ),
aLong( pHS->getID( "long" ), RSC_NOTYPE ),
aEnumLong( pHS->getID( "enum_long" ), RSC_NOTYPE ),
aIdUShort( pHS->getID( "IDUSHORT" ), RSC_NOTYPE ),
@@ -80,6 +80,7 @@ RscTypCont :: RscTypCont( RscError * pErrHdl,
a0to9999Short( pHS->getID( "YearShort" ), RSC_NOTYPE ),
aIdLong( pHS->getID( "IDLONG" ), RSC_NOTYPE ),
aString( pHS->getID( "Chars" ), RSC_NOTYPE ),
+ aStringLiteral( pHS->getID( "Chars" ), RSC_NOTYPE ),
aWinBits( pHS->getID( "WinBits" ), RSC_NOTYPE ),
aLangType(),
aLangString( pHS->getID( "Lang_Chars" ), RSC_NOTYPE, &aString, &aLangType ),
@@ -124,7 +125,7 @@ static sal_uInt32 getLangIdAndShortenLocale( RscTypCont* pTypCont,
else
rLang = rtl::OString();
#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, " %s (0x%hx)", aL.getStr(), nRet );
+ fprintf( stderr, " %s (0x%hx)", aL.getStr(), (int)nRet );
#endif
return nRet;
}
@@ -368,17 +369,17 @@ void RscTypCont :: Delete( Atom nRT, const RscId & rId ){
|*
*************************************************************************/
sal_uInt32 RscTypCont :: PutSysName( sal_uInt32 nRscTyp, char * pFileName,
- sal_uInt32 nConst, sal_uInt32 nId, BOOL bFirst )
+ sal_uInt32 nConst, sal_uInt32 nId, sal_Bool bFirst )
{
RscSysEntry *pSysEntry;
RscSysEntry *pFoundEntry = NULL;
- BOOL bId1 = FALSE;
+ sal_Bool bId1 = sal_False;
for ( size_t i = 0, n = aSysLst.size(); i < n; ++i )
{
pSysEntry = aSysLst[ i ];
if( pSysEntry->nKey == 1 )
- bId1 = TRUE;
+ bId1 = sal_True;
if( !strcmp( pSysEntry->aFileName.GetBuffer(), pFileName ) )
if( pSysEntry->nRscTyp == nRscTyp
&& pSysEntry->nTyp == nConst
@@ -415,7 +416,7 @@ sal_uInt32 RscTypCont :: PutSysName( sal_uInt32 nRscTyp, char * pFileName,
|* RscTypCont :: WriteInc
|*
*************************************************************************/
-void RscTypCont :: WriteInc( FILE * fOutput, ULONG lFileKey )
+void RscTypCont :: WriteInc( FILE * fOutput, sal_uLong lFileKey )
{
RscFile * pFName;
@@ -472,7 +473,7 @@ private:
ERRTYPE aError; // Enthaelt den ersten Fehler
RscTypCont* pTypCont;
FILE * fOutput; // AusgabeDatei
- ULONG lFileKey; // Welche src-Datei
+ sal_uLong lFileKey; // Welche src-Datei
RscTop * pClass;
DECL_LINK( CallBackWriteRc, ObjNode * );
@@ -520,7 +521,7 @@ IMPL_LINK( RscEnumerateObj, CallBackWriteRc, ObjNode *, pObjNode )
aError = pClass->WriteRcHeader( RSCINST( pClass, pObjNode->GetRscObj() ),
aMem, pTypCont,
- pObjNode->GetRscId(), 0, TRUE );
+ pObjNode->GetRscId(), 0, sal_True );
if( aError.IsError() || aError.IsWarning() )
pTypCont->pEH->Error( aError, pClass, pObjNode->GetRscId() );
@@ -599,18 +600,18 @@ void RscEnumerateObj :: WriteRcFile( RscWriteRc & rMem, FILE * fOut ){
if( nRT == RSC_VERSIONCONTROL )
{ // kommt immmer als letztes
- INT32 nCount = pTypCont->aIdTranslator.size();
+ sal_Int32 nCount = pTypCont->aIdTranslator.size();
// groesse der Tabelle
- UINT32 nSize = (nCount * (sizeof(sal_uInt64)+sizeof(INT32))) + sizeof(INT32);
+ sal_uInt32 nSize = (nCount * (sizeof(sal_uInt64)+sizeof(sal_Int32))) + sizeof(sal_Int32);
rMem.Put( nCount ); //Anzahl speichern
- for( std::map< sal_uInt64, ULONG >::const_iterator it =
+ for( std::map< sal_uInt64, sal_uLong >::const_iterator it =
pTypCont->aIdTranslator.begin(); it != pTypCont->aIdTranslator.end(); ++it )
{
// Schluessel schreiben
rMem.Put( it->first );
// Objekt Id oder Position schreiben
- rMem.Put( (INT32)it->second );
+ rMem.Put( (sal_Int32)it->second );
}
rMem.Put( nSize ); // Groesse hinten Speichern
}
@@ -652,7 +653,7 @@ public:
return aEnumObj.aError;
};
- ERRTYPE WriteSrc( ULONG lFileKey )
+ ERRTYPE WriteSrc( sal_uLong lFileKey )
{
aEnumObj.lFileKey = lFileKey;
@@ -661,7 +662,7 @@ public:
return aEnumObj.aError;
}
- ERRTYPE WriteCxx( ULONG lFileKey )
+ ERRTYPE WriteCxx( sal_uLong lFileKey )
{
aEnumObj.lFileKey = lFileKey;
@@ -670,7 +671,7 @@ public:
return aEnumObj.aError;
}
- ERRTYPE WriteHxx( ULONG lFileKey )
+ ERRTYPE WriteHxx( sal_uLong lFileKey )
{
aEnumObj.lFileKey = lFileKey;
@@ -755,7 +756,7 @@ ERRTYPE RscTypCont::WriteRc( WriteRcContext& rContext )
// version control
RscWriteRc aMem( nByteOrder );
- aVersion.pClass->WriteRcHeader( aVersion, aMem, this, RscId( RSCVERSION_ID ), 0, TRUE );
+ aVersion.pClass->WriteRcHeader( aVersion, aMem, this, RscId( RSCVERSION_ID ), 0, sal_True );
aEnumRef.aEnumObj.WriteRcFile( aMem, rContext.fOutput );
return aError;
@@ -766,8 +767,8 @@ ERRTYPE RscTypCont::WriteRc( WriteRcContext& rContext )
|* RscTypCont :: WriteSrc
|*
*************************************************************************/
-void RscTypCont :: WriteSrc( FILE * fOutput, ULONG nFileKey,
- CharSet /*nCharSet*/, BOOL bName )
+void RscTypCont :: WriteSrc( FILE * fOutput, sal_uLong nFileKey,
+ CharSet /*nCharSet*/, sal_Bool bName )
{
RscFile * pFName;
RscEnumerateRef aEnumRef( this, pRoot, fOutput );
@@ -799,7 +800,7 @@ void RscTypCont :: WriteSrc( FILE * fOutput, ULONG nFileKey,
}
else
{
- RscId::SetNames( FALSE );
+ RscId::SetNames( sal_False );
if( NOFILE_INDEX == nFileKey )
{
pFName = aFileTab.First();
@@ -820,7 +821,7 @@ void RscTypCont :: WriteSrc( FILE * fOutput, ULONG nFileKey,
|* RscTypCont :: WriteHxx
|*
*************************************************************************/
-ERRTYPE RscTypCont :: WriteHxx( FILE * fOutput, ULONG nFileKey )
+ERRTYPE RscTypCont :: WriteHxx( FILE * fOutput, sal_uLong nFileKey )
{
fprintf( fOutput, "#include <tools/rc.hxx>\n" );
fprintf( fOutput, "#include <tools/resid.hxx>\n" );
@@ -836,7 +837,7 @@ ERRTYPE RscTypCont :: WriteHxx( FILE * fOutput, ULONG nFileKey )
fprintf( fOutput, "#include <vcl/fixed.hxx>\n" );
fprintf( fOutput, "#include <vcl/group.hxx>\n" );
fprintf( fOutput, "#include <vcl/image.hxx>\n" );
- fprintf( fOutput, "#include <vcl/imagebtn.hxx>\n" );
+ fprintf( fOutput, "#include <vcl/button.hxx>\n" );
fprintf( fOutput, "#include <vcl/keycod.hxx>\n" );
fprintf( fOutput, "#include <vcl/lstbox.hxx>\n" );
fprintf( fOutput, "#include <vcl/mapmod.hxx>\n" );
@@ -882,7 +883,7 @@ ERRTYPE RscTypCont :: WriteHxx( FILE * fOutput, ULONG nFileKey )
|* RscTypCont :: WriteCxx
|*
*************************************************************************/
-ERRTYPE RscTypCont::WriteCxx( FILE * fOutput, ULONG nFileKey,
+ERRTYPE RscTypCont::WriteCxx( FILE * fOutput, sal_uLong nFileKey,
const ByteString & rHxxName )
{
RscEnumerateRef aEnumRef( this, pRoot, fOutput );
@@ -940,14 +941,14 @@ void RscTypCont::WriteRcCtor
*************************************************************************/
class RscDel
{
- ULONG lFileKey;
+ sal_uLong lFileKey;
DECL_LINK( Delete, RscTop * );
public:
- RscDel( RscTop * pRoot, ULONG lKey );
+ RscDel( RscTop * pRoot, sal_uLong lKey );
};
-inline RscDel::RscDel( RscTop * pRoot, ULONG lKey )
+inline RscDel::RscDel( RscTop * pRoot, sal_uLong lKey )
{
lFileKey = lKey;
pRoot->EnumNodes( LINK( this, RscDel, Delete ) );
@@ -961,7 +962,7 @@ IMPL_LINK_INLINE_START( RscDel, Delete, RscTop *, pNode )
}
IMPL_LINK_INLINE_END( RscDel, Delete, RscTop *, pNode )
-void RscTypCont :: Delete( ULONG lFileKey ){
+void RscTypCont :: Delete( sal_uLong lFileKey ){
// Resourceinstanzen loeschen
RscDel aDel( pRoot, lFileKey );
// Defines loeschen
@@ -973,54 +974,54 @@ void RscTypCont :: Delete( ULONG lFileKey ){
|* RscTypCont :: MakeConsistent()
|*
*************************************************************************/
-BOOL IsInstConsistent( ObjNode * pObjNode, RscTop * pRscTop )
+sal_Bool IsInstConsistent( ObjNode * pObjNode, RscTop * pRscTop )
{
- BOOL bRet = TRUE;
+ sal_Bool bRet = sal_True;
if( pObjNode ){
RSCINST aTmpI;
if( ! IsInstConsistent( (ObjNode*)pObjNode->Left(), pRscTop ) )
- bRet = FALSE;
+ bRet = sal_False;
aTmpI.pClass = pRscTop;
aTmpI.pData = pObjNode->GetRscObj();
if( ! aTmpI.pClass->IsConsistent( aTmpI ) )
- bRet = FALSE;
+ bRet = sal_False;
if( ! IsInstConsistent( (ObjNode*)pObjNode->Right(), pRscTop ) )
- bRet = FALSE;
+ bRet = sal_False;
};
return( bRet );
}
-BOOL MakeConsistent( RscTop * pRscTop )
+sal_Bool MakeConsistent( RscTop * pRscTop )
{
- BOOL bRet = TRUE;
+ sal_Bool bRet = sal_True;
if( pRscTop ){
if( ! ::MakeConsistent( (RscTop*)pRscTop->Left() ) )
- bRet = FALSE;
+ bRet = sal_False;
if( pRscTop->GetObjNode() ){
if( ! pRscTop->GetObjNode()->IsConsistent() ){
pRscTop->GetObjNode()->OrderTree();
if( ! pRscTop->GetObjNode()->IsConsistent() )
- bRet = FALSE;
+ bRet = sal_False;
}
if( ! IsInstConsistent( pRscTop->GetObjNode(), pRscTop ) )
- bRet = FALSE;
+ bRet = sal_False;
}
if( ! ::MakeConsistent( (RscTop*)pRscTop->Right() ) )
- bRet = FALSE;
+ bRet = sal_False;
};
return bRet;
}
-BOOL RscTypCont :: MakeConsistent(){
+sal_Bool RscTypCont :: MakeConsistent(){
return( ::MakeConsistent( pRoot ) );
}
diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx
index 1acd8abc3bf8..f2456cfca257 100644
--- a/rsc/source/parser/rscibas.cxx
+++ b/rsc/source/parser/rscibas.cxx
@@ -53,7 +53,7 @@
#include <boost/unordered_map.hpp>
/****************** M A C R O S ******************************************/
-void RscTypCont::SETCONST( RscConst * pClass, const char * szString, UINT32 nVal )
+void RscTypCont::SETCONST( RscConst * pClass, const char * szString, sal_uInt32 nVal )
{
#if OSL_DEBUG_LEVEL > 2
fprintf( stderr, "setconst : %s\n", szString );
@@ -62,7 +62,7 @@ void RscTypCont::SETCONST( RscConst * pClass, const char * szString, UINT32 nVal
CONSTNAME, nVal ), nVal );
}
-void RscTypCont::SETCONST( RscConst * pClass, Atom nName, UINT32 nVal )
+void RscTypCont::SETCONST( RscConst * pClass, Atom nName, sal_uInt32 nVal )
{
#if OSL_DEBUG_LEVEL > 2
fprintf( stderr, "setconst hash: %u\n", (unsigned int)nName );
@@ -103,7 +103,7 @@ void RscLangEnum::Init( RscNameTable& rNames )
while ( NULL != ( pLangEntry = MsLangId::getIsoLangEntry( nIndex )) && ( pLangEntry->mnLang != LANGUAGE_DONTKNOW ))
{
#if OSL_DEBUG_LEVEL > 2
- fprintf( stderr, "ISO Language in : %d %d %s\n",
+ fprintf( stderr, "ISO Language in : %d\n",
(int)nIndex,
pLangEntry->mnLang,
MsLangId::convertLanguageToIsoByteString( pLangEntry->mnLang ).getStr() );
@@ -201,7 +201,7 @@ Atom RscLangEnum::AddLanguage( const char* pLang, RscNameTable& rNames )
mnLangId++;
}
#if OSL_DEBUG_LEVEL > 2
- fprintf( stderr, "AddLanguage( %s ) = 0x%lx\n", pLang, nResult );
+ fprintf( stderr, "AddLanguage( %s ) = %d\n", pLang, nResult );
#endif
return nResult;
}
@@ -460,12 +460,12 @@ RscEnum * RscTypCont::InitMessButtons()
{
RscEnum * pMessButtons;
pMessButtons = new RscEnum( pHS->getID( "EnumMessButtons" ), RSC_NOTYPE );
- SETCONST( pMessButtons, "WB_OK", sal::static_int_cast<UINT32>(WB_OK) );
- SETCONST( pMessButtons, "WB_OK_CANCEL", sal::static_int_cast<UINT32>(WB_OK_CANCEL) );
- SETCONST( pMessButtons, "WB_YES_NO", sal::static_int_cast<UINT32>(WB_YES_NO) );
- SETCONST( pMessButtons, "WB_YES_NO_CANCEL", sal::static_int_cast<UINT32>(WB_YES_NO_CANCEL) );
- SETCONST( pMessButtons, "WB_RETRY_CANCEL", sal::static_int_cast<UINT32>(WB_RETRY_CANCEL) );
- SETCONST( pMessButtons, "WB_ABORT_RETRY_IGNORE", sal::static_int_cast<UINT32>(WB_ABORT_RETRY_IGNORE) );
+ SETCONST( pMessButtons, "WB_OK", sal::static_int_cast<sal_uInt32>(WB_OK) );
+ SETCONST( pMessButtons, "WB_OK_CANCEL", sal::static_int_cast<sal_uInt32>(WB_OK_CANCEL) );
+ SETCONST( pMessButtons, "WB_YES_NO", sal::static_int_cast<sal_uInt32>(WB_YES_NO) );
+ SETCONST( pMessButtons, "WB_YES_NO_CANCEL", sal::static_int_cast<sal_uInt32>(WB_YES_NO_CANCEL) );
+ SETCONST( pMessButtons, "WB_RETRY_CANCEL", sal::static_int_cast<sal_uInt32>(WB_RETRY_CANCEL) );
+ SETCONST( pMessButtons, "WB_ABORT_RETRY_IGNORE", sal::static_int_cast<sal_uInt32>(WB_ABORT_RETRY_IGNORE) );
return( pMessButtons );
}
@@ -479,12 +479,12 @@ RscEnum * RscTypCont::InitMessDefButton(){
pMessDefButton = new RscEnum( pHS->getID( "EnumMessDefButton" ),
RSC_NOTYPE );
- SETCONST( pMessDefButton, "WB_DEF_OK", sal::static_int_cast<UINT32>(WB_DEF_OK) );
- SETCONST( pMessDefButton, "WB_DEF_CANCEL", sal::static_int_cast<UINT32>(WB_DEF_CANCEL) );
- SETCONST( pMessDefButton, "WB_DEF_RETRY", sal::static_int_cast<UINT32>(WB_DEF_RETRY) );
- SETCONST( pMessDefButton, "WB_DEF_YES", sal::static_int_cast<UINT32>(WB_DEF_YES) );
- SETCONST( pMessDefButton, "WB_DEF_NO", sal::static_int_cast<UINT32>(WB_DEF_NO) );
- SETCONST( pMessDefButton, "WB_DEF_IGNORE", sal::static_int_cast<UINT32>(WB_DEF_IGNORE) );
+ SETCONST( pMessDefButton, "WB_DEF_OK", sal::static_int_cast<sal_uInt32>(WB_DEF_OK) );
+ SETCONST( pMessDefButton, "WB_DEF_CANCEL", sal::static_int_cast<sal_uInt32>(WB_DEF_CANCEL) );
+ SETCONST( pMessDefButton, "WB_DEF_RETRY", sal::static_int_cast<sal_uInt32>(WB_DEF_RETRY) );
+ SETCONST( pMessDefButton, "WB_DEF_YES", sal::static_int_cast<sal_uInt32>(WB_DEF_YES) );
+ SETCONST( pMessDefButton, "WB_DEF_NO", sal::static_int_cast<sal_uInt32>(WB_DEF_NO) );
+ SETCONST( pMessDefButton, "WB_DEF_IGNORE", sal::static_int_cast<sal_uInt32>(WB_DEF_IGNORE) );
return( pMessDefButton );
}
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index d9210049ac9d..072f1f085649 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -41,7 +41,7 @@
#include <rscclass.hxx>
#include <rsccont.hxx>
#include <rscdb.hxx>
-#include <rscsfx.hxx>
+#include <rsc/rscsfx.hxx>
#include "rsclex.hxx"
#include <yyrscyacc.hxx>
@@ -56,7 +56,7 @@ void RscTypCont::InsWinBit( RscTop * pClass, const ByteString & rName,
// Clientvariablen einfuegen
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, &aWinBits, nVal )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, &aWinBits, nVal )
);
Atom nId = aNmTb.Put( rName.GetBuffer(), VARNAME );
pClass->SetVariable( nId, pClient, NULL,
@@ -75,7 +75,7 @@ RscTop * RscTypCont::InitClassMgr()
RscBaseCont * pClass;
Atom nId;
- aBaseLst.push_back( pClass = new RscBaseCont( InvalidAtom, RSC_NOTYPE, NULL, FALSE ) );
+ aBaseLst.push_back( pClass = new RscBaseCont( InvalidAtom, RSC_NOTYPE, NULL, sal_False ) );
nId = pHS->getID( "Resource" );
pClassMgr = new RscMgr( nId, RSC_RESOURCE, pClass );
@@ -213,7 +213,7 @@ RscTop * RscTypCont::InitClassImageList( RscTop * pSuper, RscTop * /*pClassBitma
pClassImageList->SetVariable( nId, pClassColor, NULL,
VAR_SVDYNAMIC, RSC_IMAGELIST_MASKCOLOR );
- RscCont * pCont = new RscCont( pHS->getID( "USHORT *" ), RSC_NOTYPE );
+ RscCont * pCont = new RscCont( pHS->getID( "sal_uInt16 *" ), RSC_NOTYPE );
pCont->SetTypeClass( &aIdUShort );
aBaseLst.push_back( pCont );
nId = aNmTb.Put( "IdList", VARNAME );
@@ -264,14 +264,14 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit,
VAR_HIDDEN | VAR_NOENUM );
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, nDisableId )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nDisableId )
);
nId = aNmTb.Put( "Disable", VARNAME );
pClassWindow->SetVariable( nId, pClient, NULL,
VAR_NODATAINST, 0, nVarId );
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, nOutputSizeId )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nOutputSizeId )
);
nId = aNmTb.Put( "OutputSize", VARNAME );
pClassWindow->SetVariable( nId, pClient, NULL,
@@ -288,7 +288,7 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit,
InsWinBit( pClassWindow, "DialogControl", nTabControlId );
nId = aNmTb.Put( "HelpID", VARNAME );
- pClassWindow->SetVariable( nId, &aIdLong );
+ pClassWindow->SetVariable( nId, &aStringLiteral, NULL, 0, WINDOW_HELPID );
nRsc_XYMAPMODEId = nId = aNmTb.Put( "_XYMapMode", VARNAME );
@@ -316,7 +316,7 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit,
nId = aNmTb.Put( "ExtraLong", VARNAME );
pClassWindow->SetVariable( nId, &aLong, NULL, 0, WINDOW_EXTRALONG );
nId = aNmTb.Put( "UniqueId", VARNAME );
- pClassWindow->SetVariable( nId, &aLong, NULL, 0, WINDOW_UNIQUEID );
+ pClassWindow->SetVariable( nId, &aString, NULL, 0, WINDOW_UNIQUEID );
// BorderStyle
RscEnum* pBorderStyleEnum = new RscEnum( pHS->getID( "WindowBorderStyle" ), RSC_NOTYPE );
@@ -688,7 +688,7 @@ RscTop * RscTypCont::InitClassScrollBar( RscTop * pSuper )
{
RSCINST aDfltI;
- aDfltI = aShort.Create( NULL, RSCINST(), FALSE );
+ aDfltI = aShort.Create( NULL, RSCINST(), sal_False );
aDfltI.pClass->SetNumber( aDfltI, 100 );
// aDfltI.pClass->MakeDefault( aDfltI );
@@ -700,7 +700,7 @@ RscTop * RscTypCont::InitClassScrollBar( RscTop * pSuper )
{
RSCINST aDfltI;
- aDfltI = aShort.Create( NULL, RSCINST(), FALSE );
+ aDfltI = aShort.Create( NULL, RSCINST(), sal_False );
aDfltI.pClass->SetNumber( aDfltI, 1 );
// aDfltI.pClass->MakeDefault( aDfltI );
@@ -710,7 +710,7 @@ RscTop * RscTypCont::InitClassScrollBar( RscTop * pSuper )
{
RSCINST aDfltI;
- aDfltI = aShort.Create( NULL, RSCINST(), FALSE );
+ aDfltI = aShort.Create( NULL, RSCINST(), sal_False );
aDfltI.pClass->SetNumber( aDfltI, 1 );
// aDfltI.pClass->MakeDefault( aDfltI );
nId = aNmTb.Put( "LineSize", VARNAME );
@@ -750,8 +750,8 @@ RscTop * RscTypCont::InitClassListBox( RscTop * pSuper, RscArray * pStrLst )
INS_WINBIT(pClassListBox,DDExtraWidth)
{
- RSCINST aDflt = aUShort.Create( NULL, RSCINST(), FALSE );
- aDflt.pClass->SetNumber( aDflt, (USHORT)0xFFFF );
+ RSCINST aDflt = aUShort.Create( NULL, RSCINST(), sal_False );
+ aDflt.pClass->SetNumber( aDflt, (sal_uInt16)0xFFFF );
nId = aNmTb.Put( "CurPos", VARNAME );
pClassListBox->SetVariable( nId, &aUShort, &aDflt );
}
@@ -968,14 +968,14 @@ RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey )
// Clientvariablen einfuegen
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, nShiftId )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nShiftId )
);
nId = aNmTb.Put( "Shift", VARNAME );
pClassKeyCode->SetVariable( nId, pClient, NULL,
VAR_NODATAINST, 0, nVarId );
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, nMod1Id )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nMod1Id )
);
nId = aNmTb.Put( "Modifier1", VARNAME );
pClassKeyCode->SetVariable( nId, pClient, NULL,
@@ -983,7 +983,7 @@ RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey )
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, nMod2Id )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nMod2Id )
);
nId = aNmTb.Put( "Modifier2", VARNAME );
pClassKeyCode->SetVariable( nId, pClient, NULL,
@@ -1129,35 +1129,35 @@ RscTop * RscTypCont::InitClassMenuItem( RscTop * pSuper,
// Clientvariablen einfuegen
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, nCheckableId )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nCheckableId )
);
nId = aNmTb.Put( "Checkable", VARNAME );
pClassMenuItem->SetVariable( nId, pClient, NULL,
VAR_NODATAINST, 0, nVarId );
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, nAutoCheckId )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nAutoCheckId )
);
nId = aNmTb.Put( "AutoCheck", VARNAME );
pClassMenuItem->SetVariable( nId, pClient, NULL,
VAR_NODATAINST, 0, nVarId );
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, nRadioCheckId )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nRadioCheckId )
);
nId = aNmTb.Put( "RadioCheck", VARNAME );
pClassMenuItem->SetVariable( nId, pClient, NULL,
VAR_NODATAINST, 0, nVarId );
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, nAboutId )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nAboutId )
);
nId = aNmTb.Put( "About", VARNAME );
pClassMenuItem->SetVariable( nId, pClient, NULL,
VAR_NODATAINST, 0, nVarId );
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, nHelpId )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nHelpId )
);
nId = aNmTb.Put( "Help", VARNAME );
pClassMenuItem->SetVariable( nId, pClient, NULL,
@@ -1174,7 +1174,7 @@ RscTop * RscTypCont::InitClassMenuItem( RscTop * pSuper,
pClassMenuItem->SetVariable( nId, &aLangString, NULL, 0,
RSC_MENUITEM_HELPTEXT );
nId = aNmTb.Put( "HelpID", VARNAME );
- pClassMenuItem->SetVariable( nId, &aIdLong, NULL, 0,
+ pClassMenuItem->SetVariable( nId, &aStringLiteral, NULL, 0,
RSC_MENUITEM_HELPID );
nId = aNmTb.Put( "AccelKey", VARNAME );
pClassMenuItem->SetVariable( nId, pClassKeyCode, NULL, 0,
@@ -1247,7 +1247,7 @@ RscTop * RscTypCont::InitClassMessBox( RscTop * pSuper,
nId = aNmTb.Put( "DefButton", VARNAME );
pClassMessBox->SetVariable( nId, pMessDefButton );
nId = aNmTb.Put( "HelpID", VARNAME );
- pClassMessBox->SetVariable( nId, &aIdLong );
+ pClassMessBox->SetVariable( nId, &aStringLiteral );
nId = aNmTb.Put( "SysModal", VARNAME );
pClassMessBox->SetVariable( nId, &aBool );
nId = aNmTb.Put( "Title", VARNAME );
@@ -1946,43 +1946,43 @@ RscTop * RscTypCont::InitClassToolBoxItem( RscTop * pSuper,
// Clientvariablen einfuegen
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, l_nCheckableId )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, l_nCheckableId )
);
nId = aNmTb.Put( "Checkable", VARNAME );
pClassToolBoxItem->SetVariable( nId, pClient, NULL, VAR_NODATAINST, 0, l_nVarId );
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, l_nAutoCheckId )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, l_nAutoCheckId )
);
nId = aNmTb.Put( "AutoCheck", VARNAME );
pClassToolBoxItem->SetVariable( nId, pClient, NULL, VAR_NODATAINST, 0, l_nVarId );
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, l_nRadioCheckId )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, l_nRadioCheckId )
);
nId = aNmTb.Put( "RadioCheck", VARNAME );
pClassToolBoxItem->SetVariable( nId, pClient, NULL, VAR_NODATAINST, 0, l_nVarId );
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, l_nLeftId )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, l_nLeftId )
);
nId = aNmTb.Put( "Left", VARNAME );
pClassToolBoxItem->SetVariable( nId, pClient, NULL, VAR_NODATAINST, 0, l_nVarId );
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, l_nAutoSizeId )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, l_nAutoSizeId )
);
nId = aNmTb.Put( "AutoSize", VARNAME );
pClassToolBoxItem->SetVariable( nId, pClient, NULL, VAR_NODATAINST, 0, l_nVarId );
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, pFlag, l_nDropDownId )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, l_nDropDownId )
);
nId = aNmTb.Put( "DropDown", VARNAME );
pClassToolBoxItem->SetVariable( nId, pClient, NULL, VAR_NODATAINST, 0, l_nVarId );
}
nId = aNmTb.Put( "HelpID", VARNAME );
- pClassToolBoxItem->SetVariable( nId, &aIdLong, NULL, 0,
+ pClassToolBoxItem->SetVariable( nId, &aStringLiteral, NULL, 0,
RSC_TOOLBOXITEM_HELPID );
nId = aNmTb.Put( "Text", VARNAME );
pClassToolBoxItem->SetVariable( nId, &aLangString, NULL, 0,
@@ -2239,7 +2239,6 @@ RscTop * RscTypCont::InitClassTabControl( RscTop * pSuper,
pClassTabControl->SetVariable( nId, pCont, NULL, 0,
RSC_TABCONTROL_ITEMLIST );
- INS_WINBIT( pClassTabControl, SingleLine );
INS_WINBIT( pClassTabControl, DropDown );
}
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index c3dac0a6b009..c16c9826dbf7 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -191,7 +191,7 @@ void RscTypCont::Init()
Atom nId;
- aNmTb.SetSort( FALSE );
+ aNmTb.SetSort( sal_False );
{
/********** C O M P I L E R T Y P E N ******************************/
aNmTb.Put( "LINE", LINE, (long)0 );
@@ -204,12 +204,14 @@ void RscTypCont::Init()
aNmTb.Put( "writeifset", WRITEIFSET, (long)0 );
/* Werte fuer Aufzaehlungstypen */
- aNmTb.Put( "TRUE", BOOLEAN, (long)TRUE );
- aNmTb.Put( "FALSE", BOOLEAN, (long)FALSE );
+ aNmTb.Put( "TRUE", BOOLEAN, (long)sal_True );
+ aNmTb.Put( "FALSE", BOOLEAN, (long)sal_False );
+ #if 0
/* Vordefinierte HilfeId's */
aNmTb.Put( "HELP_INDEX", NUMBER, OOO_HELP_INDEX );
aNmTb.Put( "HELP_HELPONHELP", NUMBER, OOO_HELP_HELPONHELP );
+ #endif
aNmTb.Put( "XSCALE", XSCALE , (long)0 );
aNmTb.Put( "YSCALE", YSCALE , (long)0 );
@@ -260,119 +262,117 @@ void RscTypCont::Init()
// Windows
nBorderId = pHS->getID( "WB_BORDER" );
- aWinBits.SetConstant( nBorderId, sal::static_int_cast<INT32>(WB_BORDER) );
+ aWinBits.SetConstant( nBorderId, sal::static_int_cast<sal_Int32>(WB_BORDER) );
nHideId = pHS->getID( "WB_HIDE" );
- aWinBits.SetConstant( nHideId, sal::static_int_cast<INT32>(WB_HIDE) );
+ aWinBits.SetConstant( nHideId, sal::static_int_cast<sal_Int32>(WB_HIDE) );
nClipChildrenId = pHS->getID( "WB_CLIPCHILDREN" );
- aWinBits.SetConstant( nClipChildrenId, sal::static_int_cast<INT32>(WB_CLIPCHILDREN) );
+ aWinBits.SetConstant( nClipChildrenId, sal::static_int_cast<sal_Int32>(WB_CLIPCHILDREN) );
nSizeableId = pHS->getID( "WB_SIZEABLE" );
- aWinBits.SetConstant( nSizeableId, sal::static_int_cast<INT32>(WB_SIZEABLE) );
+ aWinBits.SetConstant( nSizeableId, sal::static_int_cast<sal_Int32>(WB_SIZEABLE) );
nMoveableId = pHS->getID( "WB_MOVEABLE" );
- aWinBits.SetConstant( nMoveableId, sal::static_int_cast<INT32>(WB_MOVEABLE) );
+ aWinBits.SetConstant( nMoveableId, sal::static_int_cast<sal_Int32>(WB_MOVEABLE) );
nMinimizeId = pHS->getID( "WB_MINABLE" );
aWinBits.SetConstant( nMinimizeId, 0 /*WB_MINABLE*/ );
nMaximizeId = pHS->getID( "WB_MAXABLE" );
aWinBits.SetConstant( nMaximizeId, 0 /*WB_MAXABLE*/ );
nCloseableId = pHS->getID( "WB_CLOSEABLE" );
- aWinBits.SetConstant( nCloseableId, sal::static_int_cast<INT32>(WB_CLOSEABLE) );
+ aWinBits.SetConstant( nCloseableId, sal::static_int_cast<sal_Int32>(WB_CLOSEABLE) );
nAppId = pHS->getID( "WB_APP" );
- aWinBits.SetConstant( nAppId, sal::static_int_cast<INT32>(WB_APP) );
+ aWinBits.SetConstant( nAppId, sal::static_int_cast<sal_Int32>(WB_APP) );
nTabstopId = pHS->getID( "WB_TABSTOP" );
- aWinBits.SetConstant( nTabstopId, sal::static_int_cast<INT32>(WB_TABSTOP) );
+ aWinBits.SetConstant( nTabstopId, sal::static_int_cast<sal_Int32>(WB_TABSTOP) );
nGroupId = pHS->getID( "WB_GROUP" );
- aWinBits.SetConstant( nGroupId, sal::static_int_cast<INT32>(WB_GROUP) );
+ aWinBits.SetConstant( nGroupId, sal::static_int_cast<sal_Int32>(WB_GROUP) );
nSysmodalId = pHS->getID( "WB_SYSMODAL" );
aWinBits.SetConstant( nSysmodalId, 0 /*WB_SYSMODAL*/ );
}
{
nLeftId = pHS->getID( "WB_LEFT" );
- aWinBits.SetConstant( nLeftId, sal::static_int_cast<INT32>(WB_LEFT) );
+ aWinBits.SetConstant( nLeftId, sal::static_int_cast<sal_Int32>(WB_LEFT) );
nCenterId = pHS->getID( "WB_CENTER" );
- aWinBits.SetConstant( nCenterId, sal::static_int_cast<INT32>(WB_CENTER) );
+ aWinBits.SetConstant( nCenterId, sal::static_int_cast<sal_Int32>(WB_CENTER) );
nRightId = pHS->getID( "WB_RIGHT" );
- aWinBits.SetConstant( nRightId, sal::static_int_cast<INT32>(WB_RIGHT) );
+ aWinBits.SetConstant( nRightId, sal::static_int_cast<sal_Int32>(WB_RIGHT) );
nTopId = pHS->getID( "WB_TOP" );
- aWinBits.SetConstant( nTopId, sal::static_int_cast<INT32>(WB_TOP) );
+ aWinBits.SetConstant( nTopId, sal::static_int_cast<sal_Int32>(WB_TOP) );
nVCenterId = pHS->getID( "WB_VCENTER" );
- aWinBits.SetConstant( nVCenterId, sal::static_int_cast<INT32>(WB_VCENTER) );
+ aWinBits.SetConstant( nVCenterId, sal::static_int_cast<sal_Int32>(WB_VCENTER) );
nBottomId = pHS->getID( "WB_BOTTOM" );
- aWinBits.SetConstant( nBottomId, sal::static_int_cast<INT32>(WB_BOTTOM) );
+ aWinBits.SetConstant( nBottomId, sal::static_int_cast<sal_Int32>(WB_BOTTOM) );
nHScrollId = pHS->getID( "WB_HSCROLL" );
- aWinBits.SetConstant( nHScrollId, sal::static_int_cast<INT32>(WB_HSCROLL) );
+ aWinBits.SetConstant( nHScrollId, sal::static_int_cast<sal_Int32>(WB_HSCROLL) );
nVScrollId = pHS->getID( "WB_VSCROLL" );
- aWinBits.SetConstant( nVScrollId, sal::static_int_cast<INT32>(WB_VSCROLL) );
+ aWinBits.SetConstant( nVScrollId, sal::static_int_cast<sal_Int32>(WB_VSCROLL) );
nSortId = pHS->getID( "WB_SORT" );
- aWinBits.SetConstant( nSortId, sal::static_int_cast<INT32>(WB_SORT) );
+ aWinBits.SetConstant( nSortId, sal::static_int_cast<sal_Int32>(WB_SORT) );
nDefaultId = pHS->getID( "WB_DEFBUTTON" );
- aWinBits.SetConstant( nDefaultId, sal::static_int_cast<INT32>(WB_DEFBUTTON) );
+ aWinBits.SetConstant( nDefaultId, sal::static_int_cast<sal_Int32>(WB_DEFBUTTON) );
nRepeatId = pHS->getID( "WB_REPEAT" );
- aWinBits.SetConstant( nRepeatId, sal::static_int_cast<INT32>(WB_REPEAT) );
+ aWinBits.SetConstant( nRepeatId, sal::static_int_cast<sal_Int32>(WB_REPEAT) );
nSVLookId = pHS->getID( "WB_SVLOOK" );
- aWinBits.SetConstant( nSVLookId, sal::static_int_cast<INT32>(WB_3DLOOK) );
+ aWinBits.SetConstant( nSVLookId, sal::static_int_cast<sal_Int32>(WB_3DLOOK) );
nDropDownId = pHS->getID( "WB_DROPDOWN" );
- aWinBits.SetConstant( nDropDownId, sal::static_int_cast<INT32>(WB_DROPDOWN) );
+ aWinBits.SetConstant( nDropDownId, sal::static_int_cast<sal_Int32>(WB_DROPDOWN) );
nPassWordId = pHS->getID( "WB_PASSWORD" );
- aWinBits.SetConstant( nPassWordId, sal::static_int_cast<INT32>(WB_PASSWORD) );
+ aWinBits.SetConstant( nPassWordId, sal::static_int_cast<sal_Int32>(WB_PASSWORD) );
nReadOnlyId = pHS->getID( "WB_READONLY" );
- aWinBits.SetConstant( nReadOnlyId, sal::static_int_cast<INT32>(WB_READONLY) );
+ aWinBits.SetConstant( nReadOnlyId, sal::static_int_cast<sal_Int32>(WB_READONLY) );
nAutoSizeId = pHS->getID( "WB_AUTOSIZE" );
- aWinBits.SetConstant( nAutoSizeId, sal::static_int_cast<INT32>(WB_AUTOSIZE) );
+ aWinBits.SetConstant( nAutoSizeId, sal::static_int_cast<sal_Int32>(WB_AUTOSIZE) );
nSpinId = pHS->getID( "WB_SPIN" );
- aWinBits.SetConstant( nSpinId, sal::static_int_cast<INT32>(WB_SPIN) );
+ aWinBits.SetConstant( nSpinId, sal::static_int_cast<sal_Int32>(WB_SPIN) );
nTabControlId = pHS->getID( "WB_DIALOGCONTROL" );
- aWinBits.SetConstant( nTabControlId, sal::static_int_cast<INT32>(WB_DIALOGCONTROL) );
+ aWinBits.SetConstant( nTabControlId, sal::static_int_cast<sal_Int32>(WB_DIALOGCONTROL) );
nSimpleModeId = pHS->getID( "WB_SIMPLEMODE" );
- aWinBits.SetConstant( nSimpleModeId, sal::static_int_cast<INT32>(WB_SIMPLEMODE) );
+ aWinBits.SetConstant( nSimpleModeId, sal::static_int_cast<sal_Int32>(WB_SIMPLEMODE) );
nDragId = pHS->getID( "WB_DRAG" );
- aWinBits.SetConstant( nDragId, sal::static_int_cast<INT32>(WB_DRAG) );
+ aWinBits.SetConstant( nDragId, sal::static_int_cast<sal_Int32>(WB_DRAG) );
nScrollId = pHS->getID( "WB_SCROLL" );
- aWinBits.SetConstant( nScrollId, sal::static_int_cast<INT32>(WB_SCROLL) );
+ aWinBits.SetConstant( nScrollId, sal::static_int_cast<sal_Int32>(WB_SCROLL) );
nZoomableId = pHS->getID( "WB_ZOOMABLE" );
- aWinBits.SetConstant( nZoomableId, sal::static_int_cast<INT32>(WB_ROLLABLE) );
+ aWinBits.SetConstant( nZoomableId, sal::static_int_cast<sal_Int32>(WB_ROLLABLE) );
nHideWhenDeactivateId = pHS->getID( "WB_HIDEWHENDEACTIVATE" );
aWinBits.SetConstant( nHideWhenDeactivateId, 0 /*WB_HIDEWHENDEACTIVATE*/ );
nAutoHScrollId = pHS->getID( "WB_AUTOHSCROLL" );
- aWinBits.SetConstant( nAutoHScrollId, sal::static_int_cast<INT32>(WB_AUTOHSCROLL) );
+ aWinBits.SetConstant( nAutoHScrollId, sal::static_int_cast<sal_Int32>(WB_AUTOHSCROLL) );
nAutoVScrollId = pHS->getID( "WB_AUTOVSCROLL" );
- aWinBits.SetConstant( nAutoVScrollId, sal::static_int_cast<INT32>(WB_AUTOVSCROLL) );
+ aWinBits.SetConstant( nAutoVScrollId, sal::static_int_cast<sal_Int32>(WB_AUTOVSCROLL) );
nDDExtraWidthId = pHS->getID( "WB_DDEXTRAWIDTH" );
aWinBits.SetConstant( nDDExtraWidthId, 0 /*WB_DDEXTRAWIDTH*/ );
nWordBreakId = pHS->getID( "WB_WORDBREAK" );
- aWinBits.SetConstant( nWordBreakId, sal::static_int_cast<INT32>(WB_WORDBREAK) );
+ aWinBits.SetConstant( nWordBreakId, sal::static_int_cast<sal_Int32>(WB_WORDBREAK) );
nLeftLabelId = pHS->getID( "WB_LEFTLABEL" );
aWinBits.SetConstant( nLeftLabelId, 0 /*WB_LEFTLABEL*/ );
nHasLinesId = pHS->getID( "WB_HASLINES" );
- aWinBits.SetConstant( nHasLinesId, sal::static_int_cast<INT32>(WB_HASLINES) );
+ aWinBits.SetConstant( nHasLinesId, sal::static_int_cast<sal_Int32>(WB_HASLINES) );
nHasButtonsId = pHS->getID( "WB_HASBUTTONS" );
- aWinBits.SetConstant( nHasButtonsId, sal::static_int_cast<INT32>(WB_HASBUTTONS) );
+ aWinBits.SetConstant( nHasButtonsId, sal::static_int_cast<sal_Int32>(WB_HASBUTTONS) );
nRectStyleId = pHS->getID( "WB_RECTSTYLE" );
- aWinBits.SetConstant( nRectStyleId, sal::static_int_cast<INT32>(WB_RECTSTYLE) );
+ aWinBits.SetConstant( nRectStyleId, sal::static_int_cast<sal_Int32>(WB_RECTSTYLE) );
nLineSpacingId = pHS->getID( "WB_LINESPACING" );
- aWinBits.SetConstant( nLineSpacingId, sal::static_int_cast<INT32>(WB_LINESPACING) );
+ aWinBits.SetConstant( nLineSpacingId, sal::static_int_cast<sal_Int32>(WB_LINESPACING) );
nSmallStyleId = pHS->getID( "WB_SMALLSTYLE" );
- aWinBits.SetConstant( nSmallStyleId, sal::static_int_cast<INT32>(WB_SMALLSTYLE) );
+ aWinBits.SetConstant( nSmallStyleId, sal::static_int_cast<sal_Int32>(WB_SMALLSTYLE) );
nEnableResizingId = pHS->getID( "WB_ENABLERESIZING" );
aWinBits.SetConstant( nEnableResizingId, 0 /*WB_ENABLERESIZING*/ );
nDockableId = pHS->getID( "WB_DOCKABLE" );
- aWinBits.SetConstant( nDockableId, sal::static_int_cast<INT32>(WB_DOCKABLE) );
+ aWinBits.SetConstant( nDockableId, sal::static_int_cast<sal_Int32>(WB_DOCKABLE) );
nScaleId = pHS->getID( "WB_SCALE" );
- aWinBits.SetConstant( nScaleId, sal::static_int_cast<INT32>(WB_SCALE) );
+ aWinBits.SetConstant( nScaleId, sal::static_int_cast<sal_Int32>(WB_SCALE) );
nIgnoreTabId = pHS->getID( "WB_IGNORETAB" );
- aWinBits.SetConstant( nIgnoreTabId, sal::static_int_cast<INT32>(WB_IGNORETAB) );
+ aWinBits.SetConstant( nIgnoreTabId, sal::static_int_cast<sal_Int32>(WB_IGNORETAB) );
nNoSplitDrawId = pHS->getID( "WB_NOSPLITDRAW" );
- aWinBits.SetConstant( nNoSplitDrawId, sal::static_int_cast<INT32>(WB_NOSPLITDRAW) );
+ aWinBits.SetConstant( nNoSplitDrawId, sal::static_int_cast<sal_Int32>(WB_NOSPLITDRAW) );
nTopImageId = pHS->getID( "WB_TOPIMAGE" );
- aWinBits.SetConstant( nTopImageId, sal::static_int_cast<INT32>(WB_TOPIMAGE) );
+ aWinBits.SetConstant( nTopImageId, sal::static_int_cast<sal_Int32>(WB_TOPIMAGE) );
nNoLabelId = pHS->getID( "WB_NOLABEL" );
- aWinBits.SetConstant( nNoLabelId, sal::static_int_cast<INT32>(WB_NOLABEL) );
+ aWinBits.SetConstant( nNoLabelId, sal::static_int_cast<sal_Int32>(WB_NOLABEL) );
nVertId = pHS->getID( "WB_VERT" );
- aWinBits.SetConstant( nVertId, sal::static_int_cast<INT32>(WB_VERT) );
- nSingleLineId = pHS->getID( "WB_SINGLELINE" );
- aWinBits.SetConstant( nSingleLineId, sal::static_int_cast<INT32>(WB_SINGLELINE) );
+ aWinBits.SetConstant( nVertId, sal::static_int_cast<sal_Int32>(WB_VERT) );
nSysWinId = pHS->getID( "WB_SYSTEMWINDOW" );
- aWinBits.SetConstant( nSysWinId, sal::static_int_cast<INT32>(WB_SYSTEMWINDOW) );
+ aWinBits.SetConstant( nSysWinId, sal::static_int_cast<sal_Int32>(WB_SYSTEMWINDOW) );
nStdPopupId = pHS->getID( "WB_STDPOPUP" );
- aWinBits.SetConstant( nStdPopupId, sal::static_int_cast<INT32>(WB_STDPOPUP) );
+ aWinBits.SetConstant( nStdPopupId, sal::static_int_cast<sal_Int32>(WB_STDPOPUP) );
}
{
/********** I n i t B a s i c T y p e s **************************/
@@ -695,7 +695,7 @@ void RscTypCont::Init()
// Clientvariablen einfuegen
// Sysmodal
aBaseLst.push_back(
- pClient = new RscClient( pHS->getID( "BOOL" ), RSC_NOTYPE, &aWinBits, nRepeatId )
+ pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, &aWinBits, nRepeatId )
);
nId = aNmTb.Put( "Repeat", VARNAME );
pClassSpinButton->SetVariable( nId, pClient, NULL,
diff --git a/rsc/source/parser/rsckey.cxx b/rsc/source/parser/rsckey.cxx
index be0cefcf029b..e6e1559a4130 100644
--- a/rsc/source/parser/rsckey.cxx
+++ b/rsc/source/parser/rsckey.cxx
@@ -71,7 +71,7 @@ int KeyCompare( const void * pFirst, const void * pSecond ){
|*
*************************************************************************/
RscNameTable::RscNameTable() {
- bSort = TRUE;
+ bSort = sal_True;
nEntries = 0;
pTable = NULL;
};
@@ -92,7 +92,7 @@ RscNameTable::~RscNameTable() {
|* RscNameTable::SetSort()
|*
*************************************************************************/
-void RscNameTable::SetSort( BOOL bSorted ){
+void RscNameTable::SetSort( sal_Bool bSorted ){
bSort = bSorted;
if( bSort && pTable){
// Schluesselwort Feld sortieren
@@ -157,7 +157,7 @@ Atom RscNameTable::Put( const char * pName, sal_uInt32 nTyp, RscTop * pClass )
|* RscNameTable::Get()
|*
*************************************************************************/
-BOOL RscNameTable::Get( Atom nName, KEY_STRUCT * pEle ){
+sal_Bool RscNameTable::Get( Atom nName, KEY_STRUCT * pEle ){
KEY_STRUCT * pKey = NULL;
KEY_STRUCT aSearchName;
sal_uInt32 i;
@@ -184,9 +184,9 @@ BOOL RscNameTable::Get( Atom nName, KEY_STRUCT * pEle ){
if( pKey ){ // Schluesselwort gefunden
*pEle = *pKey;
- return( TRUE );
+ return( sal_True );
};
- return( FALSE );
+ return( sal_False );
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx
index 5c38c66790ca..0f59c7ab4cdf 100644..100755
--- a/rsc/source/parser/rsclex.cxx
+++ b/rsc/source/parser/rsclex.cxx
@@ -68,7 +68,7 @@ const char* StringContainer::putString( const char* pString )
/*************************************************************************/
int c;
-BOOL bLastInclude;// War letztes Symbol INCLUDE
+sal_Bool bLastInclude;// War letztes Symbol INCLUDE
RscFileInst* pFI;
RscTypCont* pTC;
RscExpression * pExp;
@@ -76,15 +76,15 @@ struct KeyVal {
int nKeyWord;
YYSTYPE aYYSType;
} aKeyVal[ 1 ];
-BOOL bTargetDefined;
+sal_Bool bTargetDefined;
StringContainer* pStringContainer = NULL;
/****************** C O D E **********************************************/
-UINT32 GetNumber(){
- UINT32 l = 0;
- UINT32 nLog = 10;
+sal_uInt32 GetNumber(){
+ sal_uInt32 l = 0;
+ sal_uInt32 nLog = 10;
if( '0' == c ){
c = pFI->GetFastChar();
@@ -122,7 +122,7 @@ UINT32 GetNumber(){
int MakeToken( YYSTYPE * pTokenVal ){
int c1;
- while( TRUE ){ // Kommentare und Leerzeichen ueberlesen
+ while( sal_True ){ // Kommentare und Leerzeichen ueberlesen
while( isspace( c ) )
c = pFI->GetFastChar();
if( '/' == c ){
@@ -154,7 +154,7 @@ int MakeToken( YYSTYPE * pTokenVal ){
}
if( bLastInclude ){
- bLastInclude = FALSE; //Zuruecksetzten
+ bLastInclude = sal_False; //Zuruecksetzten
if( '<' == c ){
OStringBuffer aBuf( 256 );
c = pFI->GetFastChar();
@@ -172,20 +172,25 @@ int MakeToken( YYSTYPE * pTokenVal ){
if( c == '"' )
{
OStringBuffer aBuf( 256 );
- BOOL bDone = FALSE;
+ sal_Bool bDone = sal_False;
while( !bDone && !pFI->IsEof() && c )
{
c = pFI->GetFastChar();
if( c == '"' )
{
- c = pFI->GetFastChar();
+ do
+ {
+ c = pFI->GetFastChar();
+ }
+ while( c == ' ' || c == '\t' );
if( c == '"' )
{
- aBuf.append( '"' );
- aBuf.append( '"' );
+ // this is a continued string
+ // note: multiline string continuations are handled by the parser
+ // see rscyacc.y
}
else
- bDone = TRUE;
+ bDone = sal_True;
}
else if( c == '\\' )
{
@@ -238,10 +243,10 @@ int MakeToken( YYSTYPE * pTokenVal ){
pTokenVal->constname.nValue = aKey.yylval;
break;
case BOOLEAN:
- pTokenVal->svbool = (BOOL)aKey.yylval;
+ pTokenVal->svbool = (sal_Bool)aKey.yylval;
break;
case INCLUDE:
- bLastInclude = TRUE;
+ bLastInclude = sal_True;
default:
pTokenVal->value = aKey.yylval;
};
@@ -305,7 +310,7 @@ int yylex()
#endif
{
if( bTargetDefined )
- bTargetDefined = FALSE;
+ bTargetDefined = sal_False;
else
aKeyVal[ 0 ].nKeyWord =
MakeToken( &aKeyVal[ 0 ].aYYSType );
@@ -333,10 +338,10 @@ void InitParser( RscFileInst * pFileInst )
pFI = pFileInst;
pStringContainer = new StringContainer();
pExp = NULL; //fuer MacroParser
- bTargetDefined = FALSE;
+ bTargetDefined = sal_False;
// Anfangszeichen initialisieren
- bLastInclude = FALSE;
+ bLastInclude = sal_False;
c = pFI->GetFastChar();
}
@@ -362,7 +367,7 @@ void IncludeParser( RscFileInst * pFileInst )
int nToken; // Wert des Tokens
YYSTYPE aYYSType; // Daten des Tokens
RscFile * pFName; // Filestruktur
- ULONG lKey; // Fileschluessel
+ sal_uLong lKey; // Fileschluessel
RscTypCont * pTypCon = pFileInst->pTypCont;
pFName = pTypCon->aFileTab.Get( pFileInst->GetFileIndex() );
@@ -418,7 +423,7 @@ RscExpression * MacroParser( RscFileInst & rFileInst )
//Ziel auf macro_expression setzen
aKeyVal[ 0 ].nKeyWord = MACROTARGET;
- bTargetDefined = TRUE;
+ bTargetDefined = sal_True;
aError = yyparse();
pExpression = pExp;
diff --git a/rsc/source/parser/rsclex.hxx b/rsc/source/parser/rsclex.hxx
index 2cc5a4193106..c861e89402f6 100644
--- a/rsc/source/parser/rsclex.hxx
+++ b/rsc/source/parser/rsclex.hxx
@@ -77,7 +77,7 @@ class ObjectStack {
ObjectStack () { pRoot = NULL; }
const RSCINST & Top () { return pRoot->aInst; }
- BOOL IsEmpty() { return( pRoot == NULL ); }
+ sal_Bool IsEmpty() { return( pRoot == NULL ); }
void IncTupelRec() { pRoot->nTupelRec++; }
void DecTupelRec() { pRoot->nTupelRec--; }
sal_uInt32 TupelRecCount() const { return pRoot->nTupelRec; }
diff --git a/rsc/source/parser/rscpar.cxx b/rsc/source/parser/rscpar.cxx
index 389d2c686c05..fc3c44c8754d 100644
--- a/rsc/source/parser/rscpar.cxx
+++ b/rsc/source/parser/rscpar.cxx
@@ -49,7 +49,7 @@ void RscFileInst::Init()
*pLine = '\0';
nScanPos = 0;
cLastChar = '\0';
- bEof = FALSE;
+ bEof = sal_False;
};
/*************************************************************************
@@ -57,8 +57,8 @@ void RscFileInst::Init()
|* RscFileInst::RscFileInst()
|*
*************************************************************************/
-RscFileInst::RscFileInst( RscTypCont * pTC, ULONG lIndexSrc,
- ULONG lFIndex, FILE * fFile )
+RscFileInst::RscFileInst( RscTypCont * pTC, sal_uLong lIndexSrc,
+ sal_uLong lFIndex, FILE * fFile )
{
pTypCont = pTC;
Init();
@@ -72,8 +72,8 @@ RscFileInst::RscFileInst( RscTypCont * pTC, ULONG lIndexSrc,
pInput = (char *)rtl_allocateMemory( nInputBufLen );
}
-RscFileInst::RscFileInst( RscTypCont * pTC, ULONG lIndexSrc,
- ULONG lFIndex, const ByteString& rBuf )
+RscFileInst::RscFileInst( RscTypCont * pTC, sal_uLong lIndexSrc,
+ sal_uLong lFIndex, const ByteString& rBuf )
{
pTypCont = pTC;
Init();
@@ -113,7 +113,7 @@ int RscFileInst::GetChar()
else if( nInputPos >= nInputEndPos && nInputEndPos != nInputBufLen )
{
// Dateiende
- bEof = TRUE;
+ bEof = sal_True;
return 0;
}
else
diff --git a/rsc/source/parser/rscyacc.cxx b/rsc/source/parser/rscyacc.cxx
index 5896dbe5b335..103caa813804 100644
--- a/rsc/source/parser/rscyacc.cxx
+++ b/rsc/source/parser/rscyacc.cxx
@@ -65,7 +65,7 @@ RSCINST GetVarInst( const RSCINST & rInst, const char * pVarName )
return( aInst );
}
-void SetNumber( const RSCINST & rInst, const char * pVarName, INT32 lValue )
+void SetNumber( const RSCINST & rInst, const char * pVarName, sal_Int32 lValue )
{
RSCINST aInst;
@@ -81,7 +81,7 @@ void SetNumber( const RSCINST & rInst, const char * pVarName, INT32 lValue )
}
void SetConst( const RSCINST & rInst, const char * pVarName,
- Atom nValueId, INT32 nVal )
+ Atom nValueId, sal_Int32 nVal )
{
RSCINST aInst;
@@ -113,11 +113,11 @@ void SetString( const RSCINST & rInst, const char * pVarName, const char * pStr
RscId MakeRscId( RscExpType aExpType )
{
if( !aExpType.IsNothing() ){
- INT32 lValue;
+ sal_Int32 lValue;
if( !aExpType.Evaluate( &lValue ) )
pTC->pEH->Error( ERR_ZERODIVISION, NULL, RscId() );
- if( lValue < 1 || lValue > (INT32)0x7FFF )
+ if( lValue < 1 || lValue > (sal_Int32)0x7FFF )
{
pTC->pEH->Error( ERR_IDRANGE, NULL, RscId(),
ByteString::CreateFromInt32( lValue ).GetBuffer() );
@@ -131,7 +131,7 @@ RscId MakeRscId( RscExpType aExpType )
return RscId();
}
-BOOL DoClassHeader( RSCHEADER * pHeader, BOOL bMember )
+sal_Bool DoClassHeader( RSCHEADER * pHeader, sal_Bool bMember )
{
RSCINST aCopyInst;
RscId aName1 = MakeRscId( pHeader->nName1 );
@@ -179,7 +179,7 @@ BOOL DoClassHeader( RSCHEADER * pHeader, BOOL bMember )
{
if( S.IsEmpty() )
{
- if( (INT32)aName1 < 256 )
+ if( (sal_Int32)aName1 < 256 )
pTC->pEH->Error( WRN_GLOBALID, pHeader->pClass, aName1 );
if( aCopyInst.IsInst() )
@@ -201,7 +201,7 @@ BOOL DoClassHeader( RSCHEADER * pHeader, BOOL bMember )
RSCINST aTmpI;
ERRTYPE aError;
- if( (INT32)aName1 >= 256 && aName1.IsId() )
+ if( (sal_Int32)aName1 >= 256 && aName1.IsId() )
pTC->pEH->Error( WRN_LOCALID, pHeader->pClass, aName1 );
aError = S.Top().pClass->GetElement( S.Top(), aName1,
pHeader->pClass, aCopyInst, &aTmpI );
@@ -219,7 +219,7 @@ BOOL DoClassHeader( RSCHEADER * pHeader, BOOL bMember )
pHeader->pClass, RSCINST(), &aTmpI );
if( !aTmpI.IsInst() )
- return( FALSE );
+ return( sal_False );
}
S.Push( aTmpI );
};
@@ -232,7 +232,7 @@ BOOL DoClassHeader( RSCHEADER * pHeader, BOOL bMember )
pTC->pEH->Error( aError, S.Top().pClass, aName1 );
}
- return( TRUE );
+ return( sal_True );
}
RSCINST GetFirstTupelEle( const RSCINST & rTop )
@@ -255,12 +255,8 @@ RSCINST GetFirstTupelEle( const RSCINST & rTop )
#ifdef UNX
#define YYMAXDEPTH 2000
#else
-#ifdef W30
-#define YYMAXDEPTH 300
-#else
#define YYMAXDEPTH 800
#endif
-#endif
#if defined _MSC_VER
#pragma warning(push, 1)
diff --git a/rsc/source/parser/rscyacc.y b/rsc/source/parser/rscyacc.y
index a522d7416782..329884e498b6 100644
--- a/rsc/source/parser/rscyacc.y
+++ b/rsc/source/parser/rscyacc.y
@@ -39,7 +39,7 @@
Atom varid;
struct {
Atom hashid;
- INT32 nValue;
+ sal_Int32 nValue;
} constname;
RscTop * pClass;
RSCHEADER header;
@@ -47,11 +47,11 @@
CLASS_DATA pData;
RscTop * pClass;
} instance;
- INT32 value;
- USHORT ushort;
+ sal_Int32 value;
+ sal_uInt16 ushort;
short exp_short;
char * string;
- BOOL svbool;
+ sal_Bool svbool;
REF_ENUM copyref;
RscDefine * defineele;
CharSet charset;
@@ -130,7 +130,7 @@ resource_definitions
| MACROTARGET macro_expression
{
RscExpType aExpType;
- INT32 lValue;
+ sal_Int32 lValue;
aExpType.cType = RSCEXP_NOTHING;
pExp = new RscExpression( aExpType, '+', $2 );
@@ -143,13 +143,13 @@ resource_definition
: line_number
| '#' DEFINE SYMBOL macro_expression
{
- BOOL bError = FALSE;
+ sal_Bool bError = sal_False;
if( $4.IsNumber() ){
if( !pTC->aFileTab.NewDef( pFI->GetFileIndex(),
ByteString( $3 ),
$4.GetLong(), LIST_APPEND ) )
- bError = TRUE;
+ bError = sal_True;
}
else if( $4.IsDefinition() ){
RscExpType aExpType;
@@ -162,13 +162,13 @@ resource_definition
if( !pTC->aFileTab.NewDef( pFI->GetFileIndex(),
ByteString( $3 ), pExpr, LIST_APPEND ) )
- bError = TRUE;
+ bError = sal_True;
}
else if( $4.IsExpression() ){
if( !pTC->aFileTab.NewDef( pFI->GetFileIndex(),
ByteString( $3 ), $4.aExp.pExp,
LIST_APPEND ) )
- bError = TRUE;
+ bError = sal_True;
}
if( bError ){
@@ -200,7 +200,7 @@ resource_definition
new_class_definition_header
: CLASS SYMBOL id_expression ':' CLASSNAME
{
- INT32 lType;
+ sal_Int32 lType;
$3.Evaluate( &lType );
@@ -319,7 +319,7 @@ class_definition
class_header
: class_header_body
{
- if( !DoClassHeader( &$1, FALSE ) )
+ if( !DoClassHeader( &$1, sal_False ) )
return( ERR_ERROR );
$$ = $1;
}
@@ -528,7 +528,7 @@ var_header_class
{
RSCINST aInst;
- aInst = S.Top().pClass->GetVariable( S.Top(), $1, RSCINST(), FALSE, $3.pClass );
+ aInst = S.Top().pClass->GetVariable( S.Top(), $1, RSCINST(), sal_False, $3.pClass );
if( aInst.pData )
S.Push( aInst );
@@ -539,7 +539,7 @@ var_header_class
return( ERR_ERROR );
};
- if( !DoClassHeader( &$3, TRUE ) )
+ if( !DoClassHeader( &$3, sal_True ) )
return( ERR_ERROR );
$$ = $3;
}
@@ -567,7 +567,7 @@ var_header_class
pHS->getString( $1 ) );
return( ERR_ERROR );
};
- if( !DoClassHeader( &$6, TRUE ) )
+ if( !DoClassHeader( &$6, sal_True ) )
return( ERR_ERROR );
$$ = $6;
}
@@ -596,7 +596,7 @@ var_header_class
pHS->getString( $1 ) );
return( ERR_ERROR );
};
- if( !DoClassHeader( &$6, TRUE ) )
+ if( !DoClassHeader( &$6, sal_True ) )
return( ERR_ERROR );
$$ = $6;
}
@@ -784,7 +784,7 @@ list
var_bodysimple
: macro_expression
{
- INT32 l;
+ sal_Int32 l;
ERRTYPE aError;
if( !$1.Evaluate( &l ) )
@@ -1064,7 +1064,7 @@ id_expression
| macro_expression
{ // pExpession auswerten und loeschen
if( RSCEXP_EXP == $1.cType ){
- INT32 lValue;
+ sal_Int32 lValue;
if( !$1.Evaluate( &lValue ) )
pTC->pEH->Error( ERR_ZERODIVISION, NULL, RscId() );
@@ -1094,8 +1094,8 @@ line_number
pFI->SetLineNo( $3 );
pFI->SetFileIndex( pTC->aFileTab.NewCodeFile( ByteString( $4 ) ) );
pFName = pTC->aFileTab.Get( pFI->GetFileIndex() );
- pFName->bLoaded = TRUE;
- pFName->bScanned = TRUE;
+ pFName->bLoaded = sal_True;
+ pFName->bScanned = sal_True;
}
| '#' NUMBER STRING DUMMY_NUMBER
{
@@ -1104,8 +1104,8 @@ line_number
pFI->SetLineNo( $2 );
pFI->SetFileIndex( pTC->aFileTab.NewCodeFile( ByteString( $3 ) ) );
pFName = pTC->aFileTab.Get( pFI->GetFileIndex() );
- pFName->bLoaded = TRUE;
- pFName->bScanned = TRUE;
+ pFName->bLoaded = sal_True;
+ pFName->bScanned = sal_True;
}
| '#' NUMBER
{
diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx
index ec4586532475..532851ffbdea 100644
--- a/rsc/source/prj/start.cxx
+++ b/rsc/source/prj/start.cxx
@@ -86,11 +86,11 @@
|*
|* Beschreibung
*************************************************************************/
-static BOOL CallPrePro( const ByteString& rPrePro,
+static sal_Bool CallPrePro( const ByteString& rPrePro,
const ByteString& rInput,
const ByteString& rOutput,
RscPtrPtr * pCmdLine,
- BOOL bResponse )
+ sal_Bool bResponse )
{
RscPtrPtr aNewCmdL; // Kommandozeile
RscPtrPtr aRespCmdL; // Kommandozeile
@@ -184,9 +184,9 @@ static BOOL CallPrePro( const ByteString& rPrePro,
unlink( aRspFileName.GetBuffer() );
#endif
if ( nExit )
- return FALSE;
+ return sal_False;
- return TRUE;
+ return sal_True;
}
@@ -195,7 +195,7 @@ static BOOL CallPrePro( const ByteString& rPrePro,
|*
|* Beschreibung
*************************************************************************/
-static BOOL CallRsc2( ByteString aRsc2Name,
+static sal_Bool CallRsc2( ByteString aRsc2Name,
RscStrList * pInputList,
ByteString aSrsName,
RscPtrPtr * pCmdLine )
@@ -294,8 +294,8 @@ static BOOL CallRsc2( ByteString aRsc2Name,
unlink( aRspFileName.GetBuffer() );
#endif
if( nExit )
- return( FALSE );
- return( TRUE );
+ return( sal_False );
+ return( sal_True );
}
/*************************************************************************
@@ -305,10 +305,10 @@ static BOOL CallRsc2( ByteString aRsc2Name,
*************************************************************************/
SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
{
- BOOL bPrePro = TRUE;
- BOOL bHelp = FALSE;
- BOOL bError = FALSE;
- BOOL bResponse = FALSE;
+ sal_Bool bPrePro = sal_True;
+ sal_Bool bHelp = sal_False;
+ sal_Bool bError = sal_False;
+ sal_Bool bResponse = sal_False;
ByteString aSolarbin(getenv("SOLARBINDIR"));
ByteString aDelim("/");
ByteString aPrePro; //( aSolarbin + aDelim + ByteString("rscpp"));
@@ -341,7 +341,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
ppStr = (char **)aCmdLine.GetBlock();
ppStr++;
i = 1;
- BOOL bSetSrs = FALSE;
+ sal_Bool bSetSrs = sal_False;
while( ppStr && i < (aCmdLine.GetCount() -1) )
{
if( '-' == **ppStr )
@@ -349,15 +349,15 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
if( !rsc_stricmp( (*ppStr) + 1, "p" )
|| !rsc_stricmp( (*ppStr) + 1, "l" ) )
{ // kein Preprozessor
- bPrePro = FALSE;
+ bPrePro = sal_False;
}
else if( !rsc_stricmp( (*ppStr) + 1, "h" ) )
{ // Hilfe anzeigen
- bHelp = TRUE;
+ bHelp = sal_True;
}
else if( !rsc_strnicmp( (*ppStr) + 1, "presponse", 9 ) )
{ // anderer Name fuer den Preprozessor
- bResponse = TRUE;
+ bResponse = sal_True;
}
else if( !rsc_strnicmp( (*ppStr) + 1, "pp=", 3 ) )
{ // anderer Name fuer den Preprozessor
@@ -373,7 +373,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
}
else if( !rsc_strnicmp( (*ppStr) + 1, "fp=", 3 ) )
{ // anderer Name fuer .srs-file
- bSetSrs = TRUE;
+ bSetSrs = sal_True;
aSrsName = (*ppStr);
}
}
@@ -399,7 +399,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
};
if( bHelp )
- bPrePro = FALSE;
+ bPrePro = sal_False;
if( bPrePro && !aInputList.empty() )
{
ByteString aTmpName;
@@ -411,7 +411,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
if( !CallPrePro( aPrePro, *pString, aTmpName, &aCmdLine, bResponse ) )
{
printf( "Error starting preprocessor\n" );
- bError = TRUE;
+ bError = sal_True;
break;
}
aTmpList.push_back( new ByteString( aTmpName ) );
@@ -426,7 +426,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
if( !bHelp )
{
printf( "Error starting rsc2 compiler\n" );
- bError = TRUE;
+ bError = sal_True;
}
};
};
diff --git a/rsc/source/res/rscall.cxx b/rsc/source/res/rscall.cxx
index 4bd3db7b9aae..26193d4cae51 100644
--- a/rsc/source/res/rscall.cxx
+++ b/rsc/source/res/rscall.cxx
@@ -50,11 +50,11 @@ Atom nRsc_EXTRADATA = InvalidAtom;
void InitRscCompiler()
{
- pStdParType = new ByteString( "( const ResId & rResId, BOOL" );
+ pStdParType = new ByteString( "( const ResId & rResId, sal_Bool" );
pStdPar1 = new ByteString( '(' );
pStdPar2 = new ByteString( '(' );
- pWinParType = new ByteString( "( Window * pParent, const ResId & rResId, BOOL" );
+ pWinParType = new ByteString( "( Window * pParent, const ResId & rResId, sal_Bool" );
pWinPar1 = new ByteString( "( pParent," );
pWinPar2 = new ByteString( "( this," );
nRefDeep = 10;
diff --git a/rsc/source/res/rscarray.cxx b/rsc/source/res/rscarray.cxx
index a3030ef65b64..656bcfc7a1d3 100644
--- a/rsc/source/res/rscarray.cxx
+++ b/rsc/source/res/rscarray.cxx
@@ -143,7 +143,7 @@ static RscInstNode * Create( RscInstNode * pNode )
}
RSCINST RscArray::Create( RSCINST * pInst, const RSCINST & rDflt,
- BOOL bOwnClass )
+ sal_Bool bOwnClass )
{
RSCINST aInst;
RscArrayInst * pClassData;
@@ -212,7 +212,7 @@ void RscArray::Destroy( const RSCINST & rInst )
ERRTYPE RscArray::GetValueEle
(
const RSCINST & rInst,
- INT32 lValue,
+ sal_Int32 lValue,
RscTop * pCreateClass,
RSCINST * pGetInst
)
@@ -280,7 +280,7 @@ ERRTYPE RscArray::GetArrayEle
RSCINST * pGetInst
)
{
- INT32 lValue;
+ sal_Int32 lValue;
if( !pTypeClass->GetConstValue( nId, &lValue ) )
{ // nicht gefunden
return ERR_ARRAY_INVALIDINDEX;
@@ -294,31 +294,31 @@ ERRTYPE RscArray::GetArrayEle
|* RscArray::IsConsistent()
|*
*************************************************************************/
-static BOOL IsConsistent( RscInstNode * pNode )
+static sal_Bool IsConsistent( RscInstNode * pNode )
{
- BOOL bRet = TRUE;
+ sal_Bool bRet = sal_True;
if( pNode )
{
bRet = pNode->aInst.pClass->IsConsistent( pNode->aInst );
if( !IsConsistent( pNode->Left() ) )
- bRet = FALSE;
+ bRet = sal_False;
if( !IsConsistent( pNode->Right() ) )
- bRet = FALSE;
+ bRet = sal_False;
}
return bRet;
}
-BOOL RscArray::IsConsistent( const RSCINST & rInst )
+sal_Bool RscArray::IsConsistent( const RSCINST & rInst )
{
RscArrayInst * pClassData;
- BOOL bRet;
+ sal_Bool bRet;
bRet = RscTop::IsConsistent( rInst );
pClassData = (RscArrayInst *)(rInst.pData + nOffInstData);
if( !::IsConsistent( pClassData->pNode ) )
- bRet = FALSE;
+ bRet = sal_False;
return( bRet );
}
@@ -354,9 +354,9 @@ void RscArray::SetToDefault( const RSCINST & rInst )
|* RscArray::IsDefault()
|*
*************************************************************************/
-static BOOL IsDefault( RscInstNode * pNode )
+static sal_Bool IsDefault( RscInstNode * pNode )
{
- BOOL bRet = TRUE;
+ sal_Bool bRet = sal_True;
if( pNode )
{
@@ -369,13 +369,13 @@ static BOOL IsDefault( RscInstNode * pNode )
return bRet;
}
-BOOL RscArray::IsDefault( const RSCINST & rInst )
+sal_Bool RscArray::IsDefault( const RSCINST & rInst )
{
RscArrayInst * pClassData;
pClassData = (RscArrayInst *)(rInst.pData + nOffInstData);
- BOOL bRet = ::IsDefault( pClassData->pNode );
+ sal_Bool bRet = ::IsDefault( pClassData->pNode );
if( bRet )
bRet = RscTop::IsDefault( rInst );
@@ -387,9 +387,9 @@ BOOL RscArray::IsDefault( const RSCINST & rInst )
|* RscArray::IsValueDefault()
|*
*************************************************************************/
-static BOOL IsValueDefault( RscInstNode * pNode, CLASS_DATA pDef )
+static sal_Bool IsValueDefault( RscInstNode * pNode, CLASS_DATA pDef )
{
- BOOL bRet = TRUE;
+ sal_Bool bRet = sal_True;
if( pNode )
{
@@ -402,10 +402,10 @@ static BOOL IsValueDefault( RscInstNode * pNode, CLASS_DATA pDef )
return bRet;
}
-BOOL RscArray::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
+sal_Bool RscArray::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
{
RscArrayInst * pClassData;
- BOOL bRet;
+ sal_Bool bRet;
bRet = RscTop::IsValueDefault( rInst, pDef );
@@ -520,7 +520,7 @@ void RscArray::WriteSrc( const RSCINST & rInst, FILE * fOutput,
|* Beschreibung
*************************************************************************/
ERRTYPE RscArray::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
- RscTypCont * pTC, sal_uInt32 nDeep, BOOL bExtra )
+ RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra )
{
ERRTYPE aError;
RscArrayInst * pClassData;
@@ -617,7 +617,7 @@ void RscClassArray::WriteSrc( const RSCINST & rInst, FILE * fOutput,
*************************************************************************/
ERRTYPE RscClassArray::WriteRcHeader( const RSCINST & rInst, RscWriteRc & aMem,
RscTypCont * pTC, const RscId & aId,
- sal_uInt32 nDeep, BOOL bExtra )
+ sal_uInt32 nDeep, sal_Bool bExtra )
{
// Eigenen Typ schreiben
return GetSuperClass()->WriteRcHeader( rInst, aMem, pTC, aId,
diff --git a/rsc/source/res/rscclass.cxx b/rsc/source/res/rscclass.cxx
index ad2a45e66892..6f2939cd2fd2 100644
--- a/rsc/source/res/rscclass.cxx
+++ b/rsc/source/res/rscclass.cxx
@@ -113,7 +113,7 @@ RSCINST RscClass::GetInstData
(
CLASS_DATA pData,
sal_uInt32 nEle,
- BOOL bGetCopy
+ sal_Bool bGetCopy
)
{
RSCINST aInst;
@@ -174,15 +174,15 @@ CLASS_DATA RscClass::GetDfltData( sal_uInt32 nEle )
|* RscClass::SetVarDflt()
|*
*************************************************************************/
-void RscClass::SetVarDflt( CLASS_DATA pData, sal_uInt32 nEle, BOOL bSet )
+void RscClass::SetVarDflt( CLASS_DATA pData, sal_uInt32 nEle, sal_Bool bSet )
{
RscClassInst * pClass;
pClass = (RscClassInst *)(pData + nSuperSize );
if( bSet )
- pClass->nVarDflt |= ((ULONG)1 << nEle);
+ pClass->nVarDflt |= ((sal_uLong)1 << nEle);
else
- pClass->nVarDflt &= ~((ULONG)1 << nEle);
+ pClass->nVarDflt &= ~((sal_uLong)1 << nEle);
}
/*************************************************************************
@@ -190,16 +190,16 @@ void RscClass::SetVarDflt( CLASS_DATA pData, sal_uInt32 nEle, BOOL bSet )
|* RscClass::IsDflt()
|*
*************************************************************************/
-BOOL RscClass::IsDflt( CLASS_DATA pData, sal_uInt32 nEle )
+sal_Bool RscClass::IsDflt( CLASS_DATA pData, sal_uInt32 nEle )
{
RscClassInst * pClass;
- BOOL bRet;
+ sal_Bool bRet;
pClass = (RscClassInst *)(pData + nSuperSize );
- if( pClass->nVarDflt & ((ULONG)1 << nEle) )
- bRet = TRUE;
+ if( pClass->nVarDflt & ((sal_uLong)1 << nEle) )
+ bRet = sal_True;
else
- bRet = FALSE;
+ bRet = sal_False;
return bRet;
}
@@ -212,7 +212,7 @@ RSCINST RscClass::Create
(
RSCINST * pInst,
const RSCINST & rDflt,
- BOOL bOwnClass
+ sal_Bool bOwnClass
)
{
sal_uInt32 i;
@@ -236,11 +236,11 @@ RSCINST RscClass::Create
((RscClassInst *)(aInst.pData + nSuperSize))->nVarDflt =
((RscClassInst *)(rDflt.pData + nSuperSize))->nVarDflt;
else
- ((RscClassInst *)(aInst.pData + nSuperSize))->nVarDflt = ~((ULONG)0);
+ ((RscClassInst *)(aInst.pData + nSuperSize))->nVarDflt = ~((sal_uLong)0);
for( i = 0; i < nEntries; i++ )
{
- aDfltI = GetInstData( bOwnClass ? rDflt.pData : NULL, i, TRUE );
+ aDfltI = GetInstData( bOwnClass ? rDflt.pData : NULL, i, sal_True );
if( (VAR_POINTER & pVarTypeList[ i ].nVarType)
&& !(VAR_NODATAINST & pVarTypeList[ i ].nVarType) )
@@ -264,7 +264,7 @@ RSCINST RscClass::Create
}
else
{
- aMemInst = GetInstData( aInst.pData, i, TRUE );
+ aMemInst = GetInstData( aInst.pData, i, sal_True );
aMemInst = aMemInst.pClass->Create( &aMemInst, aDfltI );
};
}
@@ -291,7 +291,7 @@ void RscClass::Destroy( const RSCINST & rInst )
{
RSCINST aTmpI;
- aTmpI = GetInstData( rInst.pData, i, TRUE );
+ aTmpI = GetInstData( rInst.pData, i, sal_True );
if( aTmpI.IsInst() )
{
// Objekt loeschen
@@ -360,7 +360,7 @@ ERRTYPE RscClass::SetVariable
}
nEntries++;
- if( nEntries > (sizeof( ULONG ) * 8) )
+ if( nEntries > (sizeof( sal_uLong ) * 8) )
{
// Bereich fuer Default zu klein
RscExit( 16 );
@@ -400,7 +400,7 @@ RSCINST RscClass::GetVariable
const RSCINST & rInst,
Atom nVarName,
const RSCINST & rInitInst,
- BOOL bInitDflt,
+ sal_Bool bInitDflt,
RscTop * pCreateClass
)
{
@@ -460,7 +460,7 @@ RSCINST RscClass::GetVariable
}
};
// auf nicht Default setzen
- SetVarDflt( rInst.pData, i, FALSE );
+ SetVarDflt( rInst.pData, i, sal_False );
return( aTmpI );
};
@@ -499,11 +499,11 @@ RSCINST RscClass::GetCopyVar
if( IsDflt( rInst.pData, i ) )
{
// mit Variablen Default initialiaieren
- aVarI = GetVariable( rInst, nVarName, RSCINST(), TRUE );
- SetVarDflt( rInst.pData, i, TRUE );
+ aVarI = GetVariable( rInst, nVarName, RSCINST(), sal_True );
+ SetVarDflt( rInst.pData, i, sal_True );
}
else
- aVarI = GetInstData( rInst.pData, i, TRUE );
+ aVarI = GetInstData( rInst.pData, i, sal_True );
};
return aVarI ;
@@ -519,11 +519,11 @@ RSCINST RscClass::GetCopyVar
|* Beschreibung
|*
*************************************************************************/
-BOOL RscClass::IsConsistent( const RSCINST & rInst )
+sal_Bool RscClass::IsConsistent( const RSCINST & rInst )
{
sal_uInt32 i = 0;
RSCINST aTmpI;
- BOOL bRet;
+ sal_Bool bRet;
bRet = RscTop::IsConsistent( rInst );
@@ -531,11 +531,11 @@ BOOL RscClass::IsConsistent( const RSCINST & rInst )
{
if( !(VAR_NODATAINST & pVarTypeList[ i ].nVarType) )
{
- aTmpI = GetInstData( rInst.pData, i, TRUE );
+ aTmpI = GetInstData( rInst.pData, i, sal_True );
if( aTmpI.IsInst() )
if( ! aTmpI.pClass->IsConsistent( aTmpI ) )
- bRet = FALSE;
+ bRet = sal_False;
}
};
@@ -563,12 +563,12 @@ void RscClass::SetToDefault( const RSCINST & rInst )
// auf Default gesetzt
if( !(VAR_NODATAINST & pVarTypeList[ i ].nVarType) )
{
- aTmpI = GetInstData( rInst.pData, i, TRUE );
+ aTmpI = GetInstData( rInst.pData, i, sal_True );
if( aTmpI.IsInst() )
aTmpI.pClass->SetToDefault( aTmpI );
}
}
- pClass->nVarDflt = ~((ULONG)0); // alles auf Default
+ pClass->nVarDflt = ~((sal_uLong)0); // alles auf Default
RscTop::SetToDefault( rInst );
}
@@ -580,7 +580,7 @@ void RscClass::SetToDefault( const RSCINST & rInst )
|* Beschreibung
|*
*************************************************************************/
-BOOL RscClass::IsDefault( const RSCINST & rInst )
+sal_Bool RscClass::IsDefault( const RSCINST & rInst )
{
sal_uInt32 i;
RSCINST aTmpI;
@@ -591,7 +591,7 @@ BOOL RscClass::IsDefault( const RSCINST & rInst )
// auf Default untersucht
if( !(VAR_NODATAINST & pVarTypeList[ i ].nVarType) )
if( !IsDflt( rInst.pData, i ) )
- return( FALSE );
+ return( sal_False );
};
return( RscTop::IsDefault( rInst ) );
@@ -630,24 +630,24 @@ RSCINST RscClass::GetDefault( Atom nVarId )
|* Beschreibung
|*
*************************************************************************/
-BOOL RscClass::IsValueDflt( CLASS_DATA pData, sal_uInt32 nEle )
+sal_Bool RscClass::IsValueDflt( CLASS_DATA pData, sal_uInt32 nEle )
{
RSCINST aTmpI;
- aTmpI = GetInstData( pData, nEle, TRUE );
+ aTmpI = GetInstData( pData, nEle, sal_True );
if( aTmpI.IsInst() )
{
if( VAR_SVDYNAMIC & pVarTypeList[ nEle ].nVarType )
- return FALSE;
+ return sal_False;
if( aTmpI.pClass == pVarTypeList[ nEle ].pClass )
//sie haben auch die gleiche Klasse
return aTmpI.pClass->IsValueDefault( aTmpI, GetDfltData( nEle ) );
else
- return FALSE;
+ return sal_False;
}
- return TRUE;
+ return sal_True;
}
/*************************************************************************
@@ -657,39 +657,39 @@ BOOL RscClass::IsValueDflt( CLASS_DATA pData, sal_uInt32 nEle )
|* Beschreibung
|*
*************************************************************************/
-BOOL RscClass::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
+sal_Bool RscClass::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
{
sal_uInt32 i = 0;
RSCINST aTmpI;
RSCINST aDfltI;
if( !RscTop::IsValueDefault( rInst, pDef ) )
- return FALSE;
+ return sal_False;
if( pDef )
{
for( i = 0; i < nEntries; i++ )
{
- aTmpI = GetInstData( rInst.pData, i, TRUE );
+ aTmpI = GetInstData( rInst.pData, i, sal_True );
if( aTmpI.IsInst() )
{
if( aTmpI.pClass != pVarTypeList[ i ].pClass )
//sie haben nicht die gleiche Klasse
- return FALSE;
+ return sal_False;
- aDfltI = GetInstData( pDef, i, TRUE );
+ aDfltI = GetInstData( pDef, i, sal_True );
if( !aDfltI.IsInst() )
aDfltI.pData = GetDfltData( i );
if( !aTmpI.pClass->IsValueDefault( aTmpI, aDfltI.pData ) )
- return FALSE;
+ return sal_False;
}
}
}
else
- return FALSE;
+ return sal_False;
- return TRUE;
+ return sal_True;
}
/*************************************************************************
@@ -709,12 +709,12 @@ void RscClass::SetDefault( const RSCINST & rInst, Atom nVarName )
if( i < nEntries )
{
- aTmpI = GetInstData( rInst.pData, i, TRUE );
+ aTmpI = GetInstData( rInst.pData, i, sal_True );
if( aTmpI.IsInst() )
{
aTmpI.pClass->Destroy( aTmpI );
aTmpI.pClass->Create( &aTmpI, RSCINST() );
- SetVarDflt( rInst.pData, i, TRUE );
+ SetVarDflt( rInst.pData, i, sal_True );
}
}
else //In Superklasse nach Variable suchen
@@ -765,20 +765,20 @@ void RscClass::WriteSrc
if( !IsDflt( rInst.pData, i ) )
{
- aTmpI = GetInstData( rInst.pData, i, TRUE );
+ aTmpI = GetInstData( rInst.pData, i, sal_True );
aTmpI.pClass->WriteSrcHeader(
aTmpI, fOutput, pTC, nTab, RscId(), pVarName );
}
fprintf( fOutput, "( " );
- aTmpI = GetInstData( rInst.pData, i+1, TRUE );
+ aTmpI = GetInstData( rInst.pData, i+1, sal_True );
if( !aTmpI.IsInst() )
aTmpI.pData = GetDfltData( i+1 );
aTmpI.pClass->WriteSrcHeader(
aTmpI, fOutput, pTC, nTab, RscId(), pVarName );
fprintf( fOutput, ", " );
- aTmpI = GetInstData( rInst.pData, i+2, TRUE );
+ aTmpI = GetInstData( rInst.pData, i+2, sal_True );
if( !aTmpI.IsInst() )
aTmpI.pData = GetDfltData( i+2 );
aTmpI.pClass->WriteSrcHeader(
@@ -790,7 +790,7 @@ void RscClass::WriteSrc
else if( !IsDflt( rInst.pData, i )
&& !IsValueDflt( rInst.pData, i ) )
{
- aTmpI = GetInstData( rInst.pData, i, TRUE );
+ aTmpI = GetInstData( rInst.pData, i, sal_True );
if( aTmpI.IsInst() )
{
@@ -818,7 +818,7 @@ void RscClass::WriteSrc
|* Beschreibung
|*
*************************************************************************/
-INT32 RscClass::GetCorrectValues
+sal_Int32 RscClass::GetCorrectValues
(
const RSCINST & rInst,
sal_uInt32 nVarPos,
@@ -826,11 +826,11 @@ INT32 RscClass::GetCorrectValues
RscTypCont * pTC
)
{
- INT32 nLang = 0;
- INT32 nBaseValue;
+ sal_Int32 nLang = 0;
+ sal_Int32 nBaseValue;
// Basiswert holen
- RSCINST aTmpI = GetInstData( rInst.pData, nVarPos, TRUE );
+ RSCINST aTmpI = GetInstData( rInst.pData, nVarPos, sal_True );
aTmpI.pClass->GetNumber( aTmpI, &nBaseValue );
// Sprach Delta holen
@@ -838,8 +838,8 @@ INT32 RscClass::GetCorrectValues
if( aTmpI.IsInst() )
{
RscWriteRc aMem;
- aTmpI.pClass->WriteRc( aTmpI, aMem, pTC, 0, FALSE );
- nLang = (INT32)aMem.GetShort( nTupelIdx * sizeof(sal_uInt16) );
+ aTmpI.pClass->WriteRc( aTmpI, aMem, pTC, 0, sal_False );
+ nLang = (sal_Int32)aMem.GetShort( nTupelIdx * sizeof(sal_uInt16) );
}
return nLang + nBaseValue;
@@ -851,7 +851,7 @@ ERRTYPE RscClass::WriteInstRc
RscWriteRc & rMem,
RscTypCont * pTC,
sal_uInt32 nDeep,
- BOOL bExtra
+ sal_Bool bExtra
)
{
sal_uInt32 i = 0;
@@ -880,35 +880,35 @@ ERRTYPE RscClass::WriteInstRc
{
if( nRsc_X == pVarTypeList[ i ].nVarName )
{
- INT32 nVal = GetCorrectValues( rInst, i, 0, pTC );
+ sal_Int32 nVal = GetCorrectValues( rInst, i, 0, pTC );
rMem.Put( nVal );
}
else if( nRsc_Y == pVarTypeList[ i ].nVarName )
{
- INT32 nVal = GetCorrectValues( rInst, i, 1, pTC );
+ sal_Int32 nVal = GetCorrectValues( rInst, i, 1, pTC );
rMem.Put( nVal );
}
else if( nRsc_WIDTH == pVarTypeList[ i ].nVarName )
{
- INT32 nVal = GetCorrectValues( rInst, i, 2, pTC );
+ sal_Int32 nVal = GetCorrectValues( rInst, i, 2, pTC );
rMem.Put( nVal );
}
else if( nRsc_HEIGHT == pVarTypeList[ i ].nVarName )
{
- INT32 nVal = GetCorrectValues( rInst, i, 3, pTC );
+ sal_Int32 nVal = GetCorrectValues( rInst, i, 3, pTC );
rMem.Put( nVal );
}
else
{
- aTmpI = GetInstData( rInst.pData, i, TRUE );
- // Nur an Variable Extradata bExtra nicht auf FALSE
+ aTmpI = GetInstData( rInst.pData, i, sal_True );
+ // Nur an Variable Extradata bExtra nicht auf sal_False
// setzen
aError = aTmpI.pClass->
WriteRcHeader( aTmpI, rMem, pTC,
RscId(), nDeep,
(nRsc_EXTRADATA
== pVarTypeList[ i ].nVarName)
- ? bExtra : FALSE );
+ ? bExtra : sal_False );
}
sal_uInt32 nMask = rMem.GetLong( nMaskOff );
nMask |= pVarTypeList[ i ].nMask;
@@ -922,15 +922,15 @@ ERRTYPE RscClass::WriteInstRc
aTmpI.pData = GetDfltData( i );
}
else
- aTmpI = GetInstData( rInst.pData, i, TRUE );
- // Nur an Variable Extradata bExtra nicht auf FALSE
+ aTmpI = GetInstData( rInst.pData, i, sal_True );
+ // Nur an Variable Extradata bExtra nicht auf sal_False
// setzen
aError = aTmpI.pClass->
WriteRcHeader( aTmpI, rMem, pTC,
RscId(), nDeep,
(nRsc_EXTRADATA
== pVarTypeList[ i ].nVarName)
- ? bExtra : FALSE );
+ ? bExtra : sal_False );
}
}
}
@@ -951,7 +951,7 @@ ERRTYPE RscClass::WriteRc
RscWriteRc & rMem,
RscTypCont * pTC,
sal_uInt32 nDeep,
- BOOL bExtra
+ sal_Bool bExtra
)
{
ERRTYPE aError;
@@ -1027,7 +1027,7 @@ void RscClass::WriteRcCtor( FILE * fOutput, RscTypCont * pTC )
fprintf( fOutput, "\tsal_uInt32\tnObjMask;\n" );
fprintf( fOutput, "\tsal_uInt32\tnOffset = 0;\n" );
fprintf( fOutput, "\tBYTE *\tpResData;\n\n" );
- fprintf( fOutput, "\tpResData = (BYTE *)GetClassRes();\n\n" );
+ fprintf( fOutput, "\tpResData = (tBYTE *)GetClassRes();\n\n" );
fprintf( fOutput, "\tnObjMask = *(sal_uInt32*)pResData;\n" );
fprintf( fOutput, "\tnOffset += 4;\n\n" );
@@ -1071,7 +1071,7 @@ RscSysDepend::RscSysDepend( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper )
|*
*************************************************************************/
ERRTYPE RscSysDepend::WriteSysDependRc( const RSCINST & rInst, RscWriteRc & rMem,
- RscTypCont * pTC, sal_uInt32 nDeep, BOOL bExtra, BOOL bFirst )
+ RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra, sal_Bool bFirst )
{
sal_uInt32 nId = 0xFFFFFFFF;
ERRTYPE aError;
@@ -1112,7 +1112,7 @@ ERRTYPE RscSysDepend::WriteSysDependRc( const RSCINST & rInst, RscWriteRc & rMem
|*
*************************************************************************/
ERRTYPE RscSysDepend::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
- RscTypCont * pTC, sal_uInt32 nDeep, BOOL bExtra )
+ RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra )
{
ERRTYPE aError = RscClass::WriteRc( rInst, rMem, pTC, nDeep, bExtra );
@@ -1142,10 +1142,10 @@ RscFirstSysDepend::RscFirstSysDepend( Atom nId, sal_uInt32 nTypeId,
|*
*************************************************************************/
ERRTYPE RscFirstSysDepend::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
- RscTypCont * pTC, sal_uInt32 nDeep, BOOL bExtra )
+ RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra )
{
ERRTYPE aError = RscClass::WriteRc( rInst, rMem, pTC, nDeep, bExtra );
- aError = WriteSysDependRc( rInst, rMem, pTC, nDeep, bExtra, TRUE );
+ aError = WriteSysDependRc( rInst, rMem, pTC, nDeep, bExtra, sal_True );
return aError;
}
@@ -1202,7 +1202,7 @@ void RscTupel::WriteSrc( const RSCINST & rInst, FILE * fOutput,
if( !IsDflt( rInst.pData, i )
&& !IsValueDflt( rInst.pData, i ) )
{
- aTmpI = GetInstData( rInst.pData, i, TRUE );
+ aTmpI = GetInstData( rInst.pData, i, sal_True );
if( aTmpI.IsInst() )
aTmpI.pClass->WriteSrcHeader(
diff --git a/rsc/source/res/rscclobj.cxx b/rsc/source/res/rscclobj.cxx
index 895c778525e8..7005c9b38f09 100644
--- a/rsc/source/res/rscclobj.cxx
+++ b/rsc/source/res/rscclobj.cxx
@@ -67,16 +67,16 @@ sal_uInt32 RefNode::GetId() const
|* RefNode::PutObjNode()
|*
*************************************************************************/
-BOOL RefNode::PutObjNode( ObjNode * pPutObject ){
+sal_Bool RefNode::PutObjNode( ObjNode * pPutObject ){
// insert a node in the b-tree pObjBiTree
// if the node with the same name is in pObjBiTree,
-// return FALSE and no insert,
+// return sal_False and no insert,
if( pObjBiTree )
return( pObjBiTree->Insert( pPutObject ) );
pObjBiTree = pPutObject;
- return( TRUE );
+ return( sal_True );
}
/****************** O b j N o d e ****************************************/
@@ -101,7 +101,7 @@ ObjNode * RefNode :: GetObjNode( const RscId & rRscId ){
|* ObjNode::ObjNode()
|*
*************************************************************************/
-ObjNode::ObjNode( const RscId & rId, CLASS_DATA pData, ULONG lKey ){
+ObjNode::ObjNode( const RscId & rId, CLASS_DATA pData, sal_uLong lKey ){
pRscObj = pData;
aRscId = rId;
lFileKey = lKey;
@@ -112,7 +112,7 @@ ObjNode::ObjNode( const RscId & rId, CLASS_DATA pData, ULONG lKey ){
|* ObjNode::DelObjNode()
|*
*************************************************************************/
-ObjNode * ObjNode::DelObjNode( RscTop * pClass, ULONG nFileKey ){
+ObjNode * ObjNode::DelObjNode( RscTop * pClass, sal_uLong nFileKey ){
ObjNode * pRetNode = this;
if( Right() )
@@ -152,33 +152,33 @@ sal_uInt32 ObjNode::GetId() const
|* ObjNode::IsConsistent()
|*
*************************************************************************/
-BOOL ObjNode::IsConsistent()
+sal_Bool ObjNode::IsConsistent()
{
- BOOL bRet = TRUE;
+ sal_Bool bRet = sal_True;
if( (long)aRscId > 0x7FFF || (long)aRscId < 1 )
{
- bRet = FALSE;
+ bRet = sal_False;
}
else
{
if( Left() )
{
if( !((ObjNode *)Left())->IsConsistent() )
- bRet = FALSE;
+ bRet = sal_False;
if( ((ObjNode *)Left())->aRscId >= aRscId )
{
- bRet = FALSE;
+ bRet = sal_False;
}
};
if( Right() )
{
if( ((ObjNode *)Right())->aRscId <= aRscId )
{
- bRet = FALSE;
+ bRet = sal_False;
}
if( !((ObjNode *)Right())->IsConsistent() )
- bRet = FALSE;
+ bRet = sal_False;
};
};
diff --git a/rsc/source/res/rscconst.cxx b/rsc/source/res/rscconst.cxx
index 9903fe27c076..04f7b1ae00b1 100644
--- a/rsc/source/res/rscconst.cxx
+++ b/rsc/source/res/rscconst.cxx
@@ -84,7 +84,7 @@ RSCCLASS_TYPE RscConst::GetClassType() const
|* RscConst::SetConstance()
|*
*************************************************************************/
-ERRTYPE RscConst::SetConstant( Atom nVarName, INT32 lValue ){
+ERRTYPE RscConst::SetConstant( Atom nVarName, sal_Int32 lValue ){
if( pVarArray )
pVarArray = (VarEle *)
rtl_reallocateMemory( (void *)pVarArray,
@@ -115,7 +115,7 @@ Atom RscConst::GetConstant( sal_uInt32 nPos ){
|* RscConst::GetConstValue()
|*
*************************************************************************/
-BOOL RscConst::GetConstValue( Atom nConst, INT32 * pValue ) const
+sal_Bool RscConst::GetConstValue( Atom nConst, sal_Int32 * pValue ) const
{
sal_uInt32 i = 0;
@@ -123,9 +123,9 @@ BOOL RscConst::GetConstValue( Atom nConst, INT32 * pValue ) const
if( pVarArray[ i ].nId == nConst )
{
*pValue = pVarArray[ i ].lValue;
- return TRUE;
+ return sal_True;
}
- return FALSE;
+ return sal_False;
}
/*************************************************************************
@@ -133,7 +133,7 @@ BOOL RscConst::GetConstValue( Atom nConst, INT32 * pValue ) const
|* RscConst::GetValueConst()
|*
*************************************************************************/
-BOOL RscConst::GetValueConst( INT32 lValue, Atom * pConst ) const
+sal_Bool RscConst::GetValueConst( sal_Int32 lValue, Atom * pConst ) const
{
sal_uInt32 i = 0;
@@ -141,9 +141,9 @@ BOOL RscConst::GetValueConst( INT32 lValue, Atom * pConst ) const
if( pVarArray[ i ].lValue == lValue )
{
*pConst = pVarArray[ i ].nId;
- return TRUE;
+ return sal_True;
}
- return FALSE;
+ return sal_False;
}
/*************************************************************************
@@ -219,14 +219,14 @@ RscEnum::RscEnum( Atom nId, sal_uInt32 nTypeId )
|* RscEnum::SetConst()
|*
*************************************************************************/
-ERRTYPE RscEnum::SetConst( const RSCINST & rInst, Atom nConst, INT32 /*nVal*/ )
+ERRTYPE RscEnum::SetConst( const RSCINST & rInst, Atom nConst, sal_Int32 /*nVal*/ )
{
sal_uInt32 i = 0;
if( nEntries != (i = GetConstPos( nConst )) )
{
((RscEnumInst *)rInst.pData)->nValue = i;
- ((RscEnumInst *)rInst.pData)->bDflt = FALSE;
+ ((RscEnumInst *)rInst.pData)->bDflt = sal_False;
return( ERR_OK );
};
@@ -238,12 +238,12 @@ ERRTYPE RscEnum::SetConst( const RSCINST & rInst, Atom nConst, INT32 /*nVal*/ )
|* RscEnum::SetNumber()
|*
*************************************************************************/
-ERRTYPE RscEnum::SetNumber( const RSCINST & rInst, INT32 lValue )
+ERRTYPE RscEnum::SetNumber( const RSCINST & rInst, sal_Int32 lValue )
{
sal_uInt32 i = 0;
for( i = 0; i < nEntries; i++ ){
- if( (INT32)pVarArray[ i ].lValue == lValue )
+ if( (sal_Int32)pVarArray[ i ].lValue == lValue )
return( SetConst( rInst, pVarArray[ i ].nId, lValue ) );
};
@@ -265,7 +265,7 @@ ERRTYPE RscEnum::GetConst( const RSCINST & rInst, Atom * pH ){
|* RscEnum::GetNumber()
|*
*************************************************************************/
-ERRTYPE RscEnum::GetNumber( const RSCINST & rInst, INT32 * pNumber ){
+ERRTYPE RscEnum::GetNumber( const RSCINST & rInst, sal_Int32 * pNumber ){
*pNumber = pVarArray[ ((RscEnumInst *)rInst.pData)->nValue ].lValue;
return( ERR_OK );
}
@@ -275,7 +275,7 @@ ERRTYPE RscEnum::GetNumber( const RSCINST & rInst, INT32 * pNumber ){
|* RscEnum::Create()
|*
*************************************************************************/
-RSCINST RscEnum::Create( RSCINST * pInst, const RSCINST & rDflt, BOOL bOwnClass ){
+RSCINST RscEnum::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnClass ){
RSCINST aInst;
if( !pInst ){
@@ -292,7 +292,7 @@ RSCINST RscEnum::Create( RSCINST * pInst, const RSCINST & rDflt, BOOL bOwnClass
memmove( aInst.pData, rDflt.pData, Size() );
else{
((RscEnumInst *)aInst.pData)->nValue = 0;
- ((RscEnumInst *)aInst.pData)->bDflt = TRUE;
+ ((RscEnumInst *)aInst.pData)->bDflt = sal_True;
}
return( aInst );
@@ -303,16 +303,16 @@ RSCINST RscEnum::Create( RSCINST * pInst, const RSCINST & rDflt, BOOL bOwnClass
|* RscEnum::IsValueDefault()
|*
*************************************************************************/
-BOOL RscEnum::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){
+sal_Bool RscEnum::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){
if( pDef ){
if( ((RscEnumInst*)rInst.pData)->nValue ==
((RscEnumInst*)pDef)->nValue )
{
- return TRUE;
+ return sal_True;
}
}
- return FALSE;
+ return sal_False;
}
/*************************************************************************
@@ -333,9 +333,9 @@ void RscEnum::WriteSrc( const RSCINST & rInst, FILE * fOutput,
|*
*************************************************************************/
ERRTYPE RscEnum::WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont *, sal_uInt32, BOOL )
+ RscTypCont *, sal_uInt32, sal_Bool )
{
- aMem.Put( (INT32)pVarArray[ ((RscEnumInst *)rInst.pData)->nValue ].lValue );
+ aMem.Put( (sal_Int32)pVarArray[ ((RscEnumInst *)rInst.pData)->nValue ].lValue );
return( ERR_OK );
}
diff --git a/rsc/source/res/rsccont.cxx b/rsc/source/res/rsccont.cxx
index e2b49d7d9ab7..c39be82b5c7e 100644
--- a/rsc/source/res/rsccont.cxx
+++ b/rsc/source/res/rsccont.cxx
@@ -63,7 +63,7 @@ void ENTRY_STRUCT::Destroy()
|*
*************************************************************************/
RscBaseCont::RscBaseCont( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper,
- BOOL bNoIdent )
+ sal_Bool bNoIdent )
: RscTop( nId, nTypeId, pSuper ),
nSize( 0 )
{
@@ -118,7 +118,7 @@ void RscBaseCont::DestroyElements( RscBaseContInst * pClassData )
|*
*************************************************************************/
RSCINST RscBaseCont::Create( RSCINST * pInst, const RSCINST & rDflt,
- BOOL bOwnClass )
+ sal_Bool bOwnClass )
{
sal_uInt32 i = 0;
RSCINST aInst;
@@ -138,7 +138,7 @@ RSCINST RscBaseCont::Create( RSCINST * pInst, const RSCINST & rDflt,
pClassData = (RscBaseContInst *)(aInst.pData + nOffInstData);
pClassData->nEntries = 0;
pClassData->pEntries = NULL;
- pClassData->bDflt = TRUE;
+ pClassData->bDflt = sal_True;
if( bOwnClass ){
RscBaseContInst * pDfltClassData;
@@ -251,7 +251,7 @@ ERRTYPE RscBaseCont::GetElement( const RSCINST & rInst, const RscId & rEleName,
else
pCreateClass = pTypeClass;
- pClassData->bDflt = FALSE;
+ pClassData->bDflt = sal_False;
if( !bNoId )
aTmpI = SearchEle( rInst, rEleName, pCreateClass );
// Eintrag gefunden
@@ -446,11 +446,11 @@ else
|* RscBaseCont::SetNumber()
|*
*************************************************************************/
-ERRTYPE RscBaseCont::SetNumber( const RSCINST & rInst, INT32 lValue ){
+ERRTYPE RscBaseCont::SetNumber( const RSCINST & rInst, sal_Int32 lValue ){
RscBaseContInst * pClassData;
RSCINST aTmpI;
ERRTYPE aError;
- INT32 lNumber;
+ sal_Int32 lNumber;
pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData);
@@ -482,13 +482,13 @@ else
ERRTYPE RscBaseCont::SetBool
(
const RSCINST & rInst,
- BOOL bValue
+ sal_Bool bValue
)
{
RscBaseContInst * pClassData;
RSCINST aTmpI;
ERRTYPE aError;
- BOOL bBool;
+ sal_Bool bBool;
pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData);
@@ -522,7 +522,7 @@ ERRTYPE RscBaseCont::SetConst
(
const RSCINST & rInst,
Atom nValueId,
- INT32 lValue
+ sal_Int32 lValue
)
{
RscBaseContInst * pClassData;
@@ -598,10 +598,10 @@ else
|* RscBaseCont::IsConsistent()
|*
*************************************************************************/
-BOOL RscBaseCont::IsConsistent( const RSCINST & rInst ) {
+sal_Bool RscBaseCont::IsConsistent( const RSCINST & rInst ) {
sal_uInt32 i = 0;
RscBaseContInst * pClassData;
- BOOL bRet;
+ sal_Bool bRet;
bRet = RscTop::IsConsistent( rInst );
@@ -611,19 +611,19 @@ BOOL RscBaseCont::IsConsistent( const RSCINST & rInst ) {
// Komplexitaet = n^2 / 2
for( i = 0; i < pClassData->nEntries; i++ ){
if( !bNoId ){
- if( (INT32)pClassData->pEntries[ i ].aName > 0x7FFF
- || (INT32)pClassData->pEntries[ i ].aName < 1 ){
- bRet = FALSE;
+ if( (sal_Int32)pClassData->pEntries[ i ].aName > 0x7FFF
+ || (sal_Int32)pClassData->pEntries[ i ].aName < 1 ){
+ bRet = sal_False;
}
else if( SearchElePos( rInst, pClassData->pEntries[ i ].aName,
pClassData->pEntries[ i ].aInst.pClass, i +1 ).IsInst() )
{
- bRet = FALSE;
+ bRet = sal_False;
};
}
if( ! pClassData->pEntries[ i ].aInst.pClass->
IsConsistent( pClassData->pEntries[ i ].aInst ) )
- bRet = FALSE;
+ bRet = sal_False;
};
return( bRet );
@@ -655,20 +655,20 @@ void RscBaseCont::SetToDefault( const RSCINST & rInst )
|* RscBaseCont::IsDefault()
|*
*************************************************************************/
-BOOL RscBaseCont::IsDefault( const RSCINST & rInst ){
+sal_Bool RscBaseCont::IsDefault( const RSCINST & rInst ){
sal_uInt32 i = 0;
RscBaseContInst * pClassData;
pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData);
if( !pClassData->bDflt )
- return FALSE;
+ return sal_False;
for( i = 0; i < pClassData->nEntries; i++ ){
if( ! pClassData->pEntries[ i ].aInst.pClass->
IsDefault( pClassData->pEntries[ i ].aInst ) )
{
- return( FALSE );
+ return( sal_False );
};
};
@@ -680,19 +680,19 @@ BOOL RscBaseCont::IsDefault( const RSCINST & rInst ){
|* RscBaseCont::IsValueDefault()
|*
*************************************************************************/
-BOOL RscBaseCont::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
+sal_Bool RscBaseCont::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
{
RscBaseContInst * pClassData;
if( !RscTop::IsValueDefault( rInst, pDef ) )
- return FALSE;
+ return sal_False;
pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData);
if( pClassData->nEntries )
- return FALSE;
+ return sal_False;
else
- return TRUE;
+ return sal_True;
}
/*************************************************************************
@@ -775,14 +775,14 @@ void RscBaseCont::ContWriteSrc( const RSCINST & rInst, FILE * fOutput,
|*
*************************************************************************/
ERRTYPE RscBaseCont::ContWriteRc( const RSCINST & rInst, RscWriteRc & rMem,
- RscTypCont * pTC, sal_uInt32 nDeep, BOOL bExtra )
+ RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra )
{
sal_uInt32 i = 0;
RscBaseContInst * pClassData;
ERRTYPE aError;
if( bExtra || bNoId )
- { // Nur Subresourcen schreiben, wenn bExtra == TRUE
+ { // Nur Subresourcen schreiben, wenn bExtra == sal_True
pClassData = (RscBaseContInst *)(rInst.pData + nOffInstData);
for( i = 0; i < pClassData->nEntries && aError.IsOk(); i++ ){
@@ -803,7 +803,7 @@ void RscBaseCont::ContWriteRcAccess
FILE * fOutput,
RscTypCont * pTC,
const char * pName,
- BOOL bWriteSize
+ sal_Bool bWriteSize
)
{
if( (bNoId || bWriteSize) && !pTypeClass1 )
@@ -846,7 +846,7 @@ void RscBaseCont::WriteSrc( const RSCINST & rInst, FILE * fOutput,
|*
*************************************************************************/
ERRTYPE RscBaseCont::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
- RscTypCont * pTC, sal_uInt32 nDeep, BOOL bExtra )
+ RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra )
{
ERRTYPE aError;
@@ -926,7 +926,7 @@ ERRTYPE RscBaseCont::WriteCxx( const RSCINST & rInst, FILE * fOutput,
|*
*************************************************************************/
RscContWriteSrc::RscContWriteSrc( Atom nId, sal_uInt32 nTypeId,
- RscTop * pSuper, BOOL bNoIdent )
+ RscTop * pSuper, sal_Bool bNoIdent )
: RscBaseCont( nId, nTypeId, pSuper, bNoIdent )
{}
@@ -961,7 +961,7 @@ void RscContWriteSrc::WriteSrc( const RSCINST & rInst, FILE * fOutput,
|* RscCont::RscCont()
|*
*************************************************************************/
-RscCont::RscCont( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, BOOL bNoIdent )
+RscCont::RscCont( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, sal_Bool bNoIdent )
: RscContWriteSrc( nId, nTypeId, pSuper, bNoIdent )
{}
@@ -971,7 +971,7 @@ RscCont::RscCont( Atom nId, sal_uInt32 nTypeId, RscTop * pSuper, BOOL bNoIdent )
|*
*************************************************************************/
ERRTYPE RscCont::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
- RscTypCont * pTC, sal_uInt32 nDeep, BOOL bExtra )
+ RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra )
{
RscBaseContInst * pClassData;
ERRTYPE aError;
@@ -996,7 +996,7 @@ void RscCont::WriteRcAccess
const char * pName
)
{
- ContWriteRcAccess( fOutput, pTC, pName, TRUE );
+ ContWriteRcAccess( fOutput, pTC, pName, sal_True );
}
/*************************************************************************
@@ -1005,7 +1005,7 @@ void RscCont::WriteRcAccess
|*
*************************************************************************/
RscContExtraData::RscContExtraData( Atom nId, sal_uInt32 nTypeId,
- RscTop * pSuper, BOOL bNoIdent )
+ RscTop * pSuper, sal_Bool bNoIdent )
: RscContWriteSrc( nId, nTypeId, pSuper, bNoIdent )
{}
@@ -1015,7 +1015,7 @@ RscContExtraData::RscContExtraData( Atom nId, sal_uInt32 nTypeId,
|*
*************************************************************************/
ERRTYPE RscContExtraData::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
- RscTypCont * pTC, sal_uInt32 nDeep, BOOL bExtra )
+ RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra )
{
ERRTYPE aError;
diff --git a/rsc/source/res/rscflag.cxx b/rsc/source/res/rscflag.cxx
index 3f88b34dffd2..aeaf2fd2e43d 100644
--- a/rsc/source/res/rscflag.cxx
+++ b/rsc/source/res/rscflag.cxx
@@ -87,7 +87,7 @@ ERRTYPE RscFlag::SetNotConst( const RSCINST & rInst, Atom nConst )
|* RscFlag::SetConst()
|*
*************************************************************************/
-ERRTYPE RscFlag::SetConst( const RSCINST & rInst, Atom nConst, INT32 /*nVal*/ )
+ERRTYPE RscFlag::SetConst( const RSCINST & rInst, Atom nConst, sal_Int32 /*nVal*/ )
{
sal_uInt32 i = 0, nFlag = 0;
@@ -126,7 +126,7 @@ RSCINST RscFlag::CreateBasic( RSCINST * pInst )
|* RscFlag::Create()
|*
*************************************************************************/
-RSCINST RscFlag::Create( RSCINST * pInst, const RSCINST & rDflt, BOOL bOwnClass )
+RSCINST RscFlag::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnClass )
{
RSCINST aInst = CreateBasic( pInst );
sal_uInt32 i = 0;
@@ -154,7 +154,7 @@ RSCINST RscFlag::Create( RSCINST * pInst, const RSCINST & rDflt, BOOL bOwnClass
|*
*************************************************************************/
RSCINST RscFlag::CreateClient( RSCINST * pInst, const RSCINST & rDfltI,
- BOOL bOwnClass, Atom nConstId )
+ sal_Bool bOwnClass, Atom nConstId )
{
RSCINST aInst = CreateBasic( pInst );
sal_uInt32 i = 0, nFlag = 0;
@@ -198,17 +198,17 @@ void RscFlag::SetToDefault( const RSCINST & rInst )
|* RscFlag::IsDlft()
|*
*************************************************************************/
-BOOL RscFlag::IsDefault( const RSCINST & rInst )
+sal_Bool RscFlag::IsDefault( const RSCINST & rInst )
{
sal_uInt32 i = 0;
for( i = 0; i < Size() / sizeof( RscFlagInst ); i++ )
if( ((RscFlagInst *)rInst.pData)[ i ].nDfltFlags != 0xFFFFFFFF )
- return( FALSE );
- return( TRUE );
+ return( sal_False );
+ return( sal_True );
}
-BOOL RscFlag::IsDefault( const RSCINST & rInst, Atom nConstId )
+sal_Bool RscFlag::IsDefault( const RSCINST & rInst, Atom nConstId )
{
sal_uInt32 i = 0, nFlag = 0;
@@ -216,11 +216,11 @@ BOOL RscFlag::IsDefault( const RSCINST & rInst, Atom nConstId )
nFlag = 1 << (i % (sizeof( sal_uInt32 ) * 8) );
i = i / (sizeof( sal_uInt32 ) * 8);
if( ((RscFlagInst *)rInst.pData)[ i ].nDfltFlags & nFlag )
- return( TRUE );
+ return( sal_True );
else
- return( FALSE );
+ return( sal_False );
};
- return( TRUE );
+ return( sal_True );
}
/*************************************************************************
@@ -228,7 +228,7 @@ BOOL RscFlag::IsDefault( const RSCINST & rInst, Atom nConstId )
|* RscFlag::IsValueDefault()
|*
*************************************************************************/
-BOOL RscFlag::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef,
+sal_Bool RscFlag::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef,
Atom nConstId )
{
sal_uInt32 i = 0, nFlag = 0;
@@ -241,15 +241,15 @@ BOOL RscFlag::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef,
if( (((RscFlagInst *)rInst.pData)[ i ].nFlags & nFlag)
== (((RscFlagInst *)pDef)[ i ].nFlags & nFlag) )
{
- return TRUE;
+ return sal_True;
}
}
};
- return FALSE;
+ return sal_False;
}
-BOOL RscFlag::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
+sal_Bool RscFlag::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
{
sal_uInt32 i = 0;
@@ -262,7 +262,7 @@ BOOL RscFlag::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
if( (((RscFlagInst *)rInst.pData)[ nIndex ].nFlags & Flag)
!= (((RscFlagInst *)pDef)[ nIndex ].nFlags & Flag) )
{
- return FALSE;
+ return sal_False;
}
Flag <<= 1;
if( !Flag )
@@ -270,9 +270,9 @@ BOOL RscFlag::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
};
}
else
- return FALSE;
+ return sal_False;
- return TRUE;
+ return sal_True;
}
/*************************************************************************
@@ -280,7 +280,7 @@ BOOL RscFlag::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
|* RscFlag::IsSet()
|*
*************************************************************************/
-BOOL RscFlag::IsSet( const RSCINST & rInst, Atom nConstId )
+sal_Bool RscFlag::IsSet( const RSCINST & rInst, Atom nConstId )
{
sal_uInt32 i = 0, nFlag = 0;
@@ -288,11 +288,11 @@ BOOL RscFlag::IsSet( const RSCINST & rInst, Atom nConstId )
nFlag = 1 << (i % (sizeof( sal_uInt32 ) * 8) );
i = i / (sizeof( sal_uInt32 ) * 8);
if( ((RscFlagInst *)rInst.pData)[ i ].nFlags & nFlag )
- return( TRUE );
+ return( sal_True );
else
- return( FALSE );
+ return( sal_False );
};
- return( TRUE );
+ return( sal_True );
}
/*************************************************************************
@@ -304,7 +304,7 @@ void RscFlag::WriteSrc( const RSCINST & rInst, FILE * fOutput,
RscTypCont *, sal_uInt32, const char * )
{
sal_uInt32 i = 0, Flag = 0, nIndex = 0;
- BOOL bComma = FALSE;
+ sal_Bool bComma = sal_False;
Flag = 1;
for( i = 0; i < nEntries; i++ ){
@@ -318,7 +318,7 @@ void RscFlag::WriteSrc( const RSCINST & rInst, FILE * fOutput,
fprintf( fOutput, "not " );
fprintf( fOutput, "%s", pHS->getString( pVarArray[ i ].nId ).getStr() );
}
- bComma = TRUE;
+ bComma = sal_True;
}
Flag <<= 1;
if( !Flag )
@@ -332,9 +332,9 @@ void RscFlag::WriteSrc( const RSCINST & rInst, FILE * fOutput,
|*
*************************************************************************/
ERRTYPE RscFlag::WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont *, sal_uInt32, BOOL )
+ RscTypCont *, sal_uInt32, sal_Bool )
{
- INT32 lVal = 0;
+ sal_Int32 lVal = 0;
sal_uInt32 i = 0, Flag = 0, nIndex = 0;
Flag = 1;
@@ -348,7 +348,7 @@ ERRTYPE RscFlag::WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
Flag = 1;
};
- aMem.Put( (INT32)lVal );
+ aMem.Put( (sal_Int32)lVal );
return( ERR_OK );
}
@@ -395,7 +395,7 @@ void RscClient::WriteSrc( const RSCINST & rInst, FILE * fOutput,
|*
*************************************************************************/
RSCINST RscClient::Create( RSCINST * pInst, const RSCINST & rDflt,
- BOOL bOwnClass )
+ sal_Bool bOwnClass )
{
RSCINST aTmpI, aDfltI;
diff --git a/rsc/source/res/rscmgr.cxx b/rsc/source/res/rscmgr.cxx
index 7a44aa4d8921..1e65962099a8 100644
--- a/rsc/source/res/rscmgr.cxx
+++ b/rsc/source/res/rscmgr.cxx
@@ -67,7 +67,7 @@ sal_uInt32 RscMgr::Size()
|* RscMgr::Create()
|*
*************************************************************************/
-RSCINST RscMgr::Create( RSCINST * pInst, const RSCINST & rDflt, BOOL bOwnClass ){
+RSCINST RscMgr::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnClass ){
RSCINST aInst;
RscMgrInst * pClassData;
@@ -117,7 +117,7 @@ void RscMgr::SetToDefault( const RSCINST & rInst )
RscMgrInst * pClassData;
pClassData = (RscMgrInst *)(rInst.pData + RscClass::Size());
- pClassData->bDflt = TRUE;
+ pClassData->bDflt = sal_True;
RscClass::SetToDefault( rInst );
}
@@ -127,12 +127,12 @@ void RscMgr::SetToDefault( const RSCINST & rInst )
|* RscMgr::IsDefault()
|*
*************************************************************************/
-BOOL RscMgr::IsDefault( const RSCINST & rInst ){
+sal_Bool RscMgr::IsDefault( const RSCINST & rInst ){
RscMgrInst * pClassData;
pClassData = (RscMgrInst *)(rInst.pData + RscClass::Size());
if( !pClassData->bDflt )
- return( FALSE );
+ return( sal_False );
return( RscClass::IsDefault( rInst ) );
}
@@ -142,23 +142,23 @@ BOOL RscMgr::IsDefault( const RSCINST & rInst ){
|* RscMgr::IsValueDefault()
|*
*************************************************************************/
-BOOL RscMgr::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){
+sal_Bool RscMgr::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){
RscMgrInst * pClassData;
RscMgrInst * pDfltData;
if( !RscClass::IsValueDefault( rInst, pDef ) )
- return FALSE;
+ return sal_False;
if( pDef ){
pClassData = (RscMgrInst *)(rInst.pData + RscClass::Size());
pDfltData = (RscMgrInst *)(pDef + RscClass::Size());
if( !pClassData->aRefId.IsId() && !pDfltData->aRefId.IsId() ){
- return TRUE;
+ return sal_True;
}
}
- return FALSE;
+ return sal_False;
}
@@ -215,7 +215,7 @@ void RscMgr::WriteSrc( const RSCINST &, FILE *, RscTypCont *, sal_uInt32,
*************************************************************************/
ERRTYPE RscMgr::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem,
RscTypCont * pTC, const RscId &rId,
- sal_uInt32 nDeep, BOOL bExtra )
+ sal_uInt32 nDeep, sal_Bool bExtra )
{
RscMgrInst * pClassData;
ERRTYPE aError;
@@ -307,7 +307,7 @@ ERRTYPE RscMgr::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem,
|*
*************************************************************************/
ERRTYPE RscMgr::WriteRc( const RSCINST &, RscWriteRc &,
- RscTypCont *, sal_uInt32, BOOL )
+ RscTypCont *, sal_uInt32, sal_Bool )
{
return( ERR_OK );
@@ -530,9 +530,9 @@ ERRTYPE RscMgr::WriteCxx( const RSCINST & rInst, FILE * fOutput,
|* RscArray::IsConsistent()
|*
*************************************************************************/
-BOOL RscMgr::IsConsistent( const RSCINST & rInst )
+sal_Bool RscMgr::IsConsistent( const RSCINST & rInst )
{
- BOOL bRet;
+ sal_Bool bRet;
RscMgrInst * pClassData;
bRet = RscClass::IsConsistent( rInst );
@@ -543,7 +543,7 @@ BOOL RscMgr::IsConsistent( const RSCINST & rInst )
|| (pClassData->aRefId.GetNumber() > 0x7FFF)
|| IsToDeep( rInst ).IsError()) )
{
- bRet = FALSE;
+ bRet = sal_False;
}
return( bRet );
@@ -589,7 +589,7 @@ ERRTYPE RscMgr::IsToDeep( const RSCINST & rInst, sal_uInt32 nDeep )
aTmpI.pData = pObjNode->GetRscObj();
nDeep++;
}
- else //aTmpI.IsInst() wird FALSE, Schleife beenden
+ else //aTmpI.IsInst() wird sal_False, Schleife beenden
aTmpI.pData = NULL;
}
@@ -628,7 +628,7 @@ ERRTYPE RscMgr::SetRef( const RSCINST & rInst, const RscId & rRefId )
aError = IsToDeep( rInst );
if( aError.IsOk() )
- pClassData->bDflt = FALSE;
+ pClassData->bDflt = sal_False;
else
pClassData->aRefId = aOldId;
}
diff --git a/rsc/source/res/rscrange.cxx b/rsc/source/res/rscrange.cxx
index 0e1aa26736b6..132133d5fe76 100644
--- a/rsc/source/res/rscrange.cxx
+++ b/rsc/source/res/rscrange.cxx
@@ -71,7 +71,7 @@ RSCCLASS_TYPE RscRange::GetClassType() const
|* RscRange::SetRange()
|*
*************************************************************************/
-ERRTYPE RscRange::SetRange( INT32 nMinimum, INT32 nMaximum )
+ERRTYPE RscRange::SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum )
{
if( nMinimum > nMaximum )
{
@@ -92,18 +92,18 @@ ERRTYPE RscRange::SetRange( INT32 nMinimum, INT32 nMaximum )
|* RscRange::IsValueDefault()
|*
*************************************************************************/
-BOOL RscRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
+sal_Bool RscRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
{
if( pDef )
{
if( ((RscRangeInst*)rInst.pData)->nValue ==
((RscRangeInst*)pDef)->nValue )
{
- return TRUE;
+ return sal_True;
}
}
- return FALSE;
+ return sal_False;
}
/*************************************************************************
@@ -111,12 +111,12 @@ BOOL RscRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
|* RscRange::SetNumber()
|*
*************************************************************************/
-ERRTYPE RscRange::SetNumber( const RSCINST & rInst, INT32 nValue )
+ERRTYPE RscRange::SetNumber( const RSCINST & rInst, sal_Int32 nValue )
{
if( nMax < nValue || nMin > nValue )
return( ERR_RSCRANGE_OUTDEFSET );
((RscRangeInst *)rInst.pData)->nValue = (sal_uInt16)( nValue - nMin );
- ((RscRangeInst *)rInst.pData)->bDflt = FALSE;
+ ((RscRangeInst *)rInst.pData)->bDflt = sal_False;
return( ERR_OK );
}
@@ -125,7 +125,7 @@ ERRTYPE RscRange::SetNumber( const RSCINST & rInst, INT32 nValue )
|* RscRange::GetNumber()
|*
*************************************************************************/
-ERRTYPE RscRange::GetNumber( const RSCINST & rInst, INT32 * pN )
+ERRTYPE RscRange::GetNumber( const RSCINST & rInst, sal_Int32 * pN )
{
*pN = ((RscRangeInst *)rInst.pData)->nValue + nMin;
return( ERR_OK );
@@ -137,7 +137,7 @@ ERRTYPE RscRange::GetNumber( const RSCINST & rInst, INT32 * pN )
|*
*************************************************************************/
RSCINST RscRange::Create( RSCINST * pInst, const RSCINST & rDflt,
- BOOL bOwnClass )
+ sal_Bool bOwnClass )
{
RSCINST aInst;
@@ -160,7 +160,7 @@ RSCINST RscRange::Create( RSCINST * pInst, const RSCINST & rDflt,
((RscRangeInst *)aInst.pData)->nValue = (sal_uInt16)(0L - nMin);
else
((RscRangeInst *)aInst.pData)->nValue = 0;
- ((RscRangeInst *)aInst.pData)->bDflt = TRUE;
+ ((RscRangeInst *)aInst.pData)->bDflt = sal_True;
}
return( aInst );
@@ -183,7 +183,7 @@ void RscRange::WriteSrc( const RSCINST & rInst, FILE * fOutput,
|*
*************************************************************************/
ERRTYPE RscRange::WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont *, sal_uInt32, BOOL )
+ RscTypCont *, sal_uInt32, sal_Bool )
{
if( nMin >= 0 )
{
@@ -245,7 +245,7 @@ RSCCLASS_TYPE RscLongRange::GetClassType() const
|* RscLongRange::SetRange()
|*
*************************************************************************/
-ERRTYPE RscLongRange::SetRange( INT32 nMinimum, INT32 nMaximum )
+ERRTYPE RscLongRange::SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum )
{
if( nMinimum > nMaximum )
{
@@ -266,14 +266,14 @@ ERRTYPE RscLongRange::SetRange( INT32 nMinimum, INT32 nMaximum )
|* RscLongRange::IsValueDefault()
|*
*************************************************************************/
-BOOL RscLongRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
+sal_Bool RscLongRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
{
if( pDef )
return 0 == memcmp( &((RscLongRangeInst*)rInst.pData)->nValue,
&((RscLongRangeInst*)pDef)->nValue,
- sizeof( INT32 ) );
+ sizeof( sal_Int32 ) );
- return FALSE;
+ return sal_False;
}
/*************************************************************************
@@ -281,13 +281,13 @@ BOOL RscLongRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef )
|* RscLongRange::SetNumber()
|*
*************************************************************************/
-ERRTYPE RscLongRange::SetNumber( const RSCINST & rInst, INT32 nValue )
+ERRTYPE RscLongRange::SetNumber( const RSCINST & rInst, sal_Int32 nValue )
{
if( nMax < nValue || nMin > nValue )
return( ERR_RSCRANGE_OUTDEFSET );
void * pData = &((RscLongRangeInst*)rInst.pData)->nValue;
- memmove( pData, &nValue, sizeof( INT32 ) );
- ((RscLongRangeInst *)rInst.pData)->bDflt = FALSE;
+ memmove( pData, &nValue, sizeof( sal_Int32 ) );
+ ((RscLongRangeInst *)rInst.pData)->bDflt = sal_False;
return( ERR_OK );
}
@@ -296,10 +296,10 @@ ERRTYPE RscLongRange::SetNumber( const RSCINST & rInst, INT32 nValue )
|* RscLongRange::GetNumber()
|*
*************************************************************************/
-ERRTYPE RscLongRange::GetNumber( const RSCINST & rInst, INT32 * pN )
+ERRTYPE RscLongRange::GetNumber( const RSCINST & rInst, sal_Int32 * pN )
{
memmove( pN, &((RscLongRangeInst*)rInst.pData)->nValue,
- sizeof( INT32 ) );
+ sizeof( sal_Int32 ) );
return( ERR_OK );
}
@@ -309,7 +309,7 @@ ERRTYPE RscLongRange::GetNumber( const RSCINST & rInst, INT32 * pN )
|*
*************************************************************************/
RSCINST RscLongRange::Create( RSCINST * pInst, const RSCINST & rDflt,
- BOOL bOwnClass )
+ sal_Bool bOwnClass )
{
RSCINST aInst;
@@ -328,14 +328,14 @@ RSCINST RscLongRange::Create( RSCINST * pInst, const RSCINST & rDflt,
memmove( aInst.pData, rDflt.pData, sizeof( RscLongRangeInst ) );
else
{
- INT32 lDflt;
+ sal_Int32 lDflt;
if( 0L >= nMin && 0L <= nMax )
lDflt = 0;
else
lDflt = nMin;
void * pData = &((RscLongRangeInst*)aInst.pData)->nValue;
- memmove( pData, &lDflt, sizeof( INT32 ) );
- ((RscLongRangeInst *)aInst.pData)->bDflt = TRUE;
+ memmove( pData, &lDflt, sizeof( sal_Int32 ) );
+ ((RscLongRangeInst *)aInst.pData)->bDflt = sal_True;
}
return( aInst );
@@ -349,7 +349,7 @@ RSCINST RscLongRange::Create( RSCINST * pInst, const RSCINST & rDflt,
void RscLongRange::WriteSrc( const RSCINST & rInst, FILE * fOutput,
RscTypCont *, sal_uInt32, const char * )
{
- INT32 lVal;
+ sal_Int32 lVal;
GetNumber( rInst, &lVal );
fprintf( fOutput, "%d", static_cast<int>(lVal) );
}
@@ -360,12 +360,12 @@ void RscLongRange::WriteSrc( const RSCINST & rInst, FILE * fOutput,
|*
*************************************************************************/
ERRTYPE RscLongRange::WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont *, sal_uInt32, BOOL )
+ RscTypCont *, sal_uInt32, sal_Bool )
{
- INT32 lVal;
+ sal_Int32 lVal;
GetNumber( rInst, &lVal );
- aMem.Put( (INT32)lVal );
+ aMem.Put( (sal_Int32)lVal );
return( ERR_OK );
}
@@ -380,7 +380,7 @@ void RscLongRange::WriteRcAccess
{
fprintf( fOutput, "\t\tSet%s( ", pName );
fprintf( fOutput, "GetLong( pResData+nOffset ) );\n" );
- fprintf( fOutput, "\t\tnOffset += sizeof( INT32 );\n" );
+ fprintf( fOutput, "\t\tnOffset += sizeof( sal_Int32 );\n" );
}
/****************** R s c L o n g E n u m R a n g e *********************/
@@ -400,7 +400,7 @@ RscLongEnumRange::RscLongEnumRange( Atom nId, sal_uInt32 nTypeId )
|* Beschreibung
*************************************************************************/
ERRTYPE RscLongEnumRange::SetConst( const RSCINST & rInst, Atom /*nConst*/,
- INT32 nValue )
+ sal_Int32 nValue )
{
return SetNumber( rInst, nValue );
}
@@ -433,7 +433,7 @@ RSCCLASS_TYPE RscIdRange::GetClassType() const
|* RscIdRange::Create()
|*
*************************************************************************/
-RSCINST RscIdRange::Create( RSCINST * pInst, const RSCINST & rDflt, BOOL bOwnClass ){
+RSCINST RscIdRange::Create( RSCINST * pInst, const RSCINST & rDflt, sal_Bool bOwnClass ){
RSCINST aInst;
RscId * pClassData;
@@ -456,11 +456,11 @@ RSCINST RscIdRange::Create( RSCINST * pInst, const RSCINST & rDflt, BOOL bOwnCla
else{
*pClassData = RscId();
if( 0 >= nMin && 0 <= nMax )
- *pClassData = RscId( (INT32)0 );
+ *pClassData = RscId( (sal_Int32)0 );
else
*pClassData = RscId( nMin );
//cUnused wird fuer Defaultkennung verwendet
- ((RscId *)aInst.pData)->aExp.cUnused = TRUE;
+ ((RscId *)aInst.pData)->aExp.cUnused = sal_True;
}
return( aInst );
@@ -480,7 +480,7 @@ void RscIdRange :: Destroy( const RSCINST & rInst ){
|* RscIdRange::IsValueDefault()
|*
*************************************************************************/
-BOOL RscIdRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){
+sal_Bool RscIdRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){
if( pDef ){
if( ((RscId*)rInst.pData)->aExp.IsNumber()
&& ((RscId*)pDef)->aExp.IsNumber() )
@@ -488,12 +488,12 @@ BOOL RscIdRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){
if( ((RscId*)rInst.pData)->GetNumber() ==
((RscId*)pDef)->GetNumber() )
{
- return TRUE;
+ return sal_True;
}
}
}
- return FALSE;
+ return sal_False;
}
/*************************************************************************
@@ -501,13 +501,13 @@ BOOL RscIdRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){
|* RscIdRange::SetNumber()
|*
*************************************************************************/
-ERRTYPE RscIdRange::SetNumber( const RSCINST & rInst, INT32 nValue )
+ERRTYPE RscIdRange::SetNumber( const RSCINST & rInst, sal_Int32 nValue )
{
if( nMax < nValue || nMin > nValue )
return( ERR_RSCRANGE_OUTDEFSET );
*(RscId *)rInst.pData = RscId( nValue );
- ((RscId *)rInst.pData)->aExp.cUnused = FALSE;
+ ((RscId *)rInst.pData)->aExp.cUnused = sal_False;
return( ERR_OK );
}
@@ -516,7 +516,7 @@ ERRTYPE RscIdRange::SetNumber( const RSCINST & rInst, INT32 nValue )
|* RscIdRange::GetNumber()
|*
*************************************************************************/
-ERRTYPE RscIdRange::GetNumber( const RSCINST & rInst, INT32 * plValue ){
+ERRTYPE RscIdRange::GetNumber( const RSCINST & rInst, sal_Int32 * plValue ){
*plValue = ((RscId *)rInst.pData)->GetNumber();
return( ERR_OK );
}
@@ -532,7 +532,7 @@ ERRTYPE RscIdRange::SetRef( const RSCINST & rInst, const RscId & rRscId ){
aError = SetNumber( rInst, rRscId );
if( aError.IsOk() ){
*(RscId *)rInst.pData = rRscId;
- ((RscId *)rInst.pData)->aExp.cUnused = FALSE;
+ ((RscId *)rInst.pData)->aExp.cUnused = sal_False;
}
}
else
@@ -569,11 +569,11 @@ void RscIdRange::WriteSrc( const RSCINST & rInst, FILE * fOutput,
|*
*************************************************************************/
ERRTYPE RscIdRange::WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
- RscTypCont *, sal_uInt32, BOOL )
+ RscTypCont *, sal_uInt32, sal_Bool )
{
- INT32 lVal = ((RscId*)rInst.pData)->GetNumber();
+ sal_Int32 lVal = ((RscId*)rInst.pData)->GetNumber();
- aMem.Put( (INT32)lVal );
+ aMem.Put( (sal_Int32)lVal );
return( ERR_OK );
}
@@ -588,7 +588,7 @@ void RscIdRange::WriteRcAccess
{
fprintf( fOutput, "\t\tSet%s( ", pName );
fprintf( fOutput, "GetLong( pResData+nOffset ) );\n" );
- fprintf( fOutput, "\t\tnOffset += sizeof( INT32 );\n" );
+ fprintf( fOutput, "\t\tnOffset += sizeof( sal_Int32 );\n" );
}
/*************************************************************************
@@ -596,13 +596,13 @@ void RscIdRange::WriteRcAccess
|* RscIdRange::IsConsistent()
|*
*************************************************************************/
-BOOL RscIdRange::IsConsistent( const RSCINST & rInst )
+sal_Bool RscIdRange::IsConsistent( const RSCINST & rInst )
{
long nValue = ((RscId *)rInst.pData)->GetNumber();
if( (nMax >= nValue) && (nMin <= nValue) )
- return TRUE;
+ return sal_True;
else {
- return FALSE;
+ return sal_False;
}
}
@@ -636,7 +636,7 @@ RSCCLASS_TYPE RscBool::GetClassType() const
void RscBool::WriteSrc( const RSCINST & rInst, FILE * fOutput,
RscTypCont *, sal_uInt32, const char * )
{
- INT32 l;
+ sal_Int32 l;
GetNumber( rInst, &l );
if( l )
@@ -654,7 +654,7 @@ void RscBool::WriteRcAccess
)
{
fprintf( fOutput, "\t\tSet%s( ", pName );
- fprintf( fOutput, "(BOOL)*(short *)(pResData+nOffset) );\n" );
+ fprintf( fOutput, "(sal_Bool)*(short *)(pResData+nOffset) );\n" );
fprintf( fOutput, "\t\tnOffset += sizeof( short );\n" );
}
@@ -675,7 +675,7 @@ RscBreakRange :: RscBreakRange( Atom nId, sal_uInt32 nTypeId )
|* RscBreakRange::SetNumber()
|*
*************************************************************************/
-ERRTYPE RscBreakRange::SetNumber( const RSCINST & rInst, INT32 nValue ){
+ERRTYPE RscBreakRange::SetNumber( const RSCINST & rInst, sal_Int32 nValue ){
if( nValue == nOutRange )
return( ERR_RSCRANGE_OUTDEFSET );
else
@@ -688,10 +688,10 @@ ERRTYPE RscBreakRange::SetNumber( const RSCINST & rInst, INT32 nValue ){
|*
*************************************************************************/
RSCINST RscBreakRange::Create( RSCINST * pInst, const RSCINST & rDflt,
- BOOL bOwnClass )
+ sal_Bool bOwnClass )
{
RSCINST aInst;
- INT32 l;
+ sal_Int32 l;
aInst = RscRange::Create( pInst, rDflt, bOwnClass );
diff --git a/rsc/source/res/rscstr.cxx b/rsc/source/res/rscstr.cxx
index 94d69f860cc2..9126823b5f76 100644
--- a/rsc/source/res/rscstr.cxx
+++ b/rsc/source/res/rscstr.cxx
@@ -76,7 +76,7 @@ ERRTYPE RscString::SetString( const RSCINST & rInst, const char * pStr ){
ERRTYPE aError;
if( aError.IsOk() ){
- ((RscStringInst *)rInst.pData)->bDflt = FALSE;
+ ((RscStringInst *)rInst.pData)->bDflt = sal_False;
pTmp = ((RscStringInst *)rInst.pData)->pStr;
if( pTmp ){
@@ -124,7 +124,7 @@ ERRTYPE RscString::GetRef( const RSCINST & rInst, RscId * pRscId ){
ERRTYPE RscString::SetRef( const RSCINST & rInst, const RscId & rRefId ){
if( pRefClass ){
((RscStringInst *)rInst.pData)->aRefId = rRefId;
- ((RscStringInst *)rInst.pData)->bDflt = FALSE;
+ ((RscStringInst *)rInst.pData)->bDflt = sal_False;
}
else
return( ERR_REFNOTALLOWED );
@@ -138,7 +138,7 @@ ERRTYPE RscString::SetRef( const RSCINST & rInst, const RscId & rRefId ){
|*
*************************************************************************/
RSCINST RscString::Create( RSCINST * pInst, const RSCINST & rDflt,
- BOOL bOwnClass )
+ sal_Bool bOwnClass )
{
RSCINST aInst;
@@ -154,7 +154,7 @@ RSCINST RscString::Create( RSCINST * pInst, const RSCINST & rDflt,
((RscStringInst *)aInst.pData)->aRefId.Create();
((RscStringInst *)aInst.pData)->pStr = NULL;
- ((RscStringInst *)aInst.pData)->bDflt = TRUE;
+ ((RscStringInst *)aInst.pData)->bDflt = sal_True;
if( bOwnClass ){
((RscStringInst *)aInst.pData)->aRefId =
@@ -183,7 +183,7 @@ void RscString::Destroy( const RSCINST & rInst ){
|* RscString::IsValueDefault()
|*
*************************************************************************/
-BOOL RscString::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){
+sal_Bool RscString::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){
RscStringInst * pData = (RscStringInst*)rInst.pData;
RscStringInst * pDefData = (RscStringInst*)pDef;
@@ -196,34 +196,34 @@ BOOL RscString::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){
// Sind die Referenzidentifier gleich
if( pData->aRefId.GetNumber() == pDefData->aRefId.GetNumber() )
{
- return TRUE;
+ return sal_True;
}
}
}
else {
- BOOL bStrEmpty = FALSE;
- BOOL bDefStrEmpty = FALSE;
+ sal_Bool bStrEmpty = sal_False;
+ sal_Bool bDefStrEmpty = sal_False;
if( pData->pStr ){
bStrEmpty = ('\0' == *pData->pStr);
}
else
- bStrEmpty = TRUE;
+ bStrEmpty = sal_True;
if( pDefData->pStr ){
bDefStrEmpty = ('\0' == *pDefData->pStr);
}
else
- bDefStrEmpty = TRUE;
+ bDefStrEmpty = sal_True;
if( !bStrEmpty || !bDefStrEmpty ){
- return FALSE;
+ return sal_False;
}
- return TRUE;
+ return sal_True;
}
}
- return FALSE;
+ return sal_False;
}
/*************************************************************************
@@ -276,7 +276,7 @@ void RscString::WriteSrc( const RSCINST & rInst, FILE * fOutput,
|*
*************************************************************************/
ERRTYPE RscString::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
- RscTypCont * pTC, sal_uInt32 nDeep, BOOL bExtra )
+ RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra )
{
ERRTYPE aError;
ObjNode * pObjNode = NULL;
diff --git a/rsc/source/res/rsctop.cxx b/rsc/source/res/rsctop.cxx
index a3305412da10..db9eb6fec470 100644
--- a/rsc/source/res/rsctop.cxx
+++ b/rsc/source/res/rsctop.cxx
@@ -145,12 +145,12 @@ ERRTYPE RscTop :: GetRef( const RSCINST & rInst, RscId * pRscId ){
|* RscTop::InHierarchy()
|*
*************************************************************************/
-BOOL RscTop::InHierarchy( RscTop * pClass ){
+sal_Bool RscTop::InHierarchy( RscTop * pClass ){
if( this == pClass )
- return( TRUE );
+ return( sal_True );
if( pSuperClass )
return( pSuperClass->InHierarchy( pClass ) );
- return( FALSE );
+ return( sal_False );
}
/*************************************************************************
@@ -191,7 +191,7 @@ RSCINST RscTop::GetVariable
const RSCINST & rInst,
Atom nVarName,
const RSCINST & rInitInst,
- BOOL bInitDflt,
+ sal_Bool bInitDflt,
RscTop * pCreateClass
)
{
@@ -275,7 +275,7 @@ ERRTYPE RscTop::GetArrayEle
ERRTYPE RscTop::GetValueEle
(
const RSCINST & rInst,
- INT32 lValue,
+ sal_Int32 lValue,
RscTop * pCreateClass,
RSCINST * pGetInst
)
@@ -374,7 +374,7 @@ sal_uInt32 RscTop::GetCount( const RSCINST & rInst ){
|* RscTop::SetNumber()
|*
*************************************************************************/
-ERRTYPE RscTop::SetNumber( const RSCINST & rInst, INT32 lValue ){
+ERRTYPE RscTop::SetNumber( const RSCINST & rInst, sal_Int32 lValue ){
if( pSuperClass )
return pSuperClass->
SetNumber( rInst, lValue );
@@ -387,7 +387,7 @@ ERRTYPE RscTop::SetNumber( const RSCINST & rInst, INT32 lValue ){
|* RscTop::SetBool()
|*
*************************************************************************/
-ERRTYPE RscTop::SetBool( const RSCINST & rInst, BOOL bValue ){
+ERRTYPE RscTop::SetBool( const RSCINST & rInst, sal_Bool bValue ){
if( pSuperClass )
return pSuperClass->
SetBool( rInst, bValue );
@@ -400,7 +400,7 @@ ERRTYPE RscTop::SetBool( const RSCINST & rInst, BOOL bValue ){
|* RscTop::SetConst()
|*
*************************************************************************/
-ERRTYPE RscTop::SetConst( const RSCINST & rInst, Atom nId, INT32 nVal )
+ERRTYPE RscTop::SetConst( const RSCINST & rInst, Atom nId, sal_Int32 nVal )
{
if( pSuperClass )
return pSuperClass->SetConst( rInst, nId, nVal );
@@ -439,7 +439,7 @@ ERRTYPE RscTop::SetString( const RSCINST & rInst, const char * pStr ){
|* RscTop::GetNumber()
|*
*************************************************************************/
-ERRTYPE RscTop::GetNumber( const RSCINST & rInst, INT32 * pN ){
+ERRTYPE RscTop::GetNumber( const RSCINST & rInst, sal_Int32 * pN ){
if( pSuperClass )
return pSuperClass->
GetNumber( rInst, pN );
@@ -452,7 +452,7 @@ ERRTYPE RscTop::GetNumber( const RSCINST & rInst, INT32 * pN ){
|* RscTop::GetBool()
|*
*************************************************************************/
-ERRTYPE RscTop::GetBool( const RSCINST & rInst, BOOL * pB ){
+ERRTYPE RscTop::GetBool( const RSCINST & rInst, sal_Bool * pB ){
if( pSuperClass )
return pSuperClass->
GetBool( rInst, pB );
@@ -491,7 +491,7 @@ ERRTYPE RscTop::GetString( const RSCINST & rInst, char ** ppStr ){
|* RscTop::Create()
|*
*************************************************************************/
-RSCINST RscTop::Create( RSCINST * pInst, const RSCINST & rDefInst, BOOL bOwnRange )
+RSCINST RscTop::Create( RSCINST * pInst, const RSCINST & rDefInst, sal_Bool bOwnRange )
{
if( pSuperClass )
return pSuperClass->
@@ -518,12 +518,12 @@ void RscTop::Destroy( const RSCINST & rInst ){
|* RscTop::IsConsistent()
|*
*************************************************************************/
-BOOL RscTop::IsConsistent( const RSCINST & rInst )
+sal_Bool RscTop::IsConsistent( const RSCINST & rInst )
{
if( pSuperClass )
return pSuperClass->IsConsistent( rInst );
else
- return TRUE;
+ return sal_True;
}
/*************************************************************************
@@ -542,11 +542,11 @@ void RscTop::SetToDefault( const RSCINST & rInst )
|* RscTop::IsDefault()
|*
*************************************************************************/
-BOOL RscTop::IsDefault( const RSCINST & rInst ){
+sal_Bool RscTop::IsDefault( const RSCINST & rInst ){
if( pSuperClass )
return pSuperClass->IsDefault( rInst );
else
- return TRUE;
+ return sal_True;
}
/*************************************************************************
@@ -554,11 +554,11 @@ BOOL RscTop::IsDefault( const RSCINST & rInst ){
|* RscTop::IsValueDefault()
|*
*************************************************************************/
-BOOL RscTop::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){
+sal_Bool RscTop::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ){
if( pSuperClass )
return pSuperClass->IsValueDefault( rInst, pDef );
else
- return TRUE;
+ return sal_True;
}
/*************************************************************************
@@ -707,7 +707,7 @@ void RscTop::WriteSrc( const RSCINST & rInst, FILE * fOutput,
*************************************************************************/
ERRTYPE RscTop::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem,
RscTypCont * pTC, const RscId & rId,
- sal_uInt32 nDeep, BOOL bExtra )
+ sal_uInt32 nDeep, sal_Bool bExtra )
{
if( pSuperClass )
return( pSuperClass->
@@ -722,7 +722,7 @@ ERRTYPE RscTop::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem,
|*
*************************************************************************/
ERRTYPE RscTop::WriteRc( const RSCINST & rInst, RscWriteRc & rMem,
- RscTypCont * pTC, sal_uInt32 nDeep, BOOL bExtra )
+ RscTypCont * pTC, sal_uInt32 nDeep, sal_Bool bExtra )
{
if( pSuperClass )
return( pSuperClass->
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index 132d60483867..a4d9386126bb 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -60,12 +60,14 @@
#include <rschash.hxx>
#include <osl/file.h>
+#include <osl/file.hxx>
#include <osl/process.h>
#include <rtl/strbuf.hxx>
#include <rtl/tencinfo.h>
#include <rtl/textenc.h>
#include <vector>
+#include <algorithm>
using ::rtl::OUString;
@@ -130,7 +132,7 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH )
RscPtrPtr aCmdLine; // Kommandozeile
ByteString aString;
sal_uInt32 i;
- BOOL bOutputSrsIsSet = FALSE;
+ sal_Bool bOutputSrsIsSet = sal_False;
Init(); // Defaults setzen
@@ -241,7 +243,7 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH )
else if( !rsc_strnicmp( (*ppStr) + 1, "fp=", 3 ) )
{ // anderer Name fuer .srs-file
aOutputSrs = (*ppStr) + 4;
- bOutputSrsIsSet = TRUE;
+ bOutputSrsIsSet = sal_True;
}
else if( !rsc_strnicmp( (*ppStr) + 1, "fl=", 3 ) )
{ // Name fuer listing-file
@@ -441,10 +443,8 @@ ERRTYPE RscCompiler::Start()
if( PRINTSYNTAX_FLAG & pCL->nCommands )
{
-#ifndef W30
pTC->WriteSyntax( stdout );
-printf( "khg\n" );
-#endif
+ printf( "khg\n" );
return ERR_OK;
}
@@ -537,7 +537,7 @@ void RscCompiler::EndCompile()
if( !pFN->IsIncFile() )
{
pTC->WriteSrc( foutput, NOFILE_INDEX,
- RTL_TEXTENCODING_UNICODE, FALSE );
+ RTL_TEXTENCODING_UNICODE, sal_False );
break; // ?T 281091MM nur eine Src-Datei
}
};
@@ -613,7 +613,7 @@ void RscCompiler::EndCompile()
|* RscCompiler::IncludeParser()
|*
*************************************************************************/
-ERRTYPE RscCompiler :: IncludeParser( ULONG lFileKey )
+ERRTYPE RscCompiler :: IncludeParser( sal_uLong lFileKey )
{
FILE * finput;
RscFile * pFName;
@@ -638,7 +638,7 @@ ERRTYPE RscCompiler :: IncludeParser( ULONG lFileKey )
RscDepend * pDep;
RscFileInst aFileInst( pTC, lFileKey, lFileKey, finput );
- pFName->bScanned = TRUE;
+ pFName->bScanned = sal_True;
::IncludeParser( &aFileInst );
fclose( finput );
@@ -675,9 +675,9 @@ ERRTYPE RscCompiler :: IncludeParser( ULONG lFileKey )
|* RscCompiler :: ParseOneFile()
|*
*************************************************************************/
-ERRTYPE RscCompiler :: ParseOneFile( ULONG lFileKey,
+ERRTYPE RscCompiler :: ParseOneFile( sal_uLong lFileKey,
const RscCmdLine::OutputFile* pOutputFile,
- const WriteRcContext* pContext )
+ const WriteRcContext* pContext )
{
FILE * finput = NULL;
ERRTYPE aError;
@@ -691,7 +691,7 @@ ERRTYPE RscCompiler :: ParseOneFile( ULONG lFileKey,
RscDepend * pDep;
//Include-Dateien vorher lesen
- pFName->bLoaded = TRUE; //Endlos Rekursion vermeiden
+ pFName->bLoaded = sal_True; //Endlos Rekursion vermeiden
for ( size_t i = 0; i < pFName->aDepLst.size() && aError.IsOk(); ++i )
{
@@ -700,7 +700,7 @@ ERRTYPE RscCompiler :: ParseOneFile( ULONG lFileKey,
}
if( aError.IsError() )
- pFName->bLoaded = FALSE; //bei Fehler nicht geladenen
+ pFName->bLoaded = sal_False; //bei Fehler nicht geladenen
else
{
String aTmpName( ::GetTmpFileName(), RTL_TEXTENCODING_ASCII_US );
@@ -750,13 +750,36 @@ ERRTYPE RscCompiler :: ParseOneFile( ULONG lFileKey,
|*
*************************************************************************/
-static OString do_prefix( const char* pPrefix, const OUString& rFile )
+namespace
{
- OStringBuffer aBuf(256);
- aBuf.append( pPrefix );
- aBuf.append( ":" );
- aBuf.append( OUStringToOString( rFile, RTL_TEXTENCODING_MS_1252 ) );
- return aBuf.makeStringAndClear();
+ using namespace ::osl;
+ class RscIoError { };
+ static inline OUString lcl_getAbsoluteUrl(const OUString& i_sBaseUrl, const OString& i_sPath)
+ {
+ OUString sRelUrl, sAbsUrl;
+ if(FileBase::getFileURLFromSystemPath(OStringToOUString(i_sPath, RTL_TEXTENCODING_MS_1252), sRelUrl) != FileBase::E_None)
+ throw RscIoError();
+ if(FileBase::getAbsoluteFileURL(i_sBaseUrl, sRelUrl, sAbsUrl) != FileBase::E_None)
+ throw RscIoError();
+ return sAbsUrl;
+ };
+ static inline OString lcl_getSystemPath(const OUString& i_sUrl)
+ {
+ OUString sSys;
+ if(FileBase::getSystemPathFromFileURL(i_sUrl, sSys) != FileBase::E_None)
+ throw RscIoError();
+ OSL_TRACE("temporary file: %s", OUStringToOString(sSys, RTL_TEXTENCODING_UTF8).getStr());
+ return OUStringToOString(sSys, RTL_TEXTENCODING_MS_1252);
+ };
+ static inline OString lcl_getTempFile(OUString& sTempDirUrl)
+ {
+ // get a temp file name for the rc file
+ OUString sTempUrl;
+ if(FileBase::createTempFile(&sTempDirUrl, NULL, &sTempUrl) != FileBase::E_None)
+ throw RscIoError();
+ OSL_TRACE("temporary url: %s", OUStringToOString(sTempUrl, RTL_TEXTENCODING_UTF8).getStr());
+ return lcl_getSystemPath(sTempUrl);
+ };
}
ERRTYPE RscCompiler::Link()
@@ -765,12 +788,6 @@ ERRTYPE RscCompiler::Link()
ERRTYPE aError;
RscFile* pFName;
-#ifdef UNX
-#define PATHSEP '/'
-#else
-#define PATHSEP '\\'
-#endif
-
if( !(pCL->nCommands & NOLINK_FLAG) )
{
::std::list<RscCmdLine::OutputFile>::const_iterator it;
@@ -784,91 +801,60 @@ ERRTYPE RscCompiler::Link()
{
pTC->Delete( pTC->aFileTab.GetIndex( pFName ) );
pTC->aFileTab.Seek( pFName );
- pFName->bLoaded = FALSE;
+ pFName->bLoaded = sal_False;
}
}
- // rc-Datei schreiben
- ByteString aDir( it->aOutputRc );
- aDir.SetToken( aDir.GetTokenCount( PATHSEP )-1, PATHSEP, ByteString() );
- if( ! aDir.Len() )
- {
- char aBuf[1024];
- if( getcwd( aBuf, sizeof( aBuf ) ) )
- {
- aDir = aBuf;
- aDir.Append( PATHSEP );
- }
- }
- // work dir for absolute Urls
- OUString aCWD, aTmpUrl;
- osl_getProcessWorkingDir( &aCWD.pData );
// get two temp file urls
OString aRcTmp, aSysListTmp, aSysList;
- OUString aSysPath, aUrlDir;
- aSysPath = OStringToOUString( aDir, RTL_TEXTENCODING_MS_1252 );
- if( osl_getFileURLFromSystemPath( aSysPath.pData, &aUrlDir.pData ) != osl_File_E_None )
- pTC->pEH->FatalError( ERR_OPENFILE, RscId(), do_prefix( "url conversion", aUrlDir ) );
-
- if( osl_getAbsoluteFileURL( aCWD.pData, aUrlDir.pData, &aTmpUrl.pData ) != osl_File_E_None )
- pTC->pEH->FatalError( ERR_OPENFILE, RscId(), do_prefix( "absolute url", aUrlDir ) );
- aUrlDir = aTmpUrl;
-
- // create temp file for rc target
- if( osl_createTempFile( aUrlDir.pData, NULL, &aTmpUrl.pData ) != osl_File_E_None )
- pTC->pEH->FatalError( ERR_OPENFILE, RscId(), do_prefix( "temp file creation", aUrlDir ) );
+ try
+ {
+ OUString sPwdUrl;
+ osl_getProcessWorkingDir( &sPwdUrl.pData );
+ OUString sRcUrl = lcl_getAbsoluteUrl(sPwdUrl, it->aOutputRc);
+ // TempDir is either the directory where the rc file is located or pwd
+ OUString sTempDirUrl = sRcUrl.copy(0,sRcUrl.lastIndexOf('/'));
+ OSL_TRACE("rc directory URL: %s", OUStringToOString(sTempDirUrl, RTL_TEXTENCODING_UTF8).getStr());
+
+ aRcTmp = lcl_getTempFile(sTempDirUrl);
+ OSL_TRACE("temporary rc file: %s", aRcTmp.getStr());
+
+ OUString sOilDirUrl;
+ if(pCL->aILDir.Len())
+ sOilDirUrl = lcl_getAbsoluteUrl(sPwdUrl, pCL->aILDir);
+ else
+ sOilDirUrl = sTempDirUrl;
+ OSL_TRACE("ilst directory URL: %s", OUStringToOString(sOilDirUrl, RTL_TEXTENCODING_UTF8).getStr());
- if( osl_getSystemPathFromFileURL( aTmpUrl.pData, &aSysPath.pData ) != osl_File_E_None )
- pTC->pEH->FatalError( ERR_OPENFILE, RscId(), do_prefix( "sys path conversion", aTmpUrl ) );
- aRcTmp = OUStringToOString( aSysPath, RTL_TEXTENCODING_MS_1252 );
+ aSysListTmp = lcl_getTempFile(sOilDirUrl);
+ OSL_TRACE("temporary ilst file: %s", aSysListTmp.getStr());
- if ( NULL == (fExitFile = foutput = fopen( aRcTmp.getStr(), "wb" )) )
- pTC->pEH->FatalError( ERR_OPENFILE, RscId(), aRcTmp.getStr() );
+ OUString sIlstUrl, sIlstSys;
+ sIlstUrl = sRcUrl.copy(sRcUrl.lastIndexOf('/')+1);
+ sIlstUrl = sIlstUrl.copy(0,sIlstUrl.lastIndexOf('.'));
+ sIlstUrl += OUString::createFromAscii(".ilst");
+ sIlstUrl = lcl_getAbsoluteUrl(sOilDirUrl, OUStringToOString(sIlstUrl, RTL_TEXTENCODING_UTF8));
- // make absolute path from IL dir (-oil switch)
- // if no -oil was given, use the same dir as for rc file
- if( pCL->aILDir.Len() )
+ aSysList = lcl_getSystemPath(sIlstUrl);
+ OSL_TRACE("ilst file: %s", aSysList.getStr());
+ }
+ catch (RscIoError&)
{
- aSysPath = OStringToOUString( pCL->aILDir, RTL_TEXTENCODING_MS_1252 );
- if( osl_getFileURLFromSystemPath( aSysPath.pData, &aTmpUrl.pData ) != osl_File_E_None )
- pTC->pEH->FatalError( ERR_OPENFILE, RscId(), do_prefix( "url conversion", aSysPath ) );
- if( osl_getAbsoluteFileURL( aCWD.pData, aTmpUrl.pData, &aUrlDir.pData ) != osl_File_E_None )
- pTC->pEH->FatalError( ERR_OPENFILE, RscId(), do_prefix( "absolute url", aTmpUrl ) );
+ OString sMsg("Error with paths:\n");
+ sMsg += "temporary rc file: " + aRcTmp + "\n";
+ sMsg += "temporary ilst file: " + aSysListTmp + "\n";
+ sMsg += "ilst file: " + aSysList + "\n";
+ pTC->pEH->FatalError(ERR_OPENFILE, RscId(), sMsg);
}
-
- if( osl_getSystemPathFromFileURL( aUrlDir.pData, &aSysPath.pData ) != osl_File_E_None )
- pTC->pEH->FatalError( ERR_OPENFILE, RscId(), do_prefix( "sys path conversion", aUrlDir ) );
-
- aSysList = OUStringToOString( aSysPath, RTL_TEXTENCODING_MS_1252 );
- aSysList = aSysList + "/";
- xub_StrLen nLastSep = it->aOutputRc.SearchBackward( PATHSEP );
- if( nLastSep == STRING_NOTFOUND )
- nLastSep = 0;
- xub_StrLen nLastPt = it->aOutputRc.Search( '.', nLastSep );
- if( nLastPt == STRING_NOTFOUND )
- nLastPt = it->aOutputRc.Len()+1;
- aSysList = aSysList + it->aOutputRc.Copy( nLastSep+1, nLastPt - nLastSep-1 );
- aSysList = aSysList + ".ilst";
- // create temp file for sys list target
- if( osl_createTempFile( aUrlDir.pData, NULL, &aTmpUrl.pData ) != osl_File_E_None )
- pTC->pEH->FatalError( ERR_OPENFILE, RscId(), do_prefix( "temp file creation", aUrlDir ) );
-
- if( osl_getSystemPathFromFileURL( aTmpUrl.pData, &aSysPath.pData ) != osl_File_E_None )
- pTC->pEH->FatalError( ERR_OPENFILE, RscId(), do_prefix( "sys path conversion", aTmpUrl ) );
- aSysListTmp = OUStringToOString( aSysPath, RTL_TEXTENCODING_MS_1252 );
-
- pTC->pEH->StdOut( "Generating .rc file\n" );
-
- rtl_TextEncoding aEnc = RTL_TEXTENCODING_UTF8;
- //if( it->aLangName.CompareIgnoreCaseToAscii( "de", 2 ) == COMPARE_EQUAL )
- // aEnc = RTL_TEXTENCODING_MS_1252;
+ if ( NULL == (fExitFile = foutput = fopen( aRcTmp.getStr(), "wb" )) )
+ pTC->pEH->FatalError( ERR_OPENFILE, RscId(), aRcTmp.getStr() );
// Schreibe Datei
sal_Char cSearchDelim = ByteString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US ).GetChar( 0 );
sal_Char cAccessDelim = ByteString( DirEntry::GetAccessDelimiter(), RTL_TEXTENCODING_ASCII_US ).GetChar( 0 );
pTC->ChangeLanguage( it->aLangName );
- pTC->SetSourceCharSet( aEnc );
+ pTC->SetSourceCharSet( RTL_TEXTENCODING_UTF8 );
pTC->ClearSysNames();
ByteString aSysSearchPath( it->aLangSearchPath );
xub_StrLen nIndex = 0;
@@ -884,9 +870,7 @@ ERRTYPE RscCompiler::Link()
aSysSearchPath.Append( cSearchDelim );
aSysSearchPath.Append( aToken );
}
-#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, "setting search path for language %s: %s\n", it->aLangName.GetBuffer(), aSysSearchPath.GetBuffer() );
-#endif
+ OSL_TRACE( "setting search path for language %s: %s\n", it->aLangName.GetBuffer(), aSysSearchPath.GetBuffer() );
pTC->SetSysSearchPath( aSysSearchPath );
WriteRcContext aContext;
@@ -1077,7 +1061,7 @@ ByteString RscCompiler::GetTmpFileName()
/********************************************************************/
/* */
-/* Function : BOOL openinput() */
+/* Function : sal_Bool openinput() */
/* */
/* Description : Check to see if the input file exists and can */
/* be opened for reading. */
@@ -1100,7 +1084,7 @@ void RscCompiler::OpenInput( const ByteString& rInput )
|*************************************************************************/
bool RscCompiler::GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile,
- const WriteRcContext& rContext,
+ const WriteRcContext& rContext,
const ByteString& rBaseFileName,
ByteString& rImagePath,
FILE* pSysListFile )
@@ -1190,9 +1174,9 @@ bool RscCompiler::GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile,
// ------------------------------------------------------------------------------
void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile,
- const WriteRcContext& rContext,
- const DirEntry& rSrsInPath,
- const DirEntry& rSrsOutPath )
+ const WriteRcContext& rContext,
+ const DirEntry& rSrsInPath,
+ const DirEntry& rSrsOutPath )
{
SvFileStream aIStm( rSrsInPath.GetFull(), STREAM_READ );
SvFileStream aOStm( rSrsOutPath.GetFull(), STREAM_WRITE | STREAM_TRUNC );
@@ -1299,7 +1283,7 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile,
}
aOStm.WriteLine( "};" );
- }
+ }
else
aOStm.WriteLine( aLine );
}
diff --git a/rsc/source/tools/rscchar.cxx b/rsc/source/tools/rscchar.cxx
index 0a476662c347..3031ff668bb8 100644
--- a/rsc/source/tools/rscchar.cxx
+++ b/rsc/source/tools/rscchar.cxx
@@ -50,7 +50,7 @@
|* Beschreibung Der String wird nach C-Konvention umgesetzt
|*
*************************************************************************/
-char * RscChar::MakeUTF8( char * pStr, UINT16 nTextEncoding )
+char * RscChar::MakeUTF8( char * pStr, sal_uInt16 nTextEncoding )
{
sal_Size nMaxUniCodeBuf = strlen( pStr ) + 1;
char * pOrgStr = new char[ nMaxUniCodeBuf ];
@@ -110,7 +110,7 @@ char * RscChar::MakeUTF8( char * pStr, UINT16 nTextEncoding )
int i = 0;
while( '0' <= *pStr && '7' >= *pStr && i != 3 )
{
- nChar = nChar * 8 + (BYTE)*pStr - (BYTE)'0';
+ nChar = nChar * 8 + (sal_uInt8)*pStr - (sal_uInt8)'0';
++pStr;
i++;
}
@@ -132,11 +132,11 @@ char * RscChar::MakeUTF8( char * pStr, UINT16 nTextEncoding )
while( isxdigit( *pStr ) && i != 2 )
{
if( isdigit( *pStr ) )
- nChar = nChar * 16 + (BYTE)*pStr - (BYTE)'0';
+ nChar = nChar * 16 + (sal_uInt8)*pStr - (sal_uInt8)'0';
else if( isupper( *pStr ) )
- nChar = nChar * 16 + (BYTE)*pStr - (BYTE)'A' +10;
+ nChar = nChar * 16 + (sal_uInt8)*pStr - (sal_uInt8)'A' +10;
else
- nChar = nChar * 16 + (BYTE)*pStr - (BYTE)'a' +10;
+ nChar = nChar * 16 + (sal_uInt8)*pStr - (sal_uInt8)'a' +10;
++pStr;
i++;
}
diff --git a/rsc/source/tools/rscdef.cxx b/rsc/source/tools/rscdef.cxx
index 6bba925f32f0..99268b83d3d8 100644
--- a/rsc/source/tools/rscdef.cxx
+++ b/rsc/source/tools/rscdef.cxx
@@ -36,7 +36,7 @@
/****************** C o d e **********************************************/
/****************** R s c I d ********************************************/
-BOOL RscId::bNames = TRUE;
+sal_Bool RscId::bNames = sal_True;
/*************************************************************************
|*
@@ -44,16 +44,16 @@ BOOL RscId::bNames = TRUE;
|* static RscId::SetNoNames
|*
*************************************************************************/
-void RscId::SetNames( BOOL bSet ) { bNames = bSet; }
-BOOL RscId::IsSetNames() { return bNames; }
+void RscId::SetNames( sal_Bool bSet ) { bNames = bSet; }
+sal_Bool RscId::IsSetNames() { return bNames; }
/*************************************************************************
|*
|* RscId::GetNumber
|*
*************************************************************************/
-INT32 RscId::GetNumber() const{
- INT32 lVal;
+sal_Int32 RscId::GetNumber() const{
+ sal_Int32 lVal;
aExp.Evaluate( &lVal );
return lVal;
}
@@ -69,7 +69,7 @@ void RscId::Create( const RscExpType & rExpType )
if( aExp.IsDefinition() )
aExp.aExp.pDef->IncRef();
else if( aExp.IsExpression() ){
- INT32 lValue;
+ sal_Int32 lValue;
aExp.Evaluate( &lValue );
aExp.SetLong( lValue );
@@ -129,7 +129,7 @@ RscId& RscId::operator = ( const RscId& rRscId ){
|* RscId::operator ==
|*
*************************************************************************/
-BOOL RscId::operator == ( const RscId& rRscId ) const
+sal_Bool RscId::operator == ( const RscId& rRscId ) const
{
return( GetNumber() == rRscId.GetNumber() );
}
@@ -139,7 +139,7 @@ BOOL RscId::operator == ( const RscId& rRscId ) const
|* RscId::operator <
|*
*************************************************************************/
-BOOL RscId::operator < ( const RscId& rRscId ) const
+sal_Bool RscId::operator < ( const RscId& rRscId ) const
{
return( GetNumber() < rRscId.GetNumber() );
}
@@ -149,17 +149,17 @@ BOOL RscId::operator < ( const RscId& rRscId ) const
|* RscId::operator >
|*
*************************************************************************/
-BOOL RscId::operator > ( const RscId& rRscId ) const
+sal_Bool RscId::operator > ( const RscId& rRscId ) const
{
return( GetNumber() > rRscId.GetNumber() );
}
/*************************************************************************
|*
-|* RscId::INT32()
+|* RscId::sal_Int32()
|*
*************************************************************************/
-RscId::operator INT32() const
+RscId::operator sal_Int32() const
{
return( GetNumber() );
}
@@ -207,7 +207,7 @@ ByteString RscId::GetMacro() const
|* RscDefine::RscDefine()
|*
*************************************************************************/
-RscDefine::RscDefine( ULONG lKey, const ByteString & rDefName, INT32 lDefId )
+RscDefine::RscDefine( sal_uLong lKey, const ByteString & rDefName, sal_Int32 lDefId )
: StringNode( rDefName )
{
nRefCount = 0;
@@ -216,7 +216,7 @@ RscDefine::RscDefine( ULONG lKey, const ByteString & rDefName, INT32 lDefId )
pExp = NULL;
}
-RscDefine::RscDefine( ULONG lKey, const ByteString & rDefName,
+RscDefine::RscDefine( sal_uLong lKey, const ByteString & rDefName,
RscExpression * pExpression )
: StringNode( rDefName )
{
@@ -275,7 +275,7 @@ void RscDefine::ChangeMacro( RscExpression * pExpression ){
pExp->Evaluate( &lId );
}
-void RscDefine::ChangeMacro( INT32 lIdentifier ){
+void RscDefine::ChangeMacro( sal_Int32 lIdentifier ){
if( pExp ){
delete pExp;
pExp = NULL;
@@ -288,8 +288,8 @@ void RscDefine::ChangeMacro( INT32 lIdentifier ){
|* RscDefine::Evaluate()
|*
*************************************************************************/
-BOOL RscDefine::Evaluate(){
- BOOL bRet = TRUE;
+sal_Bool RscDefine::Evaluate(){
+ sal_Bool bRet = sal_True;
if( pExp )
bRet = !pExp->Evaluate( &lId );
@@ -324,8 +324,8 @@ ByteString RscDefine::GetMacro()
|* RscDefineList::New()
|*
*************************************************************************/
-RscDefine * RscDefineList::New( ULONG lFileKey, const ByteString & rDefName,
- INT32 lDefId, size_t lPos )
+RscDefine * RscDefineList::New( sal_uLong lFileKey, const ByteString & rDefName,
+ sal_Int32 lDefId, size_t lPos )
{
RscDefine * pDef;
@@ -342,7 +342,7 @@ RscDefine * RscDefineList::New( ULONG lFileKey, const ByteString & rDefName,
return pDef;
}
-RscDefine * RscDefineList::New( ULONG lFileKey, const ByteString & rDefName,
+RscDefine * RscDefineList::New( sal_uLong lFileKey, const ByteString & rDefName,
RscExpression * pExpression, size_t lPos )
{
RscDefine * pDef;
@@ -365,37 +365,38 @@ RscDefine * RscDefineList::New( ULONG lFileKey, const ByteString & rDefName,
|* RscDefineList::Remove()
|*
*************************************************************************/
-BOOL RscDefineList::Remove( RscDefine * pDef ) {
+sal_Bool RscDefineList::Remove( RscDefine * pDef ) {
for ( RscSubDefList::iterator it = maList.begin(); it < maList.end(); ++it ) {
if ( *it == pDef ) {
(*it)->DefineToNumber();
(*it)->DecRef();
maList.erase( it );
- return TRUE;
+ return sal_True;
}
}
- return FALSE;
+ return sal_False;
}
-BOOL RscDefineList::Remove( size_t lIndex ) {
+sal_Bool RscDefineList::Remove( size_t lIndex ) {
if ( lIndex < maList.size() ) {
RscSubDefList::iterator it = maList.begin();
::std::advance( it, lIndex );
(*it)->DefineToNumber();
(*it)->DecRef();
maList.erase( it );
- return TRUE;
+ return sal_True;
}
- return FALSE;
+ return sal_False;
}
-BOOL RscDefineList::Remove() {
- if ( maList.empty() ) return FALSE;
+sal_Bool RscDefineList::Remove() {
+ if ( maList.empty() )
+ return sal_False;
maList[ 0 ]->DefineToNumber();
maList[ 0 ]->DecRef();
maList.erase( maList.begin() );
- return TRUE;
+ return sal_True;
}
/*************************************************************************
@@ -403,7 +404,7 @@ BOOL RscDefineList::Remove() {
|* RscDefineList::Befor()
|*
*************************************************************************/
-BOOL RscDefineList::Befor( const RscDefine * pFree,
+sal_Bool RscDefineList::Befor( const RscDefine * pFree,
const RscDefine * pDepend )
{
size_t i = 0;
@@ -412,13 +413,13 @@ BOOL RscDefineList::Befor( const RscDefine * pFree,
if ( maList[ i ] == pFree ) {
for ( ++i ; i < n ; ++i ) {
if ( maList[ i ] == pDepend ) {
- return TRUE;
+ return sal_True;
}
}
}
++i;
}
- return FALSE;
+ return sal_False;
}
/*************************************************************************
@@ -443,7 +444,7 @@ void RscDefineList::WriteAll( FILE * fOutput )
|* RscExpType::Evaluate()
|*
*************************************************************************/
-BOOL RscExpType::Evaluate( INT32 * plValue ) const{
+sal_Bool RscExpType::Evaluate( sal_Int32 * plValue ) const{
if( IsDefinition() ){
aExp.pDef->Evaluate();
// Eventuellen Fehler ignorieren
@@ -456,7 +457,7 @@ BOOL RscExpType::Evaluate( INT32 * plValue ) const{
else
*plValue = GetLong();
- return TRUE;
+ return sal_True;
}
/*************************************************************************
@@ -518,9 +519,9 @@ RscExpression::~RscExpression(){
|* RscExpression::Evaluate()
|*
*************************************************************************/
-BOOL RscExpression::Evaluate( INT32 * plValue ){
- INT32 lLeft;
- INT32 lRight;
+sal_Bool RscExpression::Evaluate( sal_Int32 * plValue ){
+ sal_Int32 lLeft;
+ sal_Int32 lRight;
// linken und rechten Zweig auswerten
if( aLeftExp.Evaluate( &lLeft ) && aRightExp.Evaluate( &lRight ) ){
@@ -540,12 +541,12 @@ BOOL RscExpression::Evaluate( INT32 * plValue ){
*plValue = lLeft << lRight;
else{
if( 0L == lRight )
- return FALSE;
+ return sal_False;
*plValue = lLeft / lRight;
};
- return TRUE;
+ return sal_True;
}
- return FALSE;
+ return sal_False;
}
/*************************************************************************
@@ -596,10 +597,10 @@ ByteString RscExpression::GetMacro()
|*
*************************************************************************/
RscFile :: RscFile(){
- bLoaded = FALSE;
- bIncFile = FALSE;
- bDirty = FALSE;
- bScanned = FALSE;
+ bLoaded = sal_False;
+ bIncFile = sal_False;
+ bDirty = sal_False;
+ bScanned = sal_False;
}
/*************************************************************************
@@ -621,12 +622,12 @@ RscFile :: ~RscFile() {
|*
|* RscFile::Depend()
|*
-|* Beschreibung Diese Methode gibt TRUE zurueck, wenn lDepend
+|* Beschreibung Diese Methode gibt sal_True zurueck, wenn lDepend
|* existiert und hinter lFree steht, oder wenn
|* lDepend nicht existiert.
|*
*************************************************************************/
-BOOL RscFile::Depend( ULONG lDepend, ULONG lFree ){
+sal_Bool RscFile::Depend( sal_uLong lDepend, sal_uLong lFree ){
RscDepend * pDep;
for ( size_t i = aDepLst.size(); i > 0; )
@@ -637,12 +638,12 @@ BOOL RscFile::Depend( ULONG lDepend, ULONG lFree ){
{
pDep = aDepLst[ --j ];
if( pDep->GetFileKey() == lFree )
- return TRUE;
+ return sal_True;
}
- return FALSE;
+ return sal_False;
}
}
- return TRUE;
+ return sal_True;
}
/*************************************************************************
@@ -650,13 +651,13 @@ BOOL RscFile::Depend( ULONG lDepend, ULONG lFree ){
|* RscFile::InsertDependFile()
|*
*************************************************************************/
-BOOL RscFile :: InsertDependFile( ULONG lIncFile, size_t lPos )
+sal_Bool RscFile :: InsertDependFile( sal_uLong lIncFile, size_t lPos )
{
for ( size_t i = 0, n = aDepLst.size(); i < n; ++i )
{
RscDepend* pDep = aDepLst[ i ];
if( pDep->GetFileKey() == lIncFile )
- return TRUE;
+ return sal_True;
}
// Current-Zeiger steht auf letztem Element
@@ -669,7 +670,7 @@ BOOL RscFile :: InsertDependFile( ULONG lIncFile, size_t lPos )
::std::advance( it, lPos );
aDepLst.insert( it, new RscDepend( lIncFile ) );
}
- return TRUE;
+ return sal_True;
}
/*************************************************************************
@@ -677,7 +678,7 @@ BOOL RscFile :: InsertDependFile( ULONG lIncFile, size_t lPos )
|* RscFile::RemoveDependFile()
|*
*************************************************************************/
-void RscFile :: RemoveDependFile( ULONG lDepFile )
+void RscFile :: RemoveDependFile( sal_uLong lDepFile )
{
for ( size_t i = aDepLst.size(); i > 0; )
{
@@ -757,17 +758,17 @@ void RscDefTree::Remove( RscDefine * pDef ){
|* RscDefTree::Evaluate()
|*
*************************************************************************/
-BOOL RscDefTree::Evaluate( RscDefine * pDef ){
+sal_Bool RscDefTree::Evaluate( RscDefine * pDef ){
if( pDef ){
if( !Evaluate( (RscDefine *)pDef->Left() ) )
- return FALSE;
+ return sal_False;
if( !Evaluate( (RscDefine *)pDef->Right() ) )
- return FALSE;
+ return sal_False;
};
- return TRUE;
+ return sal_True;
}
-BOOL RscDefTree::Evaluate(){
+sal_Bool RscDefTree::Evaluate(){
return Evaluate( pDefRoot );
}
@@ -803,7 +804,7 @@ RscFileTab :: ~RscFileTab(){
|* RscFileTab::Find()
|*
*************************************************************************/
-ULONG RscFileTab :: Find( const ByteString & rName )
+sal_uLong RscFileTab :: Find( const ByteString & rName )
{
RscFile * pFName;
@@ -831,7 +832,7 @@ RscDefine * RscFileTab::FindDef( const char * pName ){
|* RscFileTab::FindDef()
|*
*************************************************************************/
-RscDefine * RscFileTab::FindDef( ULONG lFileKey, const ByteString & rName )
+RscDefine * RscFileTab::FindDef( sal_uLong lFileKey, const ByteString & rName )
{
RscDefine * pDef = FindDef( rName );
@@ -848,20 +849,20 @@ RscDefine * RscFileTab::FindDef( ULONG lFileKey, const ByteString & rName )
|* RscFileTab::Depend()
|*
*************************************************************************/
-BOOL RscFileTab::Depend( ULONG lDepend, ULONG lFree ){
+sal_Bool RscFileTab::Depend( sal_uLong lDepend, sal_uLong lFree ){
if( lDepend == lFree )
- return TRUE;
+ return sal_True;
RscFile * pFile = First();
while( pFile ){
if( !pFile->IsIncFile() ){
if( !pFile->Depend( lDepend, lFree ) )
- return FALSE;
+ return sal_False;
};
pFile = Next();
};
- return TRUE;
+ return sal_True;
}
/*************************************************************************
@@ -869,17 +870,17 @@ BOOL RscFileTab::Depend( ULONG lDepend, ULONG lFree ){
|* RscFileTab::TestDef()
|*
*************************************************************************/
-BOOL RscFileTab::TestDef( ULONG lFileKey, size_t lPos,
+sal_Bool RscFileTab::TestDef( sal_uLong lFileKey, size_t lPos,
const RscDefine * pDefDec )
{
if( lFileKey == pDefDec->GetFileKey() ) {
RscFile * pFile = GetFile( pDefDec->GetFileKey() );
if( pFile && (lPos <= pFile->aDefLst.GetPos( (RscDefine *)pDefDec ))
&& (lPos != LIST_APPEND) )
- return FALSE;
+ return sal_False;
}
else if( !Depend( lFileKey, pDefDec->GetFileKey() ) )
- return FALSE;
+ return sal_False;
return TestDef( lFileKey, lPos, pDefDec->pExp );
}
@@ -889,29 +890,29 @@ BOOL RscFileTab::TestDef( ULONG lFileKey, size_t lPos,
|* RscFileTab::TestDef()
|*
*************************************************************************/
-BOOL RscFileTab::TestDef( ULONG lFileKey, size_t lPos,
+sal_Bool RscFileTab::TestDef( sal_uLong lFileKey, size_t lPos,
const RscExpression * pExpDec )
{
if( !pExpDec )
- return TRUE;
+ return sal_True;
if( pExpDec->aLeftExp.IsExpression() )
if( !TestDef( lFileKey, lPos, pExpDec->aLeftExp.aExp.pExp ) )
- return FALSE;
+ return sal_False;
if( pExpDec->aLeftExp.IsDefinition() )
if( !TestDef( lFileKey, lPos, pExpDec->aLeftExp.aExp.pDef ) )
- return FALSE;
+ return sal_False;
if( pExpDec->aRightExp.IsExpression() )
if( !TestDef( lFileKey, lPos, pExpDec->aRightExp.aExp.pExp ) )
- return FALSE;
+ return sal_False;
if( pExpDec->aRightExp.IsDefinition() )
if( !TestDef( lFileKey, lPos, pExpDec->aRightExp.aExp.pDef ) )
- return FALSE;
+ return sal_False;
- return TRUE;
+ return sal_True;
}
/*************************************************************************
@@ -919,8 +920,8 @@ BOOL RscFileTab::TestDef( ULONG lFileKey, size_t lPos,
|* RscFileTab::NewDef()
|*
*************************************************************************/
-RscDefine * RscFileTab::NewDef( ULONG lFileKey, const ByteString & rDefName,
- INT32 lId, ULONG lPos )
+RscDefine * RscFileTab::NewDef( sal_uLong lFileKey, const ByteString & rDefName,
+ sal_Int32 lId, sal_uLong lPos )
{
RscDefine * pDef = FindDef( rDefName );
@@ -943,8 +944,8 @@ RscDefine * RscFileTab::NewDef( ULONG lFileKey, const ByteString & rDefName,
|* RscFileTab::NewDef()
|*
*************************************************************************/
-RscDefine * RscFileTab::NewDef( ULONG lFileKey, const ByteString & rDefName,
- RscExpression * pExp, ULONG lPos )
+RscDefine * RscFileTab::NewDef( sal_uLong lFileKey, const ByteString & rDefName,
+ RscExpression * pExp, sal_uLong lPos )
{
RscDefine * pDef = FindDef( rDefName );
@@ -975,14 +976,14 @@ RscDefine * RscFileTab::NewDef( ULONG lFileKey, const ByteString & rDefName,
|* RscFileTab::IsDefUsed()
|*
*************************************************************************/
-BOOL RscFileTab::IsDefUsed( const ByteString & rDefName )
+sal_Bool RscFileTab::IsDefUsed( const ByteString & rDefName )
{
RscDefine * pDef = FindDef( rDefName );
if( pDef )
return( pDef->GetRefCount() != 2 );
- return FALSE;
+ return sal_False;
}
/*************************************************************************
@@ -1009,7 +1010,7 @@ void RscFileTab::DeleteDef( const ByteString & rDefName )
|* RscFileTab::ChangeDef()
|*
*************************************************************************/
-BOOL RscFileTab::ChangeDef( const ByteString & rDefName, INT32 lId )
+sal_Bool RscFileTab::ChangeDef( const ByteString & rDefName, sal_Int32 lId )
{
RscDefine * pDef = FindDef( rDefName );
@@ -1018,7 +1019,7 @@ BOOL RscFileTab::ChangeDef( const ByteString & rDefName, INT32 lId )
//alle Macros neu bewerten
return aDefTree.Evaluate();
};
- return( FALSE );
+ return( sal_False );
}
/*************************************************************************
@@ -1026,7 +1027,7 @@ BOOL RscFileTab::ChangeDef( const ByteString & rDefName, INT32 lId )
|* RscFileTab::ChangeDef()
|*
*************************************************************************/
-BOOL RscFileTab::ChangeDef( const ByteString & rDefName,
+sal_Bool RscFileTab::ChangeDef( const ByteString & rDefName,
RscExpression * pExp )
{
RscDefine * pDef = FindDef( rDefName );
@@ -1035,7 +1036,7 @@ BOOL RscFileTab::ChangeDef( const ByteString & rDefName,
if( pDef )
{
pFile = GetFile( pDef->GetFileKey() );
- ULONG lPos = 0;
+ sal_uLong lPos = 0;
if( pFile )
lPos = pFile->aDefLst.GetPos( pDef );
//Macros in den Expressions sind definiert ?
@@ -1050,7 +1051,7 @@ BOOL RscFileTab::ChangeDef( const ByteString & rDefName,
// geloescht werden
delete pExp;
- return( FALSE );
+ return( sal_False );
}
/*************************************************************************
@@ -1058,7 +1059,7 @@ BOOL RscFileTab::ChangeDef( const ByteString & rDefName,
|* RscFileTab::ChangeDefName()
|*
*************************************************************************/
-BOOL RscFileTab::ChangeDefName( const ByteString & rDefName,
+sal_Bool RscFileTab::ChangeDefName( const ByteString & rDefName,
const ByteString & rNewName )
{
RscDefine * pDef = FindDef( rDefName );
@@ -1070,11 +1071,11 @@ BOOL RscFileTab::ChangeDefName( const ByteString & rDefName,
aDefTree.Remove( pDef );
pDef->SetName( rNewName );
aDefTree.Insert( pDef );
- return( TRUE );
+ return( sal_True );
}
};
- return( FALSE );
+ return( sal_False );
}
/*************************************************************************
@@ -1082,7 +1083,7 @@ BOOL RscFileTab::ChangeDefName( const ByteString & rDefName,
|* RscFileTab::DeleteFileContext()
|*
*************************************************************************/
-void RscFileTab :: DeleteFileContext( ULONG lFileKey ){
+void RscFileTab :: DeleteFileContext( sal_uLong lFileKey ){
RscFile * pFName;
pFName = GetFile( lFileKey );
@@ -1102,7 +1103,7 @@ void RscFileTab :: DeleteFileContext( ULONG lFileKey ){
|* RscFileTab::DeleteFile()
|*
*************************************************************************/
-void RscFileTab :: DeleteFile( ULONG lFileKey ){
+void RscFileTab :: DeleteFile( sal_uLong lFileKey ){
RscFile * pFName;
//Defines freigeben
@@ -1125,9 +1126,9 @@ void RscFileTab :: DeleteFile( ULONG lFileKey ){
|* RscFileTab::NewCodeFile()
|*
*************************************************************************/
-ULONG RscFileTab :: NewCodeFile( const ByteString & rName )
+sal_uLong RscFileTab :: NewCodeFile( const ByteString & rName )
{
- ULONG lKey;
+ sal_uLong lKey;
RscFile * pFName;
lKey = Find( rName );
@@ -1147,10 +1148,10 @@ ULONG RscFileTab :: NewCodeFile( const ByteString & rName )
|* RscFileTab::NewIncFile()
|*
*************************************************************************/
-ULONG RscFileTab :: NewIncFile( const ByteString & rName,
+sal_uLong RscFileTab :: NewIncFile( const ByteString & rName,
const ByteString & rPath )
{
- ULONG lKey;
+ sal_uLong lKey;
RscFile * pFName;
lKey = Find( rName );
diff --git a/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx
index a5079d9f37d0..11f4fff7caf1 100644
--- a/rsc/source/tools/rsctools.cxx
+++ b/rsc/source/tools/rsctools.cxx
@@ -33,7 +33,7 @@
// C and C++ Includes.
#include <stdlib.h>
#include <stdio.h>
-#if defined ( DOS ) || defined ( WIN ) || defined (WNT )
+#if defined (WNT )
#include <direct.h>
#endif
#if defined ( OS2 ) && !defined ( GCC )
@@ -52,10 +52,6 @@
#include <rtl/alloc.h>
#include <rtl/memory.h>
-#if defined (WIN)
-#define ONLY_NEW
-#endif
-
using ::rtl::OUString;
using ::rtl::OUStringToOString;
@@ -144,7 +140,7 @@ ByteString GetTmpFileName()
/* */
/* Description : appends text files */
/********************************************************************/
-BOOL Append( FILE * fDest, ByteString aTmpFile )
+sal_Bool Append( FILE * fDest, ByteString aTmpFile )
{
#define MAX_BUF 4096
FILE *fSource = fopen( aTmpFile.GetBuffer(), "rb" );
@@ -152,7 +148,7 @@ BOOL Append( FILE * fDest, ByteString aTmpFile )
{
if( fSource )
fclose( fSource );
- return FALSE;
+ return sal_False;
}
else
{
@@ -167,14 +163,14 @@ BOOL Append( FILE * fDest, ByteString aTmpFile )
fclose( fSource );
};
- return TRUE;
+ return sal_True;
}
-BOOL Append( ByteString aOutputSrs, ByteString aTmpFile )
+sal_Bool Append( ByteString aOutputSrs, ByteString aTmpFile )
{
FILE * fDest = fopen( aOutputSrs.GetBuffer(), "ab" );
- BOOL bRet = Append( fDest, aTmpFile );
+ sal_Bool bRet = Append( fDest, aTmpFile );
if( fDest )
fclose( fDest );
@@ -370,10 +366,10 @@ RscWriteRc::RscWriteRc( RSCBYTEORDER_TYPE nOrder )
short nSwapTest = 1;
RSCBYTEORDER_TYPE nMachineOrder;
- bSwap = FALSE;
+ bSwap = sal_False;
if( nOrder != RSC_SYSTEMENDIAN )
{
- if( (BYTE)*(BYTE *)&nSwapTest )
+ if( (sal_uInt8)*(sal_uInt8 *)&nSwapTest )
nMachineOrder = RSC_LITTLEENDIAN;
else
nMachineOrder = RSC_BIGENDIAN;
diff --git a/rsc/source/tools/rsctree.cxx b/rsc/source/tools/rsctree.cxx
index 762f29039b28..19a44f873949 100644
--- a/rsc/source/tools/rsctree.cxx
+++ b/rsc/source/tools/rsctree.cxx
@@ -277,12 +277,12 @@ NameNode* NameNode::Search( const void * pSearch ) const{
|* NameNode::Insert()
|*
*************************************************************************/
-BOOL NameNode::Insert( NameNode * pTN, sal_uInt32* pnDepth ){
+sal_Bool NameNode::Insert( NameNode * pTN, sal_uInt32* pnDepth ){
// Ein Knoten wird in den Baum eingefuegt
-// Gibt es einen Knoten mit dem gleichen Namen, dann return FALSE
-// sonst return TRUE. Der Knoten wird auf jeden Fall eingefuegt.
+// Gibt es einen Knoten mit dem gleichen Namen, dann return sal_False
+// sonst return sal_True. Der Knoten wird auf jeden Fall eingefuegt.
- BOOL bRet = TRUE;
+ sal_Bool bRet = sal_True;
int nCmp = Compare( pTN );
*pnDepth += 1;
@@ -298,7 +298,7 @@ BOOL NameNode::Insert( NameNode * pTN, sal_uInt32* pnDepth ){
else
pRight = pTN;
if( nCmp == EQUAL )
- bRet = FALSE;
+ bRet = sal_False;
};
return( bRet );
}
@@ -308,12 +308,12 @@ BOOL NameNode::Insert( NameNode * pTN, sal_uInt32* pnDepth ){
|* NameNode::Insert()
|*
*************************************************************************/
-BOOL NameNode::Insert( NameNode * pTN ){
+sal_Bool NameNode::Insert( NameNode * pTN ){
// insert a node in the tree.
-// if the node with the same name is in, return FALSE and no insert.
+// if the node with the same name is in, return sal_False and no insert.
// if not return true.
sal_uInt32 nDepth = 0;
- BOOL bRet;
+ sal_Bool bRet;
bRet = Insert( pTN, &nDepth );
if( bRet ){
@@ -361,14 +361,14 @@ void NameNode::SubOrderTree( NameNode * pOrderNode ){
|*
*************************************************************************/
class OrderCtrl {
- BOOL bOrder;
+ sal_Bool bOrder;
NameNode * pName;
DECL_LINK( CallBackFunc, NameNode * );
public:
- OrderCtrl() { bOrder = FALSE; pName = NULL; }
- BOOL IsOrder( const NameNode * pRoot )
+ OrderCtrl() { bOrder = sal_False; pName = NULL; }
+ sal_Bool IsOrder( const NameNode * pRoot )
{
- bOrder = TRUE;
+ bOrder = sal_True;
pName = NULL;
pRoot->EnumNodes( LINK( this, OrderCtrl, CallBackFunc ) );
return bOrder;
@@ -377,13 +377,13 @@ public:
IMPL_LINK_INLINE_START( OrderCtrl, CallBackFunc, NameNode *, pNext )
{
if( pName && pName->Compare( pNext ) != LESS )
- bOrder = FALSE;
+ bOrder = sal_False;
pName = pNext;
return 0;
}
IMPL_LINK_INLINE_END( OrderCtrl, CallBackFunc, NameNode *, pNext )
-BOOL NameNode::IsOrderTree() const{
+sal_Bool NameNode::IsOrderTree() const{
OrderCtrl aOrder;
return aOrder.IsOrder( this );
generated by cgit (git 2.34.1) at 2025-01-13 11:51:58 +0000