summaryrefslogtreecommitdiff
path: root/idl/inc
diff options
context:
space:
mode:
authorThorsten Behrens <tbehrens@novell.com>2011-03-12 02:42:58 +0100
committerThorsten Behrens <tbehrens@novell.com>2011-03-12 02:42:58 +0100
commite65c0fe553a9d1b85dcacfff7af9df8231427876 (patch)
tree250636f82248275ef5c1d491e58e4e3cf136cdff /idl/inc
parent35fbb45086c389f91c0d6ff410d814f7567c1ceb (diff)
parent4fba42e5f98fcc0fa9addf41a793c1d7f11602c8 (diff)
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Conflicts: avmedia/inc/avmedia/mediaitem.hxx avmedia/prj/build.lst avmedia/source/framework/mediaitem.cxx avmedia/source/gstreamer/gstcommon.hxx avmedia/source/gstreamer/gstframegrabber.cxx avmedia/source/gstreamer/gstframegrabber.hxx avmedia/source/gstreamer/gstmanager.cxx avmedia/source/gstreamer/gstmanager.hxx avmedia/source/gstreamer/gstplayer.cxx avmedia/source/gstreamer/gstplayer.hxx avmedia/source/gstreamer/gstuno.cxx avmedia/source/gstreamer/gstwindow.cxx avmedia/source/gstreamer/gstwindow.hxx avmedia/source/gstreamer/makefile.mk avmedia/source/quicktime/quicktimeuno.cxx avmedia/source/viewer/mediawindow.cxx avmedia/source/viewer/mediawindow_impl.cxx avmedia/source/viewer/mediawindow_impl.hxx avmedia/source/viewer/mediawindowbase_impl.cxx avmedia/source/win/winuno.cxx basic/inc/basic/basmgr.hxx basic/inc/basic/mybasic.hxx basic/inc/basic/process.hxx basic/inc/basic/sbmeth.hxx basic/inc/basic/sbmod.hxx basic/inc/basic/sbxdef.hxx basic/inc/basic/sbxvar.hxx basic/source/app/app.cxx basic/source/app/app.hxx basic/source/app/appbased.cxx basic/source/app/appedit.cxx basic/source/app/appwin.cxx basic/source/app/appwin.hxx basic/source/app/brkpnts.cxx basic/source/app/brkpnts.hxx basic/source/app/dialogs.cxx basic/source/app/dialogs.hxx basic/source/app/msgedit.cxx basic/source/app/mybasic.cxx basic/source/app/process.cxx basic/source/app/processw.hxx basic/source/app/textedit.cxx basic/source/basmgr/basicmanagerrepository.cxx basic/source/basmgr/basmgr.cxx basic/source/classes/disas.cxx basic/source/classes/eventatt.cxx basic/source/classes/image.cxx basic/source/classes/sb.cxx basic/source/classes/sbunoobj.cxx basic/source/classes/sbxmod.cxx basic/source/comp/codegen.cxx basic/source/comp/dim.cxx basic/source/comp/exprgen.cxx basic/source/comp/exprnode.cxx basic/source/comp/exprtree.cxx basic/source/comp/sbcomp.cxx basic/source/inc/expr.hxx basic/source/inc/object.hxx basic/source/inc/sbunoobj.hxx basic/source/runtime/dllmgr-x86.cxx basic/source/runtime/iosys.cxx basic/source/runtime/makefile.mk basic/source/runtime/methods.cxx basic/source/runtime/methods1.cxx basic/source/runtime/runtime.cxx basic/source/runtime/stdobj.cxx basic/source/runtime/step0.cxx basic/source/runtime/step1.cxx basic/source/runtime/step2.cxx basic/source/sbx/sbxarray.cxx basic/source/sbx/sbxbase.cxx basic/source/sbx/sbxbool.cxx basic/source/sbx/sbxbyte.cxx basic/source/sbx/sbxcoll.cxx basic/source/sbx/sbxconv.hxx basic/source/sbx/sbxcurr.cxx basic/source/sbx/sbxexec.cxx basic/source/sbx/sbxint.cxx basic/source/sbx/sbxobj.cxx basic/source/sbx/sbxscan.cxx basic/source/sbx/sbxstr.cxx basic/source/sbx/sbxvals.cxx basic/source/sbx/sbxvalue.cxx basic/source/sbx/sbxvar.cxx basic/workben/mgrtest.cxx configmgr/prj/build.lst configmgr/source/access.cxx configmgr/source/configurationprovider.cxx configmgr/source/defaultprovider.cxx configmgr/source/pad.cxx configmgr/source/services.cxx configmgr/source/update.cxx configmgr/source/xmlreader.cxx configmgr/source/xmlreader.hxx connectivity/prj/build.lst connectivity/qa/complex/connectivity/TestCase.java connectivity/source/cpool/Zregistration.cxx connectivity/source/drivers/adabas/Bservices.cxx connectivity/source/drivers/ado/Aservices.cxx connectivity/source/drivers/calc/Cservices.cxx connectivity/source/drivers/calc/makefile.mk connectivity/source/drivers/dbase/DIndex.cxx connectivity/source/drivers/dbase/DIndexIter.cxx connectivity/source/drivers/dbase/DNoException.cxx connectivity/source/drivers/dbase/DTable.cxx connectivity/source/drivers/dbase/Dservices.cxx connectivity/source/drivers/dbase/dindexnode.cxx connectivity/source/drivers/evoab/LNoException.cxx connectivity/source/drivers/evoab/LServices.cxx connectivity/source/drivers/evoab2/NServices.cxx connectivity/source/drivers/file/FNoException.cxx connectivity/source/drivers/file/FPreparedStatement.cxx connectivity/source/drivers/file/FResultSet.cxx connectivity/source/drivers/file/FStatement.cxx connectivity/source/drivers/file/quotedstring.cxx connectivity/source/drivers/flat/ETable.cxx connectivity/source/drivers/flat/Eservices.cxx connectivity/source/drivers/hsqldb/Hservices.cxx connectivity/source/drivers/jdbc/jservices.cxx connectivity/source/drivers/kab/KServices.cxx connectivity/source/drivers/macab/MacabServices.cxx connectivity/source/drivers/mozab/MResultSet.cxx connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx connectivity/source/drivers/mysql/Yservices.cxx connectivity/source/drivers/odbc/OFunctions.cxx connectivity/source/drivers/odbc/oservices.cxx connectivity/source/inc/dbase/DIndexPage.hxx connectivity/source/inc/file/FTable.hxx connectivity/source/manager/mregistration.cxx connectivity/source/parse/PColumn.cxx desktop/prj/build.lst desktop/qa/deployment_misc/test_dp_version.cxx desktop/source/app/app.cxx desktop/source/app/appfirststart.cxx desktop/source/app/cmdlineargs.cxx desktop/source/app/cmdlineargs.hxx desktop/source/app/sofficemain.cxx desktop/source/deployment/gui/dp_gui.hrc desktop/source/deployment/gui/dp_gui_dialog2.cxx desktop/source/deployment/gui/dp_gui_dialog2.hxx desktop/source/deployment/gui/dp_gui_updatedialog.cxx desktop/source/deployment/gui/dp_gui_updatedialog.hxx desktop/source/deployment/manager/dp_extensionmanager.cxx desktop/source/deployment/manager/dp_extensionmanager.hxx desktop/source/deployment/misc/dp_misc.src desktop/source/deployment/registry/component/dp_component.cxx desktop/source/deployment/registry/configuration/dp_configuration.cxx desktop/source/deployment/registry/dp_backend.cxx desktop/source/deployment/registry/help/dp_help.cxx desktop/source/deployment/registry/script/dp_script.cxx desktop/source/migration/pages.cxx desktop/source/migration/pages.hxx desktop/source/migration/wizard.cxx desktop/source/migration/wizard.hrc desktop/source/migration/wizard.hxx desktop/source/migration/wizard.src desktop/source/pkgchk/unopkg/unopkg_shared.h desktop/source/so_comp/services.cxx desktop/source/splash/makefile.mk desktop/source/splash/services_spl.cxx desktop/source/splash/splash.cxx drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx editeng/inc/editeng/adjitem.hxx editeng/inc/editeng/bolnitem.hxx editeng/inc/editeng/borderline.hxx editeng/inc/editeng/boxitem.hxx editeng/inc/editeng/brkitem.hxx editeng/inc/editeng/brshitem.hxx editeng/inc/editeng/bulitem.hxx editeng/inc/editeng/charreliefitem.hxx editeng/inc/editeng/charrotateitem.hxx editeng/inc/editeng/charscaleitem.hxx editeng/inc/editeng/cmapitem.hxx editeng/inc/editeng/colritem.hxx editeng/inc/editeng/crsditem.hxx editeng/inc/editeng/editdata.hxx editeng/inc/editeng/editeng.hxx editeng/inc/editeng/editobj.hxx editeng/inc/editeng/editstat.hxx editeng/inc/editeng/editview.hxx editeng/inc/editeng/emphitem.hxx editeng/inc/editeng/escpitem.hxx editeng/inc/editeng/fhgtitem.hxx editeng/inc/editeng/flstitem.hxx editeng/inc/editeng/fontitem.hxx editeng/inc/editeng/frmdiritem.hxx editeng/inc/editeng/fwdtitem.hxx editeng/inc/editeng/hyznitem.hxx editeng/inc/editeng/kernitem.hxx editeng/inc/editeng/langitem.hxx editeng/inc/editeng/lrspitem.hxx editeng/inc/editeng/lspcitem.hxx editeng/inc/editeng/numitem.hxx editeng/inc/editeng/outliner.hxx editeng/inc/editeng/paravertalignitem.hxx editeng/inc/editeng/pmdlitem.hxx editeng/inc/editeng/postitem.hxx editeng/inc/editeng/protitem.hxx editeng/inc/editeng/shaditem.hxx editeng/inc/editeng/sizeitem.hxx editeng/inc/editeng/svxacorr.hxx editeng/inc/editeng/svxfont.hxx editeng/inc/editeng/svxrtf.hxx editeng/inc/editeng/swafopt.hxx editeng/inc/editeng/tstpitem.hxx editeng/inc/editeng/twolinesitem.hxx editeng/inc/editeng/txtrange.hxx editeng/inc/editeng/udlnitem.hxx editeng/inc/editeng/ulspitem.hxx editeng/inc/editeng/wghtitem.hxx editeng/inc/editeng/writingmodeitem.hxx editeng/inc/editeng/xmlcnitm.hxx editeng/inc/helpid.hrc editeng/inc/pch/precompiled_editeng.hxx editeng/source/editeng/editdbg.cxx editeng/source/editeng/editdoc.cxx editeng/source/editeng/editdoc.hxx editeng/source/editeng/editdoc2.cxx editeng/source/editeng/editeng.cxx editeng/source/editeng/editobj.cxx editeng/source/editeng/editobj2.hxx editeng/source/editeng/editsel.cxx editeng/source/editeng/editundo.cxx editeng/source/editeng/editundo.hxx editeng/source/editeng/editview.cxx editeng/source/editeng/edtspell.hxx editeng/source/editeng/eehtml.cxx editeng/source/editeng/eehtml.hxx editeng/source/editeng/eeobj.cxx editeng/source/editeng/eerdll.cxx editeng/source/editeng/eertfpar.cxx editeng/source/editeng/impedit.cxx editeng/source/editeng/impedit.hxx editeng/source/editeng/impedit2.cxx editeng/source/editeng/impedit3.cxx editeng/source/editeng/impedit4.cxx editeng/source/editeng/impedit5.cxx editeng/source/editeng/makefile.mk editeng/source/items/bulitem.cxx editeng/source/items/charhiddenitem.cxx editeng/source/items/flditem.cxx editeng/source/items/frmitems.cxx editeng/source/items/makefile.mk editeng/source/items/numitem.cxx editeng/source/items/paraitem.cxx editeng/source/items/svxfont.cxx editeng/source/items/textitem.cxx editeng/source/items/writingmodeitem.cxx editeng/source/items/xmlcnitm.cxx editeng/source/misc/SvXMLAutoCorrectImport.cxx editeng/source/misc/svxacorr.cxx editeng/source/misc/txtrange.cxx editeng/source/misc/unolingu.cxx editeng/source/outliner/outleeng.cxx editeng/source/outliner/outliner.cxx editeng/source/outliner/outlundo.hxx editeng/source/outliner/outlvw.cxx editeng/source/outliner/paralist.cxx editeng/source/outliner/paralist.hxx editeng/source/rtf/rtfgrf.cxx editeng/source/rtf/rtfitem.cxx editeng/source/rtf/svxrtf.cxx editeng/source/uno/unoipset.cxx editeng/util/makefile.mk embeddedobj/prj/build.lst embeddedobj/source/commonembedding/miscobj.cxx eventattacher/prj/build.lst fileaccess/source/FileAccess.cxx formula/inc/formula/FormulaCompiler.hxx formula/inc/formula/token.hxx formula/inc/formula/tokenarray.hxx formula/source/core/api/FormulaCompiler.cxx formula/source/core/api/token.cxx formula/source/ui/dlg/FormulaHelper.cxx formula/source/ui/dlg/formula.cxx formula/source/ui/dlg/parawin.cxx formula/source/ui/dlg/structpg.cxx fpicker/prj/d.lst fpicker/source/aqua/FPentry.cxx fpicker/source/office/OfficeControlAccess.cxx fpicker/source/office/iodlg.cxx fpicker/source/office/iodlg.hxx fpicker/source/office/iodlg.src fpicker/source/office/iodlgimp.cxx fpicker/source/unx/gnome/FPentry.cxx fpicker/source/unx/gnome/SalGtkFilePicker.cxx fpicker/source/unx/gnome/SalGtkPicker.cxx fpicker/source/unx/kde4/KDE4FPEntry.cxx fpicker/source/win32/filepicker/FPentry.cxx framework/AllLangResTarget_fwe.mk framework/inc/dispatch/interaction.hxx framework/inc/framework/addonmenu.hxx framework/inc/framework/addonsoptions.hxx framework/inc/framework/bmkmenu.hxx framework/inc/framework/imageproducer.hxx framework/inc/framework/sfxhelperfunctions.hxx framework/inc/framework/statusbarconfiguration.hxx framework/inc/framework/titlehelper.hxx framework/inc/framework/toolboxconfiguration.hxx framework/inc/threadhelp/lockhelper.hxx framework/inc/xml/eventsdocumenthandler.hxx framework/inc/xml/statusbardocumenthandler.hxx framework/inc/xml/toolboxconfiguration.hxx framework/inc/xml/toolboxconfigurationdefines.hxx framework/inc/xml/toolboxdocumenthandler.hxx framework/prj/build.lst framework/qa/complex/ModuleManager/makefile.mk framework/qa/complex/accelerators/makefile.mk framework/qa/complex/framework/recovery/makefile.mk framework/qa/complex/imageManager/_XInitialization.java framework/source/classes/menumanager.cxx framework/source/dispatch/interaction.cxx framework/source/fwe/classes/bmkmenu.cxx framework/source/fwe/helper/actiontriggerhelper.cxx framework/source/fwe/helper/imageproducer.cxx framework/source/fwe/xml/menuconfiguration.cxx framework/source/fwe/xml/toolboxdocumenthandler.cxx framework/source/helper/uiconfigelementwrapperbase.cxx framework/source/helper/uielementwrapperbase.cxx framework/source/inc/pattern/window.hxx framework/source/jobs/jobdata.cxx framework/source/layoutmanager/layoutmanager.cxx framework/source/layoutmanager/panel.hxx framework/source/loadenv/loadenv.cxx framework/source/register/registerservices.cxx framework/source/services/menudocumenthandler.cxx framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx framework/source/uiconfiguration/uiconfigurationmanager.cxx framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx framework/source/uielement/addonstoolbarmanager.cxx framework/source/uielement/controlmenucontroller.cxx framework/source/uielement/fontsizemenucontroller.cxx framework/source/uielement/imagebuttontoolbarcontroller.cxx framework/source/uielement/macrosmenucontroller.cxx framework/source/uielement/menubarmanager.cxx framework/source/uielement/newmenucontroller.cxx framework/source/uielement/togglebuttontoolbarcontroller.cxx framework/source/uielement/toolbarmanager.cxx framework/source/uielement/toolbarsmenucontroller.cxx framework/test/makefile.mk framework/test/threadtest/makefile.mk framework/test/typecfg/makefile.mk framework/util/guiapps/makefile.mk framework/util/makefile.mk idl/inc/bastype.hxx idl/inc/hash.hxx idl/inc/lex.hxx idl/inc/module.hxx idl/inc/object.hxx idl/inc/slot.hxx idl/inc/types.hxx idl/source/cmptools/hash.cxx idl/source/cmptools/lex.cxx idl/source/objects/basobj.cxx idl/source/objects/bastype.cxx idl/source/objects/module.cxx idl/source/objects/object.cxx idl/source/objects/slot.cxx idl/source/objects/types.cxx idl/source/prj/command.cxx idl/source/prj/database.cxx idl/source/prj/globals.cxx idl/source/prj/svidl.cxx linguistic/inc/linguistic/misc.hxx linguistic/prj/build.lst linguistic/source/convdic.cxx linguistic/source/convdiclist.cxx linguistic/source/dicimp.cxx linguistic/source/dlistimp.cxx linguistic/source/gciterator.cxx linguistic/source/iprcache.cxx linguistic/source/lngopt.cxx linguistic/source/lngprophelp.cxx linguistic/source/lngsvcmgr.cxx linguistic/source/lngsvcmgr.hxx linguistic/source/misc2.cxx linguistic/workben/sprophelp.cxx officecfg/registry/data/org/openoffice/VCL.xcu officecfg/util/makefile.mk oovbaapi/ooo/vba/XApplicationBase.idl oovbaapi/ooo/vba/XVBAAppService.idl oovbaapi/ooo/vba/XVBADocService.idl oovbaapi/ooo/vba/excel/XApplication.idl oovbaapi/ooo/vba/excel/XRange.idl oovbaapi/ooo/vba/excel/XWorkbook.idl oovbaapi/ooo/vba/excel/XWorksheet.idl oovbaapi/ooo/vba/word/XApplication.idl oovbaapi/ooo/vba/word/XGlobals.idl oovbaapi/ooo/vba/word/XTableOfContents.idl readlicense_oo/prj/build.lst scripting/prj/build.lst scripting/prj/d.lst scripting/source/basprov/basprov.cxx scripting/source/basprov/basscript.cxx scripting/source/basprov/basscript.hxx scripting/source/dlgprov/dlgprov.cxx scripting/source/inc/util/util.hxx scripting/source/protocolhandler/scripthandler.cxx scripting/source/provider/ProviderCache.cxx scripting/source/pyprov/makefile.mk scripting/source/runtimemgr/ScriptNameResolverImpl.cxx scripting/source/runtimemgr/ScriptRuntimeManager.cxx scripting/source/runtimemgr/StorageBridge.cxx scripting/source/storage/ScriptMetadataImporter.cxx scripting/source/storage/ScriptSecurityManager.cxx scripting/source/storage/ScriptStorage.cxx scripting/source/storage/ScriptStorageManager.cxx sfx2/inc/about.hxx sfx2/inc/brokenpackageint.hxx sfx2/inc/docvor.hxx sfx2/inc/pch/precompiled_sfx2.hxx sfx2/inc/sfx2/app.hxx sfx2/inc/sfx2/basmgr.hxx sfx2/inc/sfx2/bindings.hxx sfx2/inc/sfx2/childwin.hxx sfx2/inc/sfx2/ctrlitem.hxx sfx2/inc/sfx2/dinfdlg.hxx sfx2/inc/sfx2/dispatch.hxx sfx2/inc/sfx2/docfilt.hxx sfx2/inc/sfx2/evntconf.hxx sfx2/inc/sfx2/fcontnr.hxx sfx2/inc/sfx2/frame.hxx sfx2/inc/sfx2/imagemgr.hxx sfx2/inc/sfx2/imgmgr.hxx sfx2/inc/sfx2/linksrc.hxx sfx2/inc/sfx2/macrconf.hxx sfx2/inc/sfx2/macropg.hxx sfx2/inc/sfx2/mnuitem.hxx sfx2/inc/sfx2/mnumgr.hxx sfx2/inc/sfx2/module.hxx sfx2/inc/sfx2/msg.hxx sfx2/inc/sfx2/objsh.hxx sfx2/inc/sfx2/passwd.hxx sfx2/inc/sfx2/prnmon.hxx sfx2/inc/sfx2/request.hxx sfx2/inc/sfx2/sfx.hrc sfx2/inc/sfx2/sfxbasemodel.hxx sfx2/inc/sfx2/sfxhtml.hxx sfx2/inc/sfx2/sfxresid.hxx sfx2/inc/sfx2/sfxsids.hrc sfx2/inc/sfx2/sfxuno.hxx sfx2/inc/sfx2/shell.hxx sfx2/inc/sfx2/stbitem.hxx sfx2/inc/sfx2/styfitem.hxx sfx2/inc/sfx2/tabdlg.hxx sfx2/inc/sfx2/tbxctrl.hxx sfx2/inc/sfx2/tplpitem.hxx sfx2/inc/sfx2/viewfrm.hxx sfx2/inc/sfx2/viewsh.hxx sfx2/inc/sfxbasic.hxx sfx2/inc/sorgitm.hxx sfx2/prj/build.lst sfx2/qa/complex/docinfo/makefile.mk sfx2/qa/cppunit/makefile.mk sfx2/sdi/makefile.mk sfx2/source/appl/app.cxx sfx2/source/appl/app.hrc sfx2/source/appl/app.src sfx2/source/appl/appbas.cxx sfx2/source/appl/appcfg.cxx sfx2/source/appl/appchild.cxx sfx2/source/appl/appmain.cxx sfx2/source/appl/appmisc.cxx sfx2/source/appl/appopen.cxx sfx2/source/appl/appquit.cxx sfx2/source/appl/appserv.cxx sfx2/source/appl/appuno.cxx sfx2/source/appl/childwin.cxx sfx2/source/appl/fileobj.cxx sfx2/source/appl/helpinterceptor.cxx sfx2/source/appl/imagemgr.cxx sfx2/source/appl/impldde.cxx sfx2/source/appl/impldde.hxx sfx2/source/appl/linkmgr2.cxx sfx2/source/appl/lnkbase2.cxx sfx2/source/appl/makefile.mk sfx2/source/appl/module.cxx sfx2/source/appl/newhelp.cxx sfx2/source/appl/opengrf.cxx sfx2/source/appl/sfxdll.cxx sfx2/source/appl/sfxhelp.cxx sfx2/source/appl/shutdownicon.cxx sfx2/source/appl/shutdowniconunx.cxx sfx2/source/appl/workwin.cxx sfx2/source/bastyp/fltfnc.cxx sfx2/source/bastyp/frmhtml.cxx sfx2/source/bastyp/frmhtmlw.cxx sfx2/source/bastyp/helper.cxx sfx2/source/bastyp/minarray.cxx sfx2/source/bastyp/progress.cxx sfx2/source/bastyp/sfxhtml.cxx sfx2/source/config/evntconf.cxx sfx2/source/control/bindings.cxx sfx2/source/control/ctrlitem.cxx sfx2/source/control/dispatch.cxx sfx2/source/control/macrconf.cxx sfx2/source/control/macro.cxx sfx2/source/control/makefile.mk sfx2/source/control/minfitem.cxx sfx2/source/control/msg.cxx sfx2/source/control/msgpool.cxx sfx2/source/control/objface.cxx sfx2/source/control/request.cxx sfx2/source/control/shell.cxx sfx2/source/control/sorgitm.cxx sfx2/source/dialog/about.cxx sfx2/source/dialog/basedlgs.cxx sfx2/source/dialog/dinfdlg.cxx sfx2/source/dialog/dinfedt.cxx sfx2/source/dialog/dockwin.cxx sfx2/source/dialog/filedlghelper.cxx sfx2/source/dialog/mailmodel.cxx sfx2/source/dialog/mailmodelapi.cxx sfx2/source/dialog/makefile.mk sfx2/source/dialog/mgetempl.cxx sfx2/source/dialog/passwd.cxx sfx2/source/dialog/passwd.hrc sfx2/source/dialog/printopt.cxx sfx2/source/dialog/securitypage.cxx sfx2/source/dialog/splitwin.cxx sfx2/source/dialog/styfitem.cxx sfx2/source/dialog/tabdlg.cxx sfx2/source/dialog/taskpane.cxx sfx2/source/dialog/templdlg.cxx sfx2/source/dialog/tplpitem.cxx sfx2/source/dialog/versdlg.cxx sfx2/source/doc/QuerySaveDocument.cxx sfx2/source/doc/SfxDocumentMetaData.cxx sfx2/source/doc/applet.cxx sfx2/source/doc/doc.hrc sfx2/source/doc/doc.src sfx2/source/doc/docfile.cxx sfx2/source/doc/docinf.cxx sfx2/source/doc/doctempl.cxx sfx2/source/doc/doctemplates.cxx sfx2/source/doc/docvor.cxx sfx2/source/doc/guisaveas.cxx sfx2/source/doc/makefile.mk sfx2/source/doc/objcont.cxx sfx2/source/doc/objitem.cxx sfx2/source/doc/objmisc.cxx sfx2/source/doc/objserv.cxx sfx2/source/doc/printhelper.cxx sfx2/source/doc/sfxacldetect.cxx sfx2/source/doc/sfxbasemodel.cxx sfx2/source/inc/applet.hxx sfx2/source/inc/fltoptint.hxx sfx2/source/inc/sfxlocal.hrc sfx2/source/inc/virtmenu.hxx sfx2/source/inc/workwin.hxx sfx2/source/menu/mnuitem.cxx sfx2/source/menu/objmnctl.cxx sfx2/source/menu/virtmenu.cxx sfx2/source/notify/eventsupplier.cxx sfx2/source/notify/makefile.mk sfx2/source/toolbox/imgmgr.cxx sfx2/source/toolbox/tbxitem.cxx sfx2/source/view/frame.cxx sfx2/source/view/orgmgr.cxx sfx2/source/view/printer.cxx sfx2/source/view/prnmon.cxx sfx2/source/view/viewfrm.cxx sfx2/source/view/viewprn.cxx sfx2/source/view/viewsh.cxx sfx2/util/makefile.mk sfx2/workben/custompanel/makefile.mk shell/source/backends/desktopbe/desktopbackend.cxx shell/source/backends/gconfbe/gconfbackend.cxx shell/source/backends/kde4be/kde4backend.cxx shell/source/backends/kdebe/kdebackend.cxx shell/source/win32/SysShentry.cxx shell/source/win32/shlxthandler/propsheets/propsheets.cxx shell/source/win32/simplemail/smplmailentry.cxx svx/inc/float3d.hrc svx/inc/fmhelp.hrc svx/inc/globlmn_tmpl.hrc svx/inc/helpid.hrc svx/inc/pch/precompiled_svx.hxx svx/inc/sjctrl.hxx svx/inc/srchitem.hxx svx/inc/svdibrow.hxx svx/inc/svx/SmartTagItem.hxx svx/inc/svx/algitem.hxx svx/inc/svx/camera3d.hxx svx/inc/svx/chrtitem.hxx svx/inc/svx/clipfmtitem.hxx svx/inc/svx/ctredlin.hxx svx/inc/svx/dbtoolsclient.hxx svx/inc/svx/deflt3d.hxx svx/inc/svx/dialogs.hrc svx/inc/svx/drawitem.hxx svx/inc/svx/e3ditem.hxx svx/inc/svx/extrud3d.hxx svx/inc/svx/flagsdef.hxx svx/inc/svx/float3d.hxx svx/inc/svx/frmsel.hxx svx/inc/svx/gallery.hxx svx/inc/svx/gallery1.hxx svx/inc/svx/galtheme.hxx svx/inc/svx/grfcrop.hxx svx/inc/svx/hdft.hxx svx/inc/svx/hlnkitem.hxx svx/inc/svx/hyprlink.hxx svx/inc/svx/itemwin.hxx svx/inc/svx/lathe3d.hxx svx/inc/svx/linkwarn.hxx svx/inc/svx/modctrl.hxx svx/inc/svx/msdffdef.hxx svx/inc/svx/obj3d.hxx svx/inc/svx/optgenrl.hxx svx/inc/svx/optgrid.hxx svx/inc/svx/pageitem.hxx svx/inc/svx/paraprev.hxx svx/inc/svx/postattr.hxx svx/inc/svx/rotmodit.hxx svx/inc/svx/ruler.hxx svx/inc/svx/rulritem.hxx svx/inc/svx/scene3d.hxx svx/inc/svx/sdasaitm.hxx svx/inc/svx/sdasitm.hxx svx/inc/svx/sdggaitm.hxx svx/inc/svx/sdmetitm.hxx svx/inc/svx/sdtaaitm.hxx svx/inc/svx/sdtaditm.hxx svx/inc/svx/sdtaitm.hxx svx/inc/svx/sdtakitm.hxx svx/inc/svx/sdtfchim.hxx svx/inc/svx/sdtfsitm.hxx svx/inc/svx/srchdlg.hxx svx/inc/svx/svddrag.hxx svx/inc/svx/svdetc.hxx svx/inc/svx/svdglue.hxx svx/inc/svx/svdhlpln.hxx svx/inc/svx/svdlayer.hxx svx/inc/svx/svdmark.hxx svx/inc/svx/svdmodel.hxx svx/inc/svx/svdoashp.hxx svx/inc/svx/svdobj.hxx svx/inc/svx/svdocirc.hxx svx/inc/svx/svdoedge.hxx svx/inc/svx/svdogrp.hxx svx/inc/svx/svdomeas.hxx svx/inc/svx/svdoole2.hxx svx/inc/svx/svdorect.hxx svx/inc/svx/svdotable.hxx svx/inc/svx/svdotext.hxx svx/inc/svx/svdovirt.hxx svx/inc/svx/svdpage.hxx svx/inc/svx/svdsnpv.hxx svx/inc/svx/svdtrans.hxx svx/inc/svx/svdundo.hxx svx/inc/svx/svimbase.hxx svx/inc/svx/svx3ditems.hxx svx/inc/svx/svxdlg.hxx svx/inc/svx/sxcikitm.hxx svx/inc/svx/sxekitm.hxx svx/inc/svx/sxelditm.hxx svx/inc/svx/sxenditm.hxx svx/inc/svx/sxmkitm.hxx svx/inc/svx/sxmtpitm.hxx svx/inc/svx/sxmuitm.hxx svx/inc/svx/tabarea.hxx svx/inc/svx/tabline.hxx svx/inc/svx/unoprov.hxx svx/inc/svx/viewlayoutitem.hxx svx/inc/svx/xbitmap.hxx svx/inc/svx/xbtmpit.hxx svx/inc/svx/xcolit.hxx svx/inc/svx/xfillit0.hxx svx/inc/svx/xflclit.hxx svx/inc/svx/xflftrit.hxx svx/inc/svx/xflgrit.hxx svx/inc/svx/xflhtit.hxx svx/inc/svx/xftadit.hxx svx/inc/svx/xftsfit.hxx svx/inc/svx/xftshit.hxx svx/inc/svx/xlineit0.hxx svx/inc/svx/xlinjoit.hxx svx/inc/svx/xlnclit.hxx svx/inc/svx/xlndsit.hxx svx/inc/svx/xlnedcit.hxx svx/inc/svx/xlnedit.hxx svx/inc/svx/xlnedwit.hxx svx/inc/svx/xlnstcit.hxx svx/inc/svx/xlnstit.hxx svx/inc/svx/xlnstwit.hxx svx/inc/svx/xlnwtit.hxx svx/inc/svx/xtextit0.hxx svx/inc/svx/zoomitem.hxx svx/inc/svx/zoomslideritem.hxx svx/inc/xpolyimp.hxx svx/inc/zoom_def.hxx svx/prj/d.lst svx/source/accessibility/AccessibleShape.cxx svx/source/accessibility/DescriptionGenerator.cxx svx/source/customshapes/EnhancedCustomShapeEngine.cxx svx/source/customshapes/EnhancedCustomShapeFontWork.cxx svx/source/dialog/_bmpmask.cxx svx/source/dialog/_contdlg.cxx svx/source/dialog/connctrl.cxx svx/source/dialog/contwnd.cxx svx/source/dialog/ctredlin.cxx svx/source/dialog/ctredlin.hrc svx/source/dialog/ctredlin.src svx/source/dialog/dialcontrol.cxx svx/source/dialog/dlgctrl.cxx svx/source/dialog/docrecovery.cxx svx/source/dialog/fntctrl.cxx svx/source/dialog/fontwork.cxx svx/source/dialog/frmsel.cxx svx/source/dialog/graphctl.cxx svx/source/dialog/grfflt.cxx svx/source/dialog/hdft.cxx svx/source/dialog/hyperdlg.cxx svx/source/dialog/hyprdlg.hxx svx/source/dialog/hyprlink.cxx svx/source/dialog/hyprlink.hxx svx/source/dialog/hyprlink.src svx/source/dialog/imapdlg.cxx svx/source/dialog/imapwnd.cxx svx/source/dialog/linkwarn.hrc svx/source/dialog/makefile.mk svx/source/dialog/optgrid.cxx svx/source/dialog/orienthelper.cxx svx/source/dialog/pagectrl.cxx svx/source/dialog/prtqry.cxx svx/source/dialog/rlrcitem.cxx svx/source/dialog/rubydialog.cxx svx/source/dialog/rulritem.cxx svx/source/dialog/simptabl.cxx svx/source/dialog/srchdlg.cxx svx/source/dialog/svxbmpnumvalueset.cxx svx/source/dialog/svxruler.cxx svx/source/dialog/swframeexample.cxx svx/source/engine3d/float3d.cxx svx/source/engine3d/float3d.src svx/source/engine3d/svx3ditems.cxx svx/source/fmcomp/gridctrl.cxx svx/source/fmcomp/trace.cxx svx/source/form/ParseContext.cxx svx/source/form/datanavi.cxx svx/source/form/filtnav.cxx svx/source/form/fmexch.cxx svx/source/form/fmexpl.cxx svx/source/form/fmobjfac.cxx svx/source/form/fmpage.cxx svx/source/form/fmshell.cxx svx/source/form/fmshimp.cxx svx/source/form/fmsrcimp.cxx svx/source/form/fmvwimp.cxx svx/source/form/makefile.mk svx/source/form/tabwin.cxx svx/source/form/tbxform.cxx svx/source/form/typemap.cxx svx/source/gallery2/galbrws1.cxx svx/source/gallery2/galbrws2.cxx svx/source/gallery2/galexpl.cxx svx/source/gallery2/gallery1.cxx svx/source/gallery2/galtheme.cxx svx/source/gallery2/makefile.mk svx/source/gengal/gengal.cxx svx/source/gengal/makefile.mk svx/source/inc/fmgroup.hxx svx/source/intro/about_ooo.hrc svx/source/intro/iso.src svx/source/intro/ooo.src svx/source/items/SmartTagItem.cxx svx/source/items/algitem.cxx svx/source/items/chrtitem.cxx svx/source/items/clipfmtitem.cxx svx/source/items/customshapeitem.cxx svx/source/items/drawitem.cxx svx/source/items/e3ditem.cxx svx/source/items/grfitem.cxx svx/source/items/hlnkitem.cxx svx/source/items/makefile.mk svx/source/items/pageitem.cxx svx/source/items/rotmodit.cxx svx/source/items/viewlayoutitem.cxx svx/source/items/zoomitem.cxx svx/source/items/zoomslideritem.cxx svx/source/src/app.hrc svx/source/stbctrls/makefile.mk svx/source/stbctrls/modctrl.cxx svx/source/stbctrls/xmlsecctrl.cxx svx/source/stbctrls/zoomctrl.cxx svx/source/svdraw/clonelist.cxx svx/source/svdraw/svdattr.cxx svx/source/svdraw/svdcrtv.cxx svx/source/svdraw/svdedtv1.cxx svx/source/svdraw/svdedtv2.cxx svx/source/svdraw/svdedxv.cxx svx/source/svdraw/svdetc.cxx svx/source/svdraw/svdfmtf.cxx svx/source/svdraw/svdfmtf.hxx svx/source/svdraw/svdglue.cxx svx/source/svdraw/svdhdl.cxx svx/source/svdraw/svdhlpln.cxx svx/source/svdraw/svdibrow.cxx svx/source/svdraw/svdlayer.cxx svx/source/svdraw/svdmodel.cxx svx/source/svdraw/svdoashp.cxx svx/source/svdraw/svdobj.cxx svx/source/svdraw/svdocapt.cxx svx/source/svdraw/svdocirc.cxx svx/source/svdraw/svdoedge.cxx svx/source/svdraw/svdograf.cxx svx/source/svdraw/svdogrp.cxx svx/source/svdraw/svdomeas.cxx svx/source/svdraw/svdomedia.cxx svx/source/svdraw/svdopath.cxx svx/source/svdraw/svdotext.cxx svx/source/svdraw/svdotxdr.cxx svx/source/svdraw/svdotxed.cxx svx/source/svdraw/svdotxfl.cxx svx/source/svdraw/svdotxln.cxx svx/source/svdraw/svdotxtr.cxx svx/source/svdraw/svdoutl.cxx svx/source/svdraw/svdpage.cxx svx/source/svdraw/svdpagv.cxx svx/source/svdraw/svdpntv.cxx svx/source/svdraw/svdpoev.cxx svx/source/svdraw/svdsnpv.cxx svx/source/svdraw/svdstr.src svx/source/svdraw/svdtrans.cxx svx/source/svdraw/svdundo.cxx svx/source/svdraw/svdview.cxx svx/source/svdraw/svdxcgv.cxx svx/source/table/svdotable.cxx svx/source/tbxctrls/colorwindow.hxx svx/source/tbxctrls/extrusioncontrols.cxx svx/source/tbxctrls/fillctrl.cxx svx/source/tbxctrls/grafctrl.cxx svx/source/tbxctrls/itemwin.cxx svx/source/tbxctrls/layctrl.cxx svx/source/tbxctrls/lboxctrl.cxx svx/source/tbxctrls/linectrl.cxx svx/source/tbxctrls/tbcontrl.cxx svx/source/tbxctrls/verttexttbxctrl.cxx svx/source/unodraw/unomod.cxx svx/source/unodraw/unopage.cxx svx/source/unodraw/unoprov.cxx svx/source/unodraw/unoshape.cxx svx/source/unodraw/unoshtxt.cxx svx/source/xml/xmlxtexp.cxx svx/source/xoutdev/_xpoly.cxx svx/source/xoutdev/xattr.cxx svx/source/xoutdev/xattr2.cxx svx/source/xoutdev/xattrbmp.cxx svx/source/xoutdev/xtabcolr.cxx svx/util/makefile.mk svx/workben/edittest.cxx sysui/desktop/productversion.mk ucb/prj/build.lst ucb/source/cacher/cacheserv.cxx ucb/source/core/ucb1.component ucb/source/core/ucbserv.cxx ucb/source/core/ucbstore.cxx ucb/source/core/ucbstore.hxx ucb/source/sorter/sortmain.cxx ucb/source/ucp/file/prov.cxx ucb/source/ucp/file/shell.cxx ucb/source/ucp/ftp/ftpservices.cxx ucb/source/ucp/gio/gio_provider.cxx ucb/source/ucp/gvfs/gvfs_provider.cxx ucb/source/ucp/hierarchy/hierarchyservices.cxx ucb/source/ucp/odma/odma_lib.cxx ucb/source/ucp/odma/odma_services.cxx ucb/source/ucp/package/pkgservices.cxx ucb/source/ucp/tdoc/tdoc_services.cxx ucb/source/ucp/webdav/ContentProperties.cxx ucb/source/ucp/webdav/NeonHeadRequest.cxx ucb/source/ucp/webdav/webdavcontent.cxx ucb/source/ucp/webdav/webdavservices.cxx uui/source/iahndl.cxx uui/source/iahndl.hxx uui/source/loginerr.hxx uui/source/nameclashdlg.hxx uui/source/passcrtdlg.cxx uui/source/passworddlg.cxx uui/source/passworddlg.hxx uui/source/services.cxx vbahelper/inc/vbahelper/vbahelper.hxx vbahelper/prj/build.lst vbahelper/prj/d.lst vbahelper/source/msforms/makefile.mk vbahelper/source/msforms/vbauserform.cxx vbahelper/source/vbahelper/makefile.mk vbahelper/source/vbahelper/vbaapplicationbase.cxx vbahelper/source/vbahelper/vbacommandbarcontrol.cxx vbahelper/source/vbahelper/vbadocumentbase.cxx vbahelper/source/vbahelper/vbadocumentsbase.cxx vbahelper/source/vbahelper/vbahelper.cxx vbahelper/util/makefile.mk xmlhelp/source/cxxhelp/provider/databases.cxx xmlhelp/source/cxxhelp/provider/services.cxx xmlhelp/source/treeview/tvfactory.cxx xmloff/JunitTest_xmloff_unoapi.mk xmloff/inc/functional.hxx xmloff/inc/xmloff/formlayerexport.hxx xmloff/inc/xmloff/formlayerimport.hxx xmloff/inc/xmloff/functional.hxx xmloff/inc/xmloff/shapeimport.hxx xmloff/inc/xmloff/xmlcnitm.hxx xmloff/inc/xmloff/xmlnumfi.hxx xmloff/prj/build.lst xmloff/source/chart/SchXMLChartContext.cxx xmloff/source/chart/SchXMLExport.cxx xmloff/source/chart/SchXMLImport.cxx xmloff/source/chart/SchXMLLegendContext.hxx xmloff/source/chart/SchXMLPlotAreaContext.cxx xmloff/source/core/xmluconv.cxx xmloff/source/draw/sdxmlexp.cxx xmloff/source/draw/shapeexport4.cxx xmloff/source/draw/ximp3dobject.cxx xmloff/source/draw/ximp3dscene.cxx xmloff/source/forms/formlayerexport.cxx xmloff/source/forms/formlayerimport.cxx xmloff/source/forms/handler/vcl_time_handler.hxx xmloff/source/forms/layerimport.cxx xmloff/source/forms/layerimport.hxx xmloff/source/forms/property_meta_data.hxx xmloff/source/style/PageHeaderFooterContext.cxx xmloff/source/style/PageMasterStyleMap.cxx xmloff/source/style/prstylei.cxx xmloff/source/style/xmlimppr.cxx xmloff/source/style/xmlnumfi.cxx xmloff/source/style/xmlstyle.cxx xmloff/source/table/tabledesignsimporter.cxx xmloff/source/text/XMLTextNumRuleInfo.cxx xmloff/source/text/XMLTextShapeStyleContext.cxx xmloff/source/text/txtstyle.cxx xmloff/source/transform/ChartOOoTContext.cxx xmloff/source/transform/EventOOoTContext.cxx xmloff/source/transform/TransformerBase.cxx xmloff/util/makefile.mk xmlscript/util/xcr.component
Diffstat (limited to 'idl/inc')
-rwxr-xr-x[-rw-r--r--]idl/inc/basobj.hxx50
-rwxr-xr-x[-rw-r--r--]idl/inc/bastype.hxx126
-rwxr-xr-x[-rw-r--r--]idl/inc/char.hxx0
-rwxr-xr-x[-rw-r--r--]idl/inc/command.hxx6
-rwxr-xr-x[-rw-r--r--]idl/inc/database.hxx38
-rwxr-xr-x[-rw-r--r--]idl/inc/globals.hxx0
-rwxr-xr-x[-rw-r--r--]idl/inc/hash.hxx60
-rwxr-xr-x[-rw-r--r--]idl/inc/lex.hxx84
-rwxr-xr-x[-rw-r--r--]idl/inc/makefile.mk0
-rwxr-xr-x[-rw-r--r--]idl/inc/module.hxx32
-rwxr-xr-x[-rw-r--r--]idl/inc/object.hxx32
-rwxr-xr-x[-rw-r--r--]idl/inc/pch/precompiled_idl.cxx0
-rwxr-xr-x[-rw-r--r--]idl/inc/pch/precompiled_idl.hxx0
-rwxr-xr-x[-rw-r--r--]idl/inc/slot.hxx132
-rwxr-xr-x[-rw-r--r--]idl/inc/types.hxx132
15 files changed, 346 insertions, 346 deletions
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index 2db45be5f523..ff1d7b48b569 100644..100755
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -80,19 +80,19 @@ public:
SvMetaObject();
#ifdef IDL_COMPILER
- static void WriteTab( SvStream & rOutStm, USHORT nTab );
- static BOOL TestAndSeekSpaceOnly( SvStream &, ULONG nBegPos );
+ static void WriteTab( SvStream & rOutStm, sal_uInt16 nTab );
+ static sal_Bool TestAndSeekSpaceOnly( SvStream &, sal_uLong nBegPos );
static void Back2Delemitter( SvStream & );
static void WriteStars( SvStream & );
- virtual BOOL ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
- virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+ virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+ virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
- virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+ virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0 );
- virtual void WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
- virtual void WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+ virtual void WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
+ virtual void WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
#endif
};
SV_DECL_IMPL_REF(SvMetaObject)
@@ -111,7 +111,7 @@ public:
SvMetaObject * Pop() { return aList.Remove( aList.Count() -1 ); }
SvMetaObject * Top() const { return aList.GetObject( aList.Count() -1 ); }
void Clear() { aList.Clear(); }
- ULONG Count() const { return aList.Count(); }
+ sal_uLong Count() const { return aList.Count(); }
SvMetaObject * Get( TypeId nType )
{
@@ -136,26 +136,26 @@ class SvMetaName : public SvMetaObject
protected:
#ifdef IDL_COMPILER
- virtual BOOL ReadNameSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+ virtual sal_Bool ReadNameSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
void DoReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm,
char c = '\0' );
virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
virtual void WriteContextSvIdl( SvIdlDataBase & rBase,
- SvStream & rOutStm, USHORT nTab );
+ SvStream & rOutStm, sal_uInt16 nTab );
virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm );
virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase,
- SvStream & rOutStm, USHORT nTab );
- virtual void WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+ SvStream & rOutStm, sal_uInt16 nTab );
+ virtual void WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0);
- virtual void WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+ virtual void WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0);
#endif
public:
SV_DECL_META_FACTORY1( SvMetaName, SvMetaObject, 15 )
SvMetaName();
- virtual BOOL SetName( const ByteString & rName, SvIdlDataBase * = NULL );
+ virtual sal_Bool SetName( const ByteString & rName, SvIdlDataBase * = NULL );
void SetDescription( const ByteString& rText )
{ aDescription = rText; }
const SvHelpContext& GetHelpContext() const { return aHelpContext; }
@@ -165,10 +165,10 @@ public:
virtual const SvString& GetDescription() const{ return aDescription; }
#ifdef IDL_COMPILER
- virtual BOOL Test( SvIdlDataBase &, SvTokenStream & rInStm );
- virtual BOOL ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
- virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
- virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+ virtual sal_Bool Test( SvIdlDataBase &, SvTokenStream & rInStm );
+ virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+ virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
+ virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0);
void WriteDescription( SvStream& rOutStm );
#endif
@@ -232,8 +232,8 @@ class SvMetaExtern : public SvMetaReference
SvUUId aUUId;
SvVersion aVersion;
- BOOL bReadUUId;
- BOOL bReadVersion;
+ sal_Bool bReadUUId;
+ sal_Bool bReadVersion;
public:
SV_DECL_META_FACTORY1( SvMetaExtern, SvMetaName, 16 )
SvMetaExtern();
@@ -244,16 +244,16 @@ public:
const SvVersion & GetVersion() const { return aVersion; }
#ifdef IDL_COMPILER
void SetModule( SvIdlDataBase & rBase );
- virtual BOOL ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
- virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+ virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+ virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
- virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+ virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0);
protected:
virtual void ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase,
- SvStream & rOutStm, USHORT nTab );
- virtual void WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+ SvStream & rOutStm, sal_uInt16 nTab );
+ virtual void WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0);
#endif
};
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index 79290a46c39b..a95114954eab 100644..100755
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -42,16 +42,16 @@ class SvTokenStream;
class SvUINT32
{
- UINT32 nVal;
+ sal_uInt32 nVal;
public:
SvUINT32() { nVal = 0; }
- SvUINT32( UINT32 n ) : nVal( n ) {}
- SvUINT32 & operator = ( UINT32 n ) { nVal = n; return *this; }
+ SvUINT32( sal_uInt32 n ) : nVal( n ) {}
+ SvUINT32 & operator = ( sal_uInt32 n ) { nVal = n; return *this; }
- operator UINT32 &() { return nVal; }
+ operator sal_uInt32 &() { return nVal; }
- static UINT32 Read( SvStream & rStm );
- static void Write( SvStream & rStm, UINT32 nVal );
+ static sal_uInt32 Read( SvStream & rStm );
+ static void Write( SvStream & rStm, sal_uInt32 nVal );
friend SvStream& operator << (SvStream & rStm, const SvUINT32 & r )
{ SvUINT32::Write( rStm, r.nVal ); return rStm; }
@@ -71,7 +71,7 @@ public:
operator short &() { return nVal; }
friend SvStream& operator << (SvStream & rStm, const SvINT16 & r )
- { SvUINT32::Write( rStm, (UINT32)r.nVal ); return rStm; }
+ { SvUINT32::Write( rStm, (sal_uInt32)r.nVal ); return rStm; }
friend SvStream& operator >> (SvStream & rStm, SvINT16 & r )
{ r.nVal = (short)SvUINT32::Read( rStm ); return rStm; }
};
@@ -79,53 +79,53 @@ public:
class SvUINT16
{
- USHORT nVal;
+ sal_uInt16 nVal;
public:
SvUINT16() { nVal = 0; }
- SvUINT16( USHORT n ) : nVal( n ) {}
- SvUINT16 & operator = ( USHORT n ) { nVal = n; return *this; }
+ SvUINT16( sal_uInt16 n ) : nVal( n ) {}
+ SvUINT16 & operator = ( sal_uInt16 n ) { nVal = n; return *this; }
- operator UINT16 &() { return nVal; }
+ operator sal_uInt16 &() { return nVal; }
friend SvStream& operator << (SvStream & rStm, const SvUINT16 & r )
- { SvUINT32::Write( rStm, (UINT32)r.nVal ); return rStm; }
+ { SvUINT32::Write( rStm, (sal_uInt32)r.nVal ); return rStm; }
friend SvStream& operator >> (SvStream & rStm, SvUINT16 & r )
- { r.nVal = (USHORT)SvUINT32::Read( rStm ); return rStm; }
+ { r.nVal = (sal_uInt16)SvUINT32::Read( rStm ); return rStm; }
};
class SvINT32
{
- INT32 nVal;
+ sal_Int32 nVal;
public:
SvINT32() { nVal = 0; }
- SvINT32( INT32 n ) : nVal( n ) {}
- SvINT32 & operator = ( INT32 n ) { nVal = n; return *this; }
+ SvINT32( sal_Int32 n ) : nVal( n ) {}
+ SvINT32 & operator = ( sal_Int32 n ) { nVal = n; return *this; }
- operator INT32 &() { return nVal; }
+ operator sal_Int32 &() { return nVal; }
friend SvStream& operator << (SvStream & rStm, const SvINT32 & r )
- { SvUINT32::Write( rStm, (UINT32)r.nVal ); return rStm; }
+ { SvUINT32::Write( rStm, (sal_uInt32)r.nVal ); return rStm; }
friend SvStream& operator >> (SvStream & rStm, SvINT32 & r )
- { r.nVal = (INT32)SvUINT32::Read( rStm ); return rStm; }
+ { r.nVal = (sal_Int32)SvUINT32::Read( rStm ); return rStm; }
};
class Svint
{
int nVal;
- BOOL bSet;
+ sal_Bool bSet;
public:
Svint() { nVal = bSet = 0; }
- Svint( int n ) : nVal( n ), bSet( TRUE ) {}
- Svint( int n, BOOL bSetP ) : nVal( n ), bSet( bSetP ) {}
- Svint & operator = ( int n ) { nVal = n; bSet = TRUE; return *this; }
+ Svint( int n ) : nVal( n ), bSet( sal_True ) {}
+ Svint( int n, sal_Bool bSetP ) : nVal( n ), bSet( bSetP ) {}
+ Svint & operator = ( int n ) { nVal = n; bSet = sal_True; return *this; }
operator int ()const { return nVal; }
- BOOL IsSet() const { return bSet; }
+ sal_Bool IsSet() const { return bSet; }
friend SvStream& operator << (SvStream & rStm, const Svint & r )
- { SvUINT32::Write( rStm, (UINT32)r.nVal ); rStm << r.bSet; return rStm; }
+ { SvUINT32::Write( rStm, (sal_uInt32)r.nVal ); rStm << r.bSet; return rStm; }
friend SvStream& operator >> (SvStream & rStm, Svint & r )
{ r.nVal = (int)SvUINT32::Read( rStm ); rStm >> r.bSet ; return rStm; }
};
@@ -133,27 +133,27 @@ public:
class SvBOOL
{
- BOOL nVal:1,
+ sal_Bool nVal:1,
bSet:1;
public:
- SvBOOL() { bSet = nVal = FALSE; }
- SvBOOL( BOOL n ) : nVal( n ), bSet( TRUE ) {}
- SvBOOL( BOOL n, BOOL bSetP ) : nVal( n ), bSet( bSetP ) {}
- SvBOOL & operator = ( BOOL n ) { nVal = n; bSet = TRUE; return *this; }
+ SvBOOL() { bSet = nVal = sal_False; }
+ SvBOOL( sal_Bool n ) : nVal( n ), bSet( sal_True ) {}
+ SvBOOL( sal_Bool n, sal_Bool bSetP ) : nVal( n ), bSet( bSetP ) {}
+ SvBOOL & operator = ( sal_Bool n ) { nVal = n; bSet = sal_True; return *this; }
- operator BOOL() const { return nVal; }
+ operator sal_Bool() const { return nVal; }
#ifdef STC
operator int() const { return nVal; }
#endif
- BOOL Is() const { return nVal; }
- BOOL IsSet() const { return bSet; }
+ sal_Bool Is() const { return nVal; }
+ sal_Bool IsSet() const { return bSet; }
friend SvStream& operator << (SvStream &, const SvBOOL &);
friend SvStream& operator >> (SvStream &, SvBOOL &);
#ifdef IDL_COMPILER
- BOOL ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
- BOOL WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm );
+ sal_Bool ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
+ sal_Bool WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm );
ByteString GetSvIdlString( SvStringHashEntry * pName );
#endif
};
@@ -168,34 +168,34 @@ public:
friend SvStream& operator << (SvStream &, const SvIdentifier &);
friend SvStream& operator >> (SvStream &, SvIdentifier &);
- BOOL IsSet() const { return Len() != 0; }
+ sal_Bool IsSet() const { return Len() != 0; }
#ifdef IDL_COMPILER
- BOOL ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
- BOOL WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
- USHORT nTab );
+ sal_Bool ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
+ sal_Bool WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
+ sal_uInt16 nTab );
#endif
};
class SvNumberIdentifier : public SvIdentifier
{
- UINT32 nValue;
+ sal_uInt32 nValue;
// must not be used
- BOOL ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
+ sal_Bool ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
public:
SvNumberIdentifier() : nValue( 0 ) {};
- BOOL IsSet() const
+ sal_Bool IsSet() const
{
return SvIdentifier::IsSet() || nValue != 0;
}
- UINT32 GetValue() const { return nValue; }
- void SetValue( UINT32 nVal ) { nValue = nVal; }
+ sal_uInt32 GetValue() const { return nValue; }
+ void SetValue( sal_uInt32 nVal ) { nValue = nVal; }
friend SvStream& operator << (SvStream &, const SvNumberIdentifier &);
friend SvStream& operator >> (SvStream &, SvNumberIdentifier &);
#ifdef IDL_COMPILER
- BOOL ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
- BOOL ReadSvIdl( SvIdlDataBase &, SvStringHashEntry * pName,
+ sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+ sal_Bool ReadSvIdl( SvIdlDataBase &, SvStringHashEntry * pName,
SvTokenStream & rInStm );
#endif
};
@@ -207,14 +207,14 @@ public:
SvString(){};
SvString & operator = ( const ByteString & rStr )
{ ByteString::operator =( rStr ); return *this; }
- BOOL IsSet() const { return Len() != 0; }
+ sal_Bool IsSet() const { return Len() != 0; }
friend SvStream& operator << (SvStream &, const SvString &);
friend SvStream& operator >> (SvStream &, SvString &);
#ifdef IDL_COMPILER
- BOOL ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
- BOOL WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
- USHORT nTab );
+ sal_Bool ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
+ sal_Bool WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
+ sal_uInt16 nTab );
#endif
};
@@ -224,9 +224,9 @@ class SvHelpText : public SvString
public:
SvHelpText() {}
#ifdef IDL_COMPILER
- BOOL ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
- BOOL WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
- USHORT nTab );
+ sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+ sal_Bool WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
+ sal_uInt16 nTab );
#endif
};
@@ -240,36 +240,36 @@ class SvUUId : public SvGlobalName
public:
SvUUId() {}
#ifdef IDL_COMPILER
- BOOL ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
- BOOL WriteSvIdl( SvStream & rOutStm );
+ sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+ sal_Bool WriteSvIdl( SvStream & rOutStm );
#endif
};
class SvVersion
{
- USHORT nMajorVersion;
- USHORT nMinorVersion;
+ sal_uInt16 nMajorVersion;
+ sal_uInt16 nMinorVersion;
public:
SvVersion() : nMajorVersion( 1 ), nMinorVersion( 0 ) {}
- BOOL operator == ( const SvVersion & r )
+ sal_Bool operator == ( const SvVersion & r )
{
return (r.nMajorVersion == nMajorVersion)
&& (r.nMinorVersion == nMinorVersion);
}
- BOOL operator != ( const SvVersion & r )
+ sal_Bool operator != ( const SvVersion & r )
{
return !(*this == r);
}
- USHORT GetMajorVersion() const { return nMajorVersion; }
- USHORT GetMinorVersion() const { return nMinorVersion; }
+ sal_uInt16 GetMajorVersion() const { return nMajorVersion; }
+ sal_uInt16 GetMinorVersion() const { return nMinorVersion; }
friend SvStream& operator << (SvStream &, const SvVersion &);
friend SvStream& operator >> (SvStream &, SvVersion &);
#ifdef IDL_COMPILER
- BOOL ReadSvIdl( SvTokenStream & rInStm );
- BOOL WriteSvIdl( SvStream & rOutStm );
+ sal_Bool ReadSvIdl( SvTokenStream & rInStm );
+ sal_Bool WriteSvIdl( SvStream & rOutStm );
#endif
};
diff --git a/idl/inc/char.hxx b/idl/inc/char.hxx
index 0c0528d08a98..0c0528d08a98 100644..100755
--- a/idl/inc/char.hxx
+++ b/idl/inc/char.hxx
diff --git a/idl/inc/command.hxx b/idl/inc/command.hxx
index 2882ba07a226..f8ea98a5e63f 100644..100755
--- a/idl/inc/command.hxx
+++ b/idl/inc/command.hxx
@@ -61,8 +61,8 @@ public:
String aCSVFile;
String aExportFile;
String aDocuFile;
- UINT32 nVerbosity;
- UINT32 nFlags;
+ sal_uInt32 nVerbosity;
+ sal_uInt32 nFlags;
SvCommand( int argc, char ** argv );
~SvCommand();
@@ -70,7 +70,7 @@ public:
void Init();
class SvIdlWorkingBase;
-BOOL ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand );
+sal_Bool ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand );
void DeInit();
#endif // _COMMAND_HXX
diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx
index 8d28bb0ce349..74ccbd575354 100644..100755
--- a/idl/inc/database.hxx
+++ b/idl/inc/database.hxx
@@ -42,15 +42,15 @@ class SvIdlError
{
ByteString aText;
public:
- UINT32 nLine, nColumn;
+ sal_uInt32 nLine, nColumn;
SvIdlError() : nLine(0), nColumn(0) {}
- SvIdlError( UINT32 nL, UINT32 nC )
+ SvIdlError( sal_uInt32 nL, sal_uInt32 nC )
: nLine(nL), nColumn(nC) {}
const ByteString & GetText() const { return aText; }
void SetText( const ByteString & rT ) { aText = rT; }
- BOOL IsError() const { return nLine != 0; }
+ sal_Bool IsError() const { return nLine != 0; }
void Clear() { nLine = nColumn = 0; }
SvIdlError & operator = ( const SvIdlError & rRef )
{ aText = rRef.aText;
@@ -63,13 +63,13 @@ public:
class SvIdlDataBase
{
- BOOL bExport;
+ sal_Bool bExport;
String aExportFile;
sal_uInt32 nUniqueId;
sal_uInt32 nVerbosity;
String aDataBaseFile;
SvFileStream * pStm;
- BOOL bIsModified;
+ sal_Bool bIsModified;
SvPersistStream aPersStream;
StringList aIdFileList;
SvStringHashTable * pIdTable;
@@ -95,10 +95,10 @@ protected:
public:
explicit SvIdlDataBase( const SvCommand& rCmd );
~SvIdlDataBase();
- static BOOL IsBinaryFormat( SvStream & rInStm );
+ static sal_Bool IsBinaryFormat( SvStream & rInStm );
void Load( SvStream & rInStm );
- void Save( SvStream & rInStm, UINT32 nContextFlags );
+ void Save( SvStream & rInStm, sal_uInt32 nContextFlags );
SvMetaAttributeMemberList& GetAttrList() { return aAttrList; }
SvStringHashTable * GetIdTable() { return pIdTable; }
@@ -129,11 +129,11 @@ public:
void WriteError( const ByteString & rErrWrn,
const ByteString & rFileName,
const ByteString & rErrorText,
- ULONG nRow = 0, ULONG nColumn = 0 ) const;
+ sal_uLong nRow = 0, sal_uLong nColumn = 0 ) const;
void WriteError( SvTokenStream & rInStm );
void SetError( const ByteString & rError, SvToken * pTok );
void Push( SvMetaObject * pObj );
- BOOL Pop( BOOL bOk, SvTokenStream & rInStm, UINT32 nTokPos )
+ sal_Bool Pop( sal_Bool bOk, SvTokenStream & rInStm, sal_uInt32 nTokPos )
{
GetStack().Pop();
if( bOk )
@@ -143,9 +143,9 @@ public:
return bOk;
}
sal_uInt32 GetUniqueId() { return ++nUniqueId; }
- BOOL FindId( const ByteString & rIdName, ULONG * pVal );
- BOOL InsertId( const ByteString & rIdName, ULONG nVal );
- BOOL ReadIdFile( const String & rFileName );
+ sal_Bool FindId( const ByteString & rIdName, sal_uLong * pVal );
+ sal_Bool InsertId( const ByteString & rIdName, sal_uLong nVal );
+ sal_Bool ReadIdFile( const String & rFileName );
SvMetaType * FindType( const ByteString & rName );
static SvMetaType * FindType( const SvMetaType *, SvMetaTypeMemberList & );
@@ -164,14 +164,14 @@ class SvIdlWorkingBase : public SvIdlDataBase
public:
explicit SvIdlWorkingBase( const SvCommand& rCmd );
- BOOL ReadSvIdl( SvTokenStream &, BOOL bImported, const String & rPath );
- BOOL WriteSvIdl( SvStream & );
+ sal_Bool ReadSvIdl( SvTokenStream &, sal_Bool bImported, const String & rPath );
+ sal_Bool WriteSvIdl( SvStream & );
- BOOL WriteSfx( SvStream & );
- BOOL WriteHelpIds( SvStream & );
- BOOL WriteSfxItem( SvStream & );
- BOOL WriteCSV( SvStream& );
- BOOL WriteDocumentation( SvStream& );
+ sal_Bool WriteSfx( SvStream & );
+ sal_Bool WriteHelpIds( SvStream & );
+ sal_Bool WriteSfxItem( SvStream & );
+ sal_Bool WriteCSV( SvStream& );
+ sal_Bool WriteDocumentation( SvStream& );
};
#endif
diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index 525c2a9e27e2..525c2a9e27e2 100644..100755
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx
index 41ee6db65c65..6449dfd7b9e6 100644..100755
--- a/idl/inc/hash.hxx
+++ b/idl/inc/hash.hxx
@@ -35,24 +35,24 @@
class SvHashTable
{
- UINT32 nMax; // size of hash-tabel
- UINT32 nFill; // elements in hash-tabel
- UINT32 lAsk; // number of requests
- UINT32 lTry; // number of tries
+ sal_uInt32 nMax; // size of hash-tabel
+ sal_uInt32 nFill; // elements in hash-tabel
+ sal_uInt32 lAsk; // number of requests
+ sal_uInt32 lTry; // number of tries
protected:
- BOOL Test_Insert( const void *, BOOL bInsert, UINT32 * pInsertPos );
+ sal_Bool Test_Insert( const void *, sal_Bool bInsert, sal_uInt32 * pInsertPos );
// compare element with entry
- virtual StringCompare Compare( const void * , UINT32 ) const = 0;
+ virtual StringCompare Compare( const void * , sal_uInt32 ) const = 0;
// get hash value from subclass
- virtual UINT32 HashFunc( const void * ) const = 0;
+ virtual sal_uInt32 HashFunc( const void * ) const = 0;
public:
- SvHashTable( UINT32 nMaxEntries );
+ SvHashTable( sal_uInt32 nMaxEntries );
virtual ~SvHashTable();
- UINT32 GetMax() const { return nMax; }
+ sal_uInt32 GetMax() const { return nMax; }
- virtual BOOL IsEntry( UINT32 ) const = 0;
+ virtual sal_Bool IsEntry( sal_uInt32 ) const = 0;
};
class SvStringHashTable;
@@ -60,28 +60,28 @@ class SvStringHashEntry : public SvRefBase
{
friend class SvStringHashTable;
ByteString aName;
- UINT32 nHashId;
- ULONG nValue;
- BOOL bHasId;
+ sal_uInt32 nHashId;
+ sal_uLong nValue;
+ sal_Bool bHasId;
public:
- SvStringHashEntry() : bHasId( FALSE ) {;}
- SvStringHashEntry( const ByteString & rName, UINT32 nIdx )
+ SvStringHashEntry() : bHasId( sal_False ) {;}
+ SvStringHashEntry( const ByteString & rName, sal_uInt32 nIdx )
: aName( rName )
, nHashId( nIdx )
, nValue( 0 )
- , bHasId( TRUE ) {}
+ , bHasId( sal_True ) {}
~SvStringHashEntry();
const ByteString & GetName() const { return aName; }
- BOOL HasId() const { return bHasId; }
- UINT32 GetId() const { return nHashId; }
+ sal_Bool HasId() const { return bHasId; }
+ sal_uInt32 GetId() const { return nHashId; }
- void SetValue( ULONG n ) { nValue = n; }
- ULONG GetValue() const { return nValue; }
+ void SetValue( sal_uLong n ) { nValue = n; }
+ sal_uLong GetValue() const { return nValue; }
- BOOL operator == ( const SvStringHashEntry & rRef )
+ sal_Bool operator == ( const SvStringHashEntry & rRef )
{ return nHashId == rRef.nHashId; }
- BOOL operator != ( const SvStringHashEntry & rRef )
+ sal_Bool operator != ( const SvStringHashEntry & rRef )
{ return ! operator == ( rRef ); }
SvStringHashEntry & operator = ( const SvStringHashEntry & rRef )
{ SvRefBase::operator=( rRef );
@@ -101,19 +101,19 @@ class SvStringHashTable : public SvHashTable
{
SvStringHashEntry* pEntries;
protected:
- virtual UINT32 HashFunc( const void * pElement ) const;
- virtual StringCompare Compare( const void * pElement, UINT32 nIndex ) const;
+ virtual sal_uInt32 HashFunc( const void * pElement ) const;
+ virtual StringCompare Compare( const void * pElement, sal_uInt32 nIndex ) const;
public:
- SvStringHashTable( UINT32 nMaxEntries ); // max size of hash-tabel
+ SvStringHashTable( sal_uInt32 nMaxEntries ); // max size of hash-tabel
virtual ~SvStringHashTable();
ByteString GetNearString( const ByteString & rName ) const;
- virtual BOOL IsEntry( UINT32 nIndex ) const;
+ virtual sal_Bool IsEntry( sal_uInt32 nIndex ) const;
- BOOL Insert( const ByteString & rStr, UINT32 * pHash ); // insert string
- BOOL Test( const ByteString & rStr, UINT32 * pHash ) const; // test of insert string
- SvStringHashEntry * Get ( UINT32 nIndex ) const; // return pointer to string
- SvStringHashEntry & operator []( UINT32 nPos ) const
+ sal_Bool Insert( const ByteString & rStr, sal_uInt32 * pHash ); // insert string
+ sal_Bool Test( const ByteString & rStr, sal_uInt32 * pHash ) const; // test of insert string
+ SvStringHashEntry * Get ( sal_uInt32 nIndex ) const; // return pointer to string
+ SvStringHashEntry & operator []( sal_uInt32 nPos ) const
{ return pEntries[ nPos ]; }
void FillHashList( SvStringHashList * rList ) const;
diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx
index 749d109bbf95..253083d7e9e8 100644..100755
--- a/idl/inc/lex.hxx
+++ b/idl/inc/lex.hxx
@@ -44,21 +44,21 @@ class BigInt;
class SvToken
{
friend class SvTokenStream;
- ULONG nLine, nColumn;
+ sal_uLong nLine, nColumn;
SVTOKEN_ENUM nType;
ByteString aString;
union
{
- ULONG nLong;
- BOOL bBool;
+ sal_uLong nLong;
+ sal_Bool bBool;
char cChar;
SvStringHashEntry * pHash;
};
public:
SvToken();
SvToken( const SvToken & rObj );
- SvToken( ULONG n );
- SvToken( SVTOKEN_ENUM nTypeP, BOOL b );
+ SvToken( sal_uLong n );
+ SvToken( SVTOKEN_ENUM nTypeP, sal_Bool b );
SvToken( char c );
SvToken( SVTOKEN_ENUM nTypeP, const ByteString & rStr );
SvToken( SVTOKEN_ENUM nTypeP );
@@ -68,27 +68,27 @@ public:
ByteString GetTokenAsString() const;
SVTOKEN_ENUM GetType() const { return nType; }
- void SetLine( ULONG nLineP ) { nLine = nLineP; }
- ULONG GetLine() const { return nLine; }
+ void SetLine( sal_uLong nLineP ) { nLine = nLineP; }
+ sal_uLong GetLine() const { return nLine; }
- void SetColumn( ULONG nColumnP ) { nColumn = nColumnP; }
- ULONG GetColumn() const { return nColumn; }
+ void SetColumn( sal_uLong nColumnP ) { nColumn = nColumnP; }
+ sal_uLong GetColumn() const { return nColumn; }
- BOOL IsEmpty() const { return nType == SVTOKEN_EMPTY; }
- BOOL IsComment() const { return nType == SVTOKEN_COMMENT; }
- BOOL IsInteger() const { return nType == SVTOKEN_INTEGER; }
- BOOL IsString() const { return nType == SVTOKEN_STRING; }
- BOOL IsBool() const { return nType == SVTOKEN_BOOL; }
- BOOL IsIdentifierHash() const
+ sal_Bool IsEmpty() const { return nType == SVTOKEN_EMPTY; }
+ sal_Bool IsComment() const { return nType == SVTOKEN_COMMENT; }
+ sal_Bool IsInteger() const { return nType == SVTOKEN_INTEGER; }
+ sal_Bool IsString() const { return nType == SVTOKEN_STRING; }
+ sal_Bool IsBool() const { return nType == SVTOKEN_BOOL; }
+ sal_Bool IsIdentifierHash() const
{ return nType == SVTOKEN_HASHID; }
- BOOL IsIdentifier() const
+ sal_Bool IsIdentifier() const
{
return nType == SVTOKEN_IDENTIFIER
|| nType == SVTOKEN_HASHID;
}
- BOOL IsChar() const { return nType == SVTOKEN_CHAR; }
- BOOL IsRttiBase() const { return nType == SVTOKEN_RTTIBASE; }
- BOOL IsEof() const { return nType == SVTOKEN_EOF; }
+ sal_Bool IsChar() const { return nType == SVTOKEN_CHAR; }
+ sal_Bool IsRttiBase() const { return nType == SVTOKEN_RTTIBASE; }
+ sal_Bool IsEof() const { return nType == SVTOKEN_EOF; }
const ByteString & GetString() const
{
@@ -96,26 +96,26 @@ public:
? pHash->GetName()
: aString;
}
- ULONG GetNumber() const { return nLong; }
- BOOL GetBool() const { return bBool; }
+ sal_uLong GetNumber() const { return nLong; }
+ sal_Bool GetBool() const { return bBool; }
char GetChar() const { return cChar; }
void SetHash( SvStringHashEntry * pHashP )
{ pHash = pHashP; nType = SVTOKEN_HASHID; }
- BOOL HasHash() const
+ sal_Bool HasHash() const
{ return nType == SVTOKEN_HASHID; }
SvStringHashEntry * GetHash() const { return pHash; }
- BOOL Is( SvStringHashEntry * pEntry ) const
+ sal_Bool Is( SvStringHashEntry * pEntry ) const
{ return IsIdentifierHash() && pHash == pEntry; }
};
inline SvToken::SvToken()
: nType( SVTOKEN_EMPTY ) {}
-inline SvToken::SvToken( ULONG n )
+inline SvToken::SvToken( sal_uLong n )
: nType( SVTOKEN_INTEGER ), nLong( n ) {}
-inline SvToken::SvToken( SVTOKEN_ENUM nTypeP, BOOL b )
+inline SvToken::SvToken( SVTOKEN_ENUM nTypeP, sal_Bool b )
: nType( nTypeP ), bBool( b ) {}
inline SvToken::SvToken( char c )
@@ -131,15 +131,15 @@ DECLARE_LIST( SvTokenList, SvToken * )
class SvTokenStream
{
- ULONG nLine, nColumn;
+ sal_uLong nLine, nColumn;
int nBufPos;
int c; // next character
CharSet nCharSet;
char * pCharTab; // pointer to conversion table
- USHORT nTabSize; // length of tabulator
+ sal_uInt16 nTabSize; // length of tabulator
ByteString aStrTrue;
ByteString aStrFalse;
- ULONG nMaxPos;
+ sal_uLong nMaxPos;
SvFileStream * pInStream;
SvStream & rInStream;
@@ -153,16 +153,16 @@ class SvTokenStream
int GetNextChar();
int GetFastNextChar()
{
- return aBufStr.GetChar((USHORT)nBufPos++);
+ return aBufStr.GetChar((sal_uInt16)nBufPos++);
}
void FillTokenList();
- ULONG GetNumber();
- BOOL MakeToken( SvToken & );
- BOOL IsEof() const { return rInStream.IsEof(); }
+ sal_uLong GetNumber();
+ sal_Bool MakeToken( SvToken & );
+ sal_Bool IsEof() const { return rInStream.IsEof(); }
void SetMax()
{
- ULONG n = Tell();
+ sal_uLong n = Tell();
if( n > nMaxPos )
nMaxPos = n;
}
@@ -171,7 +171,7 @@ class SvTokenStream
// if end of line spare calculation
if( 0 != c )
{
- USHORT n = 0;
+ sal_uInt16 n = 0;
nColumn = 0;
while( n < nBufPos )
nColumn += aBufStr.GetChar(n++) == '\t' ? nTabSize : 1;
@@ -188,9 +188,9 @@ public:
void SetCharSet( CharSet nSet );
CharSet GetCharSet() const { return nCharSet; }
- void SetTabSize( USHORT nTabSizeP )
+ void SetTabSize( sal_uInt16 nTabSizeP )
{ nTabSize = nTabSizeP; }
- USHORT GetTabSize() const { return nTabSize; }
+ sal_uInt16 GetTabSize() const { return nTabSize; }
SvToken * GetToken_PrevAll()
{
@@ -216,16 +216,16 @@ public:
return GetToken_NextAll();
}
SvToken * GetToken() const { return pCurToken; }
- BOOL Read( char cChar )
+ sal_Bool Read( char cChar )
{
if( pCurToken->IsChar()
&& cChar == pCurToken->GetChar() )
{
GetToken_Next();
- return TRUE;
+ return sal_True;
}
else
- return FALSE;
+ return sal_False;
}
void ReadDelemiter()
{
@@ -237,14 +237,14 @@ public:
}
}
- UINT32 Tell() const
+ sal_uInt32 Tell() const
{ return aTokList.GetCurPos(); }
- void Seek( UINT32 nPos )
+ void Seek( sal_uInt32 nPos )
{
pCurToken = aTokList.Seek( nPos );
SetMax();
}
- void SeekRel( INT32 nRelPos )
+ void SeekRel( sal_Int32 nRelPos )
{
pCurToken = aTokList.Seek( Tell() + nRelPos );
SetMax();
diff --git a/idl/inc/makefile.mk b/idl/inc/makefile.mk
index 66b944a14867..66b944a14867 100644..100755
--- a/idl/inc/makefile.mk
+++ b/idl/inc/makefile.mk
diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx
index 5d206e0f4794..964cf148b87a 100644..100755
--- a/idl/inc/module.hxx
+++ b/idl/inc/module.hxx
@@ -35,8 +35,8 @@
struct SvNamePos
{
SvGlobalName aUUId;
- UINT32 nStmPos;
- SvNamePos( const SvGlobalName & rName, UINT32 nPos )
+ sal_uInt32 nStmPos;
+ SvNamePos( const SvGlobalName & rName, sal_uInt32 nPos )
: aUUId( rName )
, nStmPos( nPos ) {}
};
@@ -54,16 +54,16 @@ class SvMetaModule : public SvMetaExtern
SvString aModulePrefix;
#ifdef IDL_COMPILER
- BOOL bImported : 1,
+ sal_Bool bImported : 1,
bIsModified : 1;
SvGlobalName aBeginName;
SvGlobalName aEndName;
SvGlobalName aNextName;
protected:
virtual void ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
- virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+ virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
- virtual void WriteContextSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+ virtual void WriteContextSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
#endif
public:
SV_DECL_META_FACTORY1( SvMetaModule, SvMetaExtern, 13 )
@@ -72,7 +72,7 @@ public:
const String & GetIdlFileName() const { return aIdlFileName; }
const ByteString & GetModulePrefix() const { return aModulePrefix; }
- virtual BOOL SetName( const ByteString & rName, SvIdlDataBase * = NULL );
+ virtual sal_Bool SetName( const ByteString & rName, SvIdlDataBase * = NULL );
const ByteString & GetHelpFileName() const { return aHelpFileName; }
const ByteString & GetTypeLibFileName() const { return aTypeLibFile; }
@@ -83,19 +83,19 @@ public:
#ifdef IDL_COMPILER
SvMetaModule( const String & rIdlFileName,
- BOOL bImported );
+ sal_Bool bImported );
- BOOL FillNextName( SvGlobalName * );
- BOOL IsImported() const { return bImported; }
- BOOL IsModified() const { return bIsModified; }
+ sal_Bool FillNextName( SvGlobalName * );
+ sal_Bool IsImported() const { return bImported; }
+ sal_Bool IsModified() const { return bIsModified; }
- virtual BOOL ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
- virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+ virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+ virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
virtual void WriteAttributes( SvIdlDataBase & rBase,
- SvStream & rOutStm, USHORT nTab,
+ SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0 );
- virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+ virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0 );
virtual void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm );
virtual void WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm,
@@ -103,8 +103,8 @@ public:
virtual void WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
Table *pIdTable );
- virtual void WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
- virtual void WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+ virtual void WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
+ virtual void WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
#endif
};
SV_DECL_IMPL_REF(SvMetaModule)
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx
index 417885184dfb..d4483da3f6c9 100644..100755
--- a/idl/inc/object.hxx
+++ b/idl/inc/object.hxx
@@ -64,9 +64,9 @@ public:
const ByteString & GetPrefix() const
{ return aPrefix; }
- void SetAutomation( BOOL rAutomation )
+ void SetAutomation( sal_Bool rAutomation )
{ aAutomation = rAutomation; }
- BOOL GetAutomation() const
+ sal_Bool GetAutomation() const
{ return aAutomation; }
void SetClass( SvMetaClass * pClass )
@@ -88,22 +88,22 @@ class SvMetaClass : public SvMetaType
SvBOOL aAutomation;
SvMetaClassRef xAutomationInterface;
- BOOL TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
+ sal_Bool TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
SvMetaAttribute & rAttr ) const;
#ifdef IDL_COMPILER
void WriteSlotStubs( const ByteString & rShellName,
SvSlotElementList & rSlotList,
ByteStringList & rList,
SvStream & rOutStm );
- USHORT WriteSlotParamArray( SvIdlDataBase & rBase,
+ sal_uInt16 WriteSlotParamArray( SvIdlDataBase & rBase,
SvSlotElementList & rSlotList,
SvStream & rOutStm );
- USHORT WriteSlots( const ByteString & rShellName, USHORT nCount,
+ sal_uInt16 WriteSlots( const ByteString & rShellName, sal_uInt16 nCount,
SvSlotElementList & rSlotList,
SvIdlDataBase & rBase,
SvStream & rOutStm );
- void InsertSlots( SvSlotElementList& rList, std::vector<ULONG>& rSuperList,
+ void InsertSlots( SvSlotElementList& rList, std::vector<sal_uLong>& rSuperList,
SvMetaClassList & rClassList,
const ByteString & rPrefix, SvIdlDataBase& rBase );
@@ -111,21 +111,21 @@ protected:
virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm );
virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase,
- SvStream & rOutStm, USHORT nTab );
+ SvStream & rOutStm, sal_uInt16 nTab );
virtual void ReadContextSvIdl( SvIdlDataBase &,
SvTokenStream & rInStm );
virtual void WriteContextSvIdl( SvIdlDataBase & rBase,
- SvStream & rOutStm, USHORT nTab );
+ SvStream & rOutStm, sal_uInt16 nTab );
void WriteOdlMembers( ByteStringList & rSuperList,
- BOOL bVariable, BOOL bWriteTab,
+ sal_Bool bVariable, sal_Bool bWriteTab,
SvIdlDataBase & rBase,
- SvStream & rOutStm, USHORT nTab );
+ SvStream & rOutStm, sal_uInt16 nTab );
#endif
public:
SV_DECL_META_FACTORY1( SvMetaClass, SvMetaType, 6 )
SvMetaClass();
- BOOL GetAutomation() const
+ sal_Bool GetAutomation() const
{ return aAutomation; }
SvMetaClass * GetSuperClass() const
{ return aSuperClass; }
@@ -137,18 +137,18 @@ public:
{ return aClassList; }
#ifdef IDL_COMPILER
- virtual BOOL ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
- virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+ virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+ virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm,
- USHORT nTab,
+ sal_uInt16 nTab,
WriteType, WriteAttribute = 0 );
virtual void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm );
virtual void WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm,
Table* pTable );
virtual void WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm,
Table * pTable );
- virtual void WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
- virtual void WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+ virtual void WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
+ virtual void WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
#endif
};
SV_IMPL_REF(SvMetaClass)
diff --git a/idl/inc/pch/precompiled_idl.cxx b/idl/inc/pch/precompiled_idl.cxx
index 7515c4ededbc..7515c4ededbc 100644..100755
--- a/idl/inc/pch/precompiled_idl.cxx
+++ b/idl/inc/pch/precompiled_idl.cxx
diff --git a/idl/inc/pch/precompiled_idl.hxx b/idl/inc/pch/precompiled_idl.hxx
index 977fd5d3b09e..977fd5d3b09e 100644..100755
--- a/idl/inc/pch/precompiled_idl.hxx
+++ b/idl/inc/pch/precompiled_idl.hxx
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index bc8832a60f0b..8363b19db5cd 100644..100755
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -74,108 +74,108 @@ class SvMetaSlot : public SvMetaAttribute
SvString aDisableFlags;
SvMetaSlot* pLinkedSlot;
SvMetaSlot* pNextSlot;
- ULONG nListPos;
+ sal_uLong nListPos;
SvMetaEnumValue* pEnumValue;
SvString aUnoName;
#ifdef IDL_COMPILER
void WriteSlot( const ByteString & rShellName,
- USHORT nCount, const ByteString & rSlotId,
+ sal_uInt16 nCount, const ByteString & rSlotId,
SvSlotElementList &rList,
const ByteString & rPrefix,
SvIdlDataBase & rBase, SvStream & rOutStm );
virtual void Write( SvIdlDataBase & rBase,
- SvStream & rOutStm, USHORT nTab,
+ SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0 );
void SetEnumValue(SvMetaEnumValue *p)
{ pEnumValue = p; }
#endif
protected:
- void SetCachable( BOOL bSet )
+ void SetCachable( sal_Bool bSet )
{
aCachable = bSet;
if( bSet )
- aVolatile = FALSE;
+ aVolatile = sal_False;
}
- void SetVolatile( BOOL bSet )
+ void SetVolatile( sal_Bool bSet )
{
aVolatile = bSet;
if( bSet )
- aCachable = FALSE;
+ aCachable = sal_False;
}
- void SetToggle( BOOL bSet )
+ void SetToggle( sal_Bool bSet )
{
aToggle = bSet;
}
- void SetAutoUpdate( BOOL bSet )
+ void SetAutoUpdate( sal_Bool bSet )
{
aAutoUpdate = bSet;
}
- void SetSynchron( BOOL bSet )
+ void SetSynchron( sal_Bool bSet )
{
aSynchron = bSet;
if( bSet )
- aAsynchron = FALSE;
+ aAsynchron = sal_False;
}
- void SetAsynchron( BOOL bSet )
+ void SetAsynchron( sal_Bool bSet )
{
aAsynchron = bSet;
if( bSet )
- aSynchron = FALSE;
+ aSynchron = sal_False;
}
- void SetRecordPerItem( BOOL bSet )
+ void SetRecordPerItem( sal_Bool bSet )
{
aRecordPerItem = bSet;
if( bSet )
- aRecordPerSet = aRecordManual = aNoRecord = FALSE;
+ aRecordPerSet = aRecordManual = aNoRecord = sal_False;
}
- void SetRecordPerSet( BOOL bSet )
+ void SetRecordPerSet( sal_Bool bSet )
{
aRecordPerSet = bSet;
if( bSet )
- aRecordPerItem = aRecordManual = aNoRecord = FALSE;
+ aRecordPerItem = aRecordManual = aNoRecord = sal_False;
}
- void SetRecordManual( BOOL bSet )
+ void SetRecordManual( sal_Bool bSet )
{
aRecordManual = bSet;
if( bSet )
- aRecordPerItem = aRecordPerSet = aNoRecord = FALSE;
+ aRecordPerItem = aRecordPerSet = aNoRecord = sal_False;
}
- void SetNoRecord( BOOL bSet )
+ void SetNoRecord( sal_Bool bSet )
{
aNoRecord = bSet;
if( bSet )
- aRecordPerItem = aRecordPerSet = aRecordManual = FALSE;
+ aRecordPerItem = aRecordPerSet = aRecordManual = sal_False;
}
- void SetRecordAbsolute( BOOL bSet )
+ void SetRecordAbsolute( sal_Bool bSet )
{ aRecordAbsolute = bSet; }
- void SetHasDialog( BOOL bSet )
+ void SetHasDialog( sal_Bool bSet )
{ aHasDialog = bSet; }
- void SetMenuConfig( BOOL bSet )
+ void SetMenuConfig( sal_Bool bSet )
{ aMenuConfig = bSet; }
- void SetToolBoxConfig( BOOL bSet )
+ void SetToolBoxConfig( sal_Bool bSet )
{ aToolBoxConfig = bSet; }
- void SetStatusBarConfig( BOOL bSet )
+ void SetStatusBarConfig( sal_Bool bSet )
{ aStatusBarConfig = bSet; }
- void SetAccelConfig( BOOL bSet )
+ void SetAccelConfig( sal_Bool bSet )
{ aAccelConfig = bSet; }
- void SetAllConfig( BOOL bSet )
+ void SetAllConfig( sal_Bool bSet )
{
aMenuConfig = bSet;
aToolBoxConfig = bSet;
aStatusBarConfig = bSet;
aAccelConfig = bSet;
}
- void SetFastCall( BOOL bSet )
+ void SetFastCall( sal_Bool bSet )
{ aFastCall = bSet; }
- void SetContainer( BOOL bSet )
+ void SetContainer( sal_Bool bSet )
{ aContainer = bSet; }
- void SetImageRotation( BOOL bSet )
+ void SetImageRotation( sal_Bool bSet )
{ aImageRotation = bSet; }
- void SetImageReflection( BOOL bSet )
+ void SetImageReflection( sal_Bool bSet )
{ aImageReflection = bSet; }
public:
@@ -186,52 +186,52 @@ public:
SvMetaSlot();
SvMetaSlot( SvMetaType * pType );
- virtual BOOL IsVariable() const;
- virtual BOOL IsMethod() const;
- virtual ByteString GetMangleName( BOOL bVariable ) const;
+ virtual sal_Bool IsVariable() const;
+ virtual sal_Bool IsMethod() const;
+ virtual ByteString GetMangleName( sal_Bool bVariable ) const;
SvMetaAttribute * GetMethod() const;
SvMetaType * GetSlotType() const;
- BOOL GetHasCoreId() const;
+ sal_Bool GetHasCoreId() const;
const ByteString & GetGroupId() const;
const ByteString & GetConfigId() const;
const ByteString & GetExecMethod() const;
const ByteString & GetStateMethod() const;
const ByteString & GetDefault() const;
const ByteString & GetDisableFlags() const;
- BOOL GetPseudoSlots() const;
- BOOL GetCachable() const;
- BOOL GetVolatile() const;
- BOOL GetToggle() const;
- BOOL GetAutoUpdate() const;
+ sal_Bool GetPseudoSlots() const;
+ sal_Bool GetCachable() const;
+ sal_Bool GetVolatile() const;
+ sal_Bool GetToggle() const;
+ sal_Bool GetAutoUpdate() const;
- BOOL GetSynchron() const;
- BOOL GetAsynchron() const;
+ sal_Bool GetSynchron() const;
+ sal_Bool GetAsynchron() const;
- BOOL GetRecordPerItem() const;
- BOOL GetRecordPerSet() const;
- BOOL GetRecordManual() const;
- BOOL GetNoRecord() const;
- BOOL GetRecordAbsolute() const;
+ sal_Bool GetRecordPerItem() const;
+ sal_Bool GetRecordPerSet() const;
+ sal_Bool GetRecordManual() const;
+ sal_Bool GetNoRecord() const;
+ sal_Bool GetRecordAbsolute() const;
- BOOL GetHasDialog() const;
+ sal_Bool GetHasDialog() const;
const ByteString & GetPseudoPrefix() const;
const ByteString & GetUnoName() const;
- BOOL GetMenuConfig() const;
- BOOL GetToolBoxConfig() const;
- BOOL GetStatusBarConfig() const;
- BOOL GetAccelConfig() const;
- BOOL GetFastCall() const;
- BOOL GetContainer() const;
- BOOL GetImageRotation() const;
- BOOL GetImageReflection() const;
+ sal_Bool GetMenuConfig() const;
+ sal_Bool GetToolBoxConfig() const;
+ sal_Bool GetStatusBarConfig() const;
+ sal_Bool GetAccelConfig() const;
+ sal_Bool GetFastCall() const;
+ sal_Bool GetContainer() const;
+ sal_Bool GetImageRotation() const;
+ sal_Bool GetImageReflection() const;
SvMetaSlot* GetLinkedSlot() const
{ return pLinkedSlot; }
SvMetaSlot* GetNextSlot() const
{ return pNextSlot; }
- ULONG GetListPos() const
+ sal_uLong GetListPos() const
{ return nListPos; }
- void SetListPos(ULONG n)
+ void SetListPos(sal_uLong n)
{ nListPos = n; }
void ResetSlotPointer()
{ pNextSlot = pLinkedSlot = 0; }
@@ -239,26 +239,26 @@ public:
#ifdef IDL_COMPILER
SvMetaEnumValue* GetEnumValue() const
{ return pEnumValue; }
- virtual BOOL Test( SvIdlDataBase &, SvTokenStream & rInStm );
+ virtual sal_Bool Test( SvIdlDataBase &, SvTokenStream & rInStm );
virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm );
virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase,
- SvStream & rOutStm, USHORT nTab );
- virtual BOOL ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+ SvStream & rOutStm, sal_uInt16 nTab );
+ virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
virtual void WriteSvIdl( SvIdlDataBase & rBase,
- SvStream & rOutStm, USHORT nTab );
+ SvStream & rOutStm, sal_uInt16 nTab );
virtual void Insert( SvSlotElementList&, const ByteString & rPrefix,
SvIdlDataBase& );
void WriteSlotStubs( const ByteString & rShellName,
ByteStringList & rList,
SvStream & rOutStm );
- USHORT WriteSlotMap( const ByteString & rShellName,
- USHORT nCount,
+ sal_uInt16 WriteSlotMap( const ByteString & rShellName,
+ sal_uInt16 nCount,
SvSlotElementList&,
const ByteString &,
SvIdlDataBase & rBase,
SvStream & rOutStm );
- USHORT WriteSlotParamArray( SvIdlDataBase & rBase,
+ sal_uInt16 WriteSlotParamArray( SvIdlDataBase & rBase,
SvStream & rOutStm );
virtual void WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
Table * pIdTable );
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 46882af1f85e..4913c21c4870 100644..100755
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -48,75 +48,75 @@ class SvMetaAttribute : public SvMetaReference
SvBOOL aIsCollection;
SvBOOL aReadOnlyDoc;
SvBOOL aHidden;
- BOOL bNewAttr;
+ sal_Bool bNewAttr;
protected:
#ifdef IDL_COMPILER
virtual void WriteCSource( SvIdlDataBase & rBase,
- SvStream & rOutStm, BOOL bSet );
- ULONG MakeSlotValue( SvIdlDataBase & rBase, BOOL bVariable ) const;
+ SvStream & rOutStm, sal_Bool bSet );
+ sal_uLong MakeSlotValue( SvIdlDataBase & rBase, sal_Bool bVariable ) const;
virtual void WriteAttributes( SvIdlDataBase & rBase,
- SvStream & rOutStm, USHORT nTab,
+ SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0 );
virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm );
virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase,
- SvStream & rOutStm, USHORT nTab );
+ SvStream & rOutStm, sal_uInt16 nTab );
#endif
public:
SV_DECL_META_FACTORY1( SvMetaAttribute, SvMetaReference, 2 )
SvMetaAttribute();
SvMetaAttribute( SvMetaType * );
- void SetNewAttribute( BOOL bNew )
+ void SetNewAttribute( sal_Bool bNew )
{ bNewAttr = bNew; }
- BOOL IsNewAttribute() const
+ sal_Bool IsNewAttribute() const
{ return bNewAttr; }
- BOOL GetReadonly() const;
+ sal_Bool GetReadonly() const;
void SetSlotId( const SvNumberIdentifier & rId )
{ aSlotId = rId; }
const SvNumberIdentifier & GetSlotId() const;
- void SetExport( BOOL bSet )
+ void SetExport( sal_Bool bSet )
{ aExport = bSet; }
- BOOL GetExport() const;
+ sal_Bool GetExport() const;
- void SetHidden( BOOL bSet )
+ void SetHidden( sal_Bool bSet )
{ aHidden = bSet; }
- BOOL GetHidden() const;
+ sal_Bool GetHidden() const;
- void SetAutomation( BOOL bSet )
+ void SetAutomation( sal_Bool bSet )
{ aAutomation = bSet; }
- BOOL GetAutomation() const;
+ sal_Bool GetAutomation() const;
- void SetIsCollection( BOOL bSet )
+ void SetIsCollection( sal_Bool bSet )
{ aIsCollection = bSet; }
- BOOL GetIsCollection() const;
- void SetReadOnlyDoc( BOOL bSet )
+ sal_Bool GetIsCollection() const;
+ void SetReadOnlyDoc( sal_Bool bSet )
{ aReadOnlyDoc = bSet; }
- BOOL GetReadOnlyDoc() const;
+ sal_Bool GetReadOnlyDoc() const;
void SetType( SvMetaType * pT ) { aType = pT; }
SvMetaType * GetType() const;
- virtual BOOL IsMethod() const;
- virtual BOOL IsVariable() const;
- virtual ByteString GetMangleName( BOOL bVariable ) const;
+ virtual sal_Bool IsMethod() const;
+ virtual sal_Bool IsVariable() const;
+ virtual ByteString GetMangleName( sal_Bool bVariable ) const;
#ifdef IDL_COMPILER
- virtual BOOL Test( SvIdlDataBase &, SvTokenStream & rInStm );
- virtual BOOL ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
- virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
- virtual void WriteParam( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+ virtual sal_Bool Test( SvIdlDataBase &, SvTokenStream & rInStm );
+ virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+ virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
+ virtual void WriteParam( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType );
void WriteRecursiv_Impl( SvIdlDataBase & rBase,
- SvStream & rOutStm, USHORT nTab,
+ SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute );
- virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+ virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0 );
- ULONG MakeSfx( ByteString * pAtrrArray );
+ sal_uLong MakeSfx( ByteString * pAtrrArray );
virtual void Insert( SvSlotElementList&, const ByteString & rPrefix,
SvIdlDataBase& );
virtual void WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
@@ -149,30 +149,30 @@ class SvMetaType : public SvMetaExtern
SvIdentifier aBasicName;
SvMetaAttributeMemberList * pAttrList;
int nType;
- BOOL bIsItem;
- BOOL bIsShell;
+ sal_Bool bIsItem;
+ sal_Bool bIsShell;
char cParserChar;
#ifdef IDL_COMPILER
void WriteSfxItem( const ByteString & rItemName, SvIdlDataBase & rBase,
SvStream & rOutStm );
protected:
- BOOL ReadNamesSvIdl( SvIdlDataBase & rBase,
+ sal_Bool ReadNamesSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm );
virtual void ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
- virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+ virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
virtual void WriteContextSvIdl( SvIdlDataBase &, SvStream & rOutStm,
- USHORT nTab );
+ sal_uInt16 nTab );
virtual void WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm,
- USHORT nTab,
+ sal_uInt16 nTab,
WriteType, WriteAttribute = 0 );
- virtual void WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+ virtual void WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0 );
- BOOL ReadHeaderSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+ sal_Bool ReadHeaderSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
void WriteHeaderSvIdl( SvIdlDataBase &, SvStream & rOutStm,
- USHORT nTab );
+ sal_uInt16 nTab );
#endif
public:
SV_DECL_META_FACTORY1( SvMetaType, SvMetaExtern, 18 )
@@ -185,7 +185,7 @@ public:
const ByteString & rBasicPostfix );
SvMetaAttributeMemberList & GetAttrList() const;
- ULONG GetAttrCount() const
+ sal_uLong GetAttrCount() const
{
return pAttrList ? pAttrList->Count() : 0L;
}
@@ -198,14 +198,14 @@ public:
int GetType() const { return nType; }
SvMetaType * GetBaseType() const;
SvMetaType * GetReturnType() const;
- BOOL IsItem() const { return bIsItem; }
- BOOL IsShell() const { return bIsShell; }
+ sal_Bool IsItem() const { return bIsItem; }
+ sal_Bool IsShell() const { return bIsShell; }
- void SetIn( BOOL b ) { aIn = b; }
- BOOL GetIn() const;
+ void SetIn( sal_Bool b ) { aIn = b; }
+ sal_Bool GetIn() const;
- void SetOut( BOOL b ) { aOut = b; }
- BOOL GetOut() const;
+ void SetOut( sal_Bool b ) { aOut = b; }
+ sal_Bool GetOut() const;
void SetCall0( int e );
int GetCall0() const;
@@ -224,27 +224,27 @@ public:
const ByteString & GetCName() const;
char GetParserChar() const { return cParserChar; }
- virtual BOOL SetName( const ByteString & rName, SvIdlDataBase * = NULL );
+ virtual sal_Bool SetName( const ByteString & rName, SvIdlDataBase * = NULL );
#ifdef IDL_COMPILER
- virtual BOOL ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+ virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
virtual void WriteSvIdl( SvIdlDataBase & rBase,
- SvStream & rOutStm, USHORT nTab );
- virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+ SvStream & rOutStm, sal_uInt16 nTab );
+ virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0 );
ByteString GetCString() const;
- void WriteSvIdlType( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
- void WriteOdlType( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+ void WriteSvIdlType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
+ void WriteOdlType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
void AppendParserString (ByteString &rString);
- ULONG MakeSfx( ByteString * pAtrrArray );
+ sal_uLong MakeSfx( ByteString * pAtrrArray );
virtual void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm );
- BOOL ReadMethodArgs( SvIdlDataBase & rBase,
+ sal_Bool ReadMethodArgs( SvIdlDataBase & rBase,
SvTokenStream & rInStm );
- void WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab, WriteType );
- void WriteMethodArgs( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab, WriteType );
- void WriteTheType( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab, WriteType );
+ void WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType );
+ void WriteMethodArgs( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType );
+ void WriteTheType( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType );
ByteString GetParserString() const;
void WriteParamNames( SvIdlDataBase & rBase, SvStream & rOutStm,
const ByteString & rChief );
@@ -272,9 +272,9 @@ public:
SvMetaEnumValue();
#ifdef IDL_COMPILER
- virtual BOOL ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
- virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
- virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+ virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+ virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
+ virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0 );
#endif
};
@@ -290,26 +290,26 @@ protected:
#ifdef IDL_COMPILER
virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
virtual void WriteContextSvIdl( SvIdlDataBase &, SvStream & rOutStm,
- USHORT nTab );
- virtual void WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
+ sal_uInt16 nTab );
+ virtual void WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0 );
#endif
public:
SV_DECL_META_FACTORY1( SvMetaTypeEnum, SvMetaType, 21 )
SvMetaTypeEnum();
- USHORT GetMaxValue() const;
- ULONG Count() const { return aEnumValueList.Count(); }
+ sal_uInt16 GetMaxValue() const;
+ sal_uLong Count() const { return aEnumValueList.Count(); }
const ByteString & GetPrefix() const { return aPrefix; }
- SvMetaEnumValue * GetObject( ULONG n ) const
+ SvMetaEnumValue * GetObject( sal_uLong n ) const
{ return aEnumValueList.GetObject( n ); }
#ifdef IDL_COMPILER
- virtual BOOL ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
- virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab );
+ virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+ virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab );
virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm,
- USHORT nTab,
+ sal_uInt16 nTab,
WriteType, WriteAttribute = 0 );
#endif
};
generated by cgit (git 2.34.1) at 2025-02-08 04:24:57 +0000