summaryrefslogtreecommitdiff
path: root/basic/source/app
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 /basic/source/app
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 'basic/source/app')
-rwxr-xr-x[-rw-r--r--]basic/source/app/app.cxx228
-rwxr-xr-x[-rw-r--r--]basic/source/app/app.hxx44
-rwxr-xr-x[-rw-r--r--]basic/source/app/appbased.cxx36
-rwxr-xr-x[-rw-r--r--]basic/source/app/appbased.hxx6
-rwxr-xr-x[-rw-r--r--]basic/source/app/appedit.cxx24
-rwxr-xr-x[-rw-r--r--]basic/source/app/appedit.hxx8
-rwxr-xr-x[-rw-r--r--]basic/source/app/apperror.cxx16
-rwxr-xr-x[-rw-r--r--]basic/source/app/apperror.hxx4
-rwxr-xr-x[-rw-r--r--]basic/source/app/appwin.cxx118
-rwxr-xr-x[-rw-r--r--]basic/source/app/appwin.hxx54
-rwxr-xr-x[-rw-r--r--]basic/source/app/basic.hrc0
-rwxr-xr-x[-rw-r--r--]basic/source/app/basic.src64
-rwxr-xr-x[-rw-r--r--]basic/source/app/basicrt.cxx10
-rwxr-xr-x[-rw-r--r--]basic/source/app/basmsg.hrc0
-rwxr-xr-x[-rw-r--r--]basic/source/app/basmsg.src0
-rwxr-xr-x[-rw-r--r--]basic/source/app/brkpnts.cxx23
-rwxr-xr-x[-rw-r--r--]basic/source/app/brkpnts.hxx2
-rwxr-xr-x[-rw-r--r--]basic/source/app/dataedit.hxx24
-rwxr-xr-x[-rw-r--r--]basic/source/app/dialogs.cxx104
-rwxr-xr-x[-rw-r--r--]basic/source/app/dialogs.hxx12
-rwxr-xr-x[-rw-r--r--]basic/source/app/makefile.mk0
-rwxr-xr-x[-rw-r--r--]basic/source/app/msgedit.cxx186
-rwxr-xr-x[-rw-r--r--]basic/source/app/msgedit.hxx26
-rwxr-xr-x[-rw-r--r--]basic/source/app/mybasic.cxx20
-rwxr-xr-x[-rw-r--r--]basic/source/app/printer.cxx4
-rwxr-xr-x[-rw-r--r--]basic/source/app/printer.hxx0
-rwxr-xr-x[-rw-r--r--]basic/source/app/process.cxx32
-rwxr-xr-x[-rw-r--r--]basic/source/app/processw.cxx40
-rwxr-xr-x[-rw-r--r--]basic/source/app/processw.hxx12
-rwxr-xr-x[-rw-r--r--]basic/source/app/resids.hrc0
-rwxr-xr-x[-rw-r--r--]basic/source/app/status.cxx8
-rwxr-xr-x[-rw-r--r--]basic/source/app/status.hxx0
-rwxr-xr-x[-rw-r--r--]basic/source/app/svtmsg.src2
-rwxr-xr-x[-rw-r--r--]basic/source/app/testbasi.cxx0
-rwxr-xr-x[-rw-r--r--]basic/source/app/testtool.idl0
-rwxr-xr-x[-rw-r--r--]basic/source/app/testtool.src2
-rwxr-xr-x[-rw-r--r--]basic/source/app/textedit.cxx146
-rwxr-xr-x[-rw-r--r--]basic/source/app/textedit.hxx32
-rwxr-xr-x[-rw-r--r--]basic/source/app/ttbasic.cxx0
-rwxr-xr-x[-rw-r--r--]basic/source/app/ttbasic.hxx0
-rwxr-xr-x[-rw-r--r--]basic/source/app/ttmsg.src2
41 files changed, 676 insertions, 613 deletions
diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx
index e82261084a70..7786914f85df 100644..100755
--- a/basic/source/app/app.cxx
+++ b/basic/source/app/app.cxx
@@ -89,52 +89,52 @@ IMPL_GEN_RES_STR;
#ifdef DBG_UTIL
// filter Messages generated due to missing configuration Bug:#83887#
-void TestToolDebugMessageFilter( const sal_Char *pString, BOOL bIsOsl )
+void TestToolDebugMessageFilter( const sal_Char *pString, sal_Bool bIsOsl )
{
- static BOOL static_bInsideFilter = FALSE;
+ static sal_Bool static_bInsideFilter = sal_False;
// Ignore messages during filtering to avoid endless recursions
if ( static_bInsideFilter )
return;
- static_bInsideFilter = TRUE;
+ static_bInsideFilter = sal_True;
ByteString aMessage( pString );
- BOOL bIgnore = FALSE;
+ sal_Bool bIgnore = sal_False;
if ( bIsOsl )
{
// OSL
if ( aMessage.Search( CByteString("Cannot open Configuration: Connector: unknown delegatee com.sun.star.connection.Connector.portal") ) != STRING_NOTFOUND )
- bIgnore = TRUE;
+ bIgnore = sal_True;
}
else
{
// DBG
#if ! (OSL_DEBUG_LEVEL > 1)
if ( aMessage.Search( CByteString("SelectAppIconPixmap") ) != STRING_NOTFOUND )
- bIgnore = TRUE;
+ bIgnore = sal_True;
#endif
if ( aMessage.Search( CByteString("PropertySetRegistry::") ) != STRING_NOTFOUND )
- bIgnore = TRUE;
+ bIgnore = sal_True;
if ( aMessage.Search( CByteString("property value missing") ) != STRING_NOTFOUND )
- bIgnore = TRUE;
+ bIgnore = sal_True;
if ( aMessage.Search( CByteString("getDateFormatsImpl") ) != STRING_NOTFOUND
&& aMessage.Search( CByteString("no date formats") ) != STRING_NOTFOUND )
- bIgnore = TRUE;
+ bIgnore = sal_True;
if ( aMessage.Search( CByteString("ucb::configureUcb(): Bad arguments") ) != STRING_NOTFOUND )
- bIgnore = TRUE;
+ bIgnore = sal_True;
if ( aMessage.Search( CByteString("CreateInstance with arguments exception") ) != STRING_NOTFOUND )
- bIgnore = TRUE;
+ bIgnore = sal_True;
if ( aMessage.Search( CByteString("AcquireTree failed") ) != STRING_NOTFOUND )
- bIgnore = TRUE;
+ bIgnore = sal_True;
}
if ( bIgnore )
{
- static_bInsideFilter = FALSE;
+ static_bInsideFilter = sal_False;
return;
}
@@ -156,25 +156,25 @@ void TestToolDebugMessageFilter( const sal_Char *pString, BOOL bIsOsl )
printf("DbgPrintMsgBox failed: %s\n", pString );
}
}
- static_bInsideFilter = FALSE;
+ static_bInsideFilter = sal_False;
}
void SAL_CALL DBG_TestToolDebugMessageFilter( const sal_Char *pString )
{
- TestToolDebugMessageFilter( pString, FALSE );
+ TestToolDebugMessageFilter( pString, sal_False );
}
extern "C" void SAL_CALL osl_TestToolDebugMessageFilter( const sal_Char *pString )
{
if ( !getenv( "DISABLE_SAL_DBGBOX" ) )
- TestToolDebugMessageFilter( pString, TRUE );
+ TestToolDebugMessageFilter( pString, sal_True );
}
#endif
// #94145# Due to a tab in TT_SIGNATURE_FOR_UNICODE_TEXTFILES which is changed to blanks by some editors
// this routine became necessary
-BOOL IsTTSignatureForUnicodeTextfile( String aLine )
+sal_Bool IsTTSignatureForUnicodeTextfile( String aLine )
{
aLine.SearchAndReplace( '\t', ' ' );
String ThreeBlanks = CUniString(" ");
@@ -272,7 +272,7 @@ int BasicApp::Main( )
if ( aDefIniPath.Exists() )
{
aDefIniPath.CopyTo( aIniPath, FSYS_ACTION_COPYFILE );
- FileStat::SetReadOnlyFlag( aIniPath, FALSE );
+ FileStat::SetReadOnlyFlag( aIniPath, sal_False );
}
}
}
@@ -355,7 +355,7 @@ void BasicApp::SetFocus()
IMPL_LINK( BasicApp, LateInit, void *, pDummy )
{
(void) pDummy; /* avoid warning about unused parameter */
- USHORT i;
+ sal_uInt16 i;
for ( i = 0 ; i < Application::GetCommandLineParamCount() ; i++ )
{
if ( Application::GetCommandLineParam( i ).Copy(0,4).CompareIgnoreCaseToAscii("-run") == COMPARE_EQUAL
@@ -363,7 +363,7 @@ IMPL_LINK( BasicApp, LateInit, void *, pDummy )
|| Application::GetCommandLineParam( i ).Copy(0,4).CompareIgnoreCaseToAscii("/run") == COMPARE_EQUAL
#endif
)
- pFrame->SetAutoRun( TRUE );
+ pFrame->SetAutoRun( sal_True );
else if ( Application::GetCommandLineParam( i ).Copy(0,7).CompareIgnoreCaseToAscii("-result") == COMPARE_EQUAL
#ifndef UNX
|| Application::GetCommandLineParam( i ).Copy(0,7).CompareIgnoreCaseToAscii("/result") == COMPARE_EQUAL
@@ -374,7 +374,7 @@ IMPL_LINK( BasicApp, LateInit, void *, pDummy )
{
if ( ByteString( Application::GetCommandLineParam( i+1 ), osl_getThreadTextEncoding() ).IsNumericAscii() )
{
- MsgEdit::SetMaxLogLen( sal::static_int_cast< USHORT >( Application::GetCommandLineParam( i+1 ).ToInt32() ) );
+ MsgEdit::SetMaxLogLen( sal::static_int_cast< sal_uInt16 >( Application::GetCommandLineParam( i+1 ).ToInt32() ) );
}
i++;
}
@@ -446,7 +446,7 @@ FloatingExecutionStatus::FloatingExecutionStatus( Window * pParent )
void FloatingExecutionStatus::SetStatus( String aW )
{
- Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+ Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
ToTop( TOTOP_NOGRABFOCUS );
aAusblend.Start();
aStatus.SetText( aW );
@@ -454,7 +454,7 @@ void FloatingExecutionStatus::SetStatus( String aW )
void FloatingExecutionStatus::SetAdditionalInfo( String aF )
{
- Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+ Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
ToTop( TOTOP_NOGRABFOCUS );
aAusblend.Start();
aAdditionalInfo.SetText( aF );
@@ -473,11 +473,11 @@ TYPEINIT1(TTExecutionStatusHint, SfxSimpleHint);
BasicFrame::BasicFrame() : WorkWindow( NULL,
WinBits( WB_APP | WB_MOVEABLE | WB_SIZEABLE | WB_CLOSEABLE ) )
-, bIsAutoRun( FALSE )
+, bIsAutoRun( sal_False )
, pDisplayHidDlg( NULL )
, pEditVar ( 0 )
-, bAutoReload( FALSE )
-, bAutoSave( TRUE )
+, bAutoReload( sal_False )
+, bAutoSave( sal_True )
, pBasic( NULL )
, pExecutionStatus( NULL )
, pStatus( NULL )
@@ -487,10 +487,10 @@ BasicFrame::BasicFrame() : WorkWindow( NULL,
{
Application::SetDefDialogParent( this );
- AlwaysEnableInput( TRUE );
+ AlwaysEnableInput( sal_True );
pBasic = TTBasic::CreateMyBasic(); // depending on what was linked to the executable
- bInBreak = FALSE;
- bDisas = FALSE;
+ bInBreak = sal_False;
+ bDisas = sal_False;
nFlags = 0;
// Icon aAppIcon;
@@ -594,11 +594,11 @@ BasicFrame::BasicFrame() : WorkWindow( NULL,
}
const ByteString ProfilePrefix("_profile_");
-const USHORT ProfilePrefixLen = ProfilePrefix.Len();
+const sal_uInt16 ProfilePrefixLen = ProfilePrefix.Len();
void BasicFrame::LoadIniFile()
{
- USHORT i;
+ sal_uInt16 i;
Config aConf(Config::GetConfigName( Config::GetDefDirectory(), CUniString("testtool") ));
for ( i = 0 ; i < aConf.GetGroupCount() ; i++ )
@@ -714,12 +714,12 @@ IMPL_LINK( BasicFrame, CheckAllFiles, Timer*, pTimer )
return 0;
}
-BOOL BasicFrame::IsAutoRun()
+sal_Bool BasicFrame::IsAutoRun()
{
return bIsAutoRun;
}
-void BasicFrame::SetAutoRun( BOOL bAuto )
+void BasicFrame::SetAutoRun( sal_Bool bAuto )
{
bIsAutoRun = bAuto;
}
@@ -809,7 +809,7 @@ IMPL_LINK( BasicFrame, CloseButtonClick, void*, EMPTYARG )
break;
}
}
- return Command( RID_FILECLOSE, FALSE );
+ return Command( RID_FILECLOSE, sal_False );
}
IMPL_LINK( BasicFrame, FloatButtonClick, void*, EMPTYARG )
@@ -848,7 +848,7 @@ void BasicFrame::WinShow_Hide()
return;
AppWin* p;
- BOOL bWasFullscreen = FALSE;
+ sal_Bool bWasFullscreen = sal_False;
for ( size_t i = pList->size(); i > 0; --i )
{
p = pList->at( i - 1 );
@@ -859,7 +859,7 @@ void BasicFrame::WinShow_Hide()
)
p->Hide( SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
else
- p->Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+ p->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
}
bWasFullscreen |= p->GetWinState() == TT_WIN_STATE_MAX;
}
@@ -869,13 +869,13 @@ void BasicFrame::WinMax_Restore()
{
// The application buttons
AppWin* p;
- BOOL bHasFullscreenWin = FALSE;
+ sal_Bool bHasFullscreenWin = sal_False;
for ( size_t i = 0, n = pList->size(); i < n && !bHasFullscreenWin; ++i )
{
p = pList->at( i );
bHasFullscreenWin = ( p->GetWinState() == TT_WIN_STATE_MAX );
}
- GetMenuBar()->ShowButtons( bHasFullscreenWin, FALSE, FALSE );
+ GetMenuBar()->ShowButtons( bHasFullscreenWin, sal_False, sal_False );
WinShow_Hide();
}
@@ -901,9 +901,9 @@ void BasicFrame::RemoveWindow( AppWin *pWin )
Menu* pMenu = GetMenuBar();
if( pList->empty() )
{
- pMenu->EnableItem( RID_APPEDIT, FALSE );
- pMenu->EnableItem( RID_APPRUN, FALSE );
- pMenu->EnableItem( RID_APPWINDOW, FALSE );
+ pMenu->EnableItem( RID_APPEDIT, sal_False );
+ pMenu->EnableItem( RID_APPRUN, sal_False );
+ pMenu->EnableItem( RID_APPWINDOW, sal_False );
}
PopupMenu* pWinMenu = pMenu->GetPopupMenu( RID_APPWINDOW );
@@ -928,20 +928,20 @@ void BasicFrame::AddWindow( AppWin *pWin )
MenuBar* pMenu = GetMenuBar();
if( !pList->empty() )
{
- pMenu->EnableItem( RID_APPEDIT, TRUE );
- pMenu->EnableItem( RID_APPRUN, TRUE );
- pMenu->EnableItem( RID_APPWINDOW, TRUE );
+ pMenu->EnableItem( RID_APPEDIT, sal_True );
+ pMenu->EnableItem( RID_APPRUN, sal_True );
+ pMenu->EnableItem( RID_APPWINDOW, sal_True );
}
PopupMenu* pWinMenu = pMenu->GetPopupMenu( RID_APPWINDOW );
- USHORT nLastID = pWinMenu->GetItemId( pWinMenu->GetItemCount() - 1 );
+ sal_uInt16 nLastID = pWinMenu->GetItemId( pWinMenu->GetItemCount() - 1 );
// Separator necessary
if ( nLastID < RID_WIN_FILE1 && pWinMenu->GetItemType( pWinMenu->GetItemCount() - 1 ) != MENUITEM_SEPARATOR )
pWinMenu->InsertSeparator();
// Find free ID
- USHORT nFreeID = RID_WIN_FILE1;
+ sal_uInt16 nFreeID = RID_WIN_FILE1;
while ( pWinMenu->GetItemPos( nFreeID ) != MENU_ITEM_NOTFOUND && nFreeID < RID_WIN_FILEn )
nFreeID++;
@@ -974,7 +974,7 @@ void BasicFrame::FocusWindow( AppWin *pWin )
}
}
pList->push_back( pWin );
- pWin->Minimize( FALSE );
+ pWin->Minimize( sal_False );
aAppFile = pWin->GetText();
UpdateTitle();
@@ -983,14 +983,14 @@ void BasicFrame::FocusWindow( AppWin *pWin )
pStatus->LoadTaskToolBox();
}
-BOOL BasicFrame::Close()
+sal_Bool BasicFrame::Close()
{
if( bInBreak || Basic().IsRunning() )
if( RET_NO == QueryBox( this, SttResId( IDS_RUNNING ) ).Execute() )
- return FALSE;
+ return sal_False;
StarBASIC::Stop();
- bInBreak = FALSE;
+ bInBreak = sal_False;
if( CloseAll() )
{
aLineNum.Stop();
@@ -1004,33 +1004,33 @@ BOOL BasicFrame::Close()
Application::SetDefDialogParent( NULL );
WorkWindow::Close();
- return TRUE;
- } else return FALSE;
+ return sal_True;
+ } else return sal_False;
}
-BOOL BasicFrame::CloseAll()
+sal_Bool BasicFrame::CloseAll()
{
while ( !pList->empty() )
if ( !pList->back()->Close() )
- return FALSE;
- return TRUE;
+ return sal_False;
+ return sal_True;
}
-BOOL BasicFrame::CompileAll()
+sal_Bool BasicFrame::CompileAll()
{
AppWin* p;
for ( size_t i = 0, n = pList->size(); i < n; ++i )
{
p = pList->at( i );
- if ( p->ISA(AppBasEd) && !((AppBasEd*)p)->Compile() ) return FALSE;
+ if ( p->ISA(AppBasEd) && !((AppBasEd*)p)->Compile() ) return sal_False;
}
- return TRUE;
+ return sal_True;
}
// Setup menu
#define MENU2FILENAME( Name ) Name.Copy( Name.SearchAscii(" ") +1).EraseAllChars( '~' )
#define LRUNr( nNr ) CByteString("LRU").Append( ByteString::CreateFromInt32( nNr ) )
-String FILENAME2MENU( USHORT nNr, String aName )
+String FILENAME2MENU( sal_uInt16 nNr, String aName )
{
String aRet;
if ( nNr <= 9 )
@@ -1049,9 +1049,9 @@ void BasicFrame::AddToLRU(String const& aFile)
PopupMenu *pPopup = GetMenuBar()->GetPopupMenu(RID_APPFILE);
aConfig.SetGroup("LRU");
- USHORT nMaxLRU = (USHORT)aConfig.ReadKey("MaxLRU","4").ToInt32();
+ sal_uInt16 nMaxLRU = (sal_uInt16)aConfig.ReadKey("MaxLRU","4").ToInt32();
DirEntry aFileEntry( aFile );
- USHORT i,nLastMove = nMaxLRU;
+ sal_uInt16 i,nLastMove = nMaxLRU;
for ( i = 1 ; i<nMaxLRU && nLastMove == nMaxLRU ; i++ )
{
@@ -1083,15 +1083,15 @@ void BasicFrame::LoadLRU()
{
Config aConfig(Config::GetConfigName( Config::GetDefDirectory(), CUniString("testtool") ));
PopupMenu *pPopup = GetMenuBar()->GetPopupMenu(RID_APPFILE);
- BOOL bAddSep = TRUE;
+ sal_Bool bAddSep = sal_True;
aConfig.SetGroup("LRU");
- USHORT nMaxLRU = (USHORT)aConfig.ReadKey("MaxLRU","4").ToInt32();
+ sal_uInt16 nMaxLRU = (sal_uInt16)aConfig.ReadKey("MaxLRU","4").ToInt32();
if ( pPopup )
bAddSep = pPopup->GetItemPos( IDM_FILE_LRU1 ) == MENU_ITEM_NOTFOUND;
- USHORT i;
+ sal_uInt16 i;
for ( i = 1; i <= nMaxLRU && pPopup != NULL; i++)
{
String aFile = UniString( aConfig.ReadKey(LRUNr(i)), RTL_TEXTENCODING_UTF8 );
@@ -1101,7 +1101,7 @@ void BasicFrame::LoadLRU()
if (bAddSep)
{
pPopup->InsertSeparator();
- bAddSep = FALSE;
+ bAddSep = sal_False;
}
if ( pPopup->GetItemPos( IDM_FILE_LRU1 + i-1 ) == MENU_ITEM_NOTFOUND )
@@ -1120,10 +1120,10 @@ void BasicFrame::LoadLRU()
IMPL_LINK( BasicFrame, InitMenu, Menu *, pMenu )
{
- BOOL bNormal = BOOL( !bInBreak );
+ sal_Bool bNormal = sal_Bool( !bInBreak );
pMenu->EnableItem( RID_RUNCOMPILE, bNormal );
- BOOL bHasEdit = BOOL( pWork != NULL );
+ sal_Bool bHasEdit = sal_Bool( pWork != NULL );
pMenu->EnableItem( RID_FILECLOSE, bHasEdit );
pMenu->EnableItem( RID_FILESAVE, bHasEdit );
@@ -1133,16 +1133,16 @@ IMPL_LINK( BasicFrame, InitMenu, Menu *, pMenu )
pMenu->EnableItem( RID_FILELOADLIB, bNormal );
pMenu->EnableItem( RID_FILESAVELIB, bHasEdit );
- BOOL bHasErr = BOOL( bNormal && pBasic->GetErrors() != 0 );
- BOOL bNext = bHasErr & bNormal;
- BOOL bPrev = bHasErr & bNormal;
+ sal_Bool bHasErr = sal_Bool( bNormal && pBasic->GetErrors() != 0 );
+ sal_Bool bNext = bHasErr & bNormal;
+ sal_Bool bPrev = bHasErr & bNormal;
if( bHasErr )
{
size_t n = pBasic->GetCurrentError();
if( n == 0 )
- bPrev = FALSE;
+ bPrev = sal_False;
if( SbError(n+1) == pBasic->GetErrors() )
- bNext = FALSE;
+ bNext = sal_False;
}
pMenu->EnableItem( RID_RUNNEXTERR, bNext );
pMenu->EnableItem( RID_RUNPREVERR, bPrev );
@@ -1150,14 +1150,14 @@ IMPL_LINK( BasicFrame, InitMenu, Menu *, pMenu )
if( pWork )
pWork->InitMenu( pMenu );
- return TRUE;
+ return sal_True;
}
IMPL_LINK_INLINE_START( BasicFrame, DeInitMenu, Menu *, pMenu )
{
(void) pMenu; /* avoid warning about unused parameter */
- SetAutoRun( FALSE );
+ SetAutoRun( sal_False );
String aString;
pStatus->Message( aString );
return 0L;
@@ -1174,15 +1174,15 @@ IMPL_LINK_INLINE_END( BasicFrame, HighlightMenu, Menu *, pMenu )
IMPL_LINK_INLINE_START( BasicFrame, MenuCommand, Menu *, pMenu )
{
- USHORT nId = pMenu->GetCurItemId();
- BOOL bChecked = pMenu->IsItemChecked( nId );
+ sal_uInt16 nId = pMenu->GetCurItemId();
+ sal_Bool bChecked = pMenu->IsItemChecked( nId );
return Command( nId, bChecked );
}
IMPL_LINK_INLINE_END( BasicFrame, MenuCommand, Menu *, pMenu )
IMPL_LINK_INLINE_START( BasicFrame, Accel, Accelerator*, pAcc )
{
- SetAutoRun( FALSE );
+ SetAutoRun( sal_False );
return Command( pAcc->GetCurItemId() );
}
IMPL_LINK_INLINE_END( BasicFrame, Accel, Accelerator*, pAcc )
@@ -1247,14 +1247,14 @@ AppBasEd* BasicFrame::CreateModuleWin( SbModule* pMod )
return p;
}
-BOOL BasicFrame::LoadFile( String aFilename )
+sal_Bool BasicFrame::LoadFile( String aFilename )
{
- BOOL bIsResult = DirEntry( aFilename ).GetExtension().CompareIgnoreCaseToAscii("RES") == COMPARE_EQUAL;
- BOOL bIsBasic = DirEntry( aFilename ).GetExtension().CompareIgnoreCaseToAscii("BAS") == COMPARE_EQUAL;
+ sal_Bool bIsResult = DirEntry( aFilename ).GetExtension().CompareIgnoreCaseToAscii("RES") == COMPARE_EQUAL;
+ sal_Bool bIsBasic = DirEntry( aFilename ).GetExtension().CompareIgnoreCaseToAscii("BAS") == COMPARE_EQUAL;
bIsBasic |= DirEntry( aFilename ).GetExtension().CompareIgnoreCaseToAscii("INC") == COMPARE_EQUAL;
AppWin* p;
- BOOL bSuccess = TRUE;
+ sal_Bool bSuccess = sal_True;
if ( bIsResult )
{
p = new AppError( this, aFilename );
@@ -1281,7 +1281,7 @@ BOOL BasicFrame::LoadFile( String aFilename )
}
// Execute command
-long BasicFrame::Command( short nID, BOOL bChecked )
+long BasicFrame::Command( short nID, sal_Bool bChecked )
{
BasicError* pErr;
@@ -1294,7 +1294,7 @@ long BasicFrame::Command( short nID, BOOL bChecked )
case RID_FILEOPEN:
{
String s;
- if( QueryFileName( s, FT_BASIC_SOURCE | FT_RESULT_FILE, FALSE ) ) {
+ if( QueryFileName( s, FT_BASIC_SOURCE | FT_RESULT_FILE, sal_False ) ) {
AddToLRU( s );
LoadFile( s );
}
@@ -1333,7 +1333,7 @@ long BasicFrame::Command( short nID, BOOL bChecked )
{
SbModule *pModule = ((AppBasEd*)pWork)->GetModule();
#if OSL_DEBUG_LEVEL > 1
- USHORT x;
+ sal_uInt16 x;
x = pWork->GetLineNr();
x = ((AppBasEd*)pWork)->GetModule()->GetBPCount();
if ( !x )
@@ -1341,7 +1341,7 @@ long BasicFrame::Command( short nID, BOOL bChecked )
x = pModule->GetBPCount();
#endif
- for ( USHORT nMethod = 0; nMethod < pModule->GetMethods()->Count(); nMethod++ )
+ for ( sal_uInt16 nMethod = 0; nMethod < pModule->GetMethods()->Count(); nMethod++ )
{
SbMethod* pMethod = (SbMethod*)pModule->GetMethods()->Get( nMethod );
DBG_ASSERT( pMethod, "Methode nicht gefunden! (NULL)" );
@@ -1382,7 +1382,7 @@ long BasicFrame::Command( short nID, BOOL bChecked )
if( bInBreak )
// Reset the flag
- bInBreak = FALSE;
+ bInBreak = sal_False;
else
{
if( IsAutoSave() && !SaveAll() ) break;
@@ -1391,10 +1391,10 @@ long BasicFrame::Command( short nID, BOOL bChecked )
pStatus->Message( aString );
if( p )
{
- BasicDLL::SetDebugMode( TRUE );
+ BasicDLL::SetDebugMode( sal_True );
Basic().ClearGlobalVars();
p->Run();
- BasicDLL::SetDebugMode( FALSE );
+ BasicDLL::SetDebugMode( sal_False );
// If cancelled during Interactive=FALSE
}
}}
@@ -1409,7 +1409,7 @@ long BasicFrame::Command( short nID, BOOL bChecked )
}
break;
case RID_RUNDISAS:
- bDisas = BOOL( !bChecked );
+ bDisas = sal_Bool( !bChecked );
break;
case RID_RUNBREAK:
if ( Basic().IsRunning() && !bInBreak )
@@ -1419,7 +1419,7 @@ long BasicFrame::Command( short nID, BOOL bChecked )
break;
case RID_RUNSTOP:
Basic().Stop();
- bInBreak = FALSE;
+ bInBreak = sal_False;
break;
case RID_RUNNEXTERR:
pErr = pBasic->NextError();
@@ -1560,23 +1560,23 @@ long BasicFrame::Command( short nID, BOOL bChecked )
pWork->Command( CommandEvent( Point(), nID ) );
}
}
- return TRUE;
+ return sal_True;
}
-BOOL BasicFrame::SaveAll()
+sal_Bool BasicFrame::SaveAll()
{
AppWin* p, *q = pWork;
for ( size_t i = 0, n = pList->size(); i < n ; i++ )
{
p = pList->at( i );
- USHORT nRes = p->QuerySave( QUERY_DISK_CHANGED );
+ sal_uInt16 nRes = p->QuerySave( QUERY_DISK_CHANGED );
if( (( nRes == SAVE_RES_ERROR ) && QueryBox(this,SttResId(IDS_ASKSAVEERROR)).Execute() == RET_NO )
|| ( nRes == SAVE_RES_CANCEL ) )
- return FALSE;
+ return sal_False;
}
if ( q )
q->ToTop();
- return TRUE;
+ return sal_True;
}
IMPL_LINK( BasicFrame, ModuleWinExists, String*, pFilename )
@@ -1620,7 +1620,7 @@ AppWin* BasicFrame::FindWin( const String& rName )
return NULL;
}
-AppWin* BasicFrame::FindWin( USHORT nWinId )
+AppWin* BasicFrame::FindWin( sal_uInt16 nWinId )
{
AppWin* p;
for ( size_t i = 0, n = pList->size(); i < n ; i++ )
@@ -1649,10 +1649,10 @@ IMPL_LINK( BasicFrame, WriteString, String*, pString )
if ( !pList->empty() )
{
pList->back()->pDataEdit->ReplaceSelected( *pString );
- return TRUE;
+ return sal_True;
}
else
- return FALSE;
+ return sal_False;
}
class NewFileDialog : public FileDialog
@@ -1675,7 +1675,7 @@ void NewFileDialog::FilterSelect()
return; // User decides after he has changed the path
String aCurFilter = GetCurFilter();
- USHORT nFilterNr = 0;
+ sal_uInt16 nFilterNr = 0;
while ( nFilterNr < GetFilterCount() && aCurFilter != GetFilterName( nFilterNr ) )
{
nFilterNr++;
@@ -1692,7 +1692,7 @@ void NewFileDialog::FilterSelect()
short NewFileDialog::Execute()
{
- BOOL bRet = (BOOL)FileDialog::Execute();
+ sal_Bool bRet = (sal_Bool)FileDialog::Execute();
if ( bRet )
{
Config aConf(Config::GetConfigName( Config::GetDefDirectory(), CUniString("testtool") ));
@@ -1705,8 +1705,8 @@ short NewFileDialog::Execute()
return bRet;
}
-BOOL BasicFrame::QueryFileName
- (String& rName, FileType nFileType, BOOL bSave )
+sal_Bool BasicFrame::QueryFileName
+ (String& rName, FileType nFileType, sal_Bool bSave )
{
NewFileDialog aDlg( this, bSave ? WinBits( WB_SAVEAS ) :
WinBits( WB_OPEN ) );
@@ -1752,13 +1752,13 @@ BOOL BasicFrame::QueryFileName
if( aDlg.Execute() )
{
rName = aDlg.GetPath();
- return TRUE;
- } else return FALSE;
+ return sal_True;
+ } else return sal_False;
}
-USHORT BasicFrame::BreakHandler()
+sal_uInt16 BasicFrame::BreakHandler()
{
- bInBreak = TRUE;
+ bInBreak = sal_True;
SetAppMode( String( SttResId ( IDS_APPMODE_BREAK ) ) );
while( bInBreak ) {
@@ -1773,7 +1773,7 @@ USHORT BasicFrame::BreakHandler()
void BasicFrame::LoadLibrary()
{
String s;
- if( QueryFileName( s, FT_BASIC_LIBRARY, FALSE ) )
+ if( QueryFileName( s, FT_BASIC_LIBRARY, sal_False ) )
{
CloseAll();
SvFileStream aStrm( s, STREAM_STD_READ );
@@ -1783,7 +1783,7 @@ void BasicFrame::LoadLibrary()
pBasic = pNew;
// Show all contents if existing
SbxArray* pMods = pBasic->GetModules();
- for( USHORT i = 0; i < pMods->Count(); i++ )
+ for( sal_uInt16 i = 0; i < pMods->Count(); i++ )
{
SbModule* pMod = (SbModule*) pMods->Get( i );
AppWin* p = new AppBasEd( this, pMod );
@@ -1801,7 +1801,7 @@ void BasicFrame::LoadLibrary()
void BasicFrame::SaveLibrary()
{
String s;
- if( QueryFileName( s, FT_BASIC_LIBRARY, TRUE ) )
+ if( QueryFileName( s, FT_BASIC_LIBRARY, sal_True ) )
{
SvFileStream aStrm( s, STREAM_STD_WRITE );
if( !Basic().Store( aStrm ) )
@@ -1815,8 +1815,8 @@ String BasicFrame::GenRealString( const String &aResString )
String aType,aValue,aResult(aResString);
String aString;
xub_StrLen nInsertPos = 0;
- BOOL bFound;
- bFound = FALSE;
+ sal_Bool bFound;
+ bFound = sal_False;
while ( (nStart = aResult.Search(StartKenn,nStartPos)) != STRING_NOTFOUND &&
(nGleich = aResult.SearchAscii("=",nStart+StartKenn.Len())) != STRING_NOTFOUND &&
@@ -1836,16 +1836,16 @@ String BasicFrame::GenRealString( const String &aResString )
aString.Erase();
}
- aString = String( SttResId( (USHORT)(aValue.ToInt32()) ) );
+ aString = String( SttResId( (sal_uInt16)(aValue.ToInt32()) ) );
nInsertPos = nStart;
nStartPos = nStart;
aResult.Erase( nStart, nEnd-nStart+1 );
- bFound = TRUE;
+ bFound = sal_True;
}
else if ( aType.Search(BaseArgKenn) == 0 ) // Starts with BaseArgKenn
{
// TODO: What the hell is that for??
- USHORT nArgNr = USHORT( aType.Copy( BaseArgKenn.Len() ).ToInt32() );
+ sal_uInt16 nArgNr = sal_uInt16( aType.Copy( BaseArgKenn.Len() ).ToInt32() );
DBG_ASSERT( aString.Search( CUniString("($Arg").Append( String::CreateFromInt32(nArgNr) ).AppendAscii(")") ) != STRING_NOTFOUND, "Extra Argument given in String");
aString.SearchAndReplace( CUniString("($Arg").Append( String::CreateFromInt32(nArgNr) ).AppendAscii(")"), aValue );
nStartPos = nStart;
diff --git a/basic/source/app/app.hxx b/basic/source/app/app.hxx
index 8f3c8e6f9f9b..983e979c5021 100644..100755
--- a/basic/source/app/app.hxx
+++ b/basic/source/app/app.hxx
@@ -62,7 +62,7 @@ public:
void LoadIniFile();
void SetFocus();
- void Wait( BOOL );
+ void Wait( sal_Bool );
DECL_LINK( LateInit, void * );
#ifdef DBG_UTIL
@@ -71,7 +71,7 @@ public:
};
-typedef USHORT FileType;
+typedef sal_uInt16 FileType;
#define FT_NO_FILE (FileType)0x00 // An error has occurred ...
#define FT_BASIC_SOURCE (FileType)0x01
@@ -90,16 +90,16 @@ class BasicFrame : public WorkWindow, public SfxBroadcaster, public SfxListener
using SystemWindow::Notify;
using Window::Command;
- virtual BOOL Close();
- BOOL CloseAll(); // Close all windows
- BOOL CompileAll(); // Compile all texts
+ virtual sal_Bool Close();
+ sal_Bool CloseAll(); // Close all windows
+ sal_Bool CompileAll(); // Compile all texts
AutoTimer aLineNum; // Show the line numbers
virtual void Resize();
virtual void Move();
virtual void GetFocus();
void LoadLibrary();
void SaveLibrary();
- BOOL bIsAutoRun;
+ sal_Bool bIsAutoRun;
DisplayHidDlg* pDisplayHidDlg;
// BreakPoint *pRunToCursorBP;
@@ -109,8 +109,8 @@ using Window::Command;
Timer aCheckFiles; // Checks the files for changes
- BOOL bAutoReload;
- BOOL bAutoSave;
+ sal_Bool bAutoReload;
+ sal_Bool bAutoSave;
DECL_LINK( CheckAllFiles, Timer* );
MyBasicRef pBasic; // BASIC-Engine
@@ -126,16 +126,16 @@ using Window::Command;
FloatingExecutionStatus *pExecutionStatus;
public:
- BOOL IsAutoRun();
- void SetAutoRun( BOOL bAuto );
- BOOL bInBreak; // TRUE if in Break-Handler
+ sal_Bool IsAutoRun();
+ void SetAutoRun( sal_Bool bAuto );
+ sal_Bool bInBreak; // sal_True if in Break-Handler
StatusLine* pStatus; // Status line
EditList* pList; // List of edit windows
AppWin* pWork; // Current edit window
BasicPrinter* pPrn; // Printer
- BOOL bDisas; // TRUE: disassemble
- USHORT nFlags; // Debugging-Flags
- USHORT nMaximizedWindows; // Number of maximized windows
+ sal_Bool bDisas; // sal_True: disassemble
+ sal_uInt16 nFlags; // Debugging-Flags
+ sal_uInt16 nMaximizedWindows; // Number of maximized windows
void FocusWindow( AppWin *pWin );
void WinMax_Restore();
void WinShow_Hide();
@@ -157,25 +157,25 @@ public:
MsgEdit* GetMsgTree( String aLogFileName );
DECL_LINK( Log, TTLogMsg * );
DECL_LINK( WinInfo, WinInfoRec * );
- BOOL LoadFile( String aFilename );
- long Command( short,BOOL=FALSE ); // Command handler
+ sal_Bool LoadFile( String aFilename );
+ long Command( short,sal_Bool=sal_False ); // Command handler
virtual void Command( const CommandEvent& rCEvt ); // Command handler
- BOOL SaveAll(); // Save all windows
- BOOL QueryFileName( String& rName, FileType nFileType, BOOL bSave ); // Query for filename
+ sal_Bool SaveAll(); // Save all windows
+ sal_Bool QueryFileName( String& rName, FileType nFileType, sal_Bool bSave ); // Query for filename
DECL_LINK( ModuleWinExists, String* );
DECL_LINK( WriteString, String* );
AppBasEd* CreateModuleWin( SbModule* pMod );
AppBasEd* FindModuleWin( const String& );
AppError* FindErrorWin( const String& );
AppWin* FindWin( const String& );
- AppWin* FindWin( USHORT nWinId );
+ AppWin* FindWin( sal_uInt16 nWinId );
AppWin* IsWinValid( AppWin* pMaybeWin );
- USHORT BreakHandler(); // Break-Handler-Callback
+ sal_uInt16 BreakHandler(); // Break-Handler-Callback
void SetEditVar( SbxVariable *pVar ){ pEditVar = pVar;}
SbxVariable* GetEditVar(){ return pEditVar;}
- BOOL IsAutoReload() { return bAutoReload; }
- BOOL IsAutoSave() { return bAutoSave; }
+ sal_Bool IsAutoReload() { return bAutoReload; }
+ sal_Bool IsAutoSave() { return bAutoSave; }
void LoadIniFile();
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
diff --git a/basic/source/app/appbased.cxx b/basic/source/app/appbased.cxx
index 3a3422e16107..4a3b94d057ec 100644..100755
--- a/basic/source/app/appbased.cxx
+++ b/basic/source/app/appbased.cxx
@@ -56,10 +56,10 @@ AppBasEd::AppBasEd( BasicFrame* pParent, SbModule* p )
pBreakpoints->Show();
- ((TextEdit*)pDataEdit)->GetTextEditImp().pTextView->SetAutoIndentMode( TRUE );
+ ((TextEdit*)pDataEdit)->GetTextEditImp().pTextView->SetAutoIndentMode( sal_True );
((TextEdit*)pDataEdit)->GetTextEditImp().pTextEngine->SetMaxTextLen( STRING_MAXLEN );
- ((TextEdit*)pDataEdit)->GetTextEditImp().SyntaxHighlight( TRUE );
- ((TextEdit*)pDataEdit)->SaveAsUTF8( TRUE );
+ ((TextEdit*)pDataEdit)->GetTextEditImp().SyntaxHighlight( sal_True );
+ ((TextEdit*)pDataEdit)->SaveAsUTF8( sal_True );
String aEmpty;
@@ -101,7 +101,7 @@ void AppBasEd::Notify( SfxBroadcaster&, const SfxHint& rHint )
const SfxSimpleHint* p = PTR_CAST(SfxSimpleHint,&rHint);
if( p )
{
- ULONG nHintId = p->GetId();
+ sal_uIntPtr nHintId = p->GetId();
if( nHintId == SBX_HINT_LANGUAGE_EXTENSION_LOADED )
{
((TextEdit*)pDataEdit)->GetTextEditImp().InvalidateSyntaxHighlight();
@@ -117,8 +117,8 @@ FileType AppBasEd::GetFileType()
IMPL_LINK_INLINE_START( AppBasEd, EditChange, void *, p )
{
(void) p; /* avoid warning about unused parameter */
- bCompiled = FALSE;
- return TRUE;
+ bCompiled = sal_False;
+ return sal_True;
}
IMPL_LINK_INLINE_END( AppBasEd, EditChange, void *, p )
@@ -126,16 +126,16 @@ IMPL_LINK_INLINE_END( AppBasEd, EditChange, void *, p )
long AppBasEd::InitMenu( Menu* pMenu )
{
AppEdit::InitMenu (pMenu );
- BOOL bRunning = pFrame->Basic().IsRunning();
+ sal_Bool bRunning = pFrame->Basic().IsRunning();
pMenu->EnableItem( RID_RUNCOMPILE, !bCompiled && !bRunning );
- return TRUE;
+ return sal_True;
}
long AppBasEd::DeInitMenu( Menu* pMenu )
{
AppEdit::DeInitMenu (pMenu );
pMenu->EnableItem( RID_RUNCOMPILE );
- return TRUE;
+ return sal_True;
}
// Menu Handler
@@ -177,13 +177,13 @@ void AppBasEd::PostLoad()
pMod->SetName( GetText() );
pMod->Clear();
pMod->SetSource( pDataEdit->GetText() );
- bCompiled = FALSE; // because the code might have changed in the meantime
+ bCompiled = sal_False; // because the code might have changed in the meantime
AppEdit::PostLoad();
pBreakpoints->LoadBreakpoints( GetText() );
}
-USHORT AppBasEd::ImplSave()
+sal_uInt16 AppBasEd::ImplSave()
{
pBreakpoints->SaveBreakpoints( GetText() );
return AppEdit::ImplSave();
@@ -199,7 +199,7 @@ void AppBasEd::Reload()
// Reload source code file after change
void AppBasEd::LoadSource()
{
- BOOL bErr;
+ sal_Bool bErr;
String aName = pMod->GetName();
bErr = !pDataEdit->Load( aName );
@@ -208,7 +208,7 @@ void AppBasEd::LoadSource()
ErrorBox( this, SttResId( IDS_READERROR ) ).Execute();
else
UpdateFileInfo( HAS_BEEN_LOADED );
- bCompiled = FALSE; // because the code might have changed in the meantime
+ bCompiled = sal_False; // because the code might have changed in the meantime
}
// Save as (new name)
@@ -219,15 +219,15 @@ void AppBasEd::PostSaveAs()
}
// Compile
-BOOL AppBasEd::Compile()
+sal_Bool AppBasEd::Compile()
{
if( !pDataEdit->HasText() || bCompiled )
- return TRUE;
+ return sal_True;
pMod->SetSource( pDataEdit->GetText() );
- BOOL bRes = FALSE;
+ sal_Bool bRes = sal_False;
if( pFrame->Basic().Compile( pMod ) )
{
- bRes = TRUE;
+ bRes = sal_True;
if( pFrame->bDisas )
Disassemble();
TextSelection aSel( pDataEdit->GetSelection() );
@@ -257,7 +257,7 @@ void AppBasEd::Run()
{
pFrame->Basic().Reset();
SbxArray* pAllModules = pFrame->Basic().GetModules();
- for (USHORT i = 0; i < pAllModules->Count(); i++)
+ for (sal_uInt16 i = 0; i < pAllModules->Count(); i++)
{
if ( (pAllModules->Get(i)->GetName()).Copy(0,2).CompareToAscii( "--" ) == COMPARE_EQUAL )
{
diff --git a/basic/source/app/appbased.hxx b/basic/source/app/appbased.hxx
index a7796fb3854b..22e9afa37bc1 100644..100755
--- a/basic/source/app/appbased.hxx
+++ b/basic/source/app/appbased.hxx
@@ -40,12 +40,12 @@ class AppBasEd : public AppEdit { // Editor-Window:
using DockingWindow::Notify;
SbModuleRef pMod; // compile module
- BOOL bCompiled; // TRUE if compiled
+ sal_Bool bCompiled; // sal_True if compiled
protected:
DECL_LINK( EditChange, void * );
#define BREAKPOINTSWIDTH 15
BreakpointWindow *pBreakpoints;
- virtual USHORT ImplSave(); // Save file
+ virtual sal_uInt16 ImplSave(); // Save file
public:
TYPEINFO();
@@ -61,7 +61,7 @@ public:
virtual void PostSaveAs(); // Postprocess of module...
void Reload();
void LoadSource(); // Load source for object
- BOOL Compile(); // Compile text
+ sal_Bool Compile(); // Compile text
void Run(); // Run image
void Disassemble(); // Disassemble image
const String& GetModName() const { return pMod->GetName(); }
diff --git a/basic/source/app/appedit.cxx b/basic/source/app/appedit.cxx
index 7d6ab8669dea..1cf75d13c58a 100644..100755
--- a/basic/source/app/appedit.cxx
+++ b/basic/source/app/appedit.cxx
@@ -79,8 +79,8 @@ AppEdit::~AppEdit()
void AppEdit::LoadIniFile()
{
TextView *pTextView = ((TextEdit*)pDataEdit)->aEdit.pTextView;
- BOOL bWasModified = pTextView->GetTextEngine()->IsModified();
- pTextView->GetTextEngine()->SetModified( FALSE );
+ sal_Bool bWasModified = pTextView->GetTextEngine()->IsModified();
+ pTextView->GetTextEngine()->SetModified( sal_False );
FontList aFontList( pFrame ); // Just some Window is needed
Config aConf(Config::GetConfigName( Config::GetDefDirectory(), CUniString("testtool") ));
@@ -89,7 +89,7 @@ void AppEdit::LoadIniFile()
String aFontStyle = String( aConf.ReadKey( "ScriptFontStyle", "normal" ), RTL_TEXTENCODING_UTF8 );
String aFontSize = String( aConf.ReadKey( "ScriptFontSize", "12" ), RTL_TEXTENCODING_UTF8 );
Font aFont = aFontList.Get( aFontName, aFontStyle );
- ULONG nFontSize = aFontSize.ToInt32();
+ sal_uIntPtr nFontSize = aFontSize.ToInt32();
aFont.SetHeight( nFontSize );
#if OSL_DEBUG_LEVEL > 1
@@ -97,7 +97,7 @@ void AppEdit::LoadIniFile()
Font aFont2( OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED, Application::GetSettings().GetUILanguage(), 0, pFrame ));
}
#endif
- aFont.SetTransparent( FALSE );
+ aFont.SetTransparent( sal_False );
pDataEdit->SetFont( aFont );
if ( ((TextEdit*)pDataEdit)->GetBreakpointWindow() )
@@ -176,7 +176,7 @@ void AppEdit::SetScrollBarRanges()
-USHORT AppEdit::GetLineNr()
+sal_uInt16 AppEdit::GetLineNr()
{
return pDataEdit->GetLineNr();
}
@@ -193,14 +193,14 @@ long AppEdit::InitMenu( Menu* pMenu )
if( pDataEdit )
{
- USHORT UndoCount = ((TextEdit*)pDataEdit)->aEdit.pTextEngine->GetUndoManager().GetUndoActionCount();
- USHORT RedoCount = ((TextEdit*)pDataEdit)->aEdit.pTextEngine->GetUndoManager().GetRedoActionCount();
+ size_t UndoCount = ((TextEdit*)pDataEdit)->aEdit.pTextEngine->GetUndoManager().GetUndoActionCount();
+ size_t RedoCount = ((TextEdit*)pDataEdit)->aEdit.pTextEngine->GetUndoManager().GetRedoActionCount();
pMenu->EnableItem( RID_EDITUNDO, UndoCount > 0 );
pMenu->EnableItem( RID_EDITREDO, RedoCount > 0 );
}
- return TRUE;
+ return sal_True;
}
long AppEdit::DeInitMenu( Menu* pMenu )
@@ -210,7 +210,7 @@ long AppEdit::DeInitMenu( Menu* pMenu )
pMenu->EnableItem( RID_EDITUNDO );
pMenu->EnableItem( RID_EDITREDO );
- return TRUE;
+ return sal_True;
}
void AppEdit::Resize()
@@ -225,7 +225,7 @@ void AppEdit::Resize()
if ( pHScroll )
{
rHSize = pHScroll->GetSizePixel();
- ULONG nHieght = rHSize.Height();
+ sal_uIntPtr nHieght = rHSize.Height();
rNewSize.Height() -= nHieght;
rHStart.Y() = rNewSize.Height();
}
@@ -233,7 +233,7 @@ void AppEdit::Resize()
if ( pVScroll )
{
rVSize = pVScroll->GetSizePixel();
- ULONG nWidth = rVSize.Width();
+ sal_uIntPtr nWidth = rVSize.Width();
rNewSize.Width() -= nWidth;
rVStart.X() = rNewSize.Width();
}
@@ -284,7 +284,7 @@ void AppEdit::PostSaveAs()
{
}
-void AppEdit::Highlight( USHORT nLine, USHORT nCol1, USHORT nCol2 )
+void AppEdit::Highlight( sal_uInt16 nLine, sal_uInt16 nCol1, sal_uInt16 nCol2 )
{
((TextEdit*)pDataEdit)->Highlight( nLine, nCol1, nCol2 );
ToTop();
diff --git a/basic/source/app/appedit.hxx b/basic/source/app/appedit.hxx
index 2399d42a54ed..67cb4337c6b0 100644..100755
--- a/basic/source/app/appedit.hxx
+++ b/basic/source/app/appedit.hxx
@@ -43,7 +43,7 @@ public:
ScrollBar *pVScroll;
ScrollBar *pHScroll;
void SetScrollBarRanges();
- ULONG nCurTextWidth;
+ sal_uIntPtr nCurTextWidth;
private:
void InitScrollBars();
protected:
@@ -52,7 +52,7 @@ public:
TYPEINFO();
AppEdit( BasicFrame* );
~AppEdit();
- USHORT GetLineNr(); // Current line number
+ sal_uInt16 GetLineNr(); // Current line number
FileType GetFileType(); // Returns the file type
virtual long InitMenu( Menu* ); // Inits the menu
virtual long DeInitMenu( Menu* ); // Reset to enable all Shortcuts
@@ -61,8 +61,8 @@ public:
void PostLoad();
void PostSaveAs();
void Mark( short, short, short ); // Select text
- void Highlight( USHORT nLine, USHORT nCol1, USHORT nCol2 );
- virtual BOOL ReloadAllowed(){ return !StarBASIC::IsRunning(); }
+ void Highlight( sal_uInt16 nLine, sal_uInt16 nCol1, sal_uInt16 nCol2 );
+ virtual sal_Bool ReloadAllowed(){ return !StarBASIC::IsRunning(); }
virtual void LoadIniFile(); // (re)load ini file after change
};
diff --git a/basic/source/app/apperror.cxx b/basic/source/app/apperror.cxx
index cd5bc34b39a8..48781eab1767 100644..100755
--- a/basic/source/app/apperror.cxx
+++ b/basic/source/app/apperror.cxx
@@ -64,10 +64,10 @@ long AppError::InitMenu( Menu* pMenu )
{
AppWin::InitMenu (pMenu );
- pMenu->EnableItem( RID_EDITUNDO, FALSE );
- pMenu->EnableItem( RID_EDITREDO, FALSE );
+ pMenu->EnableItem( RID_EDITUNDO, sal_False );
+ pMenu->EnableItem( RID_EDITREDO, sal_False );
- return TRUE;
+ return sal_True;
}
long AppError::DeInitMenu( Menu* pMenu )
@@ -77,10 +77,10 @@ long AppError::DeInitMenu( Menu* pMenu )
pMenu->EnableItem( RID_EDITUNDO );
pMenu->EnableItem( RID_EDITREDO );
- return TRUE;
+ return sal_True;
}
-USHORT AppError::GetLineNr(){ return pDataEdit->GetLineNr(); }
+sal_uInt16 AppError::GetLineNr(){ return pDataEdit->GetLineNr(); }
FileType AppError::GetFileType()
{
@@ -102,12 +102,12 @@ void AppError::LoadIniFile()
String aFontStyle = String( aConf.ReadKey( "ScriptFontStyle", "normal" ), RTL_TEXTENCODING_UTF8 );
String aFontSize = String( aConf.ReadKey( "ScriptFontSize", "12" ), RTL_TEXTENCODING_UTF8 );
Font aFont = aFontList.Get( aFontName, aFontStyle );
-// ULONG nFontSize = aFontSize.GetValue( FUNIT_POINT );
- ULONG nFontSize = aFontSize.ToInt32();
+// sal_uIntPtr nFontSize = aFontSize.GetValue( FUNIT_POINT );
+ sal_uIntPtr nFontSize = aFontSize.ToInt32();
// aFont.SetSize( Size( nFontSize, nFontSize ) );
aFont.SetHeight( nFontSize );
- aFont.SetTransparent( FALSE );
+ aFont.SetTransparent( sal_False );
// aFont.SetAlign( ALIGN_BOTTOM );
// aFont.SetHeight( aFont.GetHeight()+2 );
pDataEdit->SetFont( aFont );
diff --git a/basic/source/app/apperror.hxx b/basic/source/app/apperror.hxx
index 9dedf5c428aa..c55015a1964d 100644..100755
--- a/basic/source/app/apperror.hxx
+++ b/basic/source/app/apperror.hxx
@@ -40,10 +40,10 @@ public:
// long Command( short nID );
virtual long InitMenu( Menu* );
virtual long DeInitMenu( Menu* );
- USHORT GetLineNr();
+ sal_uInt16 GetLineNr();
FileType GetFileType();
MsgEdit* GetMsgTree() { return ((MsgEdit*)pDataEdit); }
- virtual BOOL ReloadAllowed(){ return !StarBASIC::IsRunning(); }
+ virtual sal_Bool ReloadAllowed(){ return !StarBASIC::IsRunning(); }
virtual void LoadIniFile(); // (re)load ini file after change
DirEntry aBaseDir;
};
diff --git a/basic/source/app/appwin.cxx b/basic/source/app/appwin.cxx
index e39d6c8e95b3..984637af5178 100644..100755
--- a/basic/source/app/appwin.cxx
+++ b/basic/source/app/appwin.cxx
@@ -51,10 +51,10 @@ TYPEINIT0(AppWin);
AppWin::AppWin( BasicFrame* pParent )
: DockingWindow( pParent, WB_SIZEMOVE | WB_CLOSEABLE | WB_PINABLE )
, nSkipReload(0)
-, bHasFile( FALSE )
-, bReloadAborted( FALSE )
+, bHasFile( sal_False )
+, bReloadAborted( sal_False )
, pFrame( pParent )
-, bFind( TRUE )
+, bFind( sal_True )
, pDataEdit(NULL)
{
// Load the Untitled string if not yet loaded
@@ -63,7 +63,7 @@ AppWin::AppWin( BasicFrame* pParent )
nCount++;
// Get maximized state from current window
- USHORT nInitialWinState;
+ sal_uInt16 nInitialWinState;
if ( pFrame->pWork )
{
nInitialWinState = pFrame->pWork->GetWinState();
@@ -97,7 +97,7 @@ void AppWin::SetText( const XubString& rStr )
pFrame->WindowRenamed( this );
}
-void AppWin::TitleButtonClick( USHORT nButton )
+void AppWin::TitleButtonClick( sal_uInt16 nButton )
{
if ( TITLE_BUTTON_DOCKING == nButton )
if ( TT_WIN_STATE_MAX != nWinState )
@@ -105,7 +105,7 @@ void AppWin::TitleButtonClick( USHORT nButton )
else
Restore();
else // if ( TITLE_BUTTON_HIDE == nButton )
- Minimize( TRUE );
+ Minimize( sal_True );
}
void AppWin::Maximize()
@@ -115,7 +115,7 @@ void AppWin::Maximize()
nNormalPos = GetPosPixel();
nNormalSize = GetSizePixel();
- SetFloatingMode( FALSE );
+ SetFloatingMode( sal_False );
pFrame->nMaximizedWindows++;
nWinState = TT_WIN_STATE_MAX;
@@ -137,7 +137,7 @@ void AppWin::Maximize()
void AppWin::Restore()
{
- SetFloatingMode( TRUE );
+ SetFloatingMode( sal_True );
SetPosSizePixel( nNormalPos, nNormalSize );
if ( TT_WIN_STATE_MAX == nWinState )
@@ -147,7 +147,7 @@ void AppWin::Restore()
pFrame->WinMax_Restore();
}
-void AppWin::Minimize( BOOL bMinimize )
+void AppWin::Minimize( sal_Bool bMinimize )
{
if ( bMinimize )
nWinState |= TT_WIN_STATE_HIDE;
@@ -156,7 +156,7 @@ void AppWin::Minimize( BOOL bMinimize )
pFrame->WinMax_Restore();
}
-void AppWin::Cascade( USHORT nNr )
+void AppWin::Cascade( sal_uInt16 nNr )
{
Restore();
@@ -228,7 +228,7 @@ long AppWin::PreNotify( NotifyEvent& rNEvt )
if ( rNEvt.GetType() == EVENT_GETFOCUS )
if ( pFrame->pList->back() != this )
Activate();
- return FALSE; // Der event soll weiter verarbeitet werden
+ return sal_False; // Der event soll weiter verarbeitet werden
}
void AppWin::Activate()
@@ -241,14 +241,14 @@ long AppWin::InitMenu( Menu* pMenu )
{
::rtl::OUString aTemp;
- BOOL bMarked;
+ sal_Bool bMarked;
if( pDataEdit )
{
TextSelection r = pDataEdit->GetSelection();
bMarked = r.HasRange();
}
else
- bMarked = FALSE;
+ bMarked = sal_False;
pMenu->EnableItem( RID_EDITREPEAT, (aFind.Len() != 0 ) );
pMenu->EnableItem( RID_EDITCUT, bMarked );
pMenu->EnableItem( RID_EDITCOPY, bMarked );
@@ -256,20 +256,20 @@ long AppWin::InitMenu( Menu* pMenu )
pMenu->EnableItem( RID_EDITDEL, bMarked );
// pMenu->EnableItem( RID_HELPTOPIC, bMarked );
- BOOL bHasText;
+ sal_Bool bHasText;
if( pDataEdit )
bHasText = pDataEdit->HasText();
else
- bHasText = FALSE;
- BOOL bRunning = pFrame->Basic().IsRunning();
- BOOL bCanExecute = BOOL( (!bRunning && bHasText) || pFrame->bInBreak );
+ bHasText = sal_False;
+ sal_Bool bRunning = pFrame->Basic().IsRunning();
+ sal_Bool bCanExecute = sal_Bool( (!bRunning && bHasText) || pFrame->bInBreak );
pMenu->EnableItem( RID_RUNSTART, bCanExecute );
pMenu->EnableItem( RID_RUNBREAK, bRunning && !pFrame->bInBreak);
pMenu->EnableItem( RID_RUNSTOP, bRunning );
pMenu->EnableItem( RID_RUNTOCURSOR, bCanExecute );
pMenu->EnableItem( RID_RUNSTEPINTO, bCanExecute );
pMenu->EnableItem( RID_RUNSTEPOVER, bCanExecute );
- return TRUE;
+ return sal_True;
}
long AppWin::DeInitMenu( Menu* pMenu )
@@ -286,7 +286,7 @@ long AppWin::DeInitMenu( Menu* pMenu )
pMenu->EnableItem( RID_RUNTOCURSOR );
pMenu->EnableItem( RID_RUNSTEPINTO );
pMenu->EnableItem( RID_RUNSTEPOVER );
- return TRUE;
+ return sal_True;
}
// Menu Handler
@@ -294,7 +294,7 @@ long AppWin::DeInitMenu( Menu* pMenu )
void AppWin::Command( const CommandEvent& rCEvt )
{
TextSelection r = pDataEdit->GetSelection();
- BOOL bHasMark = r.HasRange();
+ sal_Bool bHasMark = r.HasRange();
switch( rCEvt.GetCommand() ) {
case RID_FILESAVE:
QuerySave( QUERY_DISK_CHANGED | SAVE_NOT_DIRTY ); break;
@@ -336,7 +336,7 @@ void AppWin::Command( const CommandEvent& rCEvt )
pDataEdit->BuildKontextMenu( pKontext );
if ( pKontext )
{
- USHORT nRes = pKontext->Execute( this, GetPointerPosPixel() );
+ sal_uInt16 nRes = pKontext->Execute( this, GetPointerPosPixel() );
if ( nRes )
pFrame->Command( nRes );
delete pKontext;
@@ -347,12 +347,12 @@ void AppWin::Command( const CommandEvent& rCEvt )
}
-BOOL AppWin::IsSkipReload()
+sal_Bool AppWin::IsSkipReload()
{
return nSkipReload != 0;
}
-void AppWin::SkipReload( BOOL bSkip )
+void AppWin::SkipReload( sal_Bool bSkip )
{
DBG_ASSERT( bSkip || nSkipReload, "SkipReload aufgehoben ohne es zu aktivieren");
if ( bSkip )
@@ -361,17 +361,17 @@ void AppWin::SkipReload( BOOL bSkip )
nSkipReload--;
}
-BOOL AppWin::DiskFileChanged( USHORT nWhat )
+sal_Bool AppWin::DiskFileChanged( sal_uInt16 nWhat )
{
if ( !bHasFile )
- return FALSE;
+ return sal_False;
switch ( nWhat )
{
case SINCE_LAST_LOAD:
{
if ( bReloadAborted )
- return TRUE;
+ return sal_True;
else
return DiskFileChanged( SINCE_LAST_ASK_RELOAD );
}
@@ -392,16 +392,16 @@ BOOL AppWin::DiskFileChanged( USHORT nWhat )
default:
OSL_FAIL("Not Implemented in AppWin::DiskFileChanged");
}
- return TRUE;
+ return sal_True;
}
-void AppWin::UpdateFileInfo( USHORT nWhat )
+void AppWin::UpdateFileInfo( sal_uInt16 nWhat )
{
switch ( nWhat )
{
case HAS_BEEN_LOADED:
{
- bReloadAborted = FALSE;
+ bReloadAborted = sal_False;
UpdateFileInfo( ASKED_RELOAD );
}
@@ -446,7 +446,7 @@ void AppWin::CheckReload()
}
else
{
- bReloadAborted = TRUE;
+ bReloadAborted = sal_True;
}
}
}
@@ -457,14 +457,14 @@ void AppWin::Reload()
TextSelection aSelMemo = pDataEdit->GetSelection();
Load( GetText() );
pDataEdit->SetSelection( aSelMemo );
- SkipReload( FALSE );
+ SkipReload( sal_False );
}
// Load file
-BOOL AppWin::Load( const String& aName )
+sal_Bool AppWin::Load( const String& aName )
{
SkipReload();
- BOOL bErr;
+ sal_Bool bErr;
// if( !QuerySave() )
// return;
@@ -493,17 +493,17 @@ BOOL AppWin::Load( const String& aName )
SetText( aModName );
UpdateFileInfo( HAS_BEEN_LOADED );
PostLoad();
- bHasFile = TRUE;
+ bHasFile = sal_True;
}
- SkipReload( FALSE );
+ SkipReload( sal_False );
return !bErr;
}
// Save file
-USHORT AppWin::ImplSave()
+sal_uInt16 AppWin::ImplSave()
{
SkipReload();
- USHORT nResult = SAVE_RES_NOT_SAVED;
+ sal_uInt16 nResult = SAVE_RES_NOT_SAVED;
String s1 = *pNoName;
String s2 = GetText().Copy( 0, s1.Len() );
if( s1 == s2 )
@@ -513,7 +513,7 @@ USHORT AppWin::ImplSave()
if ( pDataEdit->Save( aName ) )
{
nResult = SAVE_RES_SAVED;
- bHasFile = TRUE;
+ bHasFile = sal_True;
}
else
{
@@ -522,38 +522,38 @@ USHORT AppWin::ImplSave()
}
UpdateFileInfo( HAS_BEEN_LOADED );
}
- SkipReload( FALSE );
+ SkipReload( sal_False );
return nResult;
}
// Save to new file name
-USHORT AppWin::SaveAs()
+sal_uInt16 AppWin::SaveAs()
{
SkipReload();
String s1 = *pNoName;
String s2 = GetText().Copy( 0, s1.Len() );
if( s1 == s2 ) s2.Erase();
else s2 = GetText();
- if( pFrame->QueryFileName( s2, GetFileType(), TRUE ) )
+ if( pFrame->QueryFileName( s2, GetFileType(), sal_True ) )
{
SetText( s2 );
PostSaveAs();
- SkipReload( FALSE );
+ SkipReload( sal_False );
return ImplSave();
}
else
{
- SkipReload( FALSE );
+ SkipReload( sal_False );
return SAVE_RES_CANCEL;
}
}
// Should we save the file?
-USHORT AppWin::QuerySave( QueryBits nBits )
+sal_uInt16 AppWin::QuerySave( QueryBits nBits )
{
- BOOL bQueryDirty = ( nBits & QUERY_DIRTY ) != 0;
- BOOL bQueryDiskChanged = ( nBits & QUERY_DISK_CHANGED ) != 0;
- BOOL bSaveNotDirty = ( nBits & SAVE_NOT_DIRTY ) != 0;
+ sal_Bool bQueryDirty = ( nBits & QUERY_DIRTY ) != 0;
+ sal_Bool bQueryDiskChanged = ( nBits & QUERY_DISK_CHANGED ) != 0;
+ sal_Bool bSaveNotDirty = ( nBits & SAVE_NOT_DIRTY ) != 0;
SkipReload();
short nResult;
@@ -562,8 +562,8 @@ USHORT AppWin::QuerySave( QueryBits nBits )
else
nResult = RET_NO;
- BOOL bAlwaysEnableInput = pFrame->IsAlwaysEnableInput();
- pFrame->AlwaysEnableInput( FALSE );
+ sal_Bool bAlwaysEnableInput = pFrame->IsAlwaysEnableInput();
+ pFrame->AlwaysEnableInput( sal_False );
if( ( ( IsModified() || bSaveNotDirty ) && bQueryDirty ) || ( DiskFileChanged( SINCE_LAST_LOAD ) && bQueryDiskChanged ) )
{
ToTop();
@@ -577,7 +577,7 @@ USHORT AppWin::QuerySave( QueryBits nBits )
}
pFrame->AlwaysEnableInput( bAlwaysEnableInput );
- USHORT nReturn;
+ sal_uInt16 nReturn;
switch( nResult )
{
case RET_YES:
@@ -593,11 +593,11 @@ USHORT AppWin::QuerySave( QueryBits nBits )
OSL_FAIL("switch default where no default should be: Internal error");
nReturn = SAVE_RES_CANCEL;
}
- SkipReload( FALSE );
+ SkipReload( sal_False );
return nReturn;
}
-BOOL AppWin::Close()
+sal_Bool AppWin::Close()
{
switch ( QuerySave( QUERY_DIRTY ) )
{
@@ -606,21 +606,21 @@ BOOL AppWin::Close()
{
DockingWindow::Close();
delete this;
- return TRUE;
+ return sal_True;
}
// uncomment to avoid compiler warning
// break;
case SAVE_RES_ERROR:
- return FALSE;
+ return sal_False;
// uncomment to avoid compiler warning
// break;
case SAVE_RES_CANCEL:
- return FALSE;
+ return sal_False;
// uncomment to avoid compiler warning
// break;
default:
OSL_FAIL("Not Implemented in AppWin::Close");
- return FALSE;
+ return sal_False;
}
}
@@ -630,7 +630,7 @@ void AppWin::Find()
SttResId aResId( IDD_FIND_DIALOG );
FindDialog aDlg( this, aResId, aFind );
if( aDlg.Execute() ) {
- bFind = TRUE;
+ bFind = sal_True;
Repeat();
}
}
@@ -642,7 +642,7 @@ void AppWin::Replace()
ReplaceDialog* pDlg = new ReplaceDialog
(this, aResId, aFind, aReplace );
if( pDlg->Execute() ) {
- bFind = FALSE;
+ bFind = sal_False;
Repeat();
}
}
@@ -650,7 +650,7 @@ void AppWin::Replace()
// Repeat search/replace operation
void AppWin::Repeat()
{
- if( (aFind.Len() != 0 ) && ( pDataEdit->Find( aFind ) || (ErrorBox(this,SttResId(IDS_PATTERNNOTFOUND)).Execute() && FALSE) ) && !bFind )
+ if( (aFind.Len() != 0 ) && ( pDataEdit->Find( aFind ) || (ErrorBox(this,SttResId(IDS_PATTERNNOTFOUND)).Execute() && sal_False) ) && !bFind )
pDataEdit->ReplaceSelected( aReplace );
}
diff --git a/basic/source/app/appwin.hxx b/basic/source/app/appwin.hxx
index 2add5e275d4e..e5a79e042d8b 100644..100755
--- a/basic/source/app/appwin.hxx
+++ b/basic/source/app/appwin.hxx
@@ -36,16 +36,16 @@
#include "dataedit.hxx"
#include <vector>
+typedef sal_uInt16 QueryBits;
-typedef USHORT QueryBits;
#define QUERY_NONE ( QueryBits ( 0x00 ) )
#define QUERY_DIRTY ( QueryBits ( 0x01 ) )
#define QUERY_DISK_CHANGED ( QueryBits ( 0x02 ) )
#define QUERY_ALL ( QUERY_DIRTY | QUERY_DISK_CHANGED )
#define SAVE_NOT_DIRTY ( QueryBits ( 0x04 ) )
-#define SAVE_RES_SAVED TRUE
-#define SAVE_RES_NOT_SAVED FALSE
+#define SAVE_RES_SAVED sal_True
+#define SAVE_RES_NOT_SAVED sal_False
#define SAVE_RES_ERROR 3
#define SAVE_RES_CANCEL 4
@@ -71,67 +71,67 @@ protected:
static short nCount; // number of edit windows
static String *pNoName; // "Untitled"
FileStat aLastAccess; // Last access time of loaded file
- USHORT nSkipReload; // Sometimes there must not be a reload
- BOOL bHasFile; // Otherwise reload does not make sense
- BOOL bReloadAborted; // Is set if reload was cancelled so that we can ask again wehn closing
+ sal_uInt16 nSkipReload; // Sometimes there must not be a reload
+ sal_Bool bHasFile; // Otherwise reload does not make sense
+ sal_Bool bReloadAborted; // Is set if reload was cancelled so that we can ask again wehn closing
short nId; // ID-Nummer( "Unnamed n" )
BasicFrame* pFrame; // Parent-Window
String aFind; // Search string
String aReplace; // Replace string
- BOOL bFind; // TRUE if search not replace
+ sal_Bool bFind; // sal_True if search not replace
void RequestHelp( const HelpEvent& ); // Help handler
void GetFocus(); // activate
- virtual USHORT ImplSave(); // Save file
- USHORT nWinState; // Maximized, Iconized or Normal
+ virtual sal_uInt16 ImplSave(); // Save file
+ sal_uInt16 nWinState; // Maximized, Iconized or Normal
Point nNormalPos; // Position if normal
Size nNormalSize; // Size if Normal
virtual long PreNotify( NotifyEvent& rNEvt );
- USHORT nWinId;
+ sal_uInt16 nWinId;
public:
TYPEINFO();
AppWin( BasicFrame* );
~AppWin();
DataEdit* pDataEdit; // Data area
- virtual USHORT GetLineNr()=0; // Current line number
+ virtual sal_uInt16 GetLineNr()=0; // Current line number
virtual long InitMenu( Menu* ); // Init of the menu
virtual long DeInitMenu( Menu* ); // reset to enable all shortcuts
virtual void Command( const CommandEvent& rCEvt ); // Command handler
virtual void Resize();
virtual void Help();
- virtual BOOL Load( const String& ); // Load file
+ virtual sal_Bool Load( const String& ); // Load file
virtual void PostLoad(){} // Set source at module
- virtual USHORT SaveAs(); // Save file as
+ virtual sal_uInt16 SaveAs(); // Save file as
virtual void PostSaveAs(){}
virtual void Find(); // find text
virtual void Replace(); // replace text
virtual void Repeat(); // repeat find/replace
- virtual BOOL Close(); // close window
+ virtual sal_Bool Close(); // close window
virtual void Activate(); // window was activated
virtual FileType GetFileType()=0; // returns the filetype
- virtual BOOL ReloadAllowed(){ return TRUE; }
+ virtual sal_Bool ReloadAllowed(){ return sal_True; }
virtual void Reload(); // Reload after change on disk
virtual void LoadIniFile(){;} // (re)load ini file after change
void CheckReload(); // Checks and asks if reload should performed
- BOOL DiskFileChanged( USHORT nWhat ); // Checks file for changes
- void UpdateFileInfo( USHORT nWhat ); // Remembers last file state
- BOOL IsSkipReload(); // Should we test reload?
- void SkipReload( BOOL bSkip = TRUE );
- USHORT GetWinState(){ return nWinState; }
+ sal_Bool DiskFileChanged( sal_uInt16 nWhat ); // Checks file for changes
+ void UpdateFileInfo( sal_uInt16 nWhat ); // Remembers last file state
+ sal_Bool IsSkipReload(); // Should we test reload?
+ void SkipReload( sal_Bool bSkip = sal_True );
+ sal_uInt16 GetWinState(){ return nWinState; }
void Maximize();
void Restore();
- void Minimize( BOOL bMinimize );
- void Cascade( USHORT nNr );
+ void Minimize( sal_Bool bMinimize );
+ void Cascade( sal_uInt16 nNr );
- USHORT QuerySave( QueryBits nBits = QUERY_ALL );
- BOOL IsModified() { return pDataEdit->IsModified(); }
+ sal_uInt16 QuerySave( QueryBits nBits = QUERY_ALL );
+ sal_Bool IsModified() { return pDataEdit->IsModified(); }
BasicFrame* GetBasicFrame() { return pFrame; }
- virtual void TitleButtonClick( USHORT nButton );
+ virtual void TitleButtonClick( sal_uInt16 nButton );
virtual void SetText( const XubString& rStr );
- USHORT GetWinId() { return nWinId; }
- void SetWinId( USHORT nWId ) { nWinId = nWId; }
+ sal_uInt16 GetWinId() { return nWinId; }
+ void SetWinId( sal_uInt16 nWId ) { nWinId = nWId; }
};
typedef ::std::vector< AppWin* > EditList;
diff --git a/basic/source/app/basic.hrc b/basic/source/app/basic.hrc
index e4a69d9d2942..e4a69d9d2942 100644..100755
--- a/basic/source/app/basic.hrc
+++ b/basic/source/app/basic.hrc
diff --git a/basic/source/app/basic.src b/basic/source/app/basic.src
index a879780e90ff..28cffcbae5b7 100644..100755
--- a/basic/source/app/basic.src
+++ b/basic/source/app/basic.src
@@ -29,6 +29,7 @@
#include "resids.hrc"
ModalDialog RID_CALLDLG {
+ HelpID = "basic:ModalDialog:RID_CALLDLG";
PosSize = MAP_SYSFONT (18,18,142,142);
SVLook = TRUE;
MOVEABLE = TRUE;
@@ -43,11 +44,13 @@ ModalDialog RID_CALLDLG {
PosSize = MAP_SYSFONT (10,70,120,8);
};
Edit RID_RETVAL {
+ HelpID = "basic:Edit:RID_CALLDLG:RID_RETVAL";
PosSize = MAP_SYSFONT (10,85,120,12);
Border = TRUE;
TabStop = TRUE;
};
ListBox RID_PARAMS {
+ HelpID = "basic:ListBox:RID_CALLDLG:RID_PARAMS";
PosSize = MAP_SYSFONT (10,25,120,40);
TabStop = TRUE;
Border = TRUE;
@@ -61,6 +64,7 @@ ModalDialog RID_CALLDLG {
};
ModalDialog IDD_ABOUT_DIALOG {
+ HelpID = "basic:ModalDialog:IDD_ABOUT_DIALOG";
Pos = MAP_APPFONT( 58, 17 );
Size = MAP_APPFONT( 155, 106 );
SVLook = TRUE;
@@ -107,6 +111,7 @@ ModalDialog IDD_ABOUT_DIALOG {
};
ModalDialog IDD_TT_ABOUT_DIALOG {
+ HelpID = "basic:ModalDialog:IDD_TT_ABOUT_DIALOG";
Pos = MAP_APPFONT( 58, 17 );
Size = MAP_APPFONT( 120, 81 );
SVLook = TRUE;
@@ -138,6 +143,7 @@ ModalDialog IDD_TT_ABOUT_DIALOG {
};
ModalDialog IDD_FIND_DIALOG {
+ HelpID = "basic:ModalDialog:IDD_FIND_DIALOG";
Pos = MAP_APPFONT( 69, 30 );
Size = MAP_APPFONT( 185, 70 );
SVLook = TRUE;
@@ -150,6 +156,7 @@ ModalDialog IDD_FIND_DIALOG {
TEXT[ en-US ] = "~Text";
};
Edit RID_FIND {
+ HelpID = "basic:Edit:IDD_FIND_DIALOG:RID_FIND";
BORDER = TRUE;
Pos = MAP_APPFONT( 40, 8 );
Size = MAP_APPFONT( 135, 12 );
@@ -172,6 +179,7 @@ ModalDialog IDD_FIND_DIALOG {
};
ModalDialog IDD_REPLACE_DIALOG {
+ HelpID = "basic:ModalDialog:IDD_REPLACE_DIALOG";
Pos = MAP_APPFONT( 69, 30 );
Size = MAP_APPFONT( 185, 88 );
SVLook = TRUE;
@@ -188,12 +196,14 @@ ModalDialog IDD_REPLACE_DIALOG {
TEXT[ en-US ] = "~Replace by";
};
Edit RID_FIND {
+ HelpID = "basic:Edit:IDD_REPLACE_DIALOG:RID_FIND";
BORDER = TRUE;
Pos = MAP_APPFONT( 65, 8 );
Size = MAP_APPFONT( 110, 12 );
TABSTOP = TRUE;
};
Edit RID_REPLACE {
+ HelpID = "basic:Edit:IDD_REPLACE_DIALOG:RID_REPLACE";
BORDER = TRUE;
Pos = MAP_APPFONT( 65, 28 );
Size = MAP_APPFONT( 110, 12 );
@@ -718,6 +728,7 @@ Menu RID_HELP {
};
};
ModelessDialog IDD_PRINT_DIALOG {
+ HelpID = "basic:ModelessDialog:IDD_PRINT_DIALOG";
Pos = MAP_APPFONT( 83, 42 );
Size = MAP_APPFONT( 171, 94 );
MOVEABLE = TRUE;
@@ -784,6 +795,7 @@ TabDialog IDD_OPTIONS_DLG
TabPage RID_TP_GENERIC {
+ HelpID = "basic:TabPage:RID_TP_GENERIC";
Hide = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT( 244, 100 );
@@ -793,6 +805,7 @@ TabPage RID_TP_GENERIC {
Text[ en-US ] = "Area";
};
ComboBox RID_CB_AREA {
+ HelpID = "basic:ComboBox:RID_TP_GENERIC:RID_CB_AREA";
HScroll = TRUE;
VScroll = TRUE;
AutoHScroll = TRUE;
@@ -803,12 +816,14 @@ TabPage RID_TP_GENERIC {
DropDown = TRUE;
};
PushButton RID_PB_NEW_AREA {
+ HelpID = "basic:PushButton:RID_TP_GENERIC:RID_PB_NEW_AREA";
Pos = MAP_APPFONT( 144, 12 );
Size = MAP_APPFONT( 40, 12 );
TabStop = TRUE;
Text[ en-US ] = "New";
};
PushButton RID_PD_DEL_AREA {
+ HelpID = "basic:PushButton:RID_TP_GENERIC:RID_PD_DEL_AREA";
Pos = MAP_APPFONT( 188, 12 );
Size = MAP_APPFONT( 40, 12 );
TabStop = TRUE;
@@ -820,6 +835,7 @@ TabPage RID_TP_GENERIC {
Text[ en-US ] = "Setting";
};
ComboBox RID_CB_VALUE {
+ HelpID = "basic:ComboBox:RID_TP_GENERIC:RID_CB_VALUE";
HScroll = TRUE;
VScroll = TRUE;
AutoHScroll = TRUE;
@@ -829,6 +845,7 @@ TabPage RID_TP_GENERIC {
TabStop = TRUE;
};
PushButton RID_PB_SELECT_FILE {
+ HelpID = "basic:PushButton:RID_TP_GENERIC:RID_PB_SELECT_FILE";
Pos = MAP_APPFONT( 188, 48 );
Size = MAP_APPFONT( 40, 12 );
TabStop = TRUE;
@@ -837,12 +854,14 @@ TabPage RID_TP_GENERIC {
Hide = TRUE;
};
PushButton RID_PB_NEW_VALUE {
+ HelpID = "basic:PushButton:RID_TP_GENERIC:RID_PB_NEW_VALUE";
Pos = MAP_APPFONT( 188, 48 );
Size = MAP_APPFONT( 40, 12 );
TabStop = TRUE;
Text[ en-US ] = "New";
};
PushButton RID_PB_DEL_VALUE {
+ HelpID = "basic:PushButton:RID_TP_GENERIC:RID_PB_DEL_VALUE";
Pos = MAP_APPFONT( 188, 64 );
Size = MAP_APPFONT( 40, 12 );
TabStop = TRUE;
@@ -852,6 +871,7 @@ TabPage RID_TP_GENERIC {
TabPage RID_TP_PROFILE {
+ HelpID = "basic:TabPage:RID_TP_PROFILE";
Hide = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT( 244, 100 );
@@ -861,6 +881,7 @@ TabPage RID_TP_PROFILE {
Text[ en-US ] = "Profile";
};
ComboBox RID_CB_PROFILE {
+ HelpID = "basic:ComboBox:RID_TP_PROFILE:RID_CB_PROFILE";
HScroll = TRUE;
VScroll = TRUE;
AutoHScroll = TRUE;
@@ -871,12 +892,14 @@ TabPage RID_TP_PROFILE {
DropDown = TRUE;
};
PushButton RID_PB_NEW_PROFILE {
+ HelpID = "basic:PushButton:RID_TP_PROFILE:RID_PB_NEW_PROFILE";
Pos = MAP_APPFONT( 144, 2 );
Size = MAP_APPFONT( 40, 12 );
TabStop = TRUE;
Text[ en-US ] = "New";
};
PushButton RID_PD_DEL_PROFILE {
+ HelpID = "basic:PushButton:RID_TP_PROFILE:RID_PD_DEL_PROFILE";
Pos = MAP_APPFONT( 188, 2 );
Size = MAP_APPFONT( 40, 12 );
TabStop = TRUE;
@@ -898,6 +921,7 @@ TabPage RID_TP_PROFILE {
Text[ en-US ] = "Base directory";
};
CheckBox HID_CHECK {
+ HelpID = "basic:CheckBox:RID_TP_PROFILE:HID_CHECK";
Pos = MAP_APPFONT( 7, 58 );
Size = MAP_APPFONT( 86, 12 );
Text[ en-US ] = "Default HID directory";
@@ -905,52 +929,61 @@ TabPage RID_TP_PROFILE {
Hide = FALSE;
};
Edit LOG_NAME {
+ HelpID = "basic:Edit:RID_TP_PROFILE:LOG_NAME";
Border = TRUE;
Pos = MAP_APPFONT( 97, 26 );
Size = MAP_APPFONT( 116, 12 );
TabStop = TRUE;
};
Edit BASIS_NAME {
+ HelpID = "basic:Edit:RID_TP_PROFILE:BASIS_NAME";
Border = TRUE;
Pos = MAP_APPFONT( 97, 42 );
Size = MAP_APPFONT( 116, 12 );
TabStop = TRUE;
};
Edit HID_NAME {
+ HelpID = "basic:Edit:RID_TP_PROFILE:HID_NAME";
Border = TRUE;
Pos = MAP_APPFONT( 97, 58 );
Size = MAP_APPFONT( 116, 12 );
TabStop = TRUE;
};
PushButton LOG_SET {
+ HelpID = "basic:PushButton:RID_TP_PROFILE:LOG_SET";
Pos = MAP_APPFONT( 217, 26 );
Size = MAP_APPFONT( 12, 12 );
TabStop = TRUE;
Text[ en-US ] = "...";
};
PushButton BASIS_SET {
+ HelpID = "basic:PushButton:RID_TP_PROFILE:BASIS_SET";
Pos = MAP_APPFONT( 217, 42 );
Size = MAP_APPFONT( 12, 12 );
TabStop = TRUE;
Text[ en-US ] = "...";
};
PushButton HID_SET {
+ HelpID = "basic:PushButton:RID_TP_PROFILE:HID_SET";
Pos = MAP_APPFONT( 217, 58 );
Size = MAP_APPFONT( 12, 12 );
TabStop = TRUE;
Text[ en-US ] = "...";
};
CheckBox CB_AUTORELOAD {
+ HelpID = "basic:CheckBox:RID_TP_PROFILE:CB_AUTORELOAD";
Pos = MAP_APPFONT( 7, 74 );
Size = MAP_APPFONT( 115, 12 );
Text[ en-US ] = "AutoReload";
};
CheckBox CB_AUTOSAVE {
+ HelpID = "basic:CheckBox:RID_TP_PROFILE:CB_AUTOSAVE";
Pos = MAP_APPFONT( 7, 87 );
Size = MAP_APPFONT( 115, 12 );
Text[ en-US ] = "Save before execute";
};
CheckBox CB_STOPONSYNTAXERRORS {
+ HelpID = "basic:CheckBox:RID_TP_PROFILE:CB_STOPONSYNTAXERRORS";
Pos = MAP_APPFONT( 132, 74 );
Size = MAP_APPFONT( 115, 12 );
Text[ en-US ] = "Stop on Syntax Errors";
@@ -958,6 +991,7 @@ TabPage RID_TP_PROFILE {
};
TabPage RID_TP_CRASH {
+ HelpID = "basic:TabPage:RID_TP_CRASH";
Hide = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT( 244, 100 );
@@ -967,6 +1001,7 @@ TabPage RID_TP_CRASH {
Text[ en-US ] = "Crashreport";
};
CheckBox CB_USEPROXY {
+ HelpID = "basic:CheckBox:RID_TP_CRASH:CB_USEPROXY";
Pos = MAP_APPFONT( 8, 12 );
Size = MAP_APPFONT( 120, 12 );
Text[ en-US ] = "Use Proxy";
@@ -977,6 +1012,7 @@ TabPage RID_TP_CRASH {
Text[ en-US ] = "Host";
};
Edit ED_CRHOST {
+ HelpID = "basic:Edit:RID_TP_CRASH:ED_CRHOST";
Border = TRUE;
Pos = MAP_APPFONT( 43+12, 12+13 );
Size = MAP_APPFONT( 80, 12 );
@@ -988,6 +1024,7 @@ TabPage RID_TP_CRASH {
Text[ en-US ] = "Port";
};
NumericField NF_CRPORT {
+ HelpID = "basic:NumericField:RID_TP_CRASH:NF_CRPORT";
Border = TRUE;
Pos = MAP_APPFONT( 43+12, 12+13+16 );
Size = MAP_APPFONT( 40, 12 );
@@ -1001,6 +1038,7 @@ TabPage RID_TP_CRASH {
Last = 0xffff;
};
CheckBox CB_ALLOWCONTACT {
+ HelpID = "basic:CheckBox:RID_TP_CRASH:CB_ALLOWCONTACT";
Pos = MAP_APPFONT( 8, 12+13+16+16 );
Size = MAP_APPFONT( 120, 12 );
Text[ en-US ] = "Allow Contact";
@@ -1011,6 +1049,7 @@ TabPage RID_TP_CRASH {
Text[ en-US ] = "EMail";
};
Edit ED_EMAIL {
+ HelpID = "basic:Edit:RID_TP_CRASH:ED_EMAIL";
Border = TRUE;
Pos = MAP_APPFONT( 43+12, 12+13+16+16+13 );
Size = MAP_APPFONT( 80, 12 );
@@ -1020,6 +1059,7 @@ TabPage RID_TP_CRASH {
TabPage RID_TP_MISC {
+ HelpID = "basic:TabPage:RID_TP_MISC";
Hide = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT( 244, 100 );
@@ -1034,6 +1074,7 @@ TabPage RID_TP_MISC {
Text[ en-US ] = "Host";
};
Edit ED_HOST {
+ HelpID = "basic:Edit:RID_TP_MISC:ED_HOST";
Border = TRUE;
Pos = MAP_APPFONT( 43, 12);
Size = MAP_APPFONT( 80, 12 );
@@ -1045,6 +1086,7 @@ TabPage RID_TP_MISC {
Text[ en-US ] = "Testtool Port";
};
NumericField NF_TTPORT {
+ HelpID = "basic:NumericField:RID_TP_MISC:NF_TTPORT";
Border = TRUE;
Pos = MAP_APPFONT( 191, 12);
Size = MAP_APPFONT( 40, 12 );
@@ -1063,6 +1105,7 @@ TabPage RID_TP_MISC {
Text[ en-US ] = "Remote UNO Port";
};
NumericField NF_UNOPORT {
+ HelpID = "basic:NumericField:RID_TP_MISC:NF_UNOPORT";
Border = TRUE;
Pos = MAP_APPFONT( 191, 12+15);
Size = MAP_APPFONT( 40, 12 );
@@ -1087,6 +1130,7 @@ TabPage RID_TP_MISC {
Text[ en-US ] = "Server Timeout";
};
TimeField SERVER_TIMEOUT {
+ HelpID = "basic:TimeField:RID_TP_MISC:SERVER_TIMEOUT";
Border = TRUE;
Pos = MAP_APPFONT( 83, 50 );
Size = MAP_APPFONT( 40, 12 );
@@ -1102,6 +1146,7 @@ TabPage RID_TP_MISC {
Text[ en-US ] = "Max LRU Files";
};
NumericField TF_MAX_LRU {
+ HelpID = "basic:NumericField:RID_TP_MISC:TF_MAX_LRU";
Border = TRUE;
Pos = MAP_APPFONT( 191, 50);
Size = MAP_APPFONT( 40, 12 );
@@ -1118,12 +1163,14 @@ TabPage RID_TP_MISC {
Text[ en-US ] = "OOo Program Dir";
};
Edit ED_PROGDIR {
+ HelpID = "basic:Edit:RID_TP_MISC:ED_PROGDIR";
Border = TRUE;
Pos = MAP_APPFONT( 83, 50+15 );
Size = MAP_APPFONT( 219-83-4, 12 );
TabStop = TRUE;
};
PushButton PB_PROGDIR {
+ HelpID = "basic:PushButton:RID_TP_MISC:PB_PROGDIR";
Pos = MAP_APPFONT( 219, 50+15 );
Size = MAP_APPFONT( 12, 12 );
TabStop = TRUE;
@@ -1133,6 +1180,7 @@ TabPage RID_TP_MISC {
TabPage RID_TP_FONT {
+ HelpID = "basic:TabPage:RID_TP_FONT";
Hide = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT( 244, 100 );
@@ -1142,6 +1190,7 @@ TabPage RID_TP_FONT {
Text[ en-US ] = "Type";
};
ComboBox CB_FONTNAME {
+ HelpID = "basic:ComboBox:RID_TP_FONT:CB_FONTNAME";
Pos = MAP_APPFONT( 4, 12 );
Size = MAP_APPFONT( 123, 12*4 );
Sort = TRUE;
@@ -1153,6 +1202,7 @@ TabPage RID_TP_FONT {
Text[ en-US ] = "Typeface";
};
ComboBox CB_FONTSTYLE {
+ HelpID = "basic:ComboBox:RID_TP_FONT:CB_FONTSTYLE";
Pos = MAP_APPFONT( 131, 12 );
Size = MAP_APPFONT( 65, 12*4 );
AutoHScroll = TRUE;
@@ -1163,6 +1213,7 @@ TabPage RID_TP_FONT {
Text[ en-US ] = "Size";
};
MetricBox MB_FONTSIZE {
+ HelpID = "basic:MetricBox:RID_TP_FONT:MB_FONTSIZE";
Pos = MAP_APPFONT( 200, 12 );
Size = MAP_APPFONT( 29, 12*4 );
AutoHScroll = TRUE;
@@ -1178,6 +1229,7 @@ TabPage RID_TP_FONT {
FloatingWindow IDD_DISPLAY_HID {
+ HelpID = "basic:FloatingWindow:IDD_DISPLAY_HID";
OutputSize = TRUE;
SVLook = TRUE;
Size = MAP_APPFONT( 261, 160 );
@@ -1204,6 +1256,7 @@ FloatingWindow IDD_DISPLAY_HID {
Text[ en-US ] = "Controls";
};
MultiListBox RID_MLB_CONTROLS {
+ HelpID = "basic:MultiListBox:IDD_DISPLAY_HID:RID_MLB_CONTROLS";
Border = TRUE;
AutoHScroll = TRUE;
Pos = MAP_APPFONT( 4, 28 );
@@ -1216,6 +1269,7 @@ FloatingWindow IDD_DISPLAY_HID {
Text[ en-US ] = "Slots";
};
MultiListBox RID_MLB_SLOTS {
+ HelpID = "basic:MultiListBox:IDD_DISPLAY_HID:RID_MLB_SLOTS";
Border = TRUE;
AutoHScroll = TRUE;
Pos = MAP_APPFONT( 4, 132 );
@@ -1223,12 +1277,14 @@ FloatingWindow IDD_DISPLAY_HID {
TabStop = TRUE;
};
PushButton RID_PB_KOPIEREN {
+ HelpID = "basic:PushButton:IDD_DISPLAY_HID:RID_PB_KOPIEREN";
Pos = MAP_APPFONT( 216, 28 );
Size = MAP_APPFONT( 40, 12 );
TabStop = TRUE;
Text[ en-US ] = "Copy";
};
PushButton RID_PB_BENENNEN {
+ HelpID = "basic:PushButton:IDD_DISPLAY_HID:RID_PB_BENENNEN";
Pos = MAP_APPFONT( 216, 44 );
Size = MAP_APPFONT( 40, 12 );
TabStop = TRUE;
@@ -1236,6 +1292,7 @@ FloatingWindow IDD_DISPLAY_HID {
Text[ en-US ] = "Name";
};
PushButton RID_PB_SELECTALL {
+ HelpID = "basic:PushButton:IDD_DISPLAY_HID:RID_PB_SELECTALL";
Pos = MAP_APPFONT( 216, 44 );
Size = MAP_APPFONT( 40, 12 );
TabStop = TRUE;
@@ -1356,6 +1413,7 @@ ImageList RID_IMGLST_LAYOUT
};
ModelessDialog IDD_EDIT_VAR {
+ HelpID = "basic:ModelessDialog:IDD_EDIT_VAR";
Pos = MAP_APPFONT( 0, 0 );
Size = MAP_APPFONT( 171, 87 );
Moveable = TRUE;
@@ -1386,6 +1444,7 @@ ModelessDialog IDD_EDIT_VAR {
Text[ en-US ] = "Previous contents";
};
RadioButton RID_RB_NEW_BOOL_T {
+ HelpID = "basic:RadioButton:IDD_EDIT_VAR:RID_RB_NEW_BOOL_T";
Hide = TRUE;
Pos = MAP_APPFONT( 53, 37 );
Size = MAP_APPFONT( 40, 12 );
@@ -1393,6 +1452,7 @@ ModelessDialog IDD_EDIT_VAR {
Text[ en-US ] = "True";
};
RadioButton RID_RB_NEW_BOOL_F {
+ HelpID = "basic:RadioButton:IDD_EDIT_VAR:RID_RB_NEW_BOOL_F";
Hide = TRUE;
Pos = MAP_APPFONT( 98, 37 );
Size = MAP_APPFONT( 40, 12 );
@@ -1400,6 +1460,7 @@ ModelessDialog IDD_EDIT_VAR {
Text[ en-US ] = "False";
};
NumericField RID_NF_NEW_INTEGER {
+ HelpID = "basic:NumericField:IDD_EDIT_VAR:RID_NF_NEW_INTEGER";
Border = TRUE;
Hide = TRUE;
Pos = MAP_APPFONT( 53, 37 );
@@ -1414,6 +1475,7 @@ ModelessDialog IDD_EDIT_VAR {
SpinSize = 10;
};
NumericField RID_NF_NEW_LONG {
+ HelpID = "basic:NumericField:IDD_EDIT_VAR:RID_NF_NEW_LONG";
Border = TRUE;
Hide = TRUE;
Pos = MAP_APPFONT( 53, 37 );
@@ -1428,6 +1490,7 @@ ModelessDialog IDD_EDIT_VAR {
SpinSize = 10;
};
Edit RID_ED_NEW_STRING {
+ HelpID = "basic:Edit:IDD_EDIT_VAR:RID_ED_NEW_STRING";
Hide = TRUE;
Border = TRUE;
Pos = MAP_APPFONT( 53, 37 );
@@ -1449,6 +1512,7 @@ ModelessDialog IDD_EDIT_VAR {
};
FloatingWindow LOAD_CONF {
+ HelpID = "basic:FloatingWindow:LOAD_CONF";
SVLook = TRUE;
Pos = MAP_APPFONT( 66, 23 );
Size = MAP_APPFONT( 156, 51 );
diff --git a/basic/source/app/basicrt.cxx b/basic/source/app/basicrt.cxx
index 1c540e48f825..bd1638587c13 100644..100755
--- a/basic/source/app/basicrt.cxx
+++ b/basic/source/app/basicrt.cxx
@@ -64,7 +64,7 @@ xub_StrLen BasicRuntime::GetCol2()
return pRun->nCol2;
}
-BOOL BasicRuntime::IsRun()
+sal_Bool BasicRuntime::IsRun()
{
return pRun->IsRun();
}
@@ -118,17 +118,17 @@ bool BasicRuntimeAccess::HasRuntime()
return pINST && pINST->pRun != NULL;
}
-USHORT BasicRuntimeAccess::GetStackEntryCount()
+sal_uInt16 BasicRuntimeAccess::GetStackEntryCount()
{
return GetSbData()->pErrStack->Count();
}
-BasicErrorStackEntry BasicRuntimeAccess::GetStackEntry( USHORT nIndex )
+BasicErrorStackEntry BasicRuntimeAccess::GetStackEntry( sal_uInt16 nIndex )
{
return BasicErrorStackEntry( GetSbData()->pErrStack->GetObject( nIndex ) );
}
-BOOL BasicRuntimeAccess::HasStack()
+sal_Bool BasicRuntimeAccess::HasStack()
{
return GetSbData()->pErrStack != NULL;
}
@@ -139,7 +139,7 @@ void BasicRuntimeAccess::DeleteStack()
GetSbData()->pErrStack = NULL;
}
-BOOL BasicRuntimeAccess::IsRunInit()
+sal_Bool BasicRuntimeAccess::IsRunInit()
{
return GetSbData()->bRunInit;
}
diff --git a/basic/source/app/basmsg.hrc b/basic/source/app/basmsg.hrc
index bfabe2c9759e..bfabe2c9759e 100644..100755
--- a/basic/source/app/basmsg.hrc
+++ b/basic/source/app/basmsg.hrc
diff --git a/basic/source/app/basmsg.src b/basic/source/app/basmsg.src
index e2179afd4c34..e2179afd4c34 100644..100755
--- a/basic/source/app/basmsg.src
+++ b/basic/source/app/basmsg.src
diff --git a/basic/source/app/brkpnts.cxx b/basic/source/app/brkpnts.cxx
index a09480c80dc3..134c5194b7aa 100644..100755
--- a/basic/source/app/brkpnts.cxx
+++ b/basic/source/app/brkpnts.cxx
@@ -57,7 +57,7 @@ BreakpointWindow::BreakpointWindow( Window *pParent )
, nCurYOffset( 0 )
, nMarkerPos( MARKER_NOMARKER )
, pModule( NULL )
-, bErrorMarker( FALSE )
+, bErrorMarker( sal_False )
{
if ( !pImages )
pImages = new ImageList( SttResId( RID_IMGLST_LAYOUT ) );
@@ -81,7 +81,7 @@ void BreakpointWindow::Reset()
void BreakpointWindow::SetModule( SbModule *pMod )
{
pModule = pMod;
- USHORT i;
+ sal_uInt16 i;
for ( i=0 ; i < pModule->GetBPCount() ; i++ )
{
InsertBreakpoint( pModule->GetBP( i ) );
@@ -97,13 +97,12 @@ void BreakpointWindow::SetBPsInModule()
for ( size_t i = 0, n = BreakpointList.size(); i < n; ++i )
{
Breakpoint* pBrk = BreakpointList[ i ];
- pModule->SetBP( (USHORT)pBrk->nLine );
+ pModule->SetBP( (sal_uInt16)pBrk->nLine );
#if OSL_DEBUG_LEVEL > 1
- DBG_ASSERT( !pModule->IsCompiled() || pModule->IsBP( (USHORT)pBrk->nLine ), "Brechpunkt wurde nicht gesetzt" );
+ DBG_ASSERT( !pModule->IsCompiled() || pModule->IsBP( (sal_uInt16)pBrk->nLine ), "Brechpunkt wurde nicht gesetzt" );
#endif
}
-
- for ( USHORT nMethod = 0; nMethod < pModule->GetMethods()->Count(); nMethod++ )
+ for ( sal_uInt16 nMethod = 0; nMethod < pModule->GetMethods()->Count(); nMethod++ )
{
SbMethod* pMethod = (SbMethod*)pModule->GetMethods()->Get( nMethod );
DBG_ASSERT( pMethod, "Methode nicht gefunden! (NULL)" );
@@ -146,7 +145,7 @@ void BreakpointWindow::InsertBreakpoint( sal_uInt32 nLine )
#endif
if ( StarBASIC::IsRunning() )
{
- for ( USHORT nMethod = 0; nMethod < pModule->GetMethods()->Count(); nMethod++ )
+ for ( sal_uInt16 nMethod = 0; nMethod < pModule->GetMethods()->Count(); nMethod++ )
{
SbMethod* pMethod = (SbMethod*)pModule->GetMethods()->Get( nMethod );
DBG_ASSERT( pMethod, "Methode nicht gefunden! (NULL)" );
@@ -226,7 +225,7 @@ void BreakpointWindow::LoadBreakpoints( String aFilename )
for ( i = 0 ; i < aBreakpoints.GetTokenCount( ';' ) ; i++ )
{
- InsertBreakpoint( (USHORT)aBreakpoints.GetToken( i, ';' ).ToInt32() );
+ InsertBreakpoint( (sal_uInt16)aBreakpoints.GetToken( i, ';' ).ToInt32() );
}
}
@@ -276,7 +275,7 @@ void BreakpointWindow::Paint( const Rectangle& )
sal_Int32 nY = nLine*nLineHeight - nCurYOffset;
DrawImage( Point( 0, nY ) + aBmpOff, aBrk );
}
- ShowMarker( TRUE );
+ ShowMarker( sal_True );
}
@@ -341,7 +340,7 @@ void BreakpointWindow::ShowMarker( bool bShow )
aMarkerOff.X() = ( aOutSz.Width() - aMarkerSz.Width() ) / 2;
aMarkerOff.Y() = ( nLineHeight - aMarkerSz.Height() ) / 2;
- ULONG nY = nMarkerPos*nLineHeight - nCurYOffset;
+ sal_uIntPtr nY = nMarkerPos*nLineHeight - nCurYOffset;
Point aPos( 0, nY );
aPos += aMarkerOff;
if ( bShow )
@@ -359,7 +358,7 @@ void BreakpointWindow::MouseButtonDown( const MouseEvent& rMEvt )
long nLineHeight = GetTextHeight();
long nYPos = aMousePos.Y() + nCurYOffset;
long nLine = nYPos / nLineHeight + 1;
- ToggleBreakpoint( sal::static_int_cast< USHORT >(nLine) );
+ ToggleBreakpoint( sal::static_int_cast< sal_uInt16 >(nLine) );
Invalidate();
}
}
@@ -375,7 +374,7 @@ void BreakpointWindow::SetMarkerPos( sal_uInt32 nLine, bool bError )
}
-void BreakpointWindow::Scroll( long nHorzScroll, long nVertScroll, USHORT nFlags )
+void BreakpointWindow::Scroll( long nHorzScroll, long nVertScroll, sal_uInt16 nFlags )
{
(void) nFlags; /* avoid warning about unused parameter */
nCurYOffset -= nVertScroll;
diff --git a/basic/source/app/brkpnts.hxx b/basic/source/app/brkpnts.hxx
index 55abaf9b9bd9..0ea0fc9b45ad 100644..100755
--- a/basic/source/app/brkpnts.hxx
+++ b/basic/source/app/brkpnts.hxx
@@ -72,7 +72,7 @@ protected:
public:
void SetMarkerPos( sal_uInt32 nLine, bool bErrorMarker = false );
- virtual void Scroll( long nHorzScroll, long nVertScroll, USHORT nFlags = 0 );
+ virtual void Scroll( long nHorzScroll, long nVertScroll, sal_uInt16 nFlags = 0 );
long& GetCurYOffset() { return nCurYOffset; }
};
diff --git a/basic/source/app/dataedit.hxx b/basic/source/app/dataedit.hxx
index 7f588b8a2619..60ab6626a85f 100644..100755
--- a/basic/source/app/dataedit.hxx
+++ b/basic/source/app/dataedit.hxx
@@ -42,9 +42,9 @@ class Font;
#define DATA_FUNC_DEF( MemberName, MemberType ) \
public: \
MemberType MemberName; \
- BOOL Find( const String& rStr ); \
- BOOL Load( const String& rStr ); \
- BOOL Save( const String& rStr ); \
+ sal_Bool Find( const String& rStr ); \
+ sal_Bool Load( const String& rStr ); \
+ sal_Bool Save( const String& rStr ); \
\
void GrabFocus(){ MemberName.GrabFocus(); } \
void Show(){ MemberName.Show(); } \
@@ -63,13 +63,13 @@ public:
void Redo(); \
String GetText() const; \
void SetText( const String& rStr ); \
- BOOL HasText() const; \
+ sal_Bool HasText() const; \
String GetSelected(); \
TextSelection GetSelection() const; \
void SetSelection( const TextSelection& rSelection ); \
- USHORT GetLineNr() const; \
+ sal_uInt16 GetLineNr() const; \
void ReplaceSelected( const String& rStr ); \
- BOOL IsModified(); \
+ sal_Bool IsModified(); \
void SetModifyHdl( Link l );
@@ -86,19 +86,19 @@ public:
virtual void Undo()=0;
virtual void Redo()=0;
- virtual BOOL Find( const String& )=0; // Find and select text
- virtual BOOL Load( const String& )=0; // Load text from file
- virtual BOOL Save( const String& )=0; // Save text to file
+ virtual sal_Bool Find( const String& )=0; // Find and select text
+ virtual sal_Bool Load( const String& )=0; // Load text from file
+ virtual sal_Bool Save( const String& )=0; // Save text to file
virtual String GetSelected()=0;
virtual void GrabFocus()=0;
virtual TextSelection GetSelection() const=0;
virtual void SetSelection( const TextSelection& rSelection )=0;
- virtual USHORT GetLineNr() const=0;
+ virtual sal_uInt16 GetLineNr() const=0;
virtual String GetText() const=0;
virtual void SetText( const String& rStr )=0;
- virtual BOOL HasText() const=0; // to avoid GetText.Len()
+ virtual sal_Bool HasText() const=0; // to avoid GetText.Len()
virtual void ReplaceSelected( const String& rStr )=0;
- virtual BOOL IsModified()=0;
+ virtual sal_Bool IsModified()=0;
virtual void SetModifyHdl( Link )=0;
virtual void Show()=0;
virtual void SetPosPixel( const Point& rNewPos )=0;
diff --git a/basic/source/app/dialogs.cxx b/basic/source/app/dialogs.cxx
index 178455cb9e77..dc8a57516b20 100644..100755
--- a/basic/source/app/dialogs.cxx
+++ b/basic/source/app/dialogs.cxx
@@ -95,9 +95,9 @@ IMPL_LINK_INLINE_START( FindDialog, ButtonClick, Button *, pB )
{
if( pB == &aOk ) {
*pFind = aFind.GetText();
- EndDialog( TRUE );
- } else EndDialog( FALSE );
- return TRUE;
+ EndDialog( sal_True );
+ } else EndDialog( sal_False );
+ return sal_True;
}
IMPL_LINK_INLINE_END( FindDialog, ButtonClick, Button *, pB )
@@ -125,9 +125,9 @@ IMPL_LINK( ReplaceDialog, ButtonClick, Button *, pB )
if( pB == &aOk ) {
*pFind = aFind.GetText();
*pReplace = aReplace.GetText();
- EndDialog( TRUE );
- } else EndDialog( FALSE );
- return TRUE;
+ EndDialog( sal_True );
+ } else EndDialog( sal_False );
+ return sal_True;
}
////////////////////////////////////////////////////////////////////
@@ -150,7 +150,7 @@ void ConfEdit::Init( Config &aConf )
aEdit.SetText( aTemp );
}
-ConfEdit::ConfEdit( Window* pParent, USHORT nResText, USHORT nResEdit, USHORT nResButton, const ByteString& aKN, Config &aConf )
+ConfEdit::ConfEdit( Window* pParent, sal_uInt16 nResText, sal_uInt16 nResEdit, sal_uInt16 nResButton, const ByteString& aKN, Config &aConf )
: PushButton( pParent, SttResId(nResButton) )
, aText( pParent, SttResId(nResText) )
, aEdit( pParent, SttResId(nResEdit) )
@@ -159,7 +159,7 @@ ConfEdit::ConfEdit( Window* pParent, USHORT nResText, USHORT nResEdit, USHORT nR
Init( aConf );
}
-ConfEdit::ConfEdit( Window* pParent, USHORT nResEdit, USHORT nResButton, const ByteString& aKN, Config &aConf )
+ConfEdit::ConfEdit( Window* pParent, sal_uInt16 nResEdit, sal_uInt16 nResButton, const ByteString& aKN, Config &aConf )
: PushButton( pParent, SttResId(nResButton) )
, aText( pParent )
, aEdit( pParent, SttResId(nResEdit) )
@@ -197,7 +197,7 @@ void ConfEdit::Click()
}
}
-OptConfEdit::OptConfEdit( Window* pParent, USHORT nResCheck, USHORT nResEdit, USHORT nResButton, const ByteString& aKN, ConfEdit& rBaseEdit, Config& aConf )
+OptConfEdit::OptConfEdit( Window* pParent, sal_uInt16 nResCheck, sal_uInt16 nResEdit, sal_uInt16 nResButton, const ByteString& aKN, ConfEdit& rBaseEdit, Config& aConf )
: ConfEdit( pParent, nResEdit, nResButton, aKN, aConf )
, aCheck( pParent, SttResId( nResCheck ) )
, rBase( rBaseEdit )
@@ -247,7 +247,7 @@ OptionsDialog::OptionsDialog( Window* pParent, const ResId& aResId )
, aCancel( this )
, aConfig( Config::GetConfigName( Config::GetDefDirectory(), CUniString("testtool") ) )
{
- aConfig.EnablePersistence( FALSE );
+ aConfig.EnablePersistence( sal_False );
FreeResource();
aTabCtrl.SetActivatePageHdl( LINK( this, OptionsDialog, ActivatePageHdl ) );
aTabCtrl.SetCurPageId( RID_TP_PRO );
@@ -261,25 +261,25 @@ OptionsDialog::OptionsDialog( Window* pParent, const ResId& aResId )
OptionsDialog::~OptionsDialog()
{
- for ( USHORT i = 0; i < aTabCtrl.GetPageCount(); i++ )
+ for ( sal_uInt16 i = 0; i < aTabCtrl.GetPageCount(); i++ )
delete aTabCtrl.GetTabPage( aTabCtrl.GetPageId( i ) );
};
-BOOL OptionsDialog::Close()
+sal_Bool OptionsDialog::Close()
{
if ( TabDialog::Close() )
{
delete this;
- return TRUE;
+ return sal_True;
}
else
- return FALSE;
+ return sal_False;
}
IMPL_LINK( OptionsDialog, ActivatePageHdl, TabControl *, pTabCtrl )
{
- USHORT nId = pTabCtrl->GetCurPageId();
+ sal_uInt16 nId = pTabCtrl->GetCurPageId();
// If TabPage was not yet created, do it
if ( !pTabCtrl->GetTabPage( nId ) )
{
@@ -349,7 +349,7 @@ IMPL_LINK( OptionsDialog, OKClick, Button *, pButton )
}
const ByteString ProfilePrefix("_profile_");
-const USHORT ProfilePrefixLen = ProfilePrefix.Len();
+const sal_uInt16 ProfilePrefixLen = ProfilePrefix.Len();
ProfileOptions::ProfileOptions( Window* pParent, Config &rConfig )
: TabPage( pParent, SttResId( RID_TP_PROFILE ) )
@@ -371,7 +371,7 @@ ProfileOptions::ProfileOptions( Window* pParent, Config &rConfig )
{
FreeResource();
- aCbProfile.EnableAutocomplete( TRUE );
+ aCbProfile.EnableAutocomplete( sal_True );
aCbProfile.SetSelectHdl( LINK( this, ProfileOptions, Select ) );
@@ -386,7 +386,7 @@ ProfileOptions::ProfileOptions( Window* pParent, Config &rConfig )
void ProfileOptions::LoadData()
{
// collect all profiles (all groups starting with the ProfilePrefix)
- for ( USHORT i = 0 ; i < rConf.GetGroupCount() ; i++ )
+ for ( sal_uInt16 i = 0 ; i < rConf.GetGroupCount() ; i++ )
{
ByteString aProfile = rConf.GetGroupName( i );
if ( aProfile.Match( ProfilePrefix ) )
@@ -507,7 +507,7 @@ CrashreportOptions::CrashreportOptions( Window* pParent, Config &aConfig )
{
FreeResource();
- aNFCRPort.SetUseThousandSep( FALSE );
+ aNFCRPort.SetUseThousandSep( sal_False );
ByteString aTemp;
@@ -517,7 +517,7 @@ CrashreportOptions::CrashreportOptions( Window* pParent, Config &aConfig )
if ( aTemp.EqualsIgnoreCaseAscii( "true" ) || aTemp.Equals( "1" ) )
aCBUseProxy.Check();
else
- aCBUseProxy.Check( FALSE );
+ aCBUseProxy.Check( sal_False );
aCBUseProxy.SetToggleHdl( LINK( this, CrashreportOptions, CheckProxy ) );
LINK( this, CrashreportOptions, CheckProxy ).Call( NULL ); // call once to initialize
@@ -532,7 +532,7 @@ CrashreportOptions::CrashreportOptions( Window* pParent, Config &aConfig )
if ( aTemp.EqualsIgnoreCaseAscii( "true" ) || aTemp.Equals( "1" ) )
aCBAllowContact.Check();
else
- aCBAllowContact.Check( FALSE );
+ aCBAllowContact.Check( sal_False );
aCBAllowContact.SetToggleHdl( LINK( this, CrashreportOptions, CheckResponse ) );
LINK( this, CrashreportOptions, CheckResponse ).Call( NULL ); // call once to initialize
@@ -598,9 +598,9 @@ MiscOptions::MiscOptions( Window* pParent, Config &aConfig )
{
FreeResource();
- aNFTTPort.SetUseThousandSep( FALSE );
- aNFUNOPort.SetUseThousandSep( FALSE );
- aTFMaxLRU.SetUseThousandSep( FALSE );
+ aNFTTPort.SetUseThousandSep( sal_False );
+ aNFUNOPort.SetUseThousandSep( sal_False );
+ aTFMaxLRU.SetUseThousandSep( sal_False );
ByteString aTemp;
@@ -648,8 +648,8 @@ void MiscOptions::Save( Config &aConfig )
aConfig.SetGroup("LRU");
ByteString aTemp = aConfig.ReadKey( "MaxLRU", "4" );
- USHORT nOldMaxLRU = (USHORT)aTemp.ToInt32();
- USHORT n;
+ sal_uInt16 nOldMaxLRU = (sal_uInt16)aTemp.ToInt32();
+ sal_uInt16 n;
for ( n = nOldMaxLRU ; n > aTFMaxLRU.GetValue() ; n-- )
aConfig.DeleteKey( ByteString("LRU").Append( ByteString::CreateFromInt32( n ) ) );
aConfig.WriteKey( "MaxLRU", ByteString::CreateFromInt64( aTFMaxLRU.GetValue() ) );
@@ -722,8 +722,8 @@ IMPL_LINK( FontOptions, FontSizeChanged, void*, EMPTYARG )
void FontOptions::UpdatePreview()
{
Font aFont = aFontList.Get( aFontName.GetText(), aFontStyle.GetText() );
-// ULONG nFontSize = aFontSize.GetValue( FUNIT_POINT );
- ULONG nFontSize = static_cast<ULONG>((aFontSize.GetValue() + 5) / 10);
+// sal_uIntPtr nFontSize = aFontSize.GetValue( FUNIT_POINT );
+ sal_uIntPtr nFontSize = static_cast<sal_uIntPtr>((aFontSize.GetValue() + 5) / 10);
aFont.SetHeight( nFontSize );
aFTPreview.SetFont( aFont );
aFTPreview.SetText( aFontName.GetText() );
@@ -757,13 +757,13 @@ GenericOptions::GenericOptions( Window* pParent, Config &aConfig )
, aPbDelValue( this, SttResId( RID_PB_DEL_VALUE ) )
, nMoveButtons( 0 )
-, bShowSelectPath( FALSE )
+, bShowSelectPath( sal_False )
{
FreeResource();
LoadData();
- aCbArea.EnableAutocomplete( TRUE );
- aCbValue.EnableAutocomplete( TRUE );
+ aCbArea.EnableAutocomplete( sal_True );
+ aCbValue.EnableAutocomplete( sal_True );
aCbArea.SetSelectHdl( LINK( this, GenericOptions, LoadGroup ) );
@@ -789,7 +789,7 @@ GenericOptions::~GenericOptions()
StringList* GenericOptions::GetAllGroups()
{
StringList* pGroups = new StringList();
- for ( USHORT i = 0 ; i < aConf.GetGroupCount() ; i++ )
+ for ( sal_uInt16 i = 0 ; i < aConf.GetGroupCount() ; i++ )
{
String *pGroup = new String( aConf.GetGroupName( i ), RTL_TEXTENCODING_UTF8 );
pGroups->push_back( pGroup );
@@ -826,16 +826,16 @@ void GenericOptions::ShowSelectPath( const String &rType )
{ // Show Path button
nMoveButtons += nDelta;
aMoveTimer.Start();
- bShowSelectPath = TRUE;
- aPbSelectPath.Show( TRUE );
- aPbSelectPath.Enable( TRUE );
+ bShowSelectPath = sal_True;
+ aPbSelectPath.Show( sal_True );
+ aPbSelectPath.Enable( sal_True );
}
else if ( !rType.EqualsIgnoreCaseAscii( "PATH" ) && bShowSelectPath )
{ // Hide Path button
nMoveButtons -= nDelta;
aMoveTimer.Start();
- bShowSelectPath = FALSE;
- aPbSelectPath.Enable( FALSE );
+ bShowSelectPath = sal_False;
+ aPbSelectPath.Enable( sal_False );
}
}
@@ -888,7 +888,7 @@ IMPL_LINK( GenericOptions, LoadGroup, ComboBox*, EMPTYARG )
aConf.SetGroup( aLastGroupName );
aConf.WriteKey( C_KEY_AKTUELL, ByteString( aCurrentValue, RTL_TEXTENCODING_UTF8 ) );
- USHORT i;
+ sal_uInt16 i;
for ( i=0 ; i < aCbValue.GetEntryCount() ; i++ )
{
if ( i > 0 )
@@ -1006,16 +1006,16 @@ class TextAndWin : public DockingWindow
Window* pFtOriginalParent;
Window* pWinOriginalParent;
long nSpace; // default space
- BOOL bAlignTop;
+ sal_Bool bAlignTop;
public:
- TextAndWin( Window *pParent, FixedText *pFtP, Window *pWinP, long nSpaceP, BOOL bAlignTopP );
+ TextAndWin( Window *pParent, FixedText *pFtP, Window *pWinP, long nSpaceP, sal_Bool bAlignTopP );
~TextAndWin();
virtual void Resize();
};
-TextAndWin::TextAndWin( Window *pParent, FixedText *pFtP, Window *pWinP, long nSpaceP, BOOL bAlignTopP )
+TextAndWin::TextAndWin( Window *pParent, FixedText *pFtP, Window *pWinP, long nSpaceP, sal_Bool bAlignTopP )
: DockingWindow( pParent )
, pFt( pFtP )
, pWin( pWinP )
@@ -1097,8 +1097,8 @@ DisplayHidDlg::DisplayHidDlg( Window * pParent )
#endif
pSplit = new SplitWindow( this );
- pControls = new TextAndWin( pSplit, &aFtControls, &aMlbControls, aMlbControls.GetPosPixel().X(), TRUE );
- pSlots = new TextAndWin( pSplit, &aFtSlots, &aMlbSlots, aMlbControls.GetPosPixel().X(), FALSE );
+ pControls = new TextAndWin( pSplit, &aFtControls, &aMlbControls, aMlbControls.GetPosPixel().X(), sal_True );
+ pSlots = new TextAndWin( pSplit, &aFtSlots, &aMlbSlots, aMlbControls.GetPosPixel().X(), sal_False );
pSplit->SetPosPixel( aFtControls.GetPosPixel() );
pSplit->InsertItem( 1, pControls, 70, SPLITWINDOW_APPEND, 0, SWIB_PERCENTSIZE );
@@ -1124,7 +1124,7 @@ DisplayHidDlg::~DisplayHidDlg()
IMPL_LINK( DisplayHidDlg, CopyToClipboard, void*, EMPTYARG )
{
String aSammel;
- USHORT i;
+ sal_uInt16 i;
for ( i=0 ; i < aMlbControls.GetSelectEntryCount() ; i++ )
{
@@ -1146,7 +1146,7 @@ IMPL_LINK( DisplayHidDlg, SelectAll, PushButton*, pButton )
{
if ( pButton->GetState() != STATE_CHECK )
{
- USHORT i;
+ sal_uInt16 i;
for ( i=0 ; i < aMlbControls.GetEntryCount() ; i++ )
aMlbControls.SelectEntryPos( i );
for ( i=0 ; i < aMlbSlots.GetEntryCount() ; i++ )
@@ -1249,7 +1249,7 @@ void DisplayHidDlg::Resize()
}
else
{
-// SetUpdateMode( FALSE );
+// SetUpdateMode( sal_False );
// Minimum size
Size aSize( GetOutputSizePixel() );
@@ -1305,7 +1305,7 @@ void DisplayHidDlg::Resize()
aPos.Move( pSplit->GetSizePixel().Width(), pSplit->GetSizePixel().Height() );
aOKClose.SetPosPixel( aPos );
-// SetUpdateMode( TRUE );
+// SetUpdateMode( sal_True );
// Invalidate();
}
FloatingWindow::Resize();
@@ -1385,7 +1385,7 @@ VarEditDialog::VarEditDialog( Window * pParent, SbxVariable *pPVar )
IMPL_LINK( VarEditDialog, OKClick, Button *, pButton )
{
(void) pButton; /* avoid warning about unused parameter */
- BOOL bWasError = SbxBase::IsError(); // Probably an error is thrown
+ sal_Bool bWasError = SbxBase::IsError(); // Probably an error is thrown
SbxDataType eType = pVar->GetType();
@@ -1428,7 +1428,7 @@ SvNumberformat::
String aContent( aEditRID_ED_NEW_STRING.GetText() );
- BOOL bError = FALSE;
+ sal_Bool bError = sal_False;
switch ( eType )
{
case SbxBOOL:
@@ -1441,10 +1441,10 @@ SvNumberformat::
// pVar->PutDate( aContent );
// break;
case SbxINTEGER:
- pVar->PutInteger( (INT16)aNumericFieldRID_NF_NEW_INTEGER.GetValue() );
+ pVar->PutInteger( (sal_Int16)aNumericFieldRID_NF_NEW_INTEGER.GetValue() );
break;
case SbxLONG:
- pVar->PutLong( static_cast<INT32>(aNumericFieldRID_NF_NEW_LONG.GetValue()) );
+ pVar->PutLong( static_cast<sal_Int32>(aNumericFieldRID_NF_NEW_LONG.GetValue()) );
break;
case SbxDOUBLE:
case SbxSINGLE:
@@ -1465,7 +1465,7 @@ SvNumberformat::
// pVar->PutStringExt( aEditRID_ED_NEW_STRING.GetText() );
if ( !bWasError && SbxBase::IsError() )
{
- bError = TRUE;
+ bError = sal_True;
SbxBase::ResetError();
}
diff --git a/basic/source/app/dialogs.hxx b/basic/source/app/dialogs.hxx
index 677bef1962be..108aaa5de062 100644..100755
--- a/basic/source/app/dialogs.hxx
+++ b/basic/source/app/dialogs.hxx
@@ -93,8 +93,8 @@ protected:
void Init( Config &aConf );
public:
- ConfEdit( Window* pParent, USHORT nResText, USHORT nResEdit, USHORT nResButton, const ByteString& aKN, Config &aConf );
- ConfEdit( Window* pParent, USHORT nResEdit, USHORT nResButton, const ByteString& aKN, Config &aConf );
+ ConfEdit( Window* pParent, sal_uInt16 nResText, sal_uInt16 nResEdit, sal_uInt16 nResButton, const ByteString& aKN, Config &aConf );
+ ConfEdit( Window* pParent, sal_uInt16 nResEdit, sal_uInt16 nResButton, const ByteString& aKN, Config &aConf );
void Save( Config &aConf );
void Reload( Config &aConf );
void Click();
@@ -110,7 +110,7 @@ protected:
ConfEdit& rBase;
DECL_LINK( ToggleHdl, CheckBox* );
public:
- OptConfEdit( Window* pParent, USHORT nResCheck, USHORT nResEdit, USHORT nResButton, const ByteString& aKN, ConfEdit& rBaseEdit, Config& aConf );
+ OptConfEdit( Window* pParent, sal_uInt16 nResCheck, sal_uInt16 nResEdit, sal_uInt16 nResButton, const ByteString& aKN, ConfEdit& rBaseEdit, Config& aConf );
void Reload( Config &aConf );
DECL_LINK( BaseModifyHdl, Edit* );
};
@@ -130,7 +130,7 @@ private:
public:
OptionsDialog( Window* pParent, const ResId& );
~OptionsDialog();
- virtual BOOL Close();
+ virtual sal_Bool Close();
DECL_LINK( ActivatePageHdl, TabControl * );
@@ -261,7 +261,7 @@ class GenericOptions : public TabPage
PushButton aPbDelValue;
int nMoveButtons;
- BOOL bShowSelectPath;
+ sal_Bool bShowSelectPath;
AutoTimer aMoveTimer;
DECL_LINK( MoveButtons, AutoTimer* );
@@ -309,7 +309,7 @@ protected:
DockingWindow* pSlots;
SplitWindow *pSplit;
- ULONG nDisplayMode;
+ sal_uIntPtr nDisplayMode;
DECL_LINK( Select, void* );
DECL_LINK( SelectAll, PushButton* );
diff --git a/basic/source/app/makefile.mk b/basic/source/app/makefile.mk
index e62b11c0beb4..e62b11c0beb4 100644..100755
--- a/basic/source/app/makefile.mk
+++ b/basic/source/app/makefile.mk
diff --git a/basic/source/app/msgedit.cxx b/basic/source/app/msgedit.cxx
index 34b59d50ed9b..1ebc24d560a0 100644..100755
--- a/basic/source/app/msgedit.cxx
+++ b/basic/source/app/msgedit.cxx
@@ -52,10 +52,10 @@ Version 3 Changed Charset from CHARSET_IBMPC to RTL_TEXTENCODING_UTF8
#include "basmsg.hrc"
#include "basrid.hxx"
-USHORT MsgEdit::nMaxLogLen = 0;
-BOOL MsgEdit::bLimitLogLen = FALSE;
-BOOL MsgEdit::bPrintLogToStdout = FALSE;
-BOOL MsgEdit::bPrintLogToStdoutSet = FALSE;
+sal_uInt16 MsgEdit::nMaxLogLen = 0;
+sal_Bool MsgEdit::bLimitLogLen = sal_False;
+sal_Bool MsgEdit::bPrintLogToStdout = sal_False;
+sal_Bool MsgEdit::bPrintLogToStdoutSet = sal_False;
#define WARNING_PREFIX String( SttResId( S_WARNING_PREFIX ) )
#define VERSION_STRING CUniString("File Format Version: ")
@@ -69,8 +69,8 @@ MsgEdit::MsgEdit( AppError* pParent, BasicFrame *pBF, const WinBits& aBits )
, pCurrentTestCase(NULL)
, pCurrentAssertion( NULL )
, pCurrentError(NULL)
-, bModified(FALSE)
-, bFileLoading(FALSE)
+, bModified(sal_False)
+, bFileLoading(sal_False)
, nVersion(0)
, pAppError( pParent )
, aEditTree( pParent, pBF, aBits | WB_HASBUTTONS | WB_HASLINES | WB_HASBUTTONSATROOT )
@@ -83,15 +83,15 @@ MsgEdit::MsgEdit( AppError* pParent, BasicFrame *pBF, const WinBits& aBits )
if ( !bPrintLogToStdoutSet )
{
- bPrintLogToStdoutSet = TRUE;
- for ( USHORT i = 0 ; i < Application::GetCommandLineParamCount() ; i++ )
+ bPrintLogToStdoutSet = sal_True;
+ for ( sal_uInt16 i = 0 ; i < Application::GetCommandLineParamCount() ; i++ )
{
if ( Application::GetCommandLineParam( i ).Copy(0,9).CompareIgnoreCaseToAscii("-printlog") == COMPARE_EQUAL
#ifndef UNX
|| Application::GetCommandLineParam( i ).Copy(0,9).CompareIgnoreCaseToAscii("/printlog") == COMPARE_EQUAL
#endif
)
- bPrintLogToStdout = TRUE;
+ bPrintLogToStdout = sal_True;
}
}
}
@@ -172,11 +172,11 @@ void MsgEdit::AddAnyMsg( TTLogMsg *LogMsg )
if ( !bFileLoading )
{ // Comes from Testtool and must be written immediately
- BOOL bFileWasChanged = pAppError->DiskFileChanged( SINCE_LAST_LOAD );
+ sal_Bool bFileWasChanged = pAppError->DiskFileChanged( SINCE_LAST_LOAD );
DBG_ASSERT( aLogFileName == LogMsg->aLogFileName, "Logging to different logfile as before" );
DirEntry aEntry( LogMsg->aLogFileName );
- BOOL bNewFile = !aEntry.Exists();
+ sal_Bool bNewFile = !aEntry.Exists();
SvFileStream aStrm( LogMsg->aLogFileName, STREAM_STD_WRITE );
if ( bNewFile )
{
@@ -224,7 +224,7 @@ void MsgEdit::AddRun( String aMsg, TTDebugData aDebugData )
{
if ( !bFileLoading && bLimitLogLen )
{
- USHORT nSkip = nMaxLogLen;
+ sal_uInt16 nSkip = nMaxLogLen;
SvLBoxEntry *pRun = aEditTree.First();
while ( nSkip-- && pRun )
pRun = aEditTree.NextSibling( pRun );
@@ -235,7 +235,7 @@ void MsgEdit::AddRun( String aMsg, TTDebugData aDebugData )
aEditTree.GetModel()->Remove( aEditTree.NextSibling( pRun ) );
aEditTree.GetModel()->Remove( pRun );
- bModified = TRUE;
+ bModified = sal_True;
lModify.Call( NULL );
Save( aLogFileName );
pAppError->UpdateFileInfo( HAS_BEEN_LOADED );
@@ -244,9 +244,9 @@ void MsgEdit::AddRun( String aMsg, TTDebugData aDebugData )
COPY_TTDEBUGDATA( LOG_RUN );
if ( !bFileLoading || ( bFileLoading && nVersion >= 2 ) )
- pCurrentRun = aEditTree.InsertEntry( aMsg, NULL, FALSE, 0, pTTDebugData );
+ pCurrentRun = aEditTree.InsertEntry( aMsg, NULL, sal_False, 0, pTTDebugData );
else // First file format
- pCurrentRun = aEditTree.InsertEntry( aMsg, NULL, FALSE, LIST_APPEND, pTTDebugData ); // and therefor at the end
+ pCurrentRun = aEditTree.InsertEntry( aMsg, NULL, sal_False, LIST_APPEND, pTTDebugData ); // and therefor at the end
aEditTree.ShowEntry( pCurrentRun );
pCurrentTestCase = NULL;
@@ -265,7 +265,7 @@ void MsgEdit::AddTestCase( String aMsg, TTDebugData aDebugData )
else
{
COPY_TTDEBUGDATA( LOG_TEST_CASE );
- pCurrentTestCase = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+ pCurrentTestCase = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
aEditTree.ShowEntry( pCurrentTestCase );
}
}
@@ -287,7 +287,7 @@ void MsgEdit::AddError( String aMsg, TTDebugData aDebugData )
if ( pCurrentTestCase )
{
COPY_TTDEBUGDATA( LOG_ERROR );
- pCurrentError = aEditTree.InsertEntry( aMsg, pCurrentTestCase, FALSE, LIST_APPEND, pTTDebugData );
+ pCurrentError = aEditTree.InsertEntry( aMsg, pCurrentTestCase, sal_False, LIST_APPEND, pTTDebugData );
aEditTree.ShowEntry( pCurrentError );
}
}
@@ -298,7 +298,7 @@ void MsgEdit::AddCallStack( String aMsg, TTDebugData aDebugData )
if ( pCurrentError )
{
COPY_TTDEBUGDATA( LOG_CALL_STACK );
- aEditTree.InsertEntry( aMsg, pCurrentError, FALSE, LIST_APPEND, pTTDebugData );
+ aEditTree.InsertEntry( aMsg, pCurrentError, sal_False, LIST_APPEND, pTTDebugData );
}
}
@@ -307,16 +307,16 @@ void MsgEdit::AddMessage( String aMsg, TTDebugData aDebugData )
SvLBoxEntry *pThisEntry = NULL;
COPY_TTDEBUGDATA( LOG_MESSAGE );
if ( pCurrentTestCase )
- pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, FALSE, LIST_APPEND, pTTDebugData );
+ pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, sal_False, LIST_APPEND, pTTDebugData );
else if ( pCurrentRun )
{
- pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+ pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
aEditTree.ShowEntry( pThisEntry );
}
else
{
AddRun( aMsg, aDebugData );
- pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+ pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
aEditTree.ShowEntry( pThisEntry );
}
}
@@ -329,16 +329,16 @@ void MsgEdit::AddWarning( String aMsg, TTDebugData aDebugData )
COPY_TTDEBUGDATA( LOG_WARNING );
if ( pCurrentTestCase )
- pThisEntry = aEditTree.InsertEntry( aCompleteMsg, pCurrentTestCase, FALSE, LIST_APPEND, pTTDebugData );
+ pThisEntry = aEditTree.InsertEntry( aCompleteMsg, pCurrentTestCase, sal_False, LIST_APPEND, pTTDebugData );
else if ( pCurrentRun )
{
- pThisEntry = aEditTree.InsertEntry( aCompleteMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+ pThisEntry = aEditTree.InsertEntry( aCompleteMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
aEditTree.ShowEntry( pThisEntry );
}
else
{
AddRun( aMsg, aDebugData );
- pThisEntry = aEditTree.InsertEntry( aCompleteMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+ pThisEntry = aEditTree.InsertEntry( aCompleteMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
aEditTree.ShowEntry( pThisEntry );
}
@@ -357,16 +357,16 @@ void MsgEdit::AddAssertion( String aMsg, TTDebugData aDebugData )
SvLBoxEntry *pThisEntry = NULL;
COPY_TTDEBUGDATA( LOG_ASSERTION );
if ( pCurrentTestCase )
- pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, FALSE, LIST_APPEND, pTTDebugData );
+ pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, sal_False, LIST_APPEND, pTTDebugData );
else if ( pCurrentRun )
{
- pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+ pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
aEditTree.ShowEntry( pThisEntry );
}
else
{
AddRun( aMsg, aDebugData );
- pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+ pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
aEditTree.ShowEntry( pThisEntry );
}
@@ -381,18 +381,18 @@ void MsgEdit::AddAssertionStack( String aMsg, TTDebugData aDebugData )
SvLBoxEntry *pThisEntry = NULL;
COPY_TTDEBUGDATA( LOG_ASSERTION_STACK );
if ( pCurrentAssertion )
- pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentAssertion, FALSE, LIST_APPEND, pTTDebugData );
+ pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentAssertion, sal_False, LIST_APPEND, pTTDebugData );
else if ( pCurrentTestCase )
- pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, FALSE, LIST_APPEND, pTTDebugData );
+ pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, sal_False, LIST_APPEND, pTTDebugData );
else if ( pCurrentRun )
{
- pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+ pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
aEditTree.ShowEntry( pThisEntry );
}
else
{
AddRun( aMsg, aDebugData );
- pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+ pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
aEditTree.ShowEntry( pThisEntry );
}
@@ -405,16 +405,16 @@ void MsgEdit::AddQAError( String aMsg, TTDebugData aDebugData )
SvLBoxEntry *pThisEntry = NULL;
COPY_TTDEBUGDATA( LOG_QA_ERROR );
if ( pCurrentTestCase )
- pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, FALSE, LIST_APPEND, pTTDebugData );
+ pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentTestCase, sal_False, LIST_APPEND, pTTDebugData );
else if ( pCurrentRun )
{
- pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+ pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
aEditTree.ShowEntry( pThisEntry );
}
else
{
AddRun( aMsg, aDebugData );
- pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, FALSE, LIST_APPEND, pTTDebugData );
+ pThisEntry = aEditTree.InsertEntry( aMsg, pCurrentRun, sal_False, LIST_APPEND, pTTDebugData );
aEditTree.ShowEntry( pThisEntry );
}
@@ -423,8 +423,8 @@ void MsgEdit::AddQAError( String aMsg, TTDebugData aDebugData )
}
/*
- SvLBoxEntry* GetEntry( SvLBoxEntry* pParent, ULONG nPos ) const { return SvLBox::GetEntry(pParent,nPos); }
- SvLBoxEntry* GetEntry( ULONG nRootPos ) const { return SvLBox::GetEntry(nRootPos);}
+ SvLBoxEntry* GetEntry( SvLBoxEntry* pParent, sal_uIntPtr nPos ) const { return SvLBox::GetEntry(pParent,nPos); }
+ SvLBoxEntry* GetEntry( sal_uIntPtr nRootPos ) const { return SvLBox::GetEntry(nRootPos);}
@@ -437,16 +437,16 @@ void MsgEdit::AddQAError( String aMsg, TTDebugData aDebugData )
SvLBoxEntry* PrevSelected( SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(SvListView::PrevSelected(pEntry)); }
SvLBoxEntry* LastSelected() const { return (SvLBoxEntry*)(SvListView::LastSelected()); }
- SvLBoxEntry* GetEntry( SvLBoxEntry* pParent, ULONG nPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(pParent,nPos)); }
- SvLBoxEntry* GetEntry( ULONG nRootPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(nRootPos)); }
+ SvLBoxEntry* GetEntry( SvLBoxEntry* pParent, sal_uIntPtr nPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(pParent,nPos)); }
+ SvLBoxEntry* GetEntry( sal_uIntPtr nRootPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(nRootPos)); }
SvLBoxEntry* GetParent( SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->GetParent(pEntry)); }
SvLBoxEntry* GetRootLevelParent(SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->GetRootLevelParent( pEntry ));}
- BOOL IsInChildList( SvListEntry* pParent, SvListEntry* pChild) const;
- SvListEntry* GetEntry( SvListEntry* pParent, ULONG nPos ) const;
- SvListEntry* GetEntry( ULONG nRootPos ) const;
- SvListEntry* GetEntryAtAbsPos( ULONG nAbsPos ) const;
+ sal_Bool IsInChildList( SvListEntry* pParent, SvListEntry* pChild) const;
+ SvListEntry* GetEntry( SvListEntry* pParent, sal_uIntPtr nPos ) const;
+ SvListEntry* GetEntry( sal_uIntPtr nRootPos ) const;
+ SvListEntry* GetEntryAtAbsPos( sal_uIntPtr nAbsPos ) const;
SvListEntry* GetParent( SvListEntry* pEntry ) const;
SvListEntry* GetRootLevelParent( SvListEntry* pEntry ) const;
*/
@@ -460,11 +460,11 @@ void MsgEdit::Delete()
CHECK( pCurrentTestCase );
CHECK( pCurrentAssertion );
CHECK( pCurrentError );
- bModified = TRUE;
+ bModified = sal_True;
lModify.Call( NULL );
}
-void MsgEdit::Cut(){ Copy(); Delete(); bModified = TRUE; lModify.Call( NULL ); }
+void MsgEdit::Cut(){ Copy(); Delete(); bModified = sal_True; lModify.Call( NULL ); }
void MsgEdit::Copy(){ ::svt::OStringTransfer::CopyString( GetSelected(), &aEditTree ); }
/**/void MsgEdit::Paste(){ Sound::Beep(); }
void MsgEdit::Undo(){ Sound::Beep(); }
@@ -545,7 +545,7 @@ TextSelection MsgEdit::GetSelection() const
{
if ( aEditTree.FirstSelected() )
{
- ULONG nStart=0,nEnd=0;
+ sal_uIntPtr nStart=0,nEnd=0;
nStart = aEditTree.GetModel()->GetAbsPos(aEditTree.FirstSelected() );
if ( aEditTree.LastSelected() )
nEnd = aEditTree.GetModel()->GetAbsPos(aEditTree.LastSelected() );
@@ -557,25 +557,25 @@ TextSelection MsgEdit::GetSelection() const
void MsgEdit::SetSelection( const TextSelection& rSelection )
{
- ULONG nStart,nEnd;
+ sal_uIntPtr nStart,nEnd;
while ( aEditTree.GetSelectionCount() )
- aEditTree.Select( aEditTree.FirstSelected(), FALSE );
+ aEditTree.Select( aEditTree.FirstSelected(), sal_False );
if ( rSelection.HasRange() )
{
nStart = rSelection.GetStart().GetPara();
nEnd = rSelection.GetEnd().GetPara();
- for ( ULONG i = nStart ; i <= nEnd ; i++ )
- aEditTree.Select( aEditTree.GetModel()->GetEntryAtAbsPos( i ), TRUE );
+ for ( sal_uIntPtr i = nStart ; i <= nEnd ; i++ )
+ aEditTree.Select( aEditTree.GetModel()->GetEntryAtAbsPos( i ), sal_True );
}
}
-USHORT MsgEdit::GetLineNr() const
+sal_uInt16 MsgEdit::GetLineNr() const
{
if ( aEditTree.GetCurEntry() )
- return (USHORT)aEditTree.GetModel()->GetAbsPos(aEditTree.GetCurEntry() ) + 1;
+ return (sal_uInt16)aEditTree.GetModel()->GetAbsPos(aEditTree.GetCurEntry() ) + 1;
else
return 0;
}
@@ -587,7 +587,7 @@ void MsgEdit::ReplaceSelected( const String& rStr )
OSL_FAIL("Not Implemented");
}
-BOOL MsgEdit::IsModified(){ return bModified; }
+sal_Bool MsgEdit::IsModified(){ return bModified; }
void MsgEdit::SetModifyHdl( Link l ){ lModify = l; }
String MsgEdit::GetText() const
@@ -611,16 +611,16 @@ void MsgEdit::SetText( const String& rStr )
OSL_FAIL("Not Implemented");
}
-BOOL MsgEdit::HasText() const
+sal_Bool MsgEdit::HasText() const
{
return aEditTree.First() != NULL;
}
// Search from the beginning or mark start + 1
-BOOL MsgEdit::Find( const String& s )
+sal_Bool MsgEdit::Find( const String& s )
{
TextSelection r = GetSelection();
- USHORT bgn = (USHORT) r.GetStart().GetPara() + 1;
+ sal_uInt16 bgn = (sal_uInt16) r.GetStart().GetPara() + 1;
if ( r.GetStart().GetPara() == 0 )
bgn = 0; // Search from the beginning
@@ -630,11 +630,11 @@ BOOL MsgEdit::Find( const String& s )
if( aEditTree.GetEntryText( pEntry ).Search( s, 0 ) != STRING_NOTFOUND )
{
aEditTree.SetCurEntry( pEntry );
- return TRUE;
+ return sal_True;
}
pEntry = aEditTree.Next( pEntry );
}
- return FALSE;
+ return sal_False;
}
/******************************************************************
@@ -647,17 +647,17 @@ BOOL MsgEdit::Find( const String& s )
******************************************************************/
-BOOL MsgEdit::Load( const String& aName )
+sal_Bool MsgEdit::Load( const String& aName )
{
aLogFileName = aName;
- BOOL bOk = TRUE, bFirstLine = TRUE;
- BOOL bLoadError = FALSE;
+ sal_Bool bOk = sal_True, bFirstLine = sal_True;
+ sal_Bool bLoadError = sal_False;
SvFileStream aStrm( aName, STREAM_STD_READ );
if( aStrm.IsOpen() )
{
aEditTree.Clear();
String aLine;
- bFileLoading = TRUE; // To avoid logging to disk
+ bFileLoading = sal_True; // To avoid logging to disk
TTLogMsg *pLogMsg = new TTLogMsg;
while( !aStrm.IsEof() && bOk )
{
@@ -667,7 +667,7 @@ BOOL MsgEdit::Load( const String& aName )
aStrm.ReadByteStringLine( aLine, RTL_TEXTENCODING_IBM_850 );
if( aStrm.GetError() != SVSTREAM_OK )
- bOk = FALSE;
+ bOk = sal_False;
#define TOKEN( n ) aLine.GetToken( n )
@@ -677,9 +677,9 @@ BOOL MsgEdit::Load( const String& aName )
TTDebugData aDebugData;
aDebugData.aLogType = TTLogType( TOKEN(0).ToInt32() );
aDebugData.aFilename = TOKEN(1);
- aDebugData.nLine = USHORT( TOKEN(2).ToInt32() );
- aDebugData.nCol1 = USHORT( TOKEN(3).ToInt32() );
- aDebugData.nCol2 = USHORT( TOKEN(4).ToInt32() );
+ aDebugData.nLine = sal_uInt16( TOKEN(2).ToInt32() );
+ aDebugData.nCol1 = sal_uInt16( TOKEN(3).ToInt32() );
+ aDebugData.nCol2 = sal_uInt16( TOKEN(4).ToInt32() );
aDebugData.aMsg = aLine.GetQuotedToken( 5, CUniString("\"\"") );
// Remove leading and trailing quotes
@@ -692,13 +692,13 @@ BOOL MsgEdit::Load( const String& aName )
AddAnyMsg( pLogMsg );
}
else if ( bFirstLine && (aLine.Search( VERSION_STRING ) == 0) )
- nVersion = USHORT( aLine.Copy( VERSION_STRING.Len() ).ToInt32() );
+ nVersion = sal_uInt16( aLine.Copy( VERSION_STRING.Len() ).ToInt32() );
else if ( aLine.Len() )
- bLoadError = TRUE;
+ bLoadError = sal_True;
- bFirstLine = FALSE;
+ bFirstLine = sal_False;
}
- bFileLoading = FALSE;
+ bFileLoading = sal_False;
delete pLogMsg;
aStrm.Close();
if ( nVersion < 2 && !bLoadError )
@@ -706,16 +706,16 @@ BOOL MsgEdit::Load( const String& aName )
}
else
- bOk = FALSE;
+ bOk = sal_False;
return bOk;
}
-BOOL MsgEdit::Save( const String& aName )
+sal_Bool MsgEdit::Save( const String& aName )
{
- BOOL bOk = TRUE;
- BOOL bIsText = DirEntry( aName ).GetExtension().CompareIgnoreCaseToAscii("TXT") == COMPARE_EQUAL;
+ sal_Bool bOk = sal_True;
+ sal_Bool bIsText = DirEntry( aName ).GetExtension().CompareIgnoreCaseToAscii("TXT") == COMPARE_EQUAL;
if ( bIsText && !QueryBox( NULL, SttResId( IDS_LOSS_OF_INFORMATION ) ).Execute() )
- return FALSE;
+ return sal_False;
SvFileStream aStrm( aName, STREAM_STD_WRITE | STREAM_TRUNC );
if( aStrm.IsOpen() )
{
@@ -753,16 +753,16 @@ BOOL MsgEdit::Save( const String& aName )
}
}
if( aStrm.GetError() != SVSTREAM_OK )
- bOk = FALSE;
+ bOk = sal_False;
else
{
- bModified = FALSE;
+ bModified = sal_False;
lModify.Call( NULL );
}
}
else
- bOk = FALSE;
+ bOk = sal_False;
return bOk;
}
@@ -774,7 +774,7 @@ TTTreeListBox::TTTreeListBox( AppError* pParent, BasicFrame* pBF, WinBits nWinSt
//, nDeselectParent(0)
{}
-BOOL TTTreeListBox::JumpToSourcecode( SvLBoxEntry *pThisEntry )
+sal_Bool TTTreeListBox::JumpToSourcecode( SvLBoxEntry *pThisEntry )
{
if ( pThisEntry && pThisEntry->GetUserData() && ((TTDebugData*)pThisEntry->GetUserData())->aFilename.Len() > 0 )
{
@@ -810,20 +810,20 @@ BOOL TTTreeListBox::JumpToSourcecode( SvLBoxEntry *pThisEntry )
if ( pBasicFrame->pWork && pBasicFrame->pWork->ISA(AppEdit) )
((AppEdit*)pBasicFrame->pWork)->Highlight( aData->nLine, aData->nCol1, aData->nCol2 );
- return FALSE;
+ return sal_False;
}
- return TRUE;
+ return sal_True;
}
-BOOL TTTreeListBox::DoubleClickHdl()
+sal_Bool TTTreeListBox::DoubleClickHdl()
{
return JumpToSourcecode( GetHdlEntry() );
}
-/*ULONG TTTreeListBox::SelectChildren( SvLBoxEntry* pParent, BOOL bSelect )
+/*sal_uIntPtr TTTreeListBox::SelectChildren( SvLBoxEntry* pParent, sal_Bool bSelect )
{
SvLBoxEntry *pEntry = FirstChild( pParent );
- ULONG nRet = 0;
+ sal_uIntPtr nRet = 0;
while ( pEntry )
{
nRet++;
@@ -838,8 +838,8 @@ void TTTreeListBox::SelectHdl()
{
SvLBoxEntry* pHdlEntry = GetHdlEntry();
- SelectChildren( pHdlEntry, TRUE );
- Select( pHdlEntry, TRUE );
+ SelectChildren( pHdlEntry, sal_True );
+ Select( pHdlEntry, sal_True );
// InitMenu(pApp->GetAppMenu()->GetPopupMenu( RID_APPEDIT )); // so that delete works correct
}
@@ -849,13 +849,13 @@ void TTTreeListBox::DeselectHdl()
if ( GetParent( pHdlEntry ) )
{
nDeselectParent++;
- Select( GetParent( pHdlEntry ), FALSE );
+ Select( GetParent( pHdlEntry ), sal_False );
nDeselectParent--;
}
if ( !nDeselectParent )
{
- SelectChildren( pHdlEntry, FALSE );
- Select( pHdlEntry, FALSE );
+ SelectChildren( pHdlEntry, sal_False );
+ Select( pHdlEntry, sal_False );
}
Invalidate();
} */
@@ -926,15 +926,15 @@ class TTLBoxString : public SvLBoxString
{
public:
- TTLBoxString( SvLBoxEntry* pEntry, USHORT nFlags,
+ TTLBoxString( SvLBoxEntry* pEntry, sal_uInt16 nFlags,
const String& rStr ) : SvLBoxString(pEntry,nFlags,rStr) {}
- virtual void Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags,
+ virtual void Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags,
SvLBoxEntry* pEntry);
};
-void TTLBoxString::Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags,
+void TTLBoxString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags,
SvLBoxEntry* pEntry )
{
TTFeatures aFeatures = ((TTTreeListBox*)&rDev)->GetFeatures( pEntry );
@@ -958,7 +958,7 @@ void TTLBoxString::Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags,
else
{
aFont.SetFillColor( aCol );
- aFont.SetTransparent( FALSE );
+ aFont.SetTransparent( sal_False );
Color aCol2( COL_BLACK );
aFont.SetColor( aCol2 );
}
@@ -984,7 +984,7 @@ void TTTreeListBox::InitEntry(SvLBoxEntry* pEntry,
const String& rStr ,const Image& rImg1, const Image& rImg2,
SvLBoxButtonKind eButtonKind )
{
- USHORT nColToHilite = 1; //0==Bitmap;1=="Column1";2=="Column2"
+ sal_uInt16 nColToHilite = 1; //0==Bitmap;1=="Column1";2=="Column2"
SvTreeListBox::InitEntry( pEntry, rStr, rImg1, rImg2, eButtonKind );
SvLBoxString* pCol = (SvLBoxString*)pEntry->GetItem( nColToHilite );
TTLBoxString* pStr = new TTLBoxString( pEntry, 0, pCol->GetText() );
diff --git a/basic/source/app/msgedit.hxx b/basic/source/app/msgedit.hxx
index 02355eb21a15..442ff3034c19 100644..100755
--- a/basic/source/app/msgedit.hxx
+++ b/basic/source/app/msgedit.hxx
@@ -38,7 +38,7 @@ class AppError;
#define SelectChildren SelectChilds
-typedef USHORT TTFeatures; // Bitfield for features of the entries
+typedef sal_uInt16 TTFeatures; // Bitfield for features of the entries
#define HasNothing TTFeatures(0x00)
#define HasError TTFeatures(0x01)
#define HasWarning TTFeatures(0x02)
@@ -50,13 +50,13 @@ class TTTreeListBox : public SvTreeListBox
{
protected:
// virtual void Command( const CommandEvent& rCEvt );
-// USHORT nDeselectParent;
+// sal_uInt16 nDeselectParent;
BasicFrame *pBasicFrame;
void InitEntry( SvLBoxEntry*, const String&, const Image&,
const Image&, SvLBoxButtonKind eButtonKind );
AppError *pAppError;
- BOOL JumpToSourcecode( SvLBoxEntry *pThisEntry );
+ sal_Bool JumpToSourcecode( SvLBoxEntry *pThisEntry );
public:
TTTreeListBox( AppError* pParent, BasicFrame* pBF, WinBits nWinStyle=0 );
@@ -64,11 +64,11 @@ public:
// virtual void SelectHdl();
// virtual void DeselectHdl();
- virtual BOOL DoubleClickHdl();
+ virtual sal_Bool DoubleClickHdl();
virtual void KeyInput( const KeyEvent& rKEvt );
-// ULONG SelectChildren( SvLBoxEntry* pParent, BOOL bSelect );
+// sal_uIntPtr SelectChildren( SvLBoxEntry* pParent, sal_Bool bSelect );
TTFeatures GetFeatures( SvLBoxEntry* );
};
@@ -80,20 +80,20 @@ class MsgEdit : public DataEdit
SvLBoxEntry *pCurrentTestCase;
SvLBoxEntry *pCurrentAssertion;
SvLBoxEntry *pCurrentError;
- BOOL bModified;
+ sal_Bool bModified;
Link lModify;
- BOOL bFileLoading; // TRUE while loading a file
+ sal_Bool bFileLoading; // sal_True while loading a file
String Impl_MakeText( SvLBoxEntry *pEntry ) const;
String Impl_MakeSaveText( SvLBoxEntry *pEntry ) const;
String Impl_MakeSaveText( TTDebugData aData ) const;
- USHORT nVersion; // Stores file version
+ sal_uInt16 nVersion; // Stores file version
AppError* pAppError;
String aLogFileName;
- static USHORT nMaxLogLen;
- static BOOL bLimitLogLen;
- static BOOL bPrintLogToStdout;
- static BOOL bPrintLogToStdoutSet; // has it been initialized yet
+ static sal_uInt16 nMaxLogLen;
+ static sal_Bool bLimitLogLen;
+ static sal_Bool bPrintLogToStdout;
+ static sal_Bool bPrintLogToStdoutSet; // has it been initialized yet
public:
MsgEdit( AppError*, BasicFrame *pBF, const WinBits& );
~MsgEdit();
@@ -108,7 +108,7 @@ public:
void AddAssertionStack( String aMsg, TTDebugData aDebugData );
void AddQAError( String aMsg, TTDebugData aDebugData );
- static void SetMaxLogLen( USHORT nLen ) { nMaxLogLen = nLen; bLimitLogLen = TRUE; }
+ static void SetMaxLogLen( sal_uInt16 nLen ) { nMaxLogLen = nLen; bLimitLogLen = sal_True; }
DATA_FUNC_DEF( aEditTree, TTTreeListBox )
};
diff --git a/basic/source/app/mybasic.cxx b/basic/source/app/mybasic.cxx
index 5c165f441058..9e2a32fe751f 100644..100755
--- a/basic/source/app/mybasic.cxx
+++ b/basic/source/app/mybasic.cxx
@@ -60,7 +60,7 @@ TYPEINIT1(MyBasic,StarBASIC)
class MyFactory : public SbxFactory
{
public:
- virtual SbxBase* Create( UINT16 nSbxId, UINT32 = SBXCR_SBX );
+ virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
};
static SampleObjectFac aFac1;
@@ -68,7 +68,7 @@ static MyFactory aFac2;
static ProcessFactory aProcessFac;
static short nInst = 0;
-SbxBase* MyFactory::Create( UINT16 nSbxId, UINT32 nCr )
+SbxBase* MyFactory::Create( sal_uInt16 nSbxId, sal_uInt32 nCr )
{
if( nCr == SBXCR_TEST && nSbxId == SBXID_MYBASIC )
return new MyBasic;
@@ -152,7 +152,7 @@ void MyBasic::LoadIniFile()
{
}
-SbTextType MyBasic::GetSymbolType( const String &rSymbol, BOOL bWasTTControl )
+SbTextType MyBasic::GetSymbolType( const String &rSymbol, sal_Bool bWasTTControl )
{
(void) rSymbol; /* avoid warning about unused parameter */
(void) bWasTTControl; /* avoid warning about unused parameter */
@@ -179,7 +179,7 @@ void MyBasic::Reset()
CurrentError = 0;
}
-BOOL MyBasic::Compile( SbModule* p )
+sal_Bool MyBasic::Compile( SbModule* p )
{
Reset();
return StarBASIC::Compile( p );
@@ -215,7 +215,7 @@ BasicError* MyBasic::FirstError()
return NULL;
}
-BOOL MyBasic::ErrorHdl()
+sal_Bool MyBasic::ErrorHdl()
{
AppBasEd* pWin = aBasicApp.pFrame->FindModuleWin( GetActiveModule()->GetName() );
if( !pWin )
@@ -233,12 +233,12 @@ BOOL MyBasic::ErrorHdl()
);
nError++;
CurrentError = aErrors.size() - 1;
- return BOOL( nError < 20 ); // Cancel after 20 errors
+ return sal_Bool( nError < 20 ); // Cancel after 20 errors
}
else
{
ReportRuntimeError( pWin );
- return FALSE;
+ return sal_False;
}
}
@@ -255,7 +255,7 @@ void MyBasic::ReportRuntimeError( AppBasEd *pEditWin )
GetCol1(), GetCol2() ).Show();
}
-void MyBasic::DebugFindNoErrors( BOOL bDebugFindNoErrors )
+void MyBasic::DebugFindNoErrors( sal_Bool bDebugFindNoErrors )
{
(void) bDebugFindNoErrors; /* avoid warning about unused parameter */
}
@@ -265,7 +265,7 @@ const String MyBasic::GetSpechialErrorText()
return GetErrorText();
}
-USHORT MyBasic::BreakHdl()
+sal_uInt16 MyBasic::BreakHdl()
{
SbModule* pMod = GetActiveModule();
if( pMod )
@@ -299,7 +299,7 @@ USHORT MyBasic::BreakHdl()
***************************************************************************/
BasicError::BasicError
- ( AppBasEd* w, USHORT nE, const String& r, USHORT nL, USHORT nC1, USHORT nC2 )
+ ( AppBasEd* w, sal_uInt16 nE, const String& r, sal_uInt16 nL, sal_uInt16 nC1, sal_uInt16 nC2 )
: aText( SttResId( IDS_ERROR1 ) )
{
pWin = w;
diff --git a/basic/source/app/printer.cxx b/basic/source/app/printer.cxx
index 84cddf422759..675aeed2c7e0 100644..100755
--- a/basic/source/app/printer.cxx
+++ b/basic/source/app/printer.cxx
@@ -88,7 +88,7 @@ void BasicPrinter::Print( const String& rFile, const String& rText, BasicFrame *
// Disable PRINT-Menu
MenuBar* pBar = pFrame->GetMenuBar();
Menu* pFileMenu = pBar->GetPopupMenu( RID_APPFILE );
- pFileMenu->EnableItem( RID_FILEPRINT, FALSE );
+ pFileMenu->EnableItem( RID_FILEPRINT, sal_False );
mpListener.reset( new vcl::OldStylePrintAdaptor( mpPrinter ) );
mpListener->StartPage();
@@ -107,7 +107,7 @@ void BasicPrinter::Print( const String& rFile, const String& rText, BasicFrame *
Printer::PrintJob( mpListener, mpPrinter->GetJobSetup() );
nPage = 1;
- pFileMenu->EnableItem( RID_FILEPRINT, TRUE );
+ pFileMenu->EnableItem( RID_FILEPRINT, sal_True );
}
diff --git a/basic/source/app/printer.hxx b/basic/source/app/printer.hxx
index b884a642e76f..b884a642e76f 100644..100755
--- a/basic/source/app/printer.hxx
+++ b/basic/source/app/printer.hxx
diff --git a/basic/source/app/process.cxx b/basic/source/app/process.cxx
index 91e28de22a6a..02d27e3a7ba6 100644..100755
--- a/basic/source/app/process.cxx
+++ b/basic/source/app/process.cxx
@@ -49,9 +49,9 @@ Process::Process()
, m_nEnvCount( 0 )
, m_pEnvList( NULL )
, m_aProcessName()
+, bWasGPF( sal_False )
+, bHasBeenStarted( sal_False )
, m_pProcess( NULL )
-, bWasGPF( FALSE )
-, bHasBeenStarted( FALSE )
{
}
@@ -77,7 +77,7 @@ Process::~Process()
}
-BOOL Process::ImplIsRunning()
+sal_Bool Process::ImplIsRunning()
{
if ( m_pProcess && bHasBeenStarted )
{
@@ -85,12 +85,12 @@ BOOL Process::ImplIsRunning()
aProcessInfo.Size = sizeof(oslProcessInfo);
osl_getProcessInfo(m_pProcess, osl_Process_EXITCODE, &aProcessInfo );
if ( !(aProcessInfo.Fields & osl_Process_EXITCODE) )
- return TRUE;
+ return sal_True;
else
- return FALSE;
+ return sal_False;
}
else
- return FALSE;
+ return sal_False;
}
long Process::ImplGetExitCode()
@@ -166,17 +166,17 @@ void Process::SetImage( const String &aAppPath, const String &aAppParams, const
::rtl::OUString aNormalizedAppPath;
osl::FileBase::getFileURLFromSystemPath( ::rtl::OUString(aAppPath), aNormalizedAppPath );
m_aProcessName = aNormalizedAppPath;;
- bHasBeenStarted = FALSE;
+ bHasBeenStarted = sal_False;
}
}
-BOOL Process::Start()
+sal_Bool Process::Start()
{ // Start program
- BOOL bSuccess=FALSE;
+ sal_Bool bSuccess=sal_False;
if ( m_aProcessName.getLength() && !ImplIsRunning() )
{
- bWasGPF = FALSE;
+ bWasGPF = sal_False;
#ifdef WNT
sal_uInt32 nErrorMode = SetErrorMode(SEM_NOOPENFILEERRORBOX | SEM_NOALIGNMENTFAULTEXCEPT | SEM_NOGPFAULTERRORBOX);
try
@@ -199,7 +199,7 @@ BOOL Process::Start()
}
catch( ... )
{
- bWasGPF = TRUE;
+ bWasGPF = sal_True;
// TODO: Output debug message !!
}
nErrorMode = SetErrorMode(nErrorMode);
@@ -211,17 +211,17 @@ BOOL Process::Start()
return bSuccess;
}
-ULONG Process::GetExitCode()
+sal_uIntPtr Process::GetExitCode()
{ // ExitCode of program after execution
return ImplGetExitCode();
}
-BOOL Process::IsRunning()
+sal_Bool Process::IsRunning()
{
return ImplIsRunning();
}
-BOOL Process::WasGPF()
+sal_Bool Process::WasGPF()
{ // Did the process fail?
#ifdef WNT
return ImplGetExitCode() == 3221225477;
@@ -230,11 +230,11 @@ BOOL Process::WasGPF()
#endif
}
-BOOL Process::Terminate()
+sal_Bool Process::Terminate()
{
if ( ImplIsRunning() )
return osl_terminateProcess(m_pProcess) == osl_Process_E_None;
- return TRUE;
+ return sal_True;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/app/processw.cxx b/basic/source/app/processw.cxx
index accd727df62f..4bf428b6a0ac 100644..100755
--- a/basic/source/app/processw.cxx
+++ b/basic/source/app/processw.cxx
@@ -44,10 +44,10 @@
// none
// 2) Methods:
// SetImage( Filename )
-// BOOL Start
-// USHORT GetExitCode
-// BOOL IsRunning
-// BOOL WasGPF
+// sal_Bool Start
+// sal_uInt16 GetExitCode
+// sal_Bool IsRunning
+// sal_Bool WasGPF
// This implementation is a sample for a table driven version that
@@ -63,7 +63,7 @@
#define _BWRITE 0x0200 // can be used as Lvaluen
#define _LVALUE _BWRITE
#define _READWRITE 0x0300 // can read and written
-#define _OPT 0x0400 // TRUE: optional parameter
+#define _OPT 0x0400 // sal_True: optional parameter
#define _METHOD 0x1000 // Mask-Bit for a method
#define _PROPERTY 0x2000 // Mask-Bit for a property
#define _COLL 0x4000 // Mask-Bit for a collection
@@ -124,12 +124,12 @@ SbxVariable* ProcessWrapper::Find( const String& rName, SbxClassType t )
// otherwise search
Methods* p = pMethods;
short nIndex = 0;
- BOOL bFound = FALSE;
+ sal_Bool bFound = sal_False;
while( p->nArgs != -1 )
{
if( rName.EqualsIgnoreCaseAscii( p->pName ) )
{
- bFound = TRUE; break;
+ bFound = sal_True; break;
}
nIndex += ( p->nArgs & _ARGSMASK ) + 1;
p = pMethods + nIndex;
@@ -164,22 +164,22 @@ void ProcessWrapper::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCT,
{
SbxVariable* pVar = pHint->GetVar();
SbxArray* pNotifyPar = pVar->GetParameters();
- USHORT nIndex = (USHORT) pVar->GetUserData();
+ sal_uInt16 nIndex = (sal_uInt16) pVar->GetUserData();
// No index: put through
if( nIndex )
{
- ULONG t = pHint->GetId();
+ sal_uIntPtr t = pHint->GetId();
if( t == SBX_HINT_INFOWANTED )
pVar->SetInfo( GetInfo( (short) pVar->GetUserData() ) );
else
{
- BOOL bWrite = FALSE;
+ sal_Bool bWrite = sal_False;
if( t == SBX_HINT_DATACHANGED )
- bWrite = TRUE;
+ bWrite = sal_True;
if( t == SBX_HINT_DATAWANTED || bWrite )
{
// Parameter-Test for methods:
- USHORT nPar = pMethods[ --nIndex ].nArgs & 0x00FF;
+ sal_uInt16 nPar = pMethods[ --nIndex ].nArgs & 0x00FF;
// Element 0 is the return value
if( ( !pNotifyPar && nPar )
|| ( pNotifyPar && pNotifyPar->Count() < nPar+1 ) )
@@ -207,7 +207,7 @@ SbxInfo* ProcessWrapper::GetInfo( short nIdx )
{
p++;
String aMethodName( p->pName, RTL_TEXTENCODING_ASCII_US );
- USHORT nInfoFlags = ( p->nArgs >> 8 ) & 0x03;
+ sal_uInt16 nInfoFlags = ( p->nArgs >> 8 ) & 0x03;
if( p->nArgs & _OPT )
nInfoFlags |= SBX_OPTIONAL;
pResultInfo->AddParam( aMethodName, p->eType, nInfoFlags );
@@ -221,10 +221,10 @@ SbxInfo* ProcessWrapper::GetInfo( short nIdx )
////////////////////////////////////////////////////////////////////////////
-// Properties and methods save the return value in argv[0] (Get, bPut = FALSE)
-// and store the value from argv[0] (Put, bPut = TRUE)
+// Properties and methods save the return value in argv[0] (Get, bPut = sal_False)
+// and store the value from argv[0] (Put, bPut = sal_True)
-void ProcessWrapper::PSetImage( SbxVariable* pVar, SbxArray* pMethodePar, BOOL bWriteIt )
+void ProcessWrapper::PSetImage( SbxVariable* pVar, SbxArray* pMethodePar, sal_Bool bWriteIt )
{ // Imagefile of the executable
(void) pVar; /* avoid warning about unused parameter */
(void) bWriteIt; /* avoid warning about unused parameter */
@@ -234,28 +234,28 @@ void ProcessWrapper::PSetImage( SbxVariable* pVar, SbxArray* pMethodePar, BOOL b
pProcess->SetImage(pMethodePar->Get( 1 )->GetString(), String() );
}
-void ProcessWrapper::PStart( SbxVariable* pVar, SbxArray* pMethodePar, BOOL bWriteIt )
+void ProcessWrapper::PStart( SbxVariable* pVar, SbxArray* pMethodePar, sal_Bool bWriteIt )
{ // Program is started
(void) pMethodePar; /* avoid warning about unused parameter */
(void) bWriteIt; /* avoid warning about unused parameter */
pVar->PutBool( pProcess->Start() );
}
-void ProcessWrapper::PGetExitCode( SbxVariable* pVar, SbxArray* pMethodePar, BOOL bWriteIt )
+void ProcessWrapper::PGetExitCode( SbxVariable* pVar, SbxArray* pMethodePar, sal_Bool bWriteIt )
{ // ExitCode of the program after it was finished
(void) pMethodePar; /* avoid warning about unused parameter */
(void) bWriteIt; /* avoid warning about unused parameter */
pVar->PutULong( pProcess->GetExitCode() );
}
-void ProcessWrapper::PIsRunning( SbxVariable* pVar, SbxArray* pMethodePar, BOOL bWriteIt )
+void ProcessWrapper::PIsRunning( SbxVariable* pVar, SbxArray* pMethodePar, sal_Bool bWriteIt )
{ // Program is still running
(void) pMethodePar; /* avoid warning about unused parameter */
(void) bWriteIt; /* avoid warning about unused parameter */
pVar->PutBool( pProcess->IsRunning() );
}
-void ProcessWrapper::PWasGPF( SbxVariable* pVar, SbxArray* pMethodePar, BOOL bWriteIt )
+void ProcessWrapper::PWasGPF( SbxVariable* pVar, SbxArray* pMethodePar, sal_Bool bWriteIt )
{ // Program faulted with GPF etc.
(void) pMethodePar; /* avoid warning about unused parameter */
(void) bWriteIt; /* avoid warning about unused parameter */
diff --git a/basic/source/app/processw.hxx b/basic/source/app/processw.hxx
index 32e486b0ffd8..f5d60b8d783c 100644..100755
--- a/basic/source/app/processw.hxx
+++ b/basic/source/app/processw.hxx
@@ -43,7 +43,7 @@ using SbxVariable::GetInfo;
public:
#endif
typedef void( ProcessWrapper::*pMeth )
- ( SbxVariable* pThis, SbxArray* pArgs, BOOL bWrite );
+ ( SbxVariable* pThis, SbxArray* pArgs, sal_Bool bWrite );
#if defined ( ICC )
private:
#endif
@@ -57,11 +57,11 @@ private:
static Methods aProcessMethods[]; // Method table
Methods *pMethods; // Current method table
- void PSetImage( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
- void PStart( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
- void PGetExitCode( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
- void PIsRunning( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
- void PWasGPF( SbxVariable* pVar, SbxArray* pPar, BOOL bWrite );
+ void PSetImage( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+ void PStart( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+ void PGetExitCode( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+ void PIsRunning( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
+ void PWasGPF( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite );
// Internal members and methods
Process *pProcess;
diff --git a/basic/source/app/resids.hrc b/basic/source/app/resids.hrc
index 5d3fbb098dde..5d3fbb098dde 100644..100755
--- a/basic/source/app/resids.hrc
+++ b/basic/source/app/resids.hrc
diff --git a/basic/source/app/status.cxx b/basic/source/app/status.cxx
index 14b0fcde5e38..f545538a84bd 100644..100755
--- a/basic/source/app/status.cxx
+++ b/basic/source/app/status.cxx
@@ -73,7 +73,7 @@ void StatusLine::SetProfileName( const String& s )
IMPL_LINK( StatusLine, ActivateTask, TaskToolBox*, pTTB )
{
- USHORT nFirstWinPos=0;
+ sal_uInt16 nFirstWinPos=0;
MenuBar* pMenu = pFrame->GetMenuBar();
PopupMenu* pWinMenu = pMenu->GetPopupMenu( RID_APPWINDOW );
@@ -82,14 +82,14 @@ IMPL_LINK( StatusLine, ActivateTask, TaskToolBox*, pTTB )
nFirstWinPos += pTTB->GetItemPos( pTTB->GetCurItemId() ) / 2;
- USHORT x;
+ sal_uInt16 x;
x = pTTB->GetItemPos( pTTB->GetCurItemId() );
x = pWinMenu->GetItemId( nFirstWinPos );
x = pWinMenu->GetItemCount();
AppWin* pWin = pFrame->FindWin( pWinMenu->GetItemText( pWinMenu->GetItemId( nFirstWinPos ) ).EraseAllChars( L'~' ) );
if ( pWin )
{
- pWin->Minimize( FALSE );
+ pWin->Minimize( sal_False );
pWin->ToTop();
}
return 0;
@@ -97,7 +97,7 @@ IMPL_LINK( StatusLine, ActivateTask, TaskToolBox*, pTTB )
void StatusLine::LoadTaskToolBox()
{
- USHORT nFirstWinPos=0;
+ sal_uInt16 nFirstWinPos=0;
MenuBar* pMenu = pFrame->GetMenuBar();
PopupMenu* pWinMenu = pMenu->GetPopupMenu( RID_APPWINDOW );
diff --git a/basic/source/app/status.hxx b/basic/source/app/status.hxx
index 7c3b04bed8cc..7c3b04bed8cc 100644..100755
--- a/basic/source/app/status.hxx
+++ b/basic/source/app/status.hxx
diff --git a/basic/source/app/svtmsg.src b/basic/source/app/svtmsg.src
index b7ce968b4438..365f5f3d4ee6 100644..100755
--- a/basic/source/app/svtmsg.src
+++ b/basic/source/app/svtmsg.src
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#include "svtmsg.hrc"
+#include "basic/svtmsg.hrc"
// Here are included the messages of the folder /basic/source/app
diff --git a/basic/source/app/testbasi.cxx b/basic/source/app/testbasi.cxx
index 05818806c8a8..05818806c8a8 100644..100755
--- a/basic/source/app/testbasi.cxx
+++ b/basic/source/app/testbasi.cxx
diff --git a/basic/source/app/testtool.idl b/basic/source/app/testtool.idl
index acda657881c7..acda657881c7 100644..100755
--- a/basic/source/app/testtool.idl
+++ b/basic/source/app/testtool.idl
diff --git a/basic/source/app/testtool.src b/basic/source/app/testtool.src
index 245cff6c7917..090cb735c139 100644..100755
--- a/basic/source/app/testtool.src
+++ b/basic/source/app/testtool.src
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#include "testtool.hrc"
+#include "basic/testtool.hrc"
///////////////////////////////
diff --git a/basic/source/app/textedit.cxx b/basic/source/app/textedit.cxx
index 2891cf5e7a16..4ffbef7121f8 100644..100755
--- a/basic/source/app/textedit.cxx
+++ b/basic/source/app/textedit.cxx
@@ -44,19 +44,19 @@
TextEditImp::TextEditImp( AppEdit* pParent, const WinBits& aBits )
: Window( pParent, aBits )
, pAppEdit( pParent )
-, bHighlightning( FALSE )
-, bDoSyntaxHighlight( FALSE )
-, bDelayHighlight( TRUE )
+, bHighlightning( sal_False )
+, bDoSyntaxHighlight( sal_False )
+, bDelayHighlight( sal_True )
, nTipId( 0 )
-, bViewMoved( FALSE )
+, bViewMoved( sal_False )
{
pTextEngine = new TextEngine();
pTextEngine->SetMaxTextLen( STRING_MAXLEN );
- pTextEngine->EnableUndo( TRUE );
+ pTextEngine->EnableUndo( sal_True );
pTextView = new TextView( pTextEngine, this );
pTextEngine->InsertView( pTextView );
- pTextEngine->SetModified( FALSE );
+ pTextEngine->SetModified( sal_False );
aSyntaxIdleTimer.SetTimeout( 200 );
aSyntaxIdleTimer.SetTimeoutHdl( LINK( this, TextEditImp, SyntaxTimerHdl ) );
@@ -79,10 +79,10 @@ TextEditImp::~TextEditImp()
delete pTextEngine;
}
-BOOL TextEditImp::ViewMoved()
+sal_Bool TextEditImp::ViewMoved()
{
- BOOL bOld = bViewMoved;
- bViewMoved = FALSE;
+ sal_Bool bOld = bViewMoved;
+ bViewMoved = sal_False;
return bOld;
}
@@ -98,7 +98,7 @@ void TextEditImp::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
pAppEdit->pVScroll->SetThumbPos( pTextView->GetStartDocPos().Y() );
if ( ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow() )
((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow()->Scroll( 0, ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow()->GetCurYOffset() - pTextView->GetStartDocPos().Y() );
- bViewMoved = TRUE;
+ bViewMoved = sal_True;
}
else if( rTextHint.GetId() == TEXT_HINT_TEXTHEIGHTCHANGED )
{
@@ -114,8 +114,8 @@ void TextEditImp::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
}
else if( rTextHint.GetId() == TEXT_HINT_TEXTFORMATTED )
{
- ULONG nWidth = pTextEngine->CalcTextWidth();
- if ( (ULONG)nWidth != pAppEdit->nCurTextWidth )
+ sal_uIntPtr nWidth = pTextEngine->CalcTextWidth();
+ if ( (sal_uIntPtr)nWidth != pAppEdit->nCurTextWidth )
{
pAppEdit->nCurTextWidth = nWidth;
if ( pAppEdit->pHScroll )
@@ -128,12 +128,12 @@ void TextEditImp::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
else if( rTextHint.GetId() == TEXT_HINT_PARAINSERTED )
{
if ( ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow() )
- ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow()->AdjustBreakpoints( rTextHint.GetValue()+1, TRUE );
+ ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow()->AdjustBreakpoints( rTextHint.GetValue()+1, sal_True );
}
else if( rTextHint.GetId() == TEXT_HINT_PARAREMOVED )
{
if ( ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow() )
- ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow()->AdjustBreakpoints( rTextHint.GetValue()+1, FALSE );
+ ((TextEdit*)(pAppEdit->pDataEdit))->GetBreakpointWindow()->AdjustBreakpoints( rTextHint.GetValue()+1, sal_False );
// Itchy adaption for two signs at line ends instead of one (hard coded default)
pTextEngine->SetMaxTextLen( STRING_MAXLEN - pTextEngine->GetParagraphCount() );
@@ -188,12 +188,12 @@ int TextAttribSpechial::operator==( const TextAttrib& rAttr ) const
( maFontWeight == ((const TextAttribSpechial&)rAttr).maFontWeight ) );
}
-void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
+void TextEditImp::ImpDoHighlight( const String& rSource, sal_uIntPtr nLineOff )
{
SbTextPortions aPortionList;
pAppEdit->GetBasicFrame()->Basic().Highlight( rSource, aPortionList );
- USHORT nCount = aPortionList.Count();
+ sal_uInt16 nCount = aPortionList.Count();
if ( !nCount )
return;
@@ -210,8 +210,8 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
}
// here is the postprocessing for types for the TestTool
- USHORT i;
- BOOL bWasTTControl = FALSE;
+ sal_uInt16 i;
+ sal_Bool bWasTTControl = sal_False;
for ( i = 0; i < aPortionList.Count(); i++ )
{
SbTextPortion& r = aPortionList[i];
@@ -228,20 +228,20 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
r.eType = pAppEdit->GetBasicFrame()->Basic().GetSymbolType( aSymbol, bWasTTControl );
if ( r.eType == TT_CONTROL )
- bWasTTControl = TRUE;
+ bWasTTControl = sal_True;
else
- bWasTTControl = FALSE;
+ bWasTTControl = sal_False;
}
break;
case SB_PUNCTUATION:
{
String aPunctuation = rSource.Copy( r.nStart, r.nEnd - r.nStart +1 );
if ( aPunctuation.CompareToAscii( "." ) != COMPARE_EQUAL )
- bWasTTControl = FALSE;
+ bWasTTControl = sal_False;
}
break;
default:
- bWasTTControl = FALSE;
+ bWasTTControl = sal_False;
}
}
@@ -271,7 +271,7 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
r.nEnd = rSource.Len()-1;
}
- BOOL bWasModified = pTextEngine->IsModified();
+ sal_Bool bWasModified = pTextEngine->IsModified();
for ( i = 0; i < aPortionList.Count(); i++ )
{
SbTextPortion& r = aPortionList[i];
@@ -280,7 +280,7 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
SbTextType eCol = r.eType;
Color aColor;
- ULONG nLine = nLineOff+r.nLine-1; // -1, because BASIC starts with 1
+ sal_uIntPtr nLine = nLineOff+r.nLine-1; // -1, because BASIC starts with 1
switch ( +eCol )
{
case SB_KEYWORD:
@@ -333,7 +333,7 @@ void TextEditImp::ImpDoHighlight( const String& rSource, ULONG nLineOff )
pTextEngine->SetModified( bWasModified );
}
-void TextEditImp::DoSyntaxHighlight( ULONG nPara )
+void TextEditImp::DoSyntaxHighlight( sal_uIntPtr nPara )
{
// Due to delayed syntax highlight it can happen that the
// paragraph does no longer exist
@@ -355,7 +355,7 @@ void TextEditImp::DoDelayedSyntaxHighlight( xub_StrLen nPara )
{
if ( bDelayHighlight )
{
- aSyntaxLineTable.Insert( nPara, (void*)(ULONG)1 );
+ aSyntaxLineTable.Insert( nPara, (void*)(sal_uIntPtr)1 );
aSyntaxIdleTimer.Start();
}
else
@@ -366,32 +366,32 @@ void TextEditImp::DoDelayedSyntaxHighlight( xub_StrLen nPara )
IMPL_LINK( TextEditImp, SyntaxTimerHdl, Timer *, EMPTYARG )
{
DBG_ASSERT( pTextView, "Not yet a View but Syntax-Highlight ?!" );
- pTextEngine->SetUpdateMode( FALSE );
+ pTextEngine->SetUpdateMode( sal_False );
- bHighlightning = TRUE;
- USHORT nLine;
+ bHighlightning = sal_True;
+ sal_uInt16 nLine;
while ( aSyntaxLineTable.First() && !Application::AnyInput( INPUT_MOUSEANDKEYBOARD ) )
{
- nLine = (USHORT)aSyntaxLineTable.GetCurKey();
+ nLine = (sal_uInt16)aSyntaxLineTable.GetCurKey();
DoSyntaxHighlight( nLine );
aSyntaxLineTable.Remove( nLine );
}
- BOOL bWasModified = pTextEngine->IsModified();
+ sal_Bool bWasModified = pTextEngine->IsModified();
if ( aSyntaxLineTable.Count() > 3 ) // Without VDev
{
- pTextEngine->SetUpdateMode( TRUE );
- pTextView->ShowCursor( TRUE, TRUE );
+ pTextEngine->SetUpdateMode( sal_True );
+ pTextView->ShowCursor( sal_True, sal_True );
}
else
- pTextEngine->SetUpdateMode( TRUE ); // ! With VDev
+ pTextEngine->SetUpdateMode( sal_True ); // ! With VDev
- // SetUpdateMode( TRUE ) soll kein Modify setzen
+ // SetUpdateMode( sal_True ) soll kein Modify setzen
pTextEngine->SetModified( bWasModified );
// SyntaxTimerHdl wird gerufen, wenn Text-Aenderung
// => gute Gelegenheit, Textbreite zu ermitteln!
- bHighlightning = FALSE;
+ bHighlightning = sal_False;
if ( aSyntaxLineTable.First() )
aImplSyntaxIdleTimer.Start();
@@ -405,7 +405,7 @@ void TextEditImp::InvalidateSyntaxHighlight()
DoDelayedSyntaxHighlight( i );
}
-void TextEditImp::SyntaxHighlight( BOOL bNew )
+void TextEditImp::SyntaxHighlight( sal_Bool bNew )
{
if ( ( bNew && bDoSyntaxHighlight ) || ( !bNew && !bDoSyntaxHighlight ) )
return;
@@ -422,12 +422,12 @@ void TextEditImp::SyntaxHighlight( BOOL bNew )
else
{
aSyntaxIdleTimer.Stop();
- pTextEngine->SetUpdateMode( FALSE );
- for ( ULONG i = 0; i < pTextEngine->GetParagraphCount(); i++ )
+ pTextEngine->SetUpdateMode( sal_False );
+ for ( sal_uIntPtr i = 0; i < pTextEngine->GetParagraphCount(); i++ )
pTextEngine->RemoveAttribs( i );
- pTextEngine->SetUpdateMode( TRUE );
- pTextView->ShowCursor(TRUE, TRUE );
+ pTextEngine->SetUpdateMode( sal_True );
+ pTextView->ShowCursor(sal_True, sal_True );
}
}
@@ -437,15 +437,15 @@ void TextEditImp::SetFont( const Font& rNewFont )
pTextEngine->SetFont(rNewFont);
}
-BOOL TextEditImp::IsModified()
+sal_Bool TextEditImp::IsModified()
{
return pTextEngine->IsModified();
}
void TextEditImp::KeyInput( const KeyEvent& rKeyEvent )
{
- BOOL bWasModified = pTextView->GetTextEngine()->IsModified();
- pTextView->GetTextEngine()->SetModified( FALSE );
+ sal_Bool bWasModified = pTextView->GetTextEngine()->IsModified();
+ pTextView->GetTextEngine()->SetModified( sal_False );
if ( !pTextView->KeyInput( rKeyEvent ) )
Window::KeyInput( rKeyEvent );
@@ -526,10 +526,10 @@ SbxBase* TextEditImp::GetSbxAtMousePos( String &aWord )
if ( aSuffixes.Search( aWord.GetChar(nLastChar) ) != STRING_NOTFOUND )
aWord.Erase( nLastChar, 1 );
// because perhaps TestTools throws an error
- BOOL bWasError = SbxBase::IsError();
- pAppEdit->GetBasicFrame()->Basic().DebugFindNoErrors( TRUE );
+ sal_Bool bWasError = SbxBase::IsError();
+ pAppEdit->GetBasicFrame()->Basic().DebugFindNoErrors( sal_True );
SbxBase* pSBX = StarBASIC::FindSBXInCurrentScope( aWord );
- pAppEdit->GetBasicFrame()->Basic().DebugFindNoErrors( FALSE );
+ pAppEdit->GetBasicFrame()->Basic().DebugFindNoErrors( sal_False );
DBG_ASSERT( !( !bWasError && SbxBase::IsError()), "Error generated while retrieving Variable data for viewing" );
if ( !bWasError && SbxBase::IsError() )
SbxBase::ResetError();
@@ -655,8 +655,8 @@ DBG_NAME(TextEdit)
TextEdit::TextEdit( AppEdit* pParent, const WinBits& aBits )
: pBreakpointWindow( NULL )
-, bFileWasUTF8( FALSE )
-, bSaveAsUTF8( FALSE )
+, bFileWasUTF8( sal_False )
+, bSaveAsUTF8( sal_False )
, aEdit( pParent, aBits | WB_NOHIDESELECTION )
{
DBG_CTOR(TextEdit,0);
@@ -665,7 +665,7 @@ DBG_CTOR(TextEdit,0);
TextEdit::~TextEdit()
{DBG_DTOR(TextEdit,0);}
-void TextEdit::Highlight( ULONG nLine, xub_StrLen nCol1, xub_StrLen nCol2 )
+void TextEdit::Highlight( sal_uIntPtr nLine, xub_StrLen nCol1, xub_StrLen nCol2 )
{
if ( nLine ) // Should not occure but at 'Sub expected' in first line
nLine--;
@@ -691,7 +691,7 @@ void TextEdit::Highlight( ULONG nLine, xub_StrLen nCol1, xub_StrLen nCol2 )
// Because nCol2 *may* point after the current statement
// (because the next one starts there) there are space
// that must be removed
- BOOL bColon = FALSE;
+ sal_Bool bColon = sal_False;
while ( s.GetChar( nCol2 ) == ' ' && nCol2 > nCol1 && !bColon )
{
@@ -699,7 +699,7 @@ void TextEdit::Highlight( ULONG nLine, xub_StrLen nCol1, xub_StrLen nCol2 )
if ( s.GetChar( nCol2 ) == ':' )
{
nCol2--;
- bColon = TRUE;
+ bColon = sal_True;
}
}
@@ -724,31 +724,31 @@ String TextEdit::GetSelected(){ return aEdit.pTextView->GetSelected(); }
TextSelection TextEdit::GetSelection() const{ return aEdit.pTextView->GetSelection(); }
void TextEdit::SetSelection( const TextSelection& rSelection ){ aEdit.pTextView->SetSelection( rSelection ); }
-USHORT TextEdit::GetLineNr() const
+sal_uInt16 TextEdit::GetLineNr() const
{
- return sal::static_int_cast< USHORT >(
+ return sal::static_int_cast< sal_uInt16 >(
aEdit.pTextView->GetSelection().GetEnd().GetPara()+1);
}
void TextEdit::ReplaceSelected( const String& rStr ){ aEdit.pTextView->InsertText(rStr); }
-BOOL TextEdit::IsModified(){ return aEdit.IsModified(); }
+sal_Bool TextEdit::IsModified(){ return aEdit.IsModified(); }
String TextEdit::GetText() const
{
return aEdit.pTextEngine->GetText( GetSystemLineEnd() );
}
-void TextEdit::SetText( const String& rStr ){ aEdit.pTextEngine->SetText(rStr); aEdit.pTextEngine->SetModified( FALSE ); }
+void TextEdit::SetText( const String& rStr ){ aEdit.pTextEngine->SetText(rStr); aEdit.pTextEngine->SetModified( sal_False ); }
void TextEdit::SetModifyHdl( Link l ){ aEdit.SetModifyHdl(l); }
-BOOL TextEdit::HasText() const { return aEdit.pTextEngine->GetTextLen() > 0; }
+sal_Bool TextEdit::HasText() const { return aEdit.pTextEngine->GetTextLen() > 0; }
// Search from the beginning or at mark + 1
-BOOL TextEdit::Find( const String& s )
+sal_Bool TextEdit::Find( const String& s )
{
DBG_CHKTHIS(TextEdit,0);
TextSelection aSelection = aEdit.pTextView->GetSelection();
- ULONG nPara = aSelection.GetStart().GetPara();
+ sal_uIntPtr nPara = aSelection.GetStart().GetPara();
xub_StrLen nIndex = aSelection.GetStart().GetIndex();
if ( aSelection.HasRange() )
@@ -762,23 +762,23 @@ BOOL TextEdit::Find( const String& s )
if( nIndex != STRING_NOTFOUND )
{
aEdit.pTextView->SetSelection( TextSelection( TextPaM( nPara, nIndex ), TextPaM( nPara, nIndex + s.Len() ) ) );
- return TRUE;
+ return sal_True;
}
nIndex = 0;
nPara++;
}
- return FALSE;
+ return sal_False;
}
-BOOL TextEdit::Load( const String& aName )
+sal_Bool TextEdit::Load( const String& aName )
{
DBG_CHKTHIS(TextEdit,0);
- BOOL bOk = TRUE;
+ sal_Bool bOk = sal_True;
SvFileStream aStrm( aName, STREAM_STD_READ );
if( aStrm.IsOpen() )
{
String aText, aLine, aLineBreak;
- BOOL bIsFirstLine = TRUE;
+ sal_Bool bIsFirstLine = sal_True;
aLineBreak += '\n';
aLineBreak.ConvertLineEnd();
rtl_TextEncoding aFileEncoding = RTL_TEXTENCODING_IBM_850;
@@ -788,29 +788,29 @@ DBG_CHKTHIS(TextEdit,0);
if ( bIsFirstLine && IsTTSignatureForUnicodeTextfile( aLine ) )
{
aFileEncoding = RTL_TEXTENCODING_UTF8;
- bFileWasUTF8 = TRUE;
+ bFileWasUTF8 = sal_True;
}
else
{
if ( !bIsFirstLine )
aText += aLineBreak;
aText += aLine;
- bIsFirstLine = FALSE;
+ bIsFirstLine = sal_False;
}
if( aStrm.GetError() != SVSTREAM_OK )
- bOk = FALSE;
+ bOk = sal_False;
}
SetText( aText );
}
else
- bOk = FALSE;
+ bOk = sal_False;
return bOk;
}
-BOOL TextEdit::Save( const String& aName )
+sal_Bool TextEdit::Save( const String& aName )
{
DBG_CHKTHIS(TextEdit,0);
- BOOL bOk = TRUE;
+ sal_Bool bOk = sal_True;
SvFileStream aStrm( aName, STREAM_STD_WRITE | STREAM_TRUNC );
rtl_TextEncoding aFileEncoding = RTL_TEXTENCODING_IBM_850;
if( aStrm.IsOpen() )
@@ -825,10 +825,10 @@ DBG_CHKTHIS(TextEdit,0);
aSave.ConvertLineEnd(LINEEND_LF);
aStrm << ByteString( aSave, aFileEncoding ).GetBuffer();
if( aStrm.GetError() != SVSTREAM_OK )
- bOk = FALSE;
+ bOk = sal_False;
else
- aEdit.pTextEngine->SetModified(FALSE);
- } else bOk = FALSE;
+ aEdit.pTextEngine->SetModified(sal_False);
+ } else bOk = sal_False;
return bOk;
}
diff --git a/basic/source/app/textedit.hxx b/basic/source/app/textedit.hxx
index 094896fa87f4..21044c75e4bf 100644..100755
--- a/basic/source/app/textedit.hxx
+++ b/basic/source/app/textedit.hxx
@@ -49,7 +49,7 @@ class TextEditImp : public Window, public SfxListener
using Window::Notify;
protected:
- void DoSyntaxHighlight( ULONG nPara );
+ void DoSyntaxHighlight( sal_uIntPtr nPara );
private:
@@ -63,10 +63,10 @@ private:
void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
- void ImpDoHighlight( const String& rSource, ULONG nLineOff );
- BOOL bHighlightning;
- BOOL bDoSyntaxHighlight;
- BOOL bDelayHighlight;
+ void ImpDoHighlight( const String& rSource, sal_uIntPtr nLineOff );
+ sal_Bool bHighlightning;
+ sal_Bool bDoSyntaxHighlight;
+ sal_Bool bDelayHighlight;
SbxBase* GetSbxAtMousePos( String &aWord );
@@ -75,12 +75,12 @@ private:
DECL_LINK( ShowVarContents, void* );
Point aTipPos;
String aTipWord;
- ULONG nTipId;
+ sal_uIntPtr nTipId;
Timer HideTipTimer;
Timer ShowTipTimer;
- BOOL bViewMoved;
+ sal_Bool bViewMoved;
public:
TextEditImp( AppEdit *pParent, const WinBits& aBits );
@@ -90,7 +90,7 @@ public:
TextView *pTextView;
void SetFont( const Font& rNewFont );
- BOOL IsModified();
+ sal_Bool IsModified();
void SetModifyHdl( Link l ){ ModifyHdl = l; }
void KeyInput( const KeyEvent& rKeyEvent );
@@ -99,14 +99,14 @@ public:
void MouseButtonDown( const MouseEvent& rMouseEvent );
// void MouseMove( const MouseEvent& rMouseEvent );
void Command( const CommandEvent& rCEvt );
- //BOOL Drop( const DropEvent& rEvt );
- //BOOL QueryDrop( DropEvent& rEvt );
+ //sal_Bool Drop( const DropEvent& rEvt );
+ //sal_Bool QueryDrop( DropEvent& rEvt );
- BOOL ViewMoved();
+ sal_Bool ViewMoved();
void DoDelayedSyntaxHighlight( xub_StrLen nPara );
void InvalidateSyntaxHighlight();
- void SyntaxHighlight( BOOL bNew );
+ void SyntaxHighlight( sal_Bool bNew );
void BuildKontextMenu( PopupMenu *&pMenu );
};
@@ -116,13 +116,13 @@ DBG_NAMEEX(TextEdit)
class TextEdit : public DataEdit {
BreakpointWindow *pBreakpointWindow;
- BOOL bFileWasUTF8;
- BOOL bSaveAsUTF8;
+ sal_Bool bFileWasUTF8;
+ sal_Bool bSaveAsUTF8;
public:
TextEdit( AppEdit*, const WinBits& );
~TextEdit();
- void Highlight( ULONG nLine, xub_StrLen nCol1, xub_StrLen nCol2 );
+ void Highlight( sal_uIntPtr nLine, xub_StrLen nCol1, xub_StrLen nCol2 );
TextEditImp& GetTextEditImp() { return aEdit; }
void SetBreakpointWindow( BreakpointWindow *pBPWindow ){ pBreakpointWindow = pBPWindow; }
@@ -132,7 +132,7 @@ public:
virtual void BuildKontextMenu( PopupMenu *&pMenu );
- void SaveAsUTF8( BOOL bUTF8 ) { bSaveAsUTF8 = bUTF8; }
+ void SaveAsUTF8( sal_Bool bUTF8 ) { bSaveAsUTF8 = bUTF8; }
};
#endif
diff --git a/basic/source/app/ttbasic.cxx b/basic/source/app/ttbasic.cxx
index cfc12a85dcc4..cfc12a85dcc4 100644..100755
--- a/basic/source/app/ttbasic.cxx
+++ b/basic/source/app/ttbasic.cxx
diff --git a/basic/source/app/ttbasic.hxx b/basic/source/app/ttbasic.hxx
index 8810da66b5e9..8810da66b5e9 100644..100755
--- a/basic/source/app/ttbasic.hxx
+++ b/basic/source/app/ttbasic.hxx
diff --git a/basic/source/app/ttmsg.src b/basic/source/app/ttmsg.src
index e0f43e89b851..c2c017b167ca 100644..100755
--- a/basic/source/app/ttmsg.src
+++ b/basic/source/app/ttmsg.src
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#include "ttmsg.hrc"
+#include "basic/ttmsg.hrc"
// Here are included the messages of the folder /basic/source/testtool
generated by cgit (git 2.34.1) at 2025-03-22 13:29:59 +0000