Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

Conflicts:
starmath/inc/applicat.hxx
starmath/inc/dialog.hxx
starmath/inc/document.hxx
starmath/inc/edit.hxx
starmath/inc/format.hxx
starmath/inc/node.hxx
starmath/inc/parse.hxx
starmath/inc/rect.hxx
starmath/inc/smdll.hxx
starmath/inc/smmod.hxx
starmath/inc/starmath.hrc
starmath/inc/symbol.hxx
starmath/inc/toolbox.hxx
starmath/inc/utility.hxx
starmath/inc/view.hxx
starmath/prj/build.lst
starmath/qa/cppunit/version.map
starmath/sdi/smslots.sdi
starmath/source/accessibility.cxx
starmath/source/cfgitem.cxx
starmath/source/cfgitem.hxx
starmath/source/config.cxx
starmath/source/dialog.cxx
starmath/source/document.cxx
starmath/source/edit.cxx
starmath/source/format.cxx
starmath/source/makefile.mk
starmath/source/math_pch.cxx
starmath/source/mathmlexport.cxx
starmath/source/mathmlimport.cxx
starmath/source/mathtype.cxx
starmath/source/node.cxx
starmath/source/parse.cxx
starmath/source/rect.cxx
starmath/source/register.cxx
starmath/source/smdetect.cxx
starmath/source/smdll.cxx
starmath/source/smmod.cxx
starmath/source/smres.src
starmath/source/symbol.cxx
starmath/source/toolbox.cxx
starmath/source/unomodel.cxx
starmath/source/utility.cxx
starmath/source/view.cxx
sw/JunitTest_sw_unoapi.mk
sw/Library_swd.mk
sw/Makefile
sw/inc/IDocumentFieldsAccess.hxx
sw/inc/IDocumentSettingAccess.hxx
sw/inc/IDocumentUndoRedo.hxx
sw/inc/IShellCursorSupplier.hxx
sw/inc/SwUndoField.hxx
sw/inc/acmplwrd.hxx
sw/inc/authfld.hxx
sw/inc/bparr.hxx
sw/inc/calbck.hxx
sw/inc/calc.hxx
sw/inc/ccoll.hxx
sw/inc/cellatr.hxx
sw/inc/cellfml.hxx
sw/inc/chpfld.hxx
sw/inc/cmdid.h
sw/inc/crsrsh.hxx
sw/inc/crstate.hxx
sw/inc/dbfld.hxx
sw/inc/dbmgr.hxx
sw/inc/dcontact.hxx
sw/inc/ddefld.hxx
sw/inc/doc.hxx
sw/inc/docary.hxx
sw/inc/docsh.hxx
sw/inc/docstat.hxx
sw/inc/docstyle.hxx
sw/inc/docufld.hxx
sw/inc/editsh.hxx
sw/inc/errhdl.hxx
sw/inc/expfld.hxx
sw/inc/fchrfmt.hxx
sw/inc/fesh.hxx
sw/inc/fldbas.hxx
sw/inc/flddat.hxx
sw/inc/flddropdown.hxx
sw/inc/flypos.hxx
sw/inc/fmtanchr.hxx
sw/inc/fmtautofmt.hxx
sw/inc/fmtclds.hxx
sw/inc/fmtcnct.hxx
sw/inc/fmtcol.hxx
sw/inc/fmtfsize.hxx
sw/inc/fmtftn.hxx
sw/inc/fmtftntx.hxx
sw/inc/fmthdft.hxx
sw/inc/fmtinfmt.hxx
sw/inc/fmtline.hxx
sw/inc/fmtornt.hxx
sw/inc/fmtpdsc.hxx
sw/inc/fmtruby.hxx
sw/inc/fmtsrnd.hxx
sw/inc/fmturl.hxx
sw/inc/fmtwrapinfluenceonobjpos.hxx
sw/inc/format.hxx
sw/inc/frmatr.hxx
sw/inc/frmfmt.hxx
sw/inc/grfatr.hxx
sw/inc/helpid.h
sw/inc/hintids.hxx
sw/inc/hints.hxx
sw/inc/htmltbl.hxx
sw/inc/inetfld.hxx
sw/inc/io.hxx
sw/inc/iodetect.hxx
sw/inc/itabenum.hxx
sw/inc/ndarr.hxx
sw/inc/ndgrf.hxx
sw/inc/ndindex.hxx
sw/inc/ndnotxt.hxx
sw/inc/ndole.hxx
sw/inc/ndtxt.hxx
sw/inc/ndtyp.hxx
sw/inc/node.hxx
sw/inc/numrule.hxx
sw/inc/pagedesc.hxx
sw/inc/pagepreviewlayout.hxx
sw/inc/pam.hxx
sw/inc/paratr.hxx
sw/inc/poolfmt.awk
sw/inc/poolfmt.hxx
sw/inc/printdata.hxx
sw/inc/reffld.hxx
sw/inc/shellio.hxx
sw/inc/shellres.hxx
sw/inc/swabstdlg.hxx
sw/inc/swatrset.hxx
sw/inc/swerror.h
sw/inc/swprtopt.hxx
sw/inc/swtable.hxx
sw/inc/swtypes.hxx
sw/inc/tblafmt.hxx
sw/inc/tgrditem.hxx
sw/inc/tox.hxx
sw/inc/undobj.hxx
sw/inc/unocoll.hxx
sw/inc/unoframe.hxx
sw/inc/unoprnms.hxx
sw/inc/usrfld.hxx
sw/inc/viewopt.hxx
sw/inc/viewsh.hxx
sw/inc/viscrs.hxx
sw/prj/build.lst
sw/qa/complex/accessibility/makefile.mk
sw/qa/core/Test-BigPtrArray.cxx
sw/qa/core/makefile.mk
sw/sdi/makefile.mk
sw/source/core/access/makefile.mk
sw/source/core/access/textmarkuphelper.cxx
sw/source/core/attr/calbck.cxx
sw/source/core/attr/cellatr.cxx
sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
sw/source/core/attr/format.cxx
sw/source/core/attr/hints.cxx
sw/source/core/bastyp/calc.cxx
sw/source/core/bastyp/init.cxx
sw/source/core/bastyp/makefile.mk
sw/source/core/bastyp/swcache.cxx
sw/source/core/crsr/bookmrk.cxx
sw/source/core/crsr/callnk.cxx
sw/source/core/crsr/crsrsh.cxx
sw/source/core/crsr/crstrvl.cxx
sw/source/core/crsr/findattr.cxx
sw/source/core/crsr/findcoll.cxx
sw/source/core/crsr/makefile.mk
sw/source/core/crsr/pam.cxx
sw/source/core/crsr/swcrsr.cxx
sw/source/core/crsr/trvltbl.cxx
sw/source/core/crsr/unocrsr.cxx
sw/source/core/crsr/viscrs.cxx
sw/source/core/doc/acmplwrd.cxx
sw/source/core/doc/doc.cxx
sw/source/core/doc/docbm.cxx
sw/source/core/doc/doccomp.cxx
sw/source/core/doc/docdesc.cxx
sw/source/core/doc/docdraw.cxx
sw/source/core/doc/docedt.cxx
sw/source/core/doc/docfld.cxx
sw/source/core/doc/docfly.cxx
sw/source/core/doc/docfmt.cxx
sw/source/core/doc/docftn.cxx
sw/source/core/doc/docglbl.cxx
sw/source/core/doc/docglos.cxx
sw/source/core/doc/doclay.cxx
sw/source/core/doc/docnew.cxx
sw/source/core/doc/docnum.cxx
sw/source/core/doc/docredln.cxx
sw/source/core/doc/docruby.cxx
sw/source/core/doc/docsort.cxx
sw/source/core/doc/docstat.cxx
sw/source/core/doc/doctxm.cxx
sw/source/core/doc/fmtcol.cxx
sw/source/core/doc/gctable.cxx
sw/source/core/doc/htmltbl.cxx
sw/source/core/doc/makefile.mk
sw/source/core/doc/number.cxx
sw/source/core/doc/poolfmt.cxx
sw/source/core/doc/tblafmt.cxx
sw/source/core/doc/tblcpy.cxx
sw/source/core/doc/tblrwcl.cxx
sw/source/core/docnode/makefile.mk
sw/source/core/docnode/ndcopy.cxx
sw/source/core/docnode/ndnum.cxx
sw/source/core/docnode/ndsect.cxx
sw/source/core/docnode/ndtbl.cxx
sw/source/core/docnode/ndtbl1.cxx
sw/source/core/docnode/node.cxx
sw/source/core/docnode/node2lay.cxx
sw/source/core/docnode/nodes.cxx
sw/source/core/docnode/section.cxx
sw/source/core/docnode/swbaslnk.cxx
sw/source/core/draw/dcontact.cxx
sw/source/core/draw/dflyobj.cxx
sw/source/core/draw/drawdoc.cxx
sw/source/core/draw/dview.cxx
sw/source/core/draw/makefile.mk
sw/source/core/edit/autofmt.cxx
sw/source/core/edit/edattr.cxx
sw/source/core/edit/eddel.cxx
sw/source/core/edit/edfcol.cxx
sw/source/core/edit/edfld.cxx
sw/source/core/edit/edfldexp.cxx
sw/source/core/edit/edfmt.cxx
sw/source/core/edit/edglss.cxx
sw/source/core/edit/editsh.cxx
sw/source/core/edit/edlingu.cxx
sw/source/core/edit/ednumber.cxx
sw/source/core/edit/edsect.cxx
sw/source/core/edit/edtab.cxx
sw/source/core/edit/edtox.cxx
sw/source/core/edit/edundo.cxx
sw/source/core/edit/makefile.mk
sw/source/core/except/dbgloop.cxx
sw/source/core/except/errhdl.cxx
sw/source/core/fields/authfld.cxx
sw/source/core/fields/cellfml.cxx
sw/source/core/fields/chpfld.cxx
sw/source/core/fields/dbfld.cxx
sw/source/core/fields/ddefld.cxx
sw/source/core/fields/ddetbl.cxx
sw/source/core/fields/docufld.cxx
sw/source/core/fields/expfld.cxx
sw/source/core/fields/fldbas.cxx
sw/source/core/fields/flddat.cxx
sw/source/core/fields/flddropdown.cxx
sw/source/core/fields/macrofld.cxx
sw/source/core/fields/makefile.mk
sw/source/core/fields/reffld.cxx
sw/source/core/fields/scrptfld.cxx
sw/source/core/fields/tblcalc.cxx
sw/source/core/fields/usrfld.cxx
sw/source/core/frmedt/fecopy.cxx
sw/source/core/frmedt/fedesc.cxx
sw/source/core/frmedt/fefly1.cxx
sw/source/core/frmedt/feshview.cxx
sw/source/core/frmedt/fetab.cxx
sw/source/core/frmedt/fews.cxx
sw/source/core/frmedt/makefile.mk
sw/source/core/frmedt/tblsel.cxx
sw/source/core/graphic/grfatr.cxx
sw/source/core/inc/SwUndoFmt.hxx
sw/source/core/inc/SwUndoTOXChange.hxx
sw/source/core/inc/anchoredobjectposition.hxx
sw/source/core/inc/dbgloop.hxx
sw/source/core/inc/drawfont.hxx
sw/source/core/inc/flowfrm.hxx
sw/source/core/inc/frame.hxx
sw/source/core/inc/frmtool.hxx
sw/source/core/inc/layact.hxx
sw/source/core/inc/layfrm.hxx
sw/source/core/inc/notxtfrm.hxx
sw/source/core/inc/rolbck.hxx
sw/source/core/inc/rootfrm.hxx
sw/source/core/inc/scriptinfo.hxx
sw/source/core/inc/swblocks.hxx
sw/source/core/inc/swcache.hxx
sw/source/core/inc/tabfrm.hxx
sw/source/core/inc/txmsrt.hxx
sw/source/core/inc/undoflystrattr.hxx
sw/source/core/inc/viewimp.hxx
sw/source/core/layout/atrfrm.cxx
sw/source/core/layout/calcmove.cxx
sw/source/core/layout/dbg_lay.cxx
sw/source/core/layout/findfrm.cxx
sw/source/core/layout/flowfrm.cxx
sw/source/core/layout/fly.cxx
sw/source/core/layout/flycnt.cxx
sw/source/core/layout/flyincnt.cxx
sw/source/core/layout/flylay.cxx
sw/source/core/layout/frmtool.cxx
sw/source/core/layout/ftnfrm.cxx
sw/source/core/layout/layact.cxx
sw/source/core/layout/laycache.cxx
sw/source/core/layout/makefile.mk
sw/source/core/layout/objectformatter.cxx
sw/source/core/layout/pagechg.cxx
sw/source/core/layout/pagedesc.cxx
sw/source/core/layout/paintfrm.cxx
sw/source/core/layout/sectfrm.cxx
sw/source/core/layout/tabfrm.cxx
sw/source/core/layout/trvlfrm.cxx
sw/source/core/layout/unusedf.cxx
sw/source/core/layout/wsfrm.cxx
sw/source/core/makefile.mk
sw/source/core/objectpositioning/anchoredobjectposition.cxx
sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx
sw/source/core/objectpositioning/makefile.mk
sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx
sw/source/core/ole/ndole.cxx
sw/source/core/para/makefile.mk
sw/source/core/para/paratr.cxx
sw/source/core/sw3io/makefile.mk
sw/source/core/sw3io/sw3convert.cxx
sw/source/core/swg/SwXMLTextBlocks.cxx
sw/source/core/swg/makefile.mk
sw/source/core/swg/swblocks.cxx
sw/source/core/table/swnewtable.cxx
sw/source/core/table/swtable.cxx
sw/source/core/text/EnhancedPDFExportHelper.cxx
sw/source/core/text/atrstck.cxx
sw/source/core/text/frmcrsr.cxx
sw/source/core/text/frmform.cxx
sw/source/core/text/itrcrsr.cxx
sw/source/core/text/itrform2.cxx
sw/source/core/text/makefile.mk
sw/source/core/text/porlay.cxx
sw/source/core/text/pormulti.cxx
sw/source/core/text/txtfld.cxx
sw/source/core/text/txtfrm.cxx
sw/source/core/text/txtio.cxx
sw/source/core/tox/makefile.mk
sw/source/core/tox/txmsrt.cxx
sw/source/core/txtnode/fmtatr2.cxx
sw/source/core/txtnode/fntcache.cxx
sw/source/core/txtnode/fntcap.cxx
sw/source/core/txtnode/makefile.mk
sw/source/core/txtnode/ndhints.cxx
sw/source/core/txtnode/ndtxt.cxx
sw/source/core/txtnode/swfont.cxx
sw/source/core/txtnode/thints.cxx
sw/source/core/txtnode/txtatr2.cxx
sw/source/core/txtnode/txtedt.cxx
sw/source/core/undo/SwUndoField.cxx
sw/source/core/undo/SwUndoPageDesc.cxx
sw/source/core/undo/SwUndoTOXChange.cxx
sw/source/core/undo/docundo.cxx
sw/source/core/undo/makefile.mk
sw/source/core/undo/rolbck.cxx
sw/source/core/undo/unbkmk.cxx
sw/source/core/undo/undel.cxx
sw/source/core/undo/undobj.cxx
sw/source/core/undo/undobj1.cxx
sw/source/core/undo/unfmco.cxx
sw/source/core/undo/unins.cxx
sw/source/core/undo/unnum.cxx
sw/source/core/undo/unoutl.cxx
sw/source/core/undo/unredln.cxx
sw/source/core/undo/unsect.cxx
sw/source/core/undo/unsort.cxx
sw/source/core/undo/unspnd.cxx
sw/source/core/undo/untbl.cxx
sw/source/core/unocore/makefile.mk
sw/source/core/unocore/swunohelper.cxx
sw/source/core/unocore/unobkm.cxx
sw/source/core/unocore/unocoll.cxx
sw/source/core/unocore/unocrsrhelper.cxx
sw/source/core/unocore/unodraw.cxx
sw/source/core/unocore/unofield.cxx
sw/source/core/unocore/unoframe.cxx
sw/source/core/unocore/unomap.cxx
sw/source/core/unocore/unoprnms.cxx
sw/source/core/unocore/unoredlines.cxx
sw/source/core/unocore/unosett.cxx
sw/source/core/unocore/unosrch.cxx
sw/source/core/unocore/unostyle.cxx
sw/source/core/unocore/unotbl.cxx
sw/source/core/view/vdraw.cxx
sw/source/core/view/viewimp.cxx
sw/source/core/view/viewpg.cxx
sw/source/core/view/viewsh.cxx
sw/source/core/view/vnew.cxx
sw/source/core/view/vprint.cxx
sw/source/filter/ascii/ascatr.cxx
sw/source/filter/ascii/makefile.mk
sw/source/filter/ascii/wrtasc.cxx
sw/source/filter/basflt/fltini.cxx
sw/source/filter/basflt/iodetect.cxx
sw/source/filter/basflt/makefile.mk
sw/source/filter/html/SwAppletImpl.cxx
sw/source/filter/html/css1atr.cxx
sw/source/filter/html/htmlatr.cxx
sw/source/filter/html/htmlbas.cxx
sw/source/filter/html/htmlcss1.cxx
sw/source/filter/html/htmlfly.cxx
sw/source/filter/html/htmlftn.cxx
sw/source/filter/html/htmlgrin.cxx
sw/source/filter/html/htmlnum.cxx
sw/source/filter/html/htmlplug.cxx
sw/source/filter/html/htmltab.cxx
sw/source/filter/html/makefile.mk
sw/source/filter/html/parcss1.cxx
sw/source/filter/html/svxcss1.cxx
sw/source/filter/html/swhtml.cxx
sw/source/filter/inc/msfilter.hxx
sw/source/filter/inc/wrtswtbl.hxx
sw/source/filter/rtf/makefile.mk
sw/source/filter/rtf/rtffly.cxx
sw/source/filter/rtf/rtfnum.cxx
sw/source/filter/rtf/rtftbl.cxx
sw/source/filter/rtf/swparrtf.cxx
sw/source/filter/rtf/swparrtf.hxx
sw/source/filter/writer/makefile.mk
sw/source/filter/writer/writer.cxx
sw/source/filter/writer/wrt_fn.cxx
sw/source/filter/writer/wrtswtbl.cxx
sw/source/filter/ww1/fltshell.cxx
sw/source/filter/ww1/makefile.mk
sw/source/filter/ww1/w1class.cxx
sw/source/filter/ww1/w1class.hxx
sw/source/filter/ww1/w1filter.cxx
sw/source/filter/ww1/w1par.cxx
sw/source/filter/ww1/w1sprm.cxx
sw/source/filter/ww1/w1struct.hxx
sw/source/filter/ww8/README-rtf.txt
sw/source/filter/ww8/attributeoutputbase.hxx
sw/source/filter/ww8/docxattributeoutput.cxx
sw/source/filter/ww8/docxattributeoutput.hxx
sw/source/filter/ww8/docxexport.cxx
sw/source/filter/ww8/docxexport.hxx
sw/source/filter/ww8/docxexportfilter.cxx
sw/source/filter/ww8/dump/dump8.cxx
sw/source/filter/ww8/dump/dump8a.cxx
sw/source/filter/ww8/dump/msvbasic.cxx
sw/source/filter/ww8/dump/msvbasic.hxx
sw/source/filter/ww8/dump/ww8darr.cxx
sw/source/filter/ww8/dump/ww8darr.hxx
sw/source/filter/ww8/dump/ww8dout.cxx
sw/source/filter/ww8/dump/ww8dout.hxx
sw/source/filter/ww8/dump/ww8scan.cxx
sw/source/filter/ww8/dump/ww8scan.hxx
sw/source/filter/ww8/dump/ww8struc.hxx
sw/source/filter/ww8/makefile.mk
sw/source/filter/ww8/rtfattributeoutput.cxx
sw/source/filter/ww8/rtfattributeoutput.hxx
sw/source/filter/ww8/rtfexport.cxx
sw/source/filter/ww8/rtfexport.hxx
sw/source/filter/ww8/rtfexportfilter.cxx
sw/source/filter/ww8/rtfexportfilter.hxx
sw/source/filter/ww8/rtfimportfilter.cxx
sw/source/filter/ww8/rtfimportfilter.hxx
sw/source/filter/ww8/rtfsdrexport.cxx
sw/source/filter/ww8/rtfsdrexport.hxx
sw/source/filter/ww8/writerhelper.cxx
sw/source/filter/ww8/writerwordglue.cxx
sw/source/filter/ww8/wrtw8esh.cxx
sw/source/filter/ww8/wrtw8nds.cxx
sw/source/filter/ww8/wrtw8num.cxx
sw/source/filter/ww8/wrtw8sty.cxx
sw/source/filter/ww8/wrtww8.cxx
sw/source/filter/ww8/wrtww8.hxx
sw/source/filter/ww8/wrtww8gr.cxx
sw/source/filter/ww8/ww8atr.cxx
sw/source/filter/ww8/ww8attributeoutput.hxx
sw/source/filter/ww8/ww8graf.cxx
sw/source/filter/ww8/ww8graf.hxx
sw/source/filter/ww8/ww8graf2.cxx
sw/source/filter/ww8/ww8par.cxx
sw/source/filter/ww8/ww8par.hxx
sw/source/filter/ww8/ww8par2.cxx
sw/source/filter/ww8/ww8par3.cxx
sw/source/filter/ww8/ww8par5.cxx
sw/source/filter/ww8/ww8par6.cxx
sw/source/filter/ww8/ww8scan.cxx
sw/source/filter/ww8/ww8scan.hxx
sw/source/filter/ww8/ww8struc.hxx
sw/source/filter/xml/makefile.mk
sw/source/filter/xml/xmlimpit.cxx
sw/source/filter/xml/xmltble.cxx
sw/source/filter/xml/xmltbli.cxx
sw/source/ui/app/appenv.cxx
sw/source/ui/app/apphdl.cxx
sw/source/ui/app/applab.cxx
sw/source/ui/app/appopt.cxx
sw/source/ui/app/docsh.cxx
sw/source/ui/app/docsh2.cxx
sw/source/ui/app/docshini.cxx
sw/source/ui/app/docst.cxx
sw/source/ui/app/docstyle.cxx
sw/source/ui/app/makefile.mk
sw/source/ui/app/mn.src
sw/source/ui/app/swmodul1.cxx
sw/source/ui/cctrl/makefile.mk
sw/source/ui/cctrl/swlbox.cxx
sw/source/ui/chrdlg/break.cxx
sw/source/ui/chrdlg/ccoll.cxx
sw/source/ui/chrdlg/chardlg.cxx
sw/source/ui/chrdlg/drpcps.cxx
sw/source/ui/chrdlg/makefile.mk
sw/source/ui/chrdlg/numpara.cxx
sw/source/ui/chrdlg/pardlg.cxx
sw/source/ui/chrdlg/swuiccoll.cxx
sw/source/ui/config/barcfg.cxx
sw/source/ui/config/caption.cxx
sw/source/ui/config/cfgitems.cxx
sw/source/ui/config/fontcfg.cxx
sw/source/ui/config/mailconfigpage.cxx
sw/source/ui/config/makefile.mk
sw/source/ui/config/modcfg.cxx
sw/source/ui/config/optcomp.cxx
sw/source/ui/config/optload.cxx
sw/source/ui/config/optpage.cxx
sw/source/ui/config/prtopt.cxx
sw/source/ui/config/uinums.cxx
sw/source/ui/config/usrpref.cxx
sw/source/ui/config/viewopt.cxx
sw/source/ui/dbui/dbinsdlg.cxx
sw/source/ui/dbui/dbmgr.cxx
sw/source/ui/dbui/dbtree.cxx
sw/source/ui/dbui/makefile.mk
sw/source/ui/dbui/mmaddressblockpage.cxx
sw/source/ui/dbui/mmdocselectpage.cxx
sw/source/ui/dbui/mmoutputpage.cxx
sw/source/ui/dbui/swdbtoolsclient.cxx
sw/source/ui/dialog/abstract.cxx
sw/source/ui/dialog/ascfldlg.cxx
sw/source/ui/dialog/macassgn.cxx
sw/source/ui/dialog/makefile.mk
sw/source/ui/dialog/regionsw.cxx
sw/source/ui/dialog/swdlgfact.cxx
sw/source/ui/dialog/swdlgfact.hxx
sw/source/ui/dialog/uiregionsw.cxx
sw/source/ui/dochdl/gloshdl.cxx
sw/source/ui/dochdl/makefile.mk
sw/source/ui/dochdl/swdtflvr.cxx
sw/source/ui/docvw/PostItMgr.cxx
sw/source/ui/docvw/SidebarWin.cxx
sw/source/ui/docvw/edtdd.cxx
sw/source/ui/docvw/edtwin.cxx
sw/source/ui/docvw/edtwin2.cxx
sw/source/ui/docvw/edtwin3.cxx
sw/source/ui/docvw/makefile.mk
sw/source/ui/docvw/romenu.cxx
sw/source/ui/docvw/romenu.hxx
sw/source/ui/docvw/srcedtw.cxx
sw/source/ui/envelp/envfmt.cxx
sw/source/ui/envelp/envimg.cxx
sw/source/ui/envelp/envlop1.cxx
sw/source/ui/envelp/envprt.cxx
sw/source/ui/envelp/label1.cxx
sw/source/ui/envelp/labfmt.cxx
sw/source/ui/envelp/labprt.cxx
sw/source/ui/envelp/mailmrge.cxx
sw/source/ui/envelp/makefile.mk
sw/source/ui/fldui/flddb.cxx
sw/source/ui/fldui/flddinf.cxx
sw/source/ui/fldui/flddok.cxx
sw/source/ui/fldui/fldedt.cxx
sw/source/ui/fldui/fldfunc.cxx
sw/source/ui/fldui/fldmgr.cxx
sw/source/ui/fldui/fldpage.cxx
sw/source/ui/fldui/fldref.cxx
sw/source/ui/fldui/fldtdlg.cxx
sw/source/ui/fldui/fldvar.cxx
sw/source/ui/fldui/fldwrap.cxx
sw/source/ui/fldui/inpdlg.cxx
sw/source/ui/fldui/makefile.mk
sw/source/ui/fmtui/makefile.mk
sw/source/ui/fmtui/tmpdlg.cxx
sw/source/ui/frmdlg/colmgr.cxx
sw/source/ui/frmdlg/column.cxx
sw/source/ui/frmdlg/cption.cxx
sw/source/ui/frmdlg/frmdlg.cxx
sw/source/ui/frmdlg/frmmgr.cxx
sw/source/ui/frmdlg/frmpage.cxx
sw/source/ui/frmdlg/makefile.mk
sw/source/ui/frmdlg/wrap.cxx
sw/source/ui/globdoc/makefile.mk
sw/source/ui/inc/bmpwin.hxx
sw/source/ui/inc/colmgr.hxx
sw/source/ui/inc/column.hxx
sw/source/ui/inc/envimg.hxx
sw/source/ui/inc/envlop.hxx
sw/source/ui/inc/frmpage.hxx
sw/source/ui/inc/inputwin.hxx
sw/source/ui/inc/javaedit.hxx
sw/source/ui/inc/num.hxx
sw/source/ui/inc/optpage.hxx
sw/source/ui/inc/regionsw.hxx
sw/source/ui/inc/split.hxx
sw/source/ui/inc/swlbox.hxx
sw/source/ui/inc/swmn_tmpl.hrc
sw/source/ui/inc/swuiidxmrk.hxx
sw/source/ui/inc/tabsh.hxx
sw/source/ui/inc/toxmgr.hxx
sw/source/ui/inc/uiitems.hxx
sw/source/ui/inc/view.hxx
sw/source/ui/inc/workctrl.hxx
sw/source/ui/inc/wrap.hxx
sw/source/ui/inc/wrtsh.hxx
sw/source/ui/index/cnttab.cxx
sw/source/ui/index/makefile.mk
sw/source/ui/index/toxmgr.cxx
sw/source/ui/lingu/hhcwrp.cxx
sw/source/ui/lingu/makefile.mk
sw/source/ui/lingu/olmenu.cxx
sw/source/ui/misc/bookmark.cxx
sw/source/ui/misc/docfnote.cxx
sw/source/ui/misc/glosbib.cxx
sw/source/ui/misc/glosdoc.cxx
sw/source/ui/misc/glshell.cxx
sw/source/ui/misc/insfnote.cxx
sw/source/ui/misc/linenum.cxx
sw/source/ui/misc/makefile.mk
sw/source/ui/misc/num.cxx
sw/source/ui/misc/numberingtypelistbox.cxx
sw/source/ui/misc/outline.cxx
sw/source/ui/misc/pgfnote.cxx
sw/source/ui/misc/pggrid.cxx
sw/source/ui/misc/redlndlg.cxx
sw/source/ui/misc/srtdlg.cxx
sw/source/ui/misc/swmodalredlineacceptdlg.cxx
sw/source/ui/ribbar/conarc.cxx
sw/source/ui/ribbar/drawbase.cxx
sw/source/ui/ribbar/inputwin.cxx
sw/source/ui/ribbar/inputwin.src
sw/source/ui/ribbar/makefile.mk
sw/source/ui/ribbar/tbxanchr.cxx
sw/source/ui/ribbar/workctrl.cxx
sw/source/ui/ribbar/workctrl.src
sw/source/ui/shells/annotsh.cxx
sw/source/ui/shells/basesh.cxx
sw/source/ui/shells/beziersh.cxx
sw/source/ui/shells/drawdlg.cxx
sw/source/ui/shells/drwbassh.cxx
sw/source/ui/shells/drwtxtex.cxx
sw/source/ui/shells/drwtxtsh.cxx
sw/source/ui/shells/frmsh.cxx
sw/source/ui/shells/grfsh.cxx
sw/source/ui/shells/grfshex.cxx
sw/source/ui/shells/makefile.mk
sw/source/ui/shells/tabsh.cxx
sw/source/ui/shells/textfld.cxx
sw/source/ui/shells/textglos.cxx
sw/source/ui/shells/textsh.cxx
sw/source/ui/shells/textsh1.cxx
sw/source/ui/shells/txtattr.cxx
sw/source/ui/shells/txtcrsr.cxx
sw/source/ui/shells/txtnum.cxx
sw/source/ui/table/convert.cxx
sw/source/ui/table/instable.cxx
sw/source/ui/table/makefile.mk
sw/source/ui/table/swtablerep.cxx
sw/source/ui/table/tabledlg.cxx
sw/source/ui/table/tablemgr.cxx
sw/source/ui/table/tablepg.hxx
sw/source/ui/table/tautofmt.cxx
sw/source/ui/uiview/formatclipboard.cxx
sw/source/ui/uiview/makefile.mk
sw/source/ui/uiview/pview.cxx
sw/source/ui/uiview/pview.src
sw/source/ui/uiview/scroll.cxx
sw/source/ui/uiview/srcview.cxx
sw/source/ui/uiview/swcli.cxx
sw/source/ui/uiview/uivwimp.cxx
sw/source/ui/uiview/view.cxx
sw/source/ui/uiview/view1.cxx
sw/source/ui/uiview/view2.cxx
sw/source/ui/uiview/viewcoll.cxx
sw/source/ui/uiview/viewdlg2.cxx
sw/source/ui/uiview/viewling.cxx
sw/source/ui/uiview/viewmdi.cxx
sw/source/ui/uiview/viewport.cxx
sw/source/ui/uiview/viewprt.cxx
sw/source/ui/uiview/viewsrch.cxx
sw/source/ui/uiview/viewtab.cxx
sw/source/ui/uno/SwXDocumentSettings.cxx
sw/source/ui/uno/SwXPrintPreviewSettings.cxx
sw/source/ui/uno/SwXPrintPreviewSettings.hxx
sw/source/ui/uno/unoatxt.cxx
sw/source/ui/uno/unomod.cxx
sw/source/ui/uno/unotxdoc.cxx
sw/source/ui/uno/unotxvw.cxx
sw/source/ui/utlui/attrdesc.cxx
sw/source/ui/utlui/content.cxx
sw/source/ui/utlui/glbltree.cxx
sw/source/ui/utlui/initui.cxx
sw/source/ui/utlui/makefile.mk
sw/source/ui/utlui/navipi.cxx
sw/source/ui/utlui/navipi.src
sw/source/ui/utlui/numfmtlb.cxx
sw/source/ui/utlui/prcntfld.cxx
sw/source/ui/utlui/uiitems.cxx
sw/source/ui/utlui/uitool.cxx
sw/source/ui/utlui/unotools.cxx
sw/source/ui/utlui/viewlayoutctrl.cxx
sw/source/ui/utlui/zoomctrl.cxx
sw/source/ui/vba/makefile.mk
sw/source/ui/vba/service.cxx
sw/source/ui/web/makefile.mk
sw/source/ui/wrtsh/makefile.mk
sw/source/ui/wrtsh/wrtsh1.cxx
sw/source/ui/wrtsh/wrtsh2.cxx
sw/source/ui/wrtsh/wrtsh4.cxx
sw/source/ui/wrtsh/wrtundo.cxx
sw/util/hidother.src
sw/util/makefile.mk
sw/util/msword.map

1 files changed, 75 insertions, 75 deletions

diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index d6581a60d56b..7df49e2cd355 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -104,17 +104,17 @@ protected:
 //SOLL das fuer jede Tabelle einstellbar sein?
     TblChgMode  eTblChgMode;
 
-    USHORT      nGrfsThatResize;    // Anzahl der Grfs, die beim HTML-Import
+    sal_uInt16      nGrfsThatResize;    // Anzahl der Grfs, die beim HTML-Import
                                     // noch ein Resize der Tbl. anstossen
-    USHORT      nRowsToRepeat;      // number of rows to repeat on every page
+    sal_uInt16      nRowsToRepeat;      // number of rows to repeat on every page
 
-    BOOL        bModifyLocked   :1;
-    BOOL        bNewModel       :1; // FALSE: old SubTableModel; TRUE: new RowSpanModel
+    sal_Bool        bModifyLocked   :1;
+    sal_Bool        bNewModel       :1; // sal_False: old SubTableModel; sal_True: new RowSpanModel
 #if OSL_DEBUG_LEVEL > 1
     bool bDontChangeModel;  // This is set by functions (like Merge()) to forbid a laet model change
 #endif
 
-    BOOL IsModifyLocked(){ return bModifyLocked;}
+    sal_Bool IsModifyLocked(){ return bModifyLocked;}
 
 public:
     enum SearchType
@@ -137,19 +137,19 @@ private:
     SwTable & operator= (const SwTable &);
     // no default ctor.
     SwTable();
-    BOOL OldMerge( SwDoc*, const SwSelBoxes&, SwTableBox*, SwUndoTblMerge* );
-    BOOL OldSplitRow( SwDoc*, const SwSelBoxes&, USHORT, BOOL );
-    BOOL NewMerge( SwDoc*, const SwSelBoxes&, const SwSelBoxes& rMerged,
+    sal_Bool OldMerge( SwDoc*, const SwSelBoxes&, SwTableBox*, SwUndoTblMerge* );
+    sal_Bool OldSplitRow( SwDoc*, const SwSelBoxes&, sal_uInt16, sal_Bool );
+    sal_Bool NewMerge( SwDoc*, const SwSelBoxes&, const SwSelBoxes& rMerged,
                    SwTableBox*, SwUndoTblMerge* );
-    BOOL NewSplitRow( SwDoc*, const SwSelBoxes&, USHORT, BOOL );
+    sal_Bool NewSplitRow( SwDoc*, const SwSelBoxes&, sal_uInt16, sal_Bool );
     SwBoxSelection* CollectBoxSelection( const SwPaM& rPam ) const;
-    void InsertSpannedRow( SwDoc* pDoc, USHORT nIdx, USHORT nCnt );
-    BOOL _InsertRow( SwDoc*, const SwSelBoxes&, USHORT nCnt, BOOL bBehind );
-    BOOL NewInsertCol( SwDoc*, const SwSelBoxes& rBoxes, USHORT nCnt, BOOL );
+    void InsertSpannedRow( SwDoc* pDoc, sal_uInt16 nIdx, sal_uInt16 nCnt );
+    sal_Bool _InsertRow( SwDoc*, const SwSelBoxes&, sal_uInt16 nCnt, sal_Bool bBehind );
+    sal_Bool NewInsertCol( SwDoc*, const SwSelBoxes& rBoxes, sal_uInt16 nCnt, sal_Bool );
     void _FindSuperfluousRows( SwSelBoxes& rBoxes, SwTableLine*, SwTableLine* );
     void AdjustWidths( const long nOld, const long nNew );
     void NewSetTabCols( Parm &rP, const SwTabCols &rNew, const SwTabCols &rOld,
-                        const SwTableBox *pStart, BOOL bCurRowOnly );
+                        const SwTableBox *pStart, sal_Bool bCurRowOnly );
 
 public:
 
@@ -157,18 +157,18 @@ public:
     const SwHTMLTableLayout *GetHTMLTableLayout() const { return pHTMLLayout; }
     void SetHTMLTableLayout( SwHTMLTableLayout *p );    //Eigentumsuebergang!
 
-    USHORT IncGrfsThatResize() { return ++nGrfsThatResize; }
-    USHORT DecGrfsThatResize() { return nGrfsThatResize ? --nGrfsThatResize : 0; }
+    sal_uInt16 IncGrfsThatResize() { return ++nGrfsThatResize; }
+    sal_uInt16 DecGrfsThatResize() { return nGrfsThatResize ? --nGrfsThatResize : 0; }
 
-    void LockModify()   { bModifyLocked = TRUE; }   //Muessen _immer_ paarig
-    void UnlockModify() { bModifyLocked = FALSE;}   //benutzt werden!
+    void LockModify()   { bModifyLocked = sal_True; }   //Muessen _immer_ paarig
+    void UnlockModify() { bModifyLocked = sal_False;}   //benutzt werden!
 
-    void SetTableModel( BOOL bNew ){ bNewModel = bNew; }
-    BOOL IsNewModel() const { return bNewModel; }
+    void SetTableModel( sal_Bool bNew ){ bNewModel = bNew; }
+    sal_Bool IsNewModel() const { return bNewModel; }
 
-    USHORT GetRowsToRepeat() const { return Min( GetTabLines().Count(), nRowsToRepeat ); }
-    USHORT _GetRowsToRepeat() const { return nRowsToRepeat; }
-    void SetRowsToRepeat( USHORT nNumOfRows ) { nRowsToRepeat = nNumOfRows; }
+    sal_uInt16 GetRowsToRepeat() const { return Min( GetTabLines().Count(), nRowsToRepeat ); }
+    sal_uInt16 _GetRowsToRepeat() const { return nRowsToRepeat; }
+    void SetRowsToRepeat( sal_uInt16 nNumOfRows ) { nRowsToRepeat = nNumOfRows; }
 
     bool IsHeadline( const SwTableLine& rLine ) const;
 
@@ -181,9 +181,9 @@ public:
     virtual void Modify( SfxPoolItem* pOld, SfxPoolItem* pNew );
 
     void GetTabCols( SwTabCols &rToFill, const SwTableBox *pStart,
-                     BOOL bHidden = FALSE, BOOL bCurRowOnly = FALSE ) const;
+                     sal_Bool bHidden = sal_False, sal_Bool bCurRowOnly = sal_False ) const;
     void SetTabCols( const SwTabCols &rNew, const SwTabCols &rOld,
-                     const SwTableBox *pStart, BOOL bCurRowOnly );
+                     const SwTableBox *pStart, sal_Bool bCurRowOnly );
 
 // The following functions are for new table model only...
     void CreateSelection(  const SwPaM& rPam, SwSelBoxes& rBoxes,
@@ -196,17 +196,17 @@ public:
     // SwSavRowSpan is the structure needed by Undo to undo the split operation
     // CleanUpRowSpan corrects the (top of the) second table and delviers the structure
     // for Undo
-    SwSaveRowSpan* CleanUpTopRowSpan( USHORT nSplitLine );
+    SwSaveRowSpan* CleanUpTopRowSpan( sal_uInt16 nSplitLine );
     // RestoreRowSpan is called by Undo to restore the old row span values
     void RestoreRowSpan( const SwSaveRowSpan& );
     // CleanUpBottomRowSpan corrects the overhanging row spans at the end of the first table
-    void CleanUpBottomRowSpan( USHORT nDelLines );
+    void CleanUpBottomRowSpan( sal_uInt16 nDelLines );
 
 
 // The following functions are "pseudo-virtual", i.e. they are different for old and new table model
 // It's not allowed to change the table model after the first call of one of these functions.
 
-    BOOL Merge( SwDoc* pDoc, const SwSelBoxes& rBoxes, const SwSelBoxes& rMerged,
+    sal_Bool Merge( SwDoc* pDoc, const SwSelBoxes& rBoxes, const SwSelBoxes& rMerged,
                 SwTableBox* pMergeBox, SwUndoTblMerge* pUndo = 0 )
     {
 #if OSL_DEBUG_LEVEL > 1
@@ -215,8 +215,8 @@ public:
         return bNewModel ? NewMerge( pDoc, rBoxes, rMerged, pMergeBox, pUndo ) :
                            OldMerge( pDoc, rBoxes, pMergeBox, pUndo );
     }
-    BOOL SplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, USHORT nCnt=1,
-                   BOOL bSameHeight = FALSE )
+    sal_Bool SplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt=1,
+                   sal_Bool bSameHeight = sal_False )
     {
 #if OSL_DEBUG_LEVEL > 1
         bDontChangeModel = true;
@@ -229,16 +229,16 @@ public:
     void ExpandColumnSelection( SwSelBoxes& rBoxes, long &rMin, long &rMax ) const;
     void PrepareDeleteCol( long nMin, long nMax );
 
-    BOOL InsertCol( SwDoc*, const SwSelBoxes& rBoxes,
-                    USHORT nCnt = 1, BOOL bBehind = TRUE );
-    BOOL InsertRow( SwDoc*, const SwSelBoxes& rBoxes,
-                    USHORT nCnt = 1, BOOL bBehind = TRUE );
-    BOOL AppendRow( SwDoc* pDoc, USHORT nCnt = 1 );
+    sal_Bool InsertCol( SwDoc*, const SwSelBoxes& rBoxes,
+                    sal_uInt16 nCnt = 1, sal_Bool bBehind = sal_True );
+    sal_Bool InsertRow( SwDoc*, const SwSelBoxes& rBoxes,
+                    sal_uInt16 nCnt = 1, sal_Bool bBehind = sal_True );
+    sal_Bool AppendRow( SwDoc* pDoc, sal_uInt16 nCnt = 1 );
     void PrepareDelBoxes( const SwSelBoxes& rBoxes );
-    BOOL DeleteSel( SwDoc*, const SwSelBoxes& rBoxes, const SwSelBoxes* pMerged,
-        SwUndo* pUndo, const BOOL bDelMakeFrms, const BOOL bCorrBorder );
-    BOOL SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, USHORT nCnt=1 );
-    BOOL Merge( const SwSelBoxes& rBoxes,
+    sal_Bool DeleteSel( SwDoc*, const SwSelBoxes& rBoxes, const SwSelBoxes* pMerged,
+        SwUndo* pUndo, const sal_Bool bDelMakeFrms, const sal_Bool bCorrBorder );
+    sal_Bool SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt=1 );
+    sal_Bool Merge( const SwSelBoxes& rBoxes,
                 SwTableBox* pMergeBox, SwUndoTblMerge* = 0 );
 
     void FindSuperfluousRows( SwSelBoxes& rBoxes )
@@ -252,8 +252,8 @@ public:
         // (wird von GetTblBox und SwTblFld benutzt)
     // #i80314#
     // add 3rd parameter in order to control validation check on <rStr>
-    static USHORT _GetBoxNum( String& rStr,
-                              BOOL bFirst = FALSE,
+    static sal_uInt16 _GetBoxNum( String& rStr,
+                              sal_Bool bFirst = sal_False,
                               const bool bPerformValidCheck = false );
         // suche die Inhaltstragende Box mit dem Namen
     // #i80314#
@@ -262,38 +262,38 @@ public:
     const SwTableBox* GetTblBox( const String& rName,
                                  const bool bPerformValidCheck = false ) const;
         // kopiere die selektierten Boxen in ein anderes Dokument.
-    BOOL MakeCopy( SwDoc*, const SwPosition&, const SwSelBoxes&,
-                    BOOL bCpyNds = TRUE, BOOL bCpyName = FALSE ) const;
+    sal_Bool MakeCopy( SwDoc*, const SwPosition&, const SwSelBoxes&,
+                    sal_Bool bCpyNds = sal_True, sal_Bool bCpyName = sal_False ) const;
         // kopiere die Tabelle in diese. (die Logik steht im TBLRWCL.CXX)
-    BOOL InsTable( const SwTable& rCpyTbl, const SwNodeIndex&,
+    sal_Bool InsTable( const SwTable& rCpyTbl, const SwNodeIndex&,
                     SwUndoTblCpyTbl* pUndo = 0 );
-    BOOL InsTable( const SwTable& rCpyTbl, const SwSelBoxes&,
+    sal_Bool InsTable( const SwTable& rCpyTbl, const SwSelBoxes&,
                     SwUndoTblCpyTbl* pUndo = 0 );
-    BOOL InsNewTable( const SwTable& rCpyTbl, const SwSelBoxes&,
+    sal_Bool InsNewTable( const SwTable& rCpyTbl, const SwSelBoxes&,
                       SwUndoTblCpyTbl* pUndo );
         // kopiere die Headline (mit Inhalt!) der Tabelle in eine andere
-    BOOL CopyHeadlineIntoTable( SwTableNode& rTblNd );
+    sal_Bool CopyHeadlineIntoTable( SwTableNode& rTblNd );
 
         // erfrage die Box, dessen Start-Index auf nBoxStt steht
-          SwTableBox* GetTblBox( ULONG nSttIdx );
-    const SwTableBox* GetTblBox( ULONG nSttIdx ) const
+          SwTableBox* GetTblBox( sal_uLong nSttIdx );
+    const SwTableBox* GetTblBox( sal_uLong nSttIdx ) const
                         {   return ((SwTable*)this)->GetTblBox( nSttIdx );  }
 
-    // returnt TRUE wenn sich in der Tabelle Verschachtelungen befinden
-    BOOL IsTblComplex() const;
+    // returnt sal_True wenn sich in der Tabelle Verschachtelungen befinden
+    sal_Bool IsTblComplex() const;
 
-    //returnt TRUE wenn die Tabelle oder Selektion ausgeglichen ist
-    BOOL IsTblComplexForChart( const String& rSel,
+    //returnt sal_True wenn die Tabelle oder Selektion ausgeglichen ist
+    sal_Bool IsTblComplexForChart( const String& rSel,
                                 SwChartLines* pGetCLines = 0  ) const;
 
     // suche alle Inhaltstragenden-Boxen der Grundline in der diese Box
     // steht. rBoxes auch als Return-Wert, um es gleich weiter zu benutzen
-    //JP 31.01.97: bToTop = TRUE -> hoch bis zur Grundline,
-    //                      FALSE-> sonst nur die Line der Box
+    //JP 31.01.97: bToTop = sal_True -> hoch bis zur Grundline,
+    //                      sal_False-> sonst nur die Line der Box
     SwSelBoxes& SelLineFromBox( const SwTableBox* pBox,
-                            SwSelBoxes& rBoxes, BOOL bToTop = TRUE ) const;
+                            SwSelBoxes& rBoxes, sal_Bool bToTop = sal_True ) const;
         // erfrage vom Client Informationen
-    virtual BOOL GetInfo( SfxPoolItem& ) const;
+    virtual sal_Bool GetInfo( SfxPoolItem& ) const;
 
         // suche im Format nach der angemeldeten Tabelle
     static SwTable * FindTable( SwFrmFmt const*const pFmt );
@@ -316,9 +316,9 @@ public:
     TblChgMode GetTblChgMode() const        { return eTblChgMode; }
     void SetTblChgMode( TblChgMode eMode )  { eTblChgMode = eMode; }
 
-    BOOL SetColWidth( SwTableBox& rAktBox, USHORT eType,
+    sal_Bool SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
                         SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo );
-    BOOL SetRowHeight( SwTableBox& rAktBox, USHORT eType,
+    sal_Bool SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType,
                         SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo );
 #if OSL_DEBUG_LEVEL > 1
     void CheckConsistency() const;
@@ -335,7 +335,7 @@ public:
 
     SwTableLine() : pUpper(0) {}
 
-    SwTableLine( SwTableLineFmt*, USHORT nBoxes, SwTableBox *pUp );
+    SwTableLine( SwTableLineFmt*, sal_uInt16 nBoxes, SwTableBox *pUp );
     virtual ~SwTableLine();
 
           SwTableBoxes &GetTabBoxes() { return aBoxes; }
@@ -355,9 +355,9 @@ public:
 
     // suche nach der naechsten/vorherigen Box mit Inhalt
     SwTableBox* FindNextBox( const SwTable&, const SwTableBox* =0,
-                            BOOL bOvrTblLns=TRUE ) const;
+                            sal_Bool bOvrTblLns=sal_True ) const;
     SwTableBox* FindPreviousBox( const SwTable&, const SwTableBox* =0,
-                            BOOL bOvrTblLns=TRUE ) const;
+                            sal_Bool bOvrTblLns=sal_True ) const;
 
     SwTwips GetTableLineHeight( bool& bLayoutAvailable ) const;
 
@@ -388,7 +388,7 @@ public:
 
     SwTableBox() : pSttNd(0), pUpper(0), pImpl(0) {}
 
-    SwTableBox( SwTableBoxFmt*, USHORT nLines, SwTableLine *pUp = 0 );
+    SwTableBox( SwTableBoxFmt*, sal_uInt16 nLines, SwTableLine *pUp = 0 );
     SwTableBox( SwTableBoxFmt*, const SwStartNode&, SwTableLine *pUp = 0 );
     SwTableBox( SwTableBoxFmt*, const SwNodeIndex&, SwTableLine *pUp = 0 );
     virtual ~SwTableBox();
@@ -408,7 +408,7 @@ public:
     void ChgFrmFmt( SwTableBoxFmt *pNewFmt );
 
     const SwStartNode *GetSttNd() const { return pSttNd; }
-    ULONG GetSttIdx() const
+    sal_uLong GetSttIdx() const
 #if OSL_DEBUG_LEVEL > 1
         ;
 #else
@@ -417,29 +417,29 @@ public:
 
     // suche nach der naechsten/vorherigen Box mit Inhalt
     SwTableBox* FindNextBox( const SwTable&, const SwTableBox* =0,
-                            BOOL bOvrTblLns=TRUE ) const;
+                            sal_Bool bOvrTblLns=sal_True ) const;
     SwTableBox* FindPreviousBox( const SwTable&, const SwTableBox* =0,
-                            BOOL bOvrTblLns=TRUE ) const;
+                            sal_Bool bOvrTblLns=sal_True ) const;
     // gebe den Namen dieser Box zurueck. Dieser wird dynamisch bestimmt
     // und ergibt sich aus der Position in den Lines/Boxen/Tabelle
     String GetName() const;
     // gebe den "Wert" der Box zurueck (fuers rechnen in der Tabelle)
     double GetValue( SwTblCalcPara& rPara ) const;
 
-    BOOL IsInHeadline( const SwTable* pTbl = 0 ) const;
+    sal_Bool IsInHeadline( const SwTable* pTbl = 0 ) const;
 
     // enthaelt die Box Inhalt, der als Nummer formatiert werden kann?
-    BOOL HasNumCntnt( double& rNum, sal_uInt32& rFmtIndex,
-                    BOOL& rIsEmptyTxtNd ) const;
-    ULONG IsValidNumTxtNd( BOOL bCheckAttr = TRUE ) const;
+    sal_Bool HasNumCntnt( double& rNum, sal_uInt32& rFmtIndex,
+                    sal_Bool& rIsEmptyTxtNd ) const;
+    sal_uLong IsValidNumTxtNd( sal_Bool bCheckAttr = sal_True ) const;
     // teste ob der BoxInhalt mit der Nummer uebereinstimmt, wenn eine
     // Tabellenformel gesetzt ist. (fuers Redo des Change vom NumFormat!)
-    BOOL IsNumberChanged() const;
+    sal_Bool IsNumberChanged() const;
 
     // ist das eine FormelBox oder eine Box mit numerischen Inhalt (AutoSum)
     // Was es ist, besagt der ReturnWert - die WhichId des Attributes
     // Leere Boxen haben den ReturnWert USHRT_MAX !!
-    USHORT IsFormulaOrValueBox() const;
+    sal_uInt16 IsFormulaOrValueBox() const;
 
     // Loading of a document requires an actualisation of cells with values
     void ActualiseValueBox();
@@ -457,14 +457,14 @@ public:
     bool getDummyFlag() const;
     void setDummyFlag( bool bDummy );
 
-    SwTableBox& FindStartOfRowSpan( const SwTable&, USHORT nMaxStep = USHRT_MAX );
+    SwTableBox& FindStartOfRowSpan( const SwTable&, sal_uInt16 nMaxStep = USHRT_MAX );
     const SwTableBox& FindStartOfRowSpan( const SwTable& rTable,
-        USHORT nMaxStep = USHRT_MAX ) const
+        sal_uInt16 nMaxStep = USHRT_MAX ) const
         { return const_cast<SwTableBox*>(this)->FindStartOfRowSpan( rTable, nMaxStep ); }
 
-    SwTableBox& FindEndOfRowSpan( const SwTable&, USHORT nMaxStep = USHRT_MAX );
+    SwTableBox& FindEndOfRowSpan( const SwTable&, sal_uInt16 nMaxStep = USHRT_MAX );
     const SwTableBox& FindEndOfRowSpan( const SwTable& rTable,
-        USHORT nMaxStep = USHRT_MAX ) const
+        sal_uInt16 nMaxStep = USHRT_MAX ) const
         { return const_cast<SwTableBox*>(this)->FindEndOfRowSpan( rTable, nMaxStep ); }
 };