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, 89 insertions, 89 deletions

diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 40fa7dd63774..1f5bf0530f9b 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -63,8 +63,8 @@ SV_DECL_PTRARR(SwTOXMarks, SwTOXMark*, 0, 10)
      Description:  Entry of content index, alphabetical index or user defined index
  --------------------------------------------------------------------*/
 
-#define IVER_TOXMARK_STRPOOL ((USHORT)1)
-#define IVER_TOXMARK_NEWTOX ((USHORT)2)
+#define IVER_TOXMARK_STRPOOL ((sal_uInt16)1)
+#define IVER_TOXMARK_NEWTOX ((sal_uInt16)2)
 
 class SW_DLLPUBLIC SwTOXMark
     : public SfxPoolItem
@@ -83,9 +83,9 @@ class SW_DLLPUBLIC SwTOXMark
 
     SwTxtTOXMark* pTxtAttr;
 
-    USHORT  nLevel;
-    BOOL    bAutoGenerated : 1;     // generated using a concordance file
-    BOOL    bMainEntry : 1;         // main entry emphasized by character style
+    sal_uInt16  nLevel;
+    sal_Bool    bAutoGenerated : 1;     // generated using a concordance file
+    sal_Bool    bMainEntry : 1;         // main entry emphasized by character style
 
     ::com::sun::star::uno::WeakReference<
         ::com::sun::star::text::XDocumentIndexMark> m_wXDocumentIndexMark;
@@ -113,14 +113,14 @@ public:
 
     String                  GetText() const;
 
-    inline BOOL             IsAlternativeText() const;
+    inline sal_Bool             IsAlternativeText() const;
     inline const String&    GetAlternativeText() const;
 
     inline void             SetAlternativeText( const String& rAlt );
 
     // content or user defined index
-    inline void             SetLevel(USHORT nLevel);
-    inline USHORT           GetLevel() const;
+    inline void             SetLevel(sal_uInt16 nLevel);
+    inline sal_uInt16           GetLevel() const;
 
     // for alphabetical index only
     inline void             SetPrimaryKey(const String& rStr );
@@ -135,11 +135,11 @@ public:
     inline const String&    GetPrimaryKeyReading() const;
     inline const String&    GetSecondaryKeyReading() const;
 
-    BOOL                    IsAutoGenerated() const {return bAutoGenerated;}
-    void                    SetAutoGenerated(BOOL bSet) {bAutoGenerated = bSet;}
+    sal_Bool                    IsAutoGenerated() const {return bAutoGenerated;}
+    void                    SetAutoGenerated(sal_Bool bSet) {bAutoGenerated = bSet;}
 
-    BOOL                    IsMainEntry() const {return bMainEntry;}
-    void                    SetMainEntry(BOOL bSet) { bMainEntry = bSet;}
+    sal_Bool                    IsMainEntry() const {return bMainEntry;}
+    void                    SetMainEntry(sal_Bool bSet) { bMainEntry = bSet;}
 
     inline const SwTOXType*    GetTOXType() const;
 
@@ -225,13 +225,13 @@ struct SW_DLLPUBLIC SwFormToken
     String          sCharStyleName;
     SwTwips         nTabStopPosition;
     FormTokenType   eTokenType;
-    USHORT          nPoolId;
+    sal_uInt16          nPoolId;
     SvxTabAdjust    eTabAlign;
-    USHORT          nChapterFormat;     //SwChapterFormat;
-    USHORT          nOutlineLevel;//the maximum permitted outline level in numbering
-    USHORT          nAuthorityField;    //enum ToxAuthorityField
+    sal_uInt16          nChapterFormat;     //SwChapterFormat;
+    sal_uInt16          nOutlineLevel;//the maximum permitted outline level in numbering
+    sal_uInt16          nAuthorityField;    //enum ToxAuthorityField
     sal_Unicode     cTabFillChar;
-    sal_Bool        bWithTab;      // TRUE: do generate tab
+    sal_Bool        bWithTab;      // sal_True: do generate tab
                                    // character only the tab stop
                                    // #i21237#
 
@@ -351,11 +351,11 @@ class SW_DLLPUBLIC SwForm
     String  aTemplate[ AUTH_TYPE_END + 1 ];
 
     TOXTypes    eType;
-    USHORT      nFormMaxLevel;
+    sal_uInt16      nFormMaxLevel;
 
-    BOOL    bGenerateTabPos : 1;
-    BOOL    bIsRelTabPos : 1;
-    BOOL    bCommaSeparated : 1;
+    sal_Bool    bGenerateTabPos : 1;
+    sal_Bool    bIsRelTabPos : 1;
+    sal_Bool    bCommaSeparated : 1;
 
 public:
     SwForm( TOXTypes eTOXType = TOX_CONTENT );
@@ -363,57 +363,57 @@ public:
 
     SwForm& operator=( const SwForm& rForm );
 
-    inline void SetTemplate(USHORT nLevel, const String& rName);
-    inline const String&    GetTemplate(USHORT nLevel) const;
+    inline void SetTemplate(sal_uInt16 nLevel, const String& rName);
+    inline const String&    GetTemplate(sal_uInt16 nLevel) const;
 
     // #i21237#
-    void    SetPattern(USHORT nLevel, const SwFormTokens& rName);
-    void    SetPattern(USHORT nLevel, const String& rStr);
-    const SwFormTokens& GetPattern(USHORT nLevel) const;
+    void    SetPattern(sal_uInt16 nLevel, const SwFormTokens& rName);
+    void    SetPattern(sal_uInt16 nLevel, const String& rStr);
+    const SwFormTokens& GetPattern(sal_uInt16 nLevel) const;
 
     // fill tab stop positions from template to pattern
     // #i21237#
     void                    AdjustTabStops(SwDoc& rDoc,
-                                           BOOL bInsertNewTabStops = FALSE);
+                                           sal_Bool bInsertNewTabStops = sal_False);
 
     inline TOXTypes GetTOXType() const;
-    inline USHORT   GetFormMax() const;
+    inline sal_uInt16   GetFormMax() const;
 
-    BOOL IsRelTabPos() const    {   return bIsRelTabPos; }
-    void SetRelTabPos( BOOL b ) {   bIsRelTabPos = b;       }
+    sal_Bool IsRelTabPos() const    {   return bIsRelTabPos; }
+    void SetRelTabPos( sal_Bool b ) {   bIsRelTabPos = b;       }
 
-    BOOL IsCommaSeparated() const       { return bCommaSeparated;}
-    void SetCommaSeparated( BOOL b)     { bCommaSeparated = b;}
+    sal_Bool IsCommaSeparated() const       { return bCommaSeparated;}
+    void SetCommaSeparated( sal_Bool b)     { bCommaSeparated = b;}
 
-    static USHORT GetFormMaxLevel( TOXTypes eType );
+    static sal_uInt16 GetFormMaxLevel( TOXTypes eType );
 
     static const sal_Char*  aFormEntry;             // <E>
-    static BYTE nFormEntryLen;                      // 3 characters
+    static sal_uInt8 nFormEntryLen;                      // 3 characters
     static const sal_Char*  aFormTab;               // <T>
-    static BYTE nFormTabLen;                        // 3 characters
+    static sal_uInt8 nFormTabLen;                        // 3 characters
     static const sal_Char*  aFormPageNums;          // <P>
-    static BYTE nFormPageNumsLen;                   // 3 characters
+    static sal_uInt8 nFormPageNumsLen;                   // 3 characters
     static const sal_Char* aFormLinkStt;            // <LS>
-    static BYTE nFormLinkSttLen;                    // 4 characters
+    static sal_uInt8 nFormLinkSttLen;                    // 4 characters
     static const sal_Char* aFormLinkEnd;            // <LE>
-    static BYTE nFormLinkEndLen;                    // 4 characters
+    static sal_uInt8 nFormLinkEndLen;                    // 4 characters
     static const sal_Char*  aFormEntryNum;          // <E#>
-    static BYTE nFormEntryNumLen;                   // 4 characters
+    static sal_uInt8 nFormEntryNumLen;                   // 4 characters
     static const sal_Char*  aFormEntryTxt;          // <ET>
-    static BYTE nFormEntryTxtLen;                   // 4 characters
+    static sal_uInt8 nFormEntryTxtLen;                   // 4 characters
     static const sal_Char*  aFormChapterMark;       // <C>
-    static BYTE nFormChapterMarkLen;                // 3 characters
+    static sal_uInt8 nFormChapterMarkLen;                // 3 characters
     static const sal_Char*  aFormText;              // <TX>
-    static BYTE nFormTextLen;                       // 4 characters
+    static sal_uInt8 nFormTextLen;                       // 4 characters
     static const sal_Char*  aFormAuth;              // <Axx> xx - decimal enum value
-    static BYTE nFormAuthLen;                       // 3 characters
+    static sal_uInt8 nFormAuthLen;                       // 3 characters
 };
 
 /*--------------------------------------------------------------------
      Description: Content to create indexes of
  --------------------------------------------------------------------*/
 
-typedef USHORT SwTOXElement;
+typedef sal_uInt16 SwTOXElement;
 namespace nsSwTOXElement
 {
     const SwTOXElement TOX_MARK             = 1;
@@ -426,7 +426,7 @@ namespace nsSwTOXElement
     const SwTOXElement TOX_SEQUENCE         = 128;
 }
 
-typedef USHORT SwTOIOptions;
+typedef sal_uInt16 SwTOIOptions;
 namespace nsSwTOIOptions
 {
     const SwTOIOptions TOI_SAME_ENTRY       = 1;
@@ -446,7 +446,7 @@ enum SwCaptionDisplay
     CAPTION_TEXT
 };
 
-typedef USHORT SwTOOElements;
+typedef sal_uInt16 SwTOOElements;
 namespace nsSwTOOElements
 {
     const SwTOOElements TOO_MATH            = 0x01;
@@ -477,25 +477,25 @@ class SW_DLLPUBLIC SwTOXBase : public SwClient
     String          sSortAlgorithm;
 
     union {
-        USHORT      nLevel;             // consider outline levels
-        USHORT      nOptions;           // options of alphabetical index
+        sal_uInt16      nLevel;             // consider outline levels
+        sal_uInt16      nOptions;           // options of alphabetical index
     } aData;
 
-    USHORT      nCreateType;        // sources to create the index from
-    USHORT      nOLEOptions;        // OLE sources
+    sal_uInt16      nCreateType;        // sources to create the index from
+    sal_uInt16      nOLEOptions;        // OLE sources
     SwCaptionDisplay eCaptionDisplay;   //
-    BOOL        bProtected : 1;         // index protected ?
-    BOOL        bFromChapter : 1;       // create from chapter or document
-    BOOL        bFromObjectNames : 1;   // create a table or object index
+    sal_Bool        bProtected : 1;         // index protected ?
+    sal_Bool        bFromChapter : 1;       // create from chapter or document
+    sal_Bool        bFromObjectNames : 1;   // create a table or object index
                                     // from the names rather than the caption
-    BOOL        bLevelFromChapter : 1; // User index: get the level from the source chapter
+    sal_Bool        bLevelFromChapter : 1; // User index: get the level from the source chapter
 public:
     SwTOXBase( const SwTOXType* pTyp, const SwForm& rForm,
-               USHORT nCreaType, const String& rTitle );
+               sal_uInt16 nCreaType, const String& rTitle );
     SwTOXBase( const SwTOXBase& rCopy, SwDoc* pDoc = 0 );
     virtual ~SwTOXBase();
 
-    virtual BOOL GetInfo( SfxPoolItem& rInfo ) const;
+    virtual sal_Bool GetInfo( SfxPoolItem& rInfo ) const;
 
     // a kind of CopyCtor - check if the TOXBase is at TOXType of the doc.
     // If not, so create it an copy all other used things. The return is this
@@ -503,7 +503,7 @@ public:
 
     const SwTOXType*    GetTOXType() const; //
 
-    USHORT              GetCreateType() const;      // creation types
+    sal_uInt16              GetCreateType() const;      // creation types
 
     const String&       GetTOXName() const {return aName;}
     void                SetTOXName(const String& rSet) {aName = rSet;}
@@ -512,7 +512,7 @@ public:
     const String&       GetTypeName() const;        // Name
     const SwForm&       GetTOXForm() const;         // description of the lines
 
-    void                SetCreate(USHORT);
+    void                SetCreate(sal_uInt16);
     void                SetTitle(const String& rTitle);
     void                SetTOXForm(const SwForm& rForm);
 
@@ -522,43 +522,43 @@ public:
     void                SetMainEntryCharStyle(const String& rSet)  {sMainEntryCharStyle = rSet;}
 
     // content index only
-    inline void             SetLevel(USHORT);                   // consider outline level
-    inline USHORT           GetLevel() const;
+    inline void             SetLevel(sal_uInt16);                   // consider outline level
+    inline sal_uInt16           GetLevel() const;
 
     // alphabetical index only
-    inline USHORT           GetOptions() const;                 // alphabetical index options
-    inline void             SetOptions(USHORT nOpt);
+    inline sal_uInt16           GetOptions() const;                 // alphabetical index options
+    inline void             SetOptions(sal_uInt16 nOpt);
 
     // index of objects
-    USHORT      GetOLEOptions() const {return nOLEOptions;}
-    void        SetOLEOptions(USHORT nOpt) {nOLEOptions = nOpt;}
+    sal_uInt16      GetOLEOptions() const {return nOLEOptions;}
+    void        SetOLEOptions(sal_uInt16 nOpt) {nOLEOptions = nOpt;}
 
     // index of objects
 
     // user defined index only
     inline void             SetTemplateName(const String& rName); // Absatzlayout beachten
 
-    const String&           GetStyleNames(USHORT nLevel) const
+    const String&           GetStyleNames(sal_uInt16 nLevel) const
                                 {
                                 DBG_ASSERT( nLevel < MAXLEVEL, "Which level?");
                                 return aStyleNames[nLevel];
                                 }
-    void                    SetStyleNames(const String& rSet, USHORT nLevel)
+    void                    SetStyleNames(const String& rSet, sal_uInt16 nLevel)
                                 {
                                 DBG_ASSERT( nLevel < MAXLEVEL, "Which level?");
                                 aStyleNames[nLevel] = rSet;
                                 }
-    BOOL                    IsFromChapter() const { return bFromChapter;}
-    void                    SetFromChapter(BOOL bSet) { bFromChapter = bSet;}
+    sal_Bool                    IsFromChapter() const { return bFromChapter;}
+    void                    SetFromChapter(sal_Bool bSet) { bFromChapter = bSet;}
 
-    BOOL                    IsFromObjectNames() const {return bFromObjectNames;}
-    void                    SetFromObjectNames(BOOL bSet) {bFromObjectNames = bSet;}
+    sal_Bool                    IsFromObjectNames() const {return bFromObjectNames;}
+    void                    SetFromObjectNames(sal_Bool bSet) {bFromObjectNames = bSet;}
 
-    BOOL                    IsLevelFromChapter() const {return bLevelFromChapter;}
-    void                    SetLevelFromChapter(BOOL bSet) {bLevelFromChapter = bSet;}
+    sal_Bool                    IsLevelFromChapter() const {return bLevelFromChapter;}
+    void                    SetLevelFromChapter(sal_Bool bSet) {bLevelFromChapter = bSet;}
 
-    BOOL                    IsProtected() const { return bProtected; }
-    void                    SetProtected(BOOL bSet) { bProtected = bSet; }
+    sal_Bool                    IsProtected() const { return bProtected; }
+    void                    SetProtected(sal_Bool bSet) { bProtected = bSet; }
 
     const String&           GetSequenceName() const {return sSequenceName;}
     void                    SetSequenceName(const String& rSet) {sSequenceName = rSet;}
@@ -566,7 +566,7 @@ public:
     SwCaptionDisplay        GetCaptionDisplay() const { return eCaptionDisplay;}
     void                    SetCaptionDisplay(SwCaptionDisplay eSet) {eCaptionDisplay = eSet;}
 
-    BOOL                    IsTOXBaseInReadonly() const;
+    sal_Bool                    IsTOXBaseInReadonly() const;
 
     const SfxItemSet*       GetAttrSet() const;
     void                    SetAttrSet( const SfxItemSet& );
@@ -577,7 +577,7 @@ public:
     const String&   GetSortAlgorithm()const {return sSortAlgorithm;}
     void            SetSortAlgorithm(const String& rSet) {sSortAlgorithm = rSet;}
     // #i21237#
-    void AdjustTabStops(SwDoc & rDoc, BOOL bDefaultRightTabStop);
+    void AdjustTabStops(SwDoc & rDoc, sal_Bool bDefaultRightTabStop);
     SwTOXBase&          operator=(const SwTOXBase& rSource);
 };
 
@@ -595,7 +595,7 @@ inline const String& SwTOXMark::GetAlternativeText() const
 inline const SwTOXType* SwTOXMark::GetTOXType() const
     { return (SwTOXType*)GetRegisteredIn(); }
 
-inline BOOL SwTOXMark::IsAlternativeText() const
+inline sal_Bool SwTOXMark::IsAlternativeText() const
     { return aAltText.Len() > 0; }
 
 inline void SwTOXMark::SetAlternativeText(const String& rAlt)
@@ -603,7 +603,7 @@ inline void SwTOXMark::SetAlternativeText(const String& rAlt)
     aAltText = rAlt;
 }
 
-inline void SwTOXMark::SetLevel( USHORT nLvl )
+inline void SwTOXMark::SetLevel( sal_uInt16 nLvl )
 {
     OSL_ENSURE( !GetTOXType() || GetTOXType()->GetType() != TOX_INDEX, "Falscher Feldtyp");
     nLevel = nLvl;
@@ -639,7 +639,7 @@ inline void SwTOXMark::SetSecondaryKeyReading( const String& rKey )
     aSecondaryKeyReading = rKey;
 }
 
-inline USHORT SwTOXMark::GetLevel() const
+inline sal_uInt16 SwTOXMark::GetLevel() const
 {
     OSL_ENSURE( !GetTOXType() || GetTOXType()->GetType() != TOX_INDEX, "Falscher Feldtyp");
     return nLevel;
@@ -678,13 +678,13 @@ inline const String& SwTOXMark::GetSecondaryKeyReading() const
 //
 //SwForm
 //
-inline void SwForm::SetTemplate(USHORT nLevel, const String& rTemplate)
+inline void SwForm::SetTemplate(sal_uInt16 nLevel, const String& rTemplate)
 {
     OSL_ENSURE(nLevel < GetFormMax(), "Index >= FORM_MAX");
     aTemplate[nLevel] = rTemplate;
 }
 
-inline const String& SwForm::GetTemplate(USHORT nLevel) const
+inline const String& SwForm::GetTemplate(sal_uInt16 nLevel) const
 {
     OSL_ENSURE(nLevel < GetFormMax(), "Index >= FORM_MAX");
     return aTemplate[nLevel];
@@ -695,7 +695,7 @@ inline TOXTypes SwForm::GetTOXType() const
     return eType;
 }
 
-inline USHORT SwForm::GetFormMax() const
+inline sal_uInt16 SwForm::GetFormMax() const
 {
     return nFormMaxLevel;
 }
@@ -716,7 +716,7 @@ inline TOXTypes SwTOXType::GetType() const
 inline const SwTOXType* SwTOXBase::GetTOXType() const
     { return (SwTOXType*)GetRegisteredIn(); }
 
-inline USHORT SwTOXBase::GetCreateType() const
+inline sal_uInt16 SwTOXBase::GetCreateType() const
     { return nCreateType; }
 
 inline const String& SwTOXBase::GetTitle() const
@@ -728,12 +728,12 @@ inline const String& SwTOXBase::GetTypeName() const
 inline const SwForm& SwTOXBase::GetTOXForm() const
     { return aForm; }
 
-inline void SwTOXBase::AdjustTabStops(SwDoc & rDoc, BOOL bDefaultRightTabStop)
+inline void SwTOXBase::AdjustTabStops(SwDoc & rDoc, sal_Bool bDefaultRightTabStop)
 {
     aForm.AdjustTabStops(rDoc, bDefaultRightTabStop);
 }
 
-inline void SwTOXBase::SetCreate(USHORT nCreate)
+inline void SwTOXBase::SetCreate(sal_uInt16 nCreate)
     { nCreateType = nCreate; }
 
 inline void SwTOXBase::SetTOXForm(const SwForm& rForm)
@@ -742,13 +742,13 @@ inline void SwTOXBase::SetTOXForm(const SwForm& rForm)
 inline TOXTypes SwTOXBase::GetType() const
     { return GetTOXType()->GetType(); }
 
-inline void SwTOXBase::SetLevel(USHORT nLev)
+inline void SwTOXBase::SetLevel(sal_uInt16 nLev)
 {
     OSL_ENSURE(GetTOXType()->GetType() != TOX_INDEX, "Falscher Feldtyp");
     aData.nLevel = nLev;
 }
 
-inline USHORT SwTOXBase::GetLevel() const
+inline sal_uInt16 SwTOXBase::GetLevel() const
 {
     OSL_ENSURE(GetTOXType()->GetType() != TOX_INDEX, "Falscher Feldtyp");
     return aData.nLevel;
@@ -760,13 +760,13 @@ inline void SwTOXBase::SetTemplateName(const String& rName)
     aStyleNames[0] = rName;
 }
 
-inline USHORT SwTOXBase::GetOptions() const
+inline sal_uInt16 SwTOXBase::GetOptions() const
 {
     OSL_ENSURE(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
     return aData.nOptions;
 }
 
-inline void SwTOXBase::SetOptions(USHORT nOpt)
+inline void SwTOXBase::SetOptions(sal_uInt16 nOpt)
 {
     OSL_ENSURE(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
     aData.nOptions = nOpt;