summaryrefslogtreecommitdiff
path: root/formula/inc
diff options
context:
space:
mode:
authorThorsten Behrens <tbehrens@novell.com>2011-03-12 02:42:58 +0100
committerThorsten Behrens <tbehrens@novell.com>2011-03-12 02:42:58 +0100
commitf9c53ad052cb31b8ff2727526651a79f333e3bf6 (patch)
treec6896e41cf8ea247019df025377175690c154bc8 /formula/inc
parentff62ed4745a9b2367c68ef3eb863d29022f0fa7d (diff)
parent9497c2fb5de3be75b742f34cb605038e13acc22d (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 'formula/inc')
-rwxr-xr-x[-rw-r--r--]formula/inc/AddressConvention.hxx0
-rwxr-xr-x[-rw-r--r--]formula/inc/formula/ExternalReferenceHelper.hxx0
-rwxr-xr-x[-rw-r--r--]formula/inc/formula/FormulaCompiler.hxx57
-rwxr-xr-x[-rw-r--r--]formula/inc/formula/FormulaOpCodeMapperObj.hxx0
-rwxr-xr-x[-rw-r--r--]formula/inc/formula/IControlReferenceHandler.hxx2
-rwxr-xr-x[-rw-r--r--]formula/inc/formula/IFunctionDescription.hxx12
-rwxr-xr-x[-rw-r--r--]formula/inc/formula/compiler.hrc0
-rwxr-xr-x[-rw-r--r--]formula/inc/formula/errorcodes.hxx78
-rwxr-xr-x[-rw-r--r--]formula/inc/formula/formdata.hxx44
-rwxr-xr-x[-rw-r--r--]formula/inc/formula/formula.hxx32
-rwxr-xr-x[-rw-r--r--]formula/inc/formula/formuladllapi.h0
-rwxr-xr-x[-rw-r--r--]formula/inc/formula/formulahelper.hxx12
-rwxr-xr-x[-rw-r--r--]formula/inc/formula/funcutl.hxx2
-rwxr-xr-x[-rw-r--r--]formula/inc/formula/grammar.hxx0
-rwxr-xr-x[-rw-r--r--]formula/inc/formula/opcode.hxx2
-rwxr-xr-x[-rw-r--r--]formula/inc/formula/token.hxx92
-rwxr-xr-x[-rw-r--r--]formula/inc/formula/tokenarray.hxx48
-rwxr-xr-x[-rw-r--r--]formula/inc/helpids.hrc50
-rwxr-xr-x[-rw-r--r--]formula/inc/makefile.mk0
-rwxr-xr-x[-rw-r--r--]formula/inc/pch/precompiled_formula.cxx0
-rwxr-xr-x[-rw-r--r--]formula/inc/pch/precompiled_formula.hxx0
21 files changed, 211 insertions, 220 deletions
diff --git a/formula/inc/AddressConvention.hxx b/formula/inc/AddressConvention.hxx
index 7ad743ac11..7ad743ac11 100644..100755
--- a/formula/inc/AddressConvention.hxx
+++ b/formula/inc/AddressConvention.hxx
diff --git a/formula/inc/formula/ExternalReferenceHelper.hxx b/formula/inc/formula/ExternalReferenceHelper.hxx
index 20cf2568e4..20cf2568e4 100644..100755
--- a/formula/inc/formula/ExternalReferenceHelper.hxx
+++ b/formula/inc/formula/ExternalReferenceHelper.hxx
diff --git a/formula/inc/formula/FormulaCompiler.hxx b/formula/inc/formula/FormulaCompiler.hxx
index f5f1e71174..166d522728 100644..100755
--- a/formula/inc/formula/FormulaCompiler.hxx
+++ b/formula/inc/formula/FormulaCompiler.hxx
@@ -65,7 +65,7 @@ struct FormulaArrayStack
{
FormulaArrayStack* pNext;
FormulaTokenArray* pArr;
- BOOL bTemp;
+ sal_Bool bTemp;
};
@@ -100,7 +100,7 @@ public:
ExternalHashMap * mpExternalHashMap; /// Hash map of ocExternal, Filter String -> AddIn String
ExternalHashMap * mpReverseExternalHashMap; /// Hash map of ocExternal, AddIn String -> Filter String
FormulaGrammar::Grammar meGrammar; /// Grammar, language and reference convention
- USHORT mnSymbols; /// Count of OpCode symbols
+ sal_uInt16 mnSymbols; /// Count of OpCode symbols
bool mbCore : 1; /// If mapping was setup by core, not filters
bool mbEnglish : 1; /// If English symbols and external names
@@ -110,7 +110,7 @@ public:
public:
- OpCodeMap(USHORT nSymbols, bool bCore, FormulaGrammar::Grammar eGrammar ) :
+ OpCodeMap(sal_uInt16 nSymbols, bool bCore, FormulaGrammar::Grammar eGrammar ) :
mpHashMap( new OpCodeHashMap( nSymbols)),
mpTable( new String[ nSymbols ]),
mpExternalHashMap( new ExternalHashMap),
@@ -137,8 +137,8 @@ public:
/// Get the symbol string matching an OpCode.
inline const String& getSymbol( const OpCode eOp ) const
{
- DBG_ASSERT( USHORT(eOp) < mnSymbols, "OpCodeMap::getSymbol: OpCode out of range");
- if (USHORT(eOp) < mnSymbols)
+ DBG_ASSERT( sal_uInt16(eOp) < mnSymbols, "OpCodeMap::getSymbol: OpCode out of range");
+ if (sal_uInt16(eOp) < mnSymbols)
return mpTable[ eOp ];
static String s_sEmpty;
return s_sEmpty;
@@ -148,7 +148,7 @@ public:
inline FormulaGrammar::Grammar getGrammar() const { return meGrammar; }
/// Get the symbol count.
- inline USHORT getSymbolCount() const { return mnSymbols; }
+ inline sal_uInt16 getSymbolCount() const { return mnSymbols; }
/** Are these English symbols, as opposed to native language (which may
be English as well)? */
@@ -218,25 +218,26 @@ public:
*/
OpCode GetEnglishOpCode( const String& rName ) const;
- void SetCompileForFAP( BOOL bVal )
+ void SetCompileForFAP( sal_Bool bVal )
{ bCompileForFAP = bVal; bIgnoreErrors = bVal; }
static bool IsOpCodeVolatile( OpCode eOp );
- static BOOL DeQuote( String& rStr );
+ static sal_Bool DeQuote( String& rStr );
+
static const String& GetNativeSymbol( OpCode eOp );
- static BOOL IsMatrixFunction(OpCode _eOpCode); // if a function _always_ returns a Matrix
+ static sal_Bool IsMatrixFunction(OpCode _eOpCode); // if a function _always_ returns a Matrix
short GetNumFormatType() const { return nNumFmt; }
- BOOL CompileTokenArray();
+ sal_Bool CompileTokenArray();
void CreateStringFromTokenArray( String& rFormula );
void CreateStringFromTokenArray( rtl::OUStringBuffer& rBuffer );
FormulaToken* CreateStringFromToken( String& rFormula, FormulaToken* pToken,
- BOOL bAllowArrAdvance = FALSE );
+ sal_Bool bAllowArrAdvance = sal_False );
FormulaToken* CreateStringFromToken( rtl::OUStringBuffer& rBuffer, FormulaToken* pToken,
- BOOL bAllowArrAdvance = FALSE );
+ sal_Bool bAllowArrAdvance = sal_False );
void AppendBoolean( rtl::OUStringBuffer& rBuffer, bool bVal );
void AppendDouble( rtl::OUStringBuffer& rBuffer, double fVal );
@@ -250,18 +251,18 @@ public:
static void ResetNativeSymbols();
static void SetNativeSymbols( const OpCodeMapPtr& xMap );
protected:
- virtual String FindAddInFunction( const String& rUpperName, BOOL bLocalFirst ) const;
+ virtual String FindAddInFunction( const String& rUpperName, sal_Bool bLocalFirst ) const;
virtual void fillFromAddInCollectionUpperName( NonConstOpCodeMapPtr xMap ) const;
virtual void fillFromAddInMap( NonConstOpCodeMapPtr xMap, FormulaGrammar::Grammar _eGrammar ) const;
virtual void fillFromAddInCollectionEnglishName( NonConstOpCodeMapPtr xMap ) const;
virtual void fillAddInToken(::std::vector< ::com::sun::star::sheet::FormulaOpCodeMapEntry >& _rVec,bool _bIsEnglish) const;
- virtual void SetError(USHORT nError);
+ virtual void SetError(sal_uInt16 nError);
virtual FormulaTokenRef ExtendRangeReference( FormulaToken & rTok1, FormulaToken & rTok2, bool bReuseDoubleRef );
- virtual BOOL HandleExternalReference(const FormulaToken& _aToken);
- virtual BOOL HandleRange();
- virtual BOOL HandleSingleRef();
- virtual BOOL HandleDbData();
+ virtual sal_Bool HandleExternalReference(const FormulaToken& _aToken);
+ virtual sal_Bool HandleRange();
+ virtual sal_Bool HandleSingleRef();
+ virtual sal_Bool HandleDbData();
virtual void CreateStringFromExternal(rtl::OUStringBuffer& rBuffer, FormulaToken* pTokenP);
virtual void CreateStringFromSingleRef(rtl::OUStringBuffer& rBuffer,FormulaToken* pTokenP);
@@ -269,9 +270,9 @@ protected:
virtual void CreateStringFromMatrix(rtl::OUStringBuffer& rBuffer,FormulaToken* pTokenP);
virtual void CreateStringFromIndex(rtl::OUStringBuffer& rBuffer,FormulaToken* pTokenP);
virtual void LocalizeString( String& rName ); // modify rName - input: exact name
- virtual BOOL IsImportingXML() const;
+ virtual sal_Bool IsImportingXML() const;
- BOOL GetToken();
+ sal_Bool GetToken();
OpCode NextToken();
void PutCode( FormulaTokenRef& );
void Factor();
@@ -288,7 +289,7 @@ protected:
void NotLine();
OpCode Expression();
void PopTokenArray();
- void PushTokenArray( FormulaTokenArray*, BOOL = FALSE );
+ void PushTokenArray( FormulaTokenArray*, sal_Bool = sal_False );
bool MergeRangeReference( FormulaToken * * const pCode1, FormulaToken * const * const pCode2 );
@@ -308,18 +309,18 @@ protected:
OpCode eLastOp;
short nRecursion; // GetToken() recursions
short nNumFmt; // set during CompileTokenArray()
- USHORT pc;
+ sal_uInt16 pc;
FormulaGrammar::Grammar
meGrammar; // The grammar used, language plus convention.
- BOOL bAutoCorrect; // whether to apply AutoCorrection
- BOOL bCorrected; // AutoCorrection was applied
- BOOL bCompileForFAP; //! not real RPN but names, for FunctionAutoPilot,
+ sal_Bool bAutoCorrect; // whether to apply AutoCorrection
+ sal_Bool bCorrected; // AutoCorrection was applied
+ sal_Bool bCompileForFAP; //! not real RPN but names, for FunctionAutoPilot,
// will not be resolved
- BOOL bIgnoreErrors; // on AutoCorrect and CompileForFAP
+ sal_Bool bIgnoreErrors; // on AutoCorrect and CompileForFAP
// ignore errors and create RPN nevertheless
- BOOL glSubTotal; // if code contains one or more subtotal functions
+ sal_Bool glSubTotal; // if code contains one or more subtotal functions
private:
void InitSymbolsNative() const; /// only SymbolsNative, on first document creation
void InitSymbolsEnglish() const; /// only SymbolsEnglish, maybe later
@@ -327,7 +328,7 @@ private:
void InitSymbolsODFF() const; /// only SymbolsODFF, on demand
void InitSymbolsEnglishXL() const; /// only SymbolsEnglishXL, on demand
- void loadSymbols(USHORT _nSymbols,FormulaGrammar::Grammar _eGrammar,NonConstOpCodeMapPtr& _xMap) const;
+ void loadSymbols(sal_uInt16 _nSymbols,FormulaGrammar::Grammar _eGrammar,NonConstOpCodeMapPtr& _xMap) const;
static inline void ForceArrayOperator( FormulaTokenRef& rCurr, const FormulaTokenRef& rPrev )
{
diff --git a/formula/inc/formula/FormulaOpCodeMapperObj.hxx b/formula/inc/formula/FormulaOpCodeMapperObj.hxx
index fe50c22139..fe50c22139 100644..100755
--- a/formula/inc/formula/FormulaOpCodeMapperObj.hxx
+++ b/formula/inc/formula/FormulaOpCodeMapperObj.hxx
diff --git a/formula/inc/formula/IControlReferenceHandler.hxx b/formula/inc/formula/IControlReferenceHandler.hxx
index 84fd125061..44aa68ba13 100644..100755
--- a/formula/inc/formula/IControlReferenceHandler.hxx
+++ b/formula/inc/formula/IControlReferenceHandler.hxx
@@ -38,7 +38,7 @@ namespace formula
{
public:
virtual void ShowReference(const String& _sRef) = 0;
- virtual void HideReference( BOOL bDoneRefMode = TRUE ) = 0;
+ virtual void HideReference( sal_Bool bDoneRefMode = sal_True ) = 0;
virtual void ReleaseFocus( RefEdit* pEdit, RefButton* pButton = NULL ) = 0;
virtual void ToggleCollapsed( RefEdit* pEdit, RefButton* pButton = NULL ) = 0;
};
diff --git a/formula/inc/formula/IFunctionDescription.hxx b/formula/inc/formula/IFunctionDescription.hxx
index eeb3f47db0..838a2f9629 100644..100755
--- a/formula/inc/formula/IFunctionDescription.hxx
+++ b/formula/inc/formula/IFunctionDescription.hxx
@@ -90,10 +90,10 @@ namespace formula
// GetFormulaString
virtual ::rtl::OUString getFormula(const ::std::vector< ::rtl::OUString >& _aArguments) const = 0;
// GetVisibleArgMapping
- virtual void fillVisibleArgumentMapping(::std::vector<USHORT>& _rArguments) const = 0;
+ virtual void fillVisibleArgumentMapping(::std::vector<sal_uInt16>& _rArguments) const = 0;
virtual void initArgumentInfo() const = 0;
virtual ::rtl::OUString getSignature() const = 0;
- virtual long getHelpId() const = 0;
+ virtual rtl::OString getHelpId() const = 0;
// parameter
virtual sal_uInt32 getParameterCount() const = 0;
@@ -118,7 +118,7 @@ namespace formula
public:
IStructHelper(){}
virtual SvLBoxEntry* InsertEntry(const XubString& rText, SvLBoxEntry* pParent,
- USHORT nFlag,ULONG nPos=0,IFormulaToken* pScToken=NULL) = 0;
+ sal_uInt16 nFlag,sal_uLong nPos=0,IFormulaToken* pScToken=NULL) = 0;
virtual String GetEntryText(SvLBoxEntry* pEntry) const = 0;
virtual SvLBoxEntry* GetParent(SvLBoxEntry* pEntry) const = 0;
@@ -153,9 +153,9 @@ namespace formula
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaOpCodeMapper> getFormulaOpCodeMapper() const = 0;
virtual ::com::sun::star::table::CellAddress getReferencePosition() const = 0;
- virtual void setDispatcherLock( BOOL bLock ) = 0;
- virtual void dispatch(BOOL _bOK,BOOL _bMartixChecked) = 0;
- virtual void doClose(BOOL _bOk) = 0;
+ virtual void setDispatcherLock( sal_Bool bLock ) = 0;
+ virtual void dispatch(sal_Bool _bOK,sal_Bool _bMartixChecked) = 0;
+ virtual void doClose(sal_Bool _bOk) = 0;
virtual void insertEntryToLRUList(const IFunctionDescription* pDesc) = 0;
virtual void showReference(const String& _sFormula) = 0;
};
diff --git a/formula/inc/formula/compiler.hrc b/formula/inc/formula/compiler.hrc
index c1a8117ab0..c1a8117ab0 100644..100755
--- a/formula/inc/formula/compiler.hrc
+++ b/formula/inc/formula/compiler.hrc
diff --git a/formula/inc/formula/errorcodes.hxx b/formula/inc/formula/errorcodes.hxx
index 54fd243dba..bf46a4744f 100644..100755
--- a/formula/inc/formula/errorcodes.hxx
+++ b/formula/inc/formula/errorcodes.hxx
@@ -35,60 +35,60 @@
namespace ScErrorCodes
{
-const USHORT errIllegalChar = 501;
-const USHORT errIllegalArgument = 502;
-const USHORT errIllegalFPOperation = 503; // #NUM!
-const USHORT errIllegalParameter = 504;
-const USHORT errIllegalJump = 505;
-const USHORT errSeparator = 506;
-const USHORT errPair = 507;
-const USHORT errPairExpected = 508;
-const USHORT errOperatorExpected = 509;
-const USHORT errVariableExpected = 510;
-const USHORT errParameterExpected = 511;
-const USHORT errCodeOverflow = 512;
-const USHORT errStringOverflow = 513;
-const USHORT errStackOverflow = 514;
-const USHORT errUnknownState = 515;
-const USHORT errUnknownVariable = 516;
-const USHORT errUnknownOpCode = 517;
-const USHORT errUnknownStackVariable = 518;
-const USHORT errNoValue = 519; // #VALUE!
-const USHORT errUnknownToken = 520;
-const USHORT errNoCode = 521; // #NULL!
-const USHORT errCircularReference = 522;
-const USHORT errNoConvergence = 523;
-const USHORT errNoRef = 524; // #REF!
-const USHORT errNoName = 525; // #NAME?
-const USHORT errDoubleRef = 526;
-const USHORT errInterpOverflow = 527;
+const sal_uInt16 errIllegalChar = 501;
+const sal_uInt16 errIllegalArgument = 502;
+const sal_uInt16 errIllegalFPOperation = 503; // #NUM!
+const sal_uInt16 errIllegalParameter = 504;
+const sal_uInt16 errIllegalJump = 505;
+const sal_uInt16 errSeparator = 506;
+const sal_uInt16 errPair = 507;
+const sal_uInt16 errPairExpected = 508;
+const sal_uInt16 errOperatorExpected = 509;
+const sal_uInt16 errVariableExpected = 510;
+const sal_uInt16 errParameterExpected = 511;
+const sal_uInt16 errCodeOverflow = 512;
+const sal_uInt16 errStringOverflow = 513;
+const sal_uInt16 errStackOverflow = 514;
+const sal_uInt16 errUnknownState = 515;
+const sal_uInt16 errUnknownVariable = 516;
+const sal_uInt16 errUnknownOpCode = 517;
+const sal_uInt16 errUnknownStackVariable = 518;
+const sal_uInt16 errNoValue = 519; // #VALUE!
+const sal_uInt16 errUnknownToken = 520;
+const sal_uInt16 errNoCode = 521; // #NULL!
+const sal_uInt16 errCircularReference = 522;
+const sal_uInt16 errNoConvergence = 523;
+const sal_uInt16 errNoRef = 524; // #REF!
+const sal_uInt16 errNoName = 525; // #NAME?
+const sal_uInt16 errDoubleRef = 526;
+const sal_uInt16 errInterpOverflow = 527;
// Not displayed, temporary for TrackFormulas,
// Cell depends on another cell that has errCircularReference
-const USHORT errTrackFromCircRef = 528;
+const sal_uInt16 errTrackFromCircRef = 528;
// ScInterpreter internal: no numeric value but numeric queried. If this is
// set as mnStringNoValueError no error is generated but 0 returned.
-const USHORT errCellNoValue = 529;
+const sal_uInt16 errCellNoValue = 529;
// Interpreter: needed AddIn not found
-const USHORT errNoAddin = 530;
+const sal_uInt16 errNoAddin = 530;
// Interpreter: needed Macro not found
-const USHORT errNoMacro = 531;
+const sal_uInt16 errNoMacro = 531;
// Interpreter: Division by zero
-const USHORT errDivisionByZero = 532; // #DIV/0!
+const sal_uInt16 errDivisionByZero = 532; // #DIV/0!
// Compiler: a non-simple (str,err,val) value was put in an array
-const USHORT errNestedArray = 533;
+const sal_uInt16 errNestedArray = 533;
// ScInterpreter internal: no numeric value but numeric queried. If this is
// temporarily (!) set as mnStringNoValueError, the error is generated and can
// be used to distinguish that condition from all other (inherited) errors. Do
// not use for anything else! Never push or inherit the error otherwise!
-const USHORT errNotNumericString = 534;
+const sal_uInt16 errNotNumericString = 534;
// Interpreter: NA() not available condition, not a real error
-const USHORT NOTAVAILABLE = 0x7fff;
+const sal_uInt16 NOTAVAILABLE = 0x7fff;
/** Unconditionally construct a double value of NAN where the lower bits
represent an interpreter error code. */
-inline double CreateDoubleError( USHORT nErr )
+inline double CreateDoubleError( sal_uInt16 nErr )
{
union
{
@@ -102,17 +102,17 @@ inline double CreateDoubleError( USHORT nErr )
/** Recreate the error code of a coded double error, if any. */
-inline USHORT GetDoubleErrorValue( double fVal )
+inline sal_uInt16 GetDoubleErrorValue( double fVal )
{
if ( ::rtl::math::isFinite( fVal ) )
return 0;
if ( ::rtl::math::isInf( fVal ) )
return errIllegalFPOperation; // normal INF
- UINT32 nErr = reinterpret_cast< sal_math_Double * >(
+ sal_uInt32 nErr = reinterpret_cast< sal_math_Double * >(
&fVal)->nan_parts.fraction_lo;
if ( nErr & 0xffff0000 )
return errNoValue; // just a normal NAN
- return (USHORT)(nErr & 0x0000ffff); // any other error
+ return (sal_uInt16)(nErr & 0x0000ffff); // any other error
}
} // namespace ScErrorCodes
diff --git a/formula/inc/formula/formdata.hxx b/formula/inc/formula/formdata.hxx
index 369468eb68..a5dc872d5f 100644..100755
--- a/formula/inc/formula/formdata.hxx
+++ b/formula/inc/formula/formdata.hxx
@@ -44,28 +44,28 @@ public:
virtual void SaveValues();
void RestoreValues();
- BOOL HasParent() const { return pParent != NULL; }
+ sal_Bool HasParent() const { return pParent != NULL; }
- inline USHORT GetMode() const { return nMode; }
+ inline sal_uInt16 GetMode() const { return nMode; }
inline xub_StrLen GetFStart() const { return nFStart; }
- inline USHORT GetCatSel() const { return nCatSel; }
- inline USHORT GetFuncSel() const { return nFuncSel; }
- inline USHORT GetOffset() const { return nOffset; }
- inline USHORT GetEdFocus() const { return nEdFocus; }
+ inline sal_uInt16 GetCatSel() const { return nCatSel; }
+ inline sal_uInt16 GetFuncSel() const { return nFuncSel; }
+ inline sal_uInt16 GetOffset() const { return nOffset; }
+ inline sal_uInt16 GetEdFocus() const { return nEdFocus; }
inline const String& GetUndoStr() const { return aUndoStr; }
- inline BOOL GetMatrixFlag()const{ return bMatrix;}
- inline ULONG GetUniqueId()const { return nUniqueId;}
+ inline sal_Bool GetMatrixFlag()const{ return bMatrix;}
+ inline rtl::OString GetUniqueId()const { return aUniqueId;}
inline const Selection& GetSelection()const { return aSelection;}
- inline void SetMode( USHORT nNew ) { nMode = nNew; }
+ inline void SetMode( sal_uInt16 nNew ) { nMode = nNew; }
inline void SetFStart( xub_StrLen nNew ) { nFStart = nNew; }
- inline void SetCatSel( USHORT nNew ) { nCatSel = nNew; }
- inline void SetFuncSel( USHORT nNew ) { nFuncSel = nNew; }
- inline void SetOffset( USHORT nNew ) { nOffset = nNew; }
- inline void SetEdFocus( USHORT nNew ) { nEdFocus = nNew; }
+ inline void SetCatSel( sal_uInt16 nNew ) { nCatSel = nNew; }
+ inline void SetFuncSel( sal_uInt16 nNew ) { nFuncSel = nNew; }
+ inline void SetOffset( sal_uInt16 nNew ) { nOffset = nNew; }
+ inline void SetEdFocus( sal_uInt16 nNew ) { nEdFocus = nNew; }
inline void SetUndoStr( const String& rNew ) { aUndoStr = rNew; }
- inline void SetMatrixFlag(BOOL bNew) { bMatrix=bNew;}
- inline void SetUniqueId(ULONG nNew) { nUniqueId=nNew;}
+ inline void SetMatrixFlag(sal_Bool bNew) { bMatrix=bNew;}
+ inline void SetUniqueId(const rtl::OString nNew) { aUniqueId=nNew;}
inline void SetSelection(const Selection& aSel) { aSelection=aSel;}
protected:
void Reset();
@@ -74,15 +74,15 @@ protected:
FormEditData* pParent; // fuer Verschachtelung
private:
- USHORT nMode; // enum ScFormulaDlgMode
+ sal_uInt16 nMode; // enum ScFormulaDlgMode
xub_StrLen nFStart;
- USHORT nCatSel;
- USHORT nFuncSel;
- USHORT nOffset;
- USHORT nEdFocus;
+ sal_uInt16 nCatSel;
+ sal_uInt16 nFuncSel;
+ sal_uInt16 nOffset;
+ sal_uInt16 nEdFocus;
String aUndoStr;
- BOOL bMatrix;
- ULONG nUniqueId;
+ sal_Bool bMatrix;
+ rtl::OString aUniqueId;
Selection aSelection;
};
diff --git a/formula/inc/formula/formula.hxx b/formula/inc/formula/formula.hxx
index 17c30517dc..70ed2f104b 100644..100755
--- a/formula/inc/formula/formula.hxx
+++ b/formula/inc/formula/formula.hxx
@@ -79,22 +79,22 @@ protected:
virtual long PreNotify( NotifyEvent& rNEvt );
::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL );
void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL );
- void RefInputDoneAfter( BOOL bForced = FALSE );
- ULONG FindFocusWin(Window *pWin);
- void SetFocusWin(Window *pWin,ULONG nUniqueId);
+ void RefInputDoneAfter( sal_Bool bForced = sal_False );
+ rtl::OString FindFocusWin(Window *pWin);
+ void SetFocusWin(Window *pWin,const rtl::OString& nUniqueId);
void HighlightFunctionParas(const String& aFormula);
void SetMeText(const String& _sText);
- FormulaDlgMode SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,BOOL bMatrix,BOOL _bSelect,BOOL _bUpdate);
+ FormulaDlgMode SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,sal_Bool bMatrix,sal_Bool _bSelect,sal_Bool _bUpdate);
void Update();
- BOOL CheckMatrix(String& aFormula /*IN/OUT*/);
+ sal_Bool CheckMatrix(String& aFormula /*IN/OUT*/);
String GetMeText() const;
void Update(const String& _sExp);
void CheckMatrix();
- void DoEnter(BOOL _bOk);
- BOOL isUserMatrix() const;
+ void DoEnter(sal_Bool _bOk);
+ sal_Bool isUserMatrix() const;
const IFunctionDescription* getCurrentFunctionDescription() const;
- BOOL UpdateParaWin(Selection& _rSelection);
+ sal_Bool UpdateParaWin(Selection& _rSelection);
void UpdateParaWin(const Selection& _rSelection,const String& _sRefStr);
RefEdit* GetActiveEdit();
void SetEdSelection();
@@ -128,22 +128,22 @@ protected:
virtual long PreNotify( NotifyEvent& rNEvt );
::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL );
void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL );
- void RefInputDoneAfter( BOOL bForced = FALSE );
- ULONG FindFocusWin(Window *pWin);
- void SetFocusWin(Window *pWin,ULONG nUniqueId);
+ void RefInputDoneAfter( sal_Bool bForced = sal_False );
+ rtl::OString FindFocusWin(Window *pWin);
+ void SetFocusWin(Window *pWin,const rtl::OString& nUniqueId);
void HighlightFunctionParas(const String& aFormula);
void SetMeText(const String& _sText);
- FormulaDlgMode SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,BOOL bMatrix,BOOL _bSelect,BOOL _bUpdate);
+ FormulaDlgMode SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,sal_Bool bMatrix,sal_Bool _bSelect,sal_Bool _bUpdate);
void Update();
- BOOL CheckMatrix(String& aFormula /*IN/OUT*/);
+ sal_Bool CheckMatrix(String& aFormula /*IN/OUT*/);
String GetMeText() const;
void Update(const String& _sExp);
void CheckMatrix();
- void DoEnter(BOOL _bOk);
- BOOL isUserMatrix() const;
+ void DoEnter(sal_Bool _bOk);
+ sal_Bool isUserMatrix() const;
const IFunctionDescription* getCurrentFunctionDescription() const;
- BOOL UpdateParaWin(Selection& _rSelection);
+ sal_Bool UpdateParaWin(Selection& _rSelection);
void UpdateParaWin(const Selection& _rSelection,const String& _sRefStr);
RefEdit* GetActiveEdit();
void SetEdSelection();
diff --git a/formula/inc/formula/formuladllapi.h b/formula/inc/formula/formuladllapi.h
index c412c25cf8..c412c25cf8 100644..100755
--- a/formula/inc/formula/formuladllapi.h
+++ b/formula/inc/formula/formuladllapi.h
diff --git a/formula/inc/formula/formulahelper.hxx b/formula/inc/formula/formulahelper.hxx
index e8ab24f03b..34d77fd388 100644..100755
--- a/formula/inc/formula/formulahelper.hxx
+++ b/formula/inc/formula/formulahelper.hxx
@@ -55,29 +55,29 @@ namespace formula
inline const CharClass* GetCharClass() const { return m_pCharClass; }
- BOOL GetNextFunc( const String& rFormula,
- BOOL bBack,
+ sal_Bool GetNextFunc( const String& rFormula,
+ sal_Bool bBack,
xub_StrLen& rFStart, // Ein- und Ausgabe
xub_StrLen* pFEnd = NULL,
const IFunctionDescription** ppFDesc = NULL,
::std::vector< ::rtl::OUString>* pArgs = NULL ) const;
xub_StrLen GetFunctionStart( const String& rFormula, xub_StrLen nStart,
- BOOL bBack, String* pFuncName = NULL ) const;
+ sal_Bool bBack, String* pFuncName = NULL ) const;
xub_StrLen GetFunctionEnd ( const String& rFormula, xub_StrLen nStart ) const;
xub_StrLen GetArgStart ( const String& rFormula, xub_StrLen nStart,
- USHORT nArg ) const;
+ sal_uInt16 nArg ) const;
void GetArgStrings ( ::std::vector< ::rtl::OUString >& _rArgs,
const String& rFormula,
xub_StrLen nFuncPos,
- USHORT nArgs ) const;
+ sal_uInt16 nArgs ) const;
void FillArgStrings ( const String& rFormula,
xub_StrLen nFuncPos,
- USHORT nArgs,
+ sal_uInt16 nArgs,
::std::vector< ::rtl::OUString >& _rArgs ) const;
};
// =============================================================================
diff --git a/formula/inc/formula/funcutl.hxx b/formula/inc/formula/funcutl.hxx
index 6f7d23d3d3..fd6c3a7603 100644..100755
--- a/formula/inc/formula/funcutl.hxx
+++ b/formula/inc/formula/funcutl.hxx
@@ -43,7 +43,7 @@ class FORMULA_DLLPUBLIC RefEdit : public Edit
private:
Timer aTimer;
IControlReferenceHandler* pAnyRefDlg; // parent dialog
- BOOL bSilentFocus; // for SilentGrabFocus()
+ sal_Bool bSilentFocus; // for SilentGrabFocus()
DECL_LINK( UpdateHdl, Timer* );
diff --git a/formula/inc/formula/grammar.hxx b/formula/inc/formula/grammar.hxx
index 1b95f108cc..1b95f108cc 100644..100755
--- a/formula/inc/formula/grammar.hxx
+++ b/formula/inc/formula/grammar.hxx
diff --git a/formula/inc/formula/opcode.hxx b/formula/inc/formula/opcode.hxx
index e13cb6dc72..03e86eb093 100644..100755
--- a/formula/inc/formula/opcode.hxx
+++ b/formula/inc/formula/opcode.hxx
@@ -397,7 +397,7 @@ enum OpCodeEnum
#ifndef DBG_UTIL
// save memory since compilers tend to int an enum
-typedef USHORT OpCode;
+typedef sal_uInt16 OpCode;
#else
// have enum names in debugger
typedef OpCodeEnum OpCode;
diff --git a/formula/inc/formula/token.hxx b/formula/inc/formula/token.hxx
index 8937f844ae..a8c54aa8df 100644..100755
--- a/formula/inc/formula/token.hxx
+++ b/formula/inc/formula/token.hxx
@@ -78,7 +78,7 @@ enum StackVarEnum
#ifndef DBG_UTIL
// save memory since compilers tend to int an enum
-typedef BYTE StackVar;
+typedef sal_uInt8 StackVar;
#else
// have enum names in debugger
typedef StackVarEnum StackVar;
@@ -98,7 +98,7 @@ class FORMULA_DLLPUBLIC FormulaToken : public IFormulaToken
protected:
const StackVar eType; // type of data
- mutable USHORT nRefCnt; // reference count
+ mutable sal_uInt16 nRefCnt; // reference count
public:
FormulaToken( StackVar eTypeP,OpCode e = ocPush ) :
@@ -110,17 +110,17 @@ public:
inline void Delete() { delete this; }
inline StackVar GetType() const { return eType; }
- BOOL IsFunction() const; // pure functions, no operators
- BOOL IsMatrixFunction() const; // if a function _always_ returns a Matrix
+ sal_Bool IsFunction() const; // pure functions, no operators
+ sal_Bool IsMatrixFunction() const; // if a function _always_ returns a Matrix
bool IsExternalRef() const;
- BYTE GetParamCount() const;
+ sal_uInt8 GetParamCount() const;
inline void IncRef() const { nRefCnt++; }
inline void DecRef() const
{
if (!--nRefCnt)
const_cast<FormulaToken*>(this)->Delete();
}
- inline USHORT GetRef() const { return nRefCnt; }
+ inline sal_uInt16 GetRef() const { return nRefCnt; }
inline OpCode GetOpCode() const { return eOp; }
/**
@@ -138,26 +138,26 @@ public:
Any other non-overloaded method pops up an assertion.
*/
- virtual BYTE GetByte() const;
- virtual void SetByte( BYTE n );
+ virtual sal_uInt8 GetByte() const;
+ virtual void SetByte( sal_uInt8 n );
virtual bool HasForceArray() const;
virtual void SetForceArray( bool b );
virtual double GetDouble() const;
virtual double& GetDoubleAsReference();
virtual const String& GetString() const;
- virtual USHORT GetIndex() const;
- virtual void SetIndex( USHORT n );
+ virtual sal_uInt16 GetIndex() const;
+ virtual void SetIndex( sal_uInt16 n );
virtual short* GetJump() const;
virtual const String& GetExternal() const;
virtual FormulaToken* GetFAPOrigToken() const;
- virtual USHORT GetError() const;
- virtual void SetError( USHORT );
+ virtual sal_uInt16 GetError() const;
+ virtual void SetError( sal_uInt16 );
virtual FormulaToken* Clone() const { return new FormulaToken(*this); }
- virtual BOOL Is3DRef() const; // reference with 3D flag set
- virtual BOOL TextEqual( const formula::FormulaToken& rToken ) const;
- virtual BOOL operator==( const FormulaToken& rToken ) const;
+ virtual sal_Bool Is3DRef() const; // reference with 3D flag set
+ virtual sal_Bool TextEqual( const formula::FormulaToken& rToken ) const;
+ virtual sal_Bool operator==( const FormulaToken& rToken ) const;
virtual bool isFunction() const
{
@@ -192,17 +192,17 @@ inline void intrusive_ptr_release(const FormulaToken* p)
class FORMULA_DLLPUBLIC FormulaByteToken : public FormulaToken
{
private:
- BYTE nByte;
+ sal_uInt8 nByte;
bool bHasForceArray;
protected:
- FormulaByteToken( OpCode e, BYTE n, StackVar v, bool b ) :
+ FormulaByteToken( OpCode e, sal_uInt8 n, StackVar v, bool b ) :
FormulaToken( v,e ), nByte( n ),
bHasForceArray( b ) {}
public:
- FormulaByteToken( OpCode e, BYTE n, bool b ) :
+ FormulaByteToken( OpCode e, sal_uInt8 n, bool b ) :
FormulaToken( svByte,e ), nByte( n ),
bHasForceArray( b ) {}
- FormulaByteToken( OpCode e, BYTE n ) :
+ FormulaByteToken( OpCode e, sal_uInt8 n ) :
FormulaToken( svByte,e ), nByte( n ),
bHasForceArray( false ) {}
FormulaByteToken( OpCode e ) :
@@ -213,11 +213,11 @@ public:
bHasForceArray( r.bHasForceArray ) {}
virtual FormulaToken* Clone() const { return new FormulaByteToken(*this); }
- virtual BYTE GetByte() const;
- virtual void SetByte( BYTE n );
+ virtual sal_uInt8 GetByte() const;
+ virtual void SetByte( sal_uInt8 n );
virtual bool HasForceArray() const;
virtual void SetForceArray( bool b );
- virtual BOOL operator==( const FormulaToken& rToken ) const;
+ virtual sal_Bool operator==( const FormulaToken& rToken ) const;
DECL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaByteToken )
};
@@ -230,7 +230,7 @@ class FORMULA_DLLPUBLIC FormulaFAPToken : public FormulaByteToken
private:
FormulaTokenRef pOrigToken;
public:
- FormulaFAPToken( OpCode e, BYTE n, FormulaToken* p ) :
+ FormulaFAPToken( OpCode e, sal_uInt8 n, FormulaToken* p ) :
FormulaByteToken( e, n, svFAP, false ),
pOrigToken( p ) {}
FormulaFAPToken( const FormulaFAPToken& r ) :
@@ -238,7 +238,7 @@ public:
virtual FormulaToken* Clone() const { return new FormulaFAPToken(*this); }
virtual FormulaToken* GetFAPOrigToken() const;
- virtual BOOL operator==( const FormulaToken& rToken ) const;
+ virtual sal_Bool operator==( const FormulaToken& rToken ) const;
};
class FORMULA_DLLPUBLIC FormulaDoubleToken : public FormulaToken
@@ -254,7 +254,7 @@ public:
virtual FormulaToken* Clone() const { return new FormulaDoubleToken(*this); }
virtual double GetDouble() const;
virtual double& GetDoubleAsReference();
- virtual BOOL operator==( const FormulaToken& rToken ) const;
+ virtual sal_Bool operator==( const FormulaToken& rToken ) const;
DECL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaDoubleToken )
};
@@ -272,14 +272,14 @@ public:
virtual FormulaToken* Clone() const { return new FormulaStringToken(*this); }
virtual const String& GetString() const;
- virtual BOOL operator==( const FormulaToken& rToken ) const;
+ virtual sal_Bool operator==( const FormulaToken& rToken ) const;
DECL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaStringToken )
};
/** Identical to FormulaStringToken, but with explicit OpCode instead of implicit
- ocPush, and an optional BYTE for ocBad tokens. */
+ ocPush, and an optional sal_uInt8 for ocBad tokens. */
class FORMULA_DLLPUBLIC FormulaStringOpToken : public FormulaByteToken
{
private:
@@ -292,23 +292,23 @@ public:
virtual FormulaToken* Clone() const { return new FormulaStringOpToken(*this); }
virtual const String& GetString() const;
- virtual BOOL operator==( const FormulaToken& rToken ) const;
+ virtual sal_Bool operator==( const FormulaToken& rToken ) const;
};
class FORMULA_DLLPUBLIC FormulaIndexToken : public FormulaToken
{
private:
- USHORT nIndex;
+ sal_uInt16 nIndex;
public:
- FormulaIndexToken( OpCode e, USHORT n ) :
+ FormulaIndexToken( OpCode e, sal_uInt16 n ) :
FormulaToken( svIndex, e ), nIndex( n ) {}
FormulaIndexToken( const FormulaIndexToken& r ) :
FormulaToken( r ), nIndex( r.nIndex ) {}
virtual FormulaToken* Clone() const { return new FormulaIndexToken(*this); }
- virtual USHORT GetIndex() const;
- virtual void SetIndex( USHORT n );
- virtual BOOL operator==( const FormulaToken& rToken ) const;
+ virtual sal_uInt16 GetIndex() const;
+ virtual void SetIndex( sal_uInt16 n );
+ virtual sal_Bool operator==( const FormulaToken& rToken ) const;
};
@@ -316,9 +316,9 @@ class FORMULA_DLLPUBLIC FormulaExternalToken : public FormulaToken
{
private:
String aExternal;
- BYTE nByte;
+ sal_uInt8 nByte;
public:
- FormulaExternalToken( OpCode e, BYTE n, const String& r ) :
+ FormulaExternalToken( OpCode e, sal_uInt8 n, const String& r ) :
FormulaToken( svExternal, e ), aExternal( r ),
nByte( n ) {}
FormulaExternalToken( OpCode e, const String& r ) :
@@ -330,9 +330,9 @@ public:
virtual FormulaToken* Clone() const { return new FormulaExternalToken(*this); }
virtual const String& GetExternal() const;
- virtual BYTE GetByte() const;
- virtual void SetByte( BYTE n );
- virtual BOOL operator==( const FormulaToken& rToken ) const;
+ virtual sal_uInt8 GetByte() const;
+ virtual void SetByte( sal_uInt8 n );
+ virtual sal_Bool operator==( const FormulaToken& rToken ) const;
};
@@ -347,7 +347,7 @@ public:
virtual FormulaToken* Clone() const { return new FormulaMissingToken(*this); }
virtual double GetDouble() const;
virtual const String& GetString() const;
- virtual BOOL operator==( const FormulaToken& rToken ) const;
+ virtual sal_Bool operator==( const FormulaToken& rToken ) const;
};
class FORMULA_DLLPUBLIC FormulaJumpToken : public FormulaToken
@@ -369,7 +369,7 @@ public:
}
virtual ~FormulaJumpToken();
virtual short* GetJump() const;
- virtual BOOL operator==( const formula::FormulaToken& rToken ) const;
+ virtual sal_Bool operator==( const formula::FormulaToken& rToken ) const;
virtual FormulaToken* Clone() const { return new FormulaJumpToken(*this); }
};
@@ -383,23 +383,23 @@ public:
FormulaToken( r ) {}
virtual FormulaToken* Clone() const { return new FormulaUnknownToken(*this); }
- virtual BOOL operator==( const FormulaToken& rToken ) const;
+ virtual sal_Bool operator==( const FormulaToken& rToken ) const;
};
class FORMULA_DLLPUBLIC FormulaErrorToken : public FormulaToken
{
- USHORT nError;
+ sal_uInt16 nError;
public:
- FormulaErrorToken( USHORT nErr ) :
+ FormulaErrorToken( sal_uInt16 nErr ) :
FormulaToken( svError ), nError( nErr) {}
FormulaErrorToken( const FormulaErrorToken& r ) :
FormulaToken( r ), nError( r.nError) {}
virtual FormulaToken* Clone() const { return new FormulaErrorToken(*this); }
- virtual USHORT GetError() const;
- virtual void SetError( USHORT nErr );
- virtual BOOL operator==( const FormulaToken& rToken ) const;
+ virtual sal_uInt16 GetError() const;
+ virtual void SetError( sal_uInt16 nErr );
+ virtual sal_Bool operator==( const FormulaToken& rToken ) const;
};
// =============================================================================
diff --git a/formula/inc/formula/tokenarray.hxx b/formula/inc/formula/tokenarray.hxx
index 02d725a9bc..03b0bc9b80 100644..100755
--- a/formula/inc/formula/tokenarray.hxx
+++ b/formula/inc/formula/tokenarray.hxx
@@ -42,7 +42,7 @@ namespace formula
// RecalcMode access only via TokenArray SetRecalcMode / IsRecalcMode...
-typedef BYTE ScRecalcMode;
+typedef sal_uInt8 ScRecalcMode;
// Only one of the exclusive bits can be set,
// handled by TokenArray SetRecalcMode... methods
#define RECALCMODE_NORMAL 0x01 // exclusive
@@ -75,13 +75,13 @@ class FORMULA_DLLPUBLIC FormulaTokenArray
protected:
FormulaToken** pCode; // Token code array
FormulaToken** pRPN; // RPN array
- USHORT nLen; // Length of token array
- USHORT nRPN; // Length of RPN array
- USHORT nIndex; // Current step index
- USHORT nError; // Error code
+ sal_uInt16 nLen; // Length of token array
+ sal_uInt16 nRPN; // Length of RPN array
+ sal_uInt16 nIndex; // Current step index
+ sal_uInt16 nError; // Error code
short nRefs; // Count of cell references
ScRecalcMode nMode; // Flags to indicate when to recalc this code
- BOOL bHyperLink; // If HYPERLINK() occurs in the formula.
+ sal_Bool bHyperLink; // If HYPERLINK() occurs in the formula.
protected:
void Assign( const FormulaTokenArray& );
@@ -118,7 +118,7 @@ public:
FormulaToken* GetNextColRowName();
FormulaToken* GetNextOpCodeRPN( OpCode );
/// Peek at nIdx-1 if not out of bounds, decrements nIdx if successful. Returns NULL if not.
- FormulaToken* PeekPrev( USHORT & nIdx );
+ FormulaToken* PeekPrev( sal_uInt16 & nIdx );
FormulaToken* PeekNext();
FormulaToken* PeekPrevNoSpaces(); /// Only after Reset/First/Next/Last/Prev!
FormulaToken* PeekNextNoSpaces(); /// Only after Reset/First/Next/Last/Prev!
@@ -128,22 +128,22 @@ public:
FormulaToken* PrevRPN();
bool HasExternalRef() const;
- BOOL HasOpCode( OpCode ) const;
- BOOL HasOpCodeRPN( OpCode ) const;
+ sal_Bool HasOpCode( OpCode ) const;
+ sal_Bool HasOpCodeRPN( OpCode ) const;
/// Token of type svIndex or opcode ocColRowName
- BOOL HasNameOrColRowName() const;
+ sal_Bool HasNameOrColRowName() const;
FormulaToken** GetArray() const { return pCode; }
FormulaToken** GetCode() const { return pRPN; }
- USHORT GetLen() const { return nLen; }
- USHORT GetCodeLen() const { return nRPN; }
+ sal_uInt16 GetLen() const { return nLen; }
+ sal_uInt16 GetCodeLen() const { return nRPN; }
void Reset() { nIndex = 0; }
- USHORT GetCodeError() const { return nError; }
- void SetCodeError( USHORT n ) { nError = n; }
+ sal_uInt16 GetCodeError() const { return nError; }
+ void SetCodeError( sal_uInt16 n ) { nError = n; }
short GetRefs() const { return nRefs; }
void IncrementRefs() { ++nRefs; }
- void SetHyperLink( BOOL bVal ) { bHyperLink = bVal; }
- BOOL IsHyperLink() const { return bHyperLink; }
+ void SetHyperLink( sal_Bool bVal ) { bHyperLink = bVal; }
+ sal_Bool IsHyperLink() const { return bHyperLink; }
inline ScRecalcMode GetRecalcMode() const { return nMode; }
/** Bits aren't set directly but validated and
@@ -168,17 +168,17 @@ public:
{ nMode |= RECALCMODE_ONREFMOVE; }
inline void ClearRecalcModeOnRefMove()
{ nMode &= ~RECALCMODE_ONREFMOVE; }
- inline BOOL IsRecalcModeNormal() const
+ inline sal_Bool IsRecalcModeNormal() const
{ return (nMode & RECALCMODE_NORMAL) != 0; }
- inline BOOL IsRecalcModeAlways() const
+ inline sal_Bool IsRecalcModeAlways() const
{ return (nMode & RECALCMODE_ALWAYS) != 0; }
- inline BOOL IsRecalcModeOnLoad() const
+ inline sal_Bool IsRecalcModeOnLoad() const
{ return (nMode & RECALCMODE_ONLOAD) != 0; }
- inline BOOL IsRecalcModeOnLoadOnce() const
+ inline sal_Bool IsRecalcModeOnLoadOnce() const
{ return (nMode & RECALCMODE_ONLOAD_ONCE) != 0; }
- inline BOOL IsRecalcModeForced() const
+ inline sal_Bool IsRecalcModeForced() const
{ return (nMode & RECALCMODE_FORCED) != 0; }
- inline BOOL IsRecalcModeOnRefMove() const
+ inline sal_Bool IsRecalcModeOnRefMove() const
{ return (nMode & RECALCMODE_ONREFMOVE) != 0; }
/** Get OpCode of the most outer function */
@@ -186,7 +186,7 @@ public:
/** Operators +,-,*,/,^,&,=,<>,<,>,<=,>=
with DoubleRef in Formula? */
- BOOL HasMatrixDoubleRefOps();
+ sal_Bool HasMatrixDoubleRefOps();
virtual FormulaToken* AddOpCode(OpCode e);
@@ -207,7 +207,7 @@ public:
FormulaToken* AddString( const sal_Unicode* pStr );
FormulaToken* AddString( const String& rStr );
FormulaToken* AddDouble( double fVal );
- FormulaToken* AddName( USHORT n );
+ FormulaToken* AddName( sal_uInt16 n );
FormulaToken* AddExternal( const sal_Unicode* pStr );
/** Xcl import may play dirty tricks with OpCode!=ocExternal.
Others don't use! */
diff --git a/formula/inc/helpids.hrc b/formula/inc/helpids.hrc
index dfd7403f8d..c2f6903517 100644..100755
--- a/formula/inc/helpids.hrc
+++ b/formula/inc/helpids.hrc
@@ -27,36 +27,26 @@
#ifndef FORMULA_HELPID_HRC
#define FORMULA_HELPID_HRC
-#ifndef _SOLAR_HRC
-#include <svl/solar.hrc> // HID_FORMULA_START
-#endif
-
-#define HID_FORMULADLG_FORMULA (HID_FORMULA_START + 0)
-#define HID_FORMULA_FAP_FORMULA (HID_FORMULA_START + 1)
-#define HID_FORMULA_FAP_STRUCT (HID_FORMULA_START + 2)
-#define HID_FORMULA_FAP_PAGE (HID_FORMULA_START + 3)
-#define HID_FORMULA_FAP_EDIT1 (HID_FORMULA_START + 4)
-#define HID_FORMULA_FAP_EDIT2 (HID_FORMULA_START + 5)
-#define HID_FORMULA_FAP_EDIT3 (HID_FORMULA_START + 6)
-#define HID_FORMULA_FAP_EDIT4 (HID_FORMULA_START + 7)
-#define HID_FORMULA_FAP_BTN_FX1 (HID_FORMULA_START + 8)
-#define HID_FORMULA_FAP_BTN_FX2 (HID_FORMULA_START + 9)
-#define HID_FORMULA_FAP_BTN_FX3 (HID_FORMULA_START +10)
-#define HID_FORMULA_FAP_BTN_FX4 (HID_FORMULA_START +11)
-#define HID_FORMULA_FAP_BTN_REF1 (HID_FORMULA_START +12)
-#define HID_FORMULA_FAP_BTN_REF2 (HID_FORMULA_START +13)
-#define HID_FORMULA_FAP_BTN_REF3 (HID_FORMULA_START +14)
-#define HID_FORMULA_FAP_BTN_REF4 (HID_FORMULA_START +15)
-#define HID_FORMULA_LB_CATEGORY (HID_FORMULA_START +16)
-#define HID_FORMULA_LB_FUNCTION (HID_FORMULA_START +17)
-#define HID_FORMULATAB_FUNCTION (HID_FORMULA_START +18)
-#define HID_FORMULATAB_STRUCT (HID_FORMULA_START +19)
-
-
-#if HID_FORMULATAB_STRUCT > HID_FORMULA_END
-#error Help-Id Ueberlauf in #file, #line
-#endif
-// don't forget to update the file util/hidother.src
+#define HID_FORMULADLG_FORMULA "FORMULA_HID_FORMULADLG_FORMULA"
+#define HID_FORMULA_FAP_FORMULA "FORMULA_HID_FORMULA_FAP_FORMULA"
+#define HID_FORMULA_FAP_STRUCT "FORMULA_HID_FORMULA_FAP_STRUCT"
+#define HID_FORMULA_FAP_PAGE "FORMULA_HID_FORMULA_FAP_PAGE"
+#define HID_FORMULA_FAP_EDIT1 "FORMULA_HID_FORMULA_FAP_EDIT1"
+#define HID_FORMULA_FAP_EDIT2 "FORMULA_HID_FORMULA_FAP_EDIT2"
+#define HID_FORMULA_FAP_EDIT3 "FORMULA_HID_FORMULA_FAP_EDIT3"
+#define HID_FORMULA_FAP_EDIT4 "FORMULA_HID_FORMULA_FAP_EDIT4"
+#define HID_FORMULA_FAP_BTN_FX1 "FORMULA_HID_FORMULA_FAP_BTN_FX1"
+#define HID_FORMULA_FAP_BTN_FX2 "FORMULA_HID_FORMULA_FAP_BTN_FX2"
+#define HID_FORMULA_FAP_BTN_FX3 "FORMULA_HID_FORMULA_FAP_BTN_FX3"
+#define HID_FORMULA_FAP_BTN_FX4 "FORMULA_HID_FORMULA_FAP_BTN_FX4"
+#define HID_FORMULA_FAP_BTN_REF1 "FORMULA_HID_FORMULA_FAP_BTN_REF1"
+#define HID_FORMULA_FAP_BTN_REF2 "FORMULA_HID_FORMULA_FAP_BTN_REF2"
+#define HID_FORMULA_FAP_BTN_REF3 "FORMULA_HID_FORMULA_FAP_BTN_REF3"
+#define HID_FORMULA_FAP_BTN_REF4 "FORMULA_HID_FORMULA_FAP_BTN_REF4"
+#define HID_FORMULA_LB_CATEGORY "FORMULA_HID_FORMULA_LB_CATEGORY"
+#define HID_FORMULA_LB_FUNCTION "FORMULA_HID_FORMULA_LB_FUNCTION"
+#define HID_FORMULATAB_FUNCTION "FORMULA_HID_FORMULATAB_FUNCTION"
+#define HID_FORMULATAB_STRUCT "FORMULA_HID_FORMULATAB_STRUCT"
#endif //FORMULA_HELPID_HRC
diff --git a/formula/inc/makefile.mk b/formula/inc/makefile.mk
index dfe7226e08..dfe7226e08 100644..100755
--- a/formula/inc/makefile.mk
+++ b/formula/inc/makefile.mk
diff --git a/formula/inc/pch/precompiled_formula.cxx b/formula/inc/pch/precompiled_formula.cxx
index d38b937c3f..d38b937c3f 100644..100755
--- a/formula/inc/pch/precompiled_formula.cxx
+++ b/formula/inc/pch/precompiled_formula.cxx
diff --git a/formula/inc/pch/precompiled_formula.hxx b/formula/inc/pch/precompiled_formula.hxx
index 10833d9bab..10833d9bab 100644..100755
--- a/formula/inc/pch/precompiled_formula.hxx
+++ b/formula/inc/pch/precompiled_formula.hxx
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-22 07:31:23 +0000