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

diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx
index 6802fa7eb1af..4016dba7f833 100644
--- a/sw/inc/htmltbl.hxx
+++ b/sw/inc/htmltbl.hxx
@@ -61,15 +61,15 @@ class SwHTMLTableLayoutCnts
     // done for this content. Therefore they are compared against
     // a reference value. If 255 is reached the continue with 0.
     // This avoids reinitialization on every resize.
-    BYTE nPass1Done;            // How many times has Pass 1 been called?
-    BYTE nWidthSet;             // How many times has the width been set?
+    sal_uInt8 nPass1Done;           // How many times has Pass 1 been called?
+    sal_uInt8 nWidthSet;                // How many times has the width been set?
 
-    BOOL bNoBreakTag;       // <NOBR>-Tag over complete content.
+    sal_Bool bNoBreakTag;       // <NOBR>-Tag over complete content.
 
 public:
 
     SwHTMLTableLayoutCnts( const SwStartNode* pSttNd, SwHTMLTableLayout* pTab,
-                           BOOL bNoBreakTag, SwHTMLTableLayoutCnts* pNxt );
+                           sal_Bool bNoBreakTag, SwHTMLTableLayoutCnts* pNxt );
 
     ~SwHTMLTableLayoutCnts();
 
@@ -83,32 +83,32 @@ public:
     // Calculation of next node.
     SwHTMLTableLayoutCnts *GetNext() const { return pNext; }
 
-    void SetWidthSet( BYTE nRef ) { nWidthSet = nRef; }
-    BOOL IsWidthSet( BYTE nRef ) const { return nRef==nWidthSet; }
+    void SetWidthSet( sal_uInt8 nRef ) { nWidthSet = nRef; }
+    sal_Bool IsWidthSet( sal_uInt8 nRef ) const { return nRef==nWidthSet; }
 
-    void SetPass1Done( BYTE nRef ) { nPass1Done = nRef; }
-    BOOL IsPass1Done( BYTE nRef ) const { return nRef==nPass1Done; }
+    void SetPass1Done( sal_uInt8 nRef ) { nPass1Done = nRef; }
+    sal_Bool IsPass1Done( sal_uInt8 nRef ) const { return nRef==nPass1Done; }
 
-    BOOL HasNoBreakTag() const { return bNoBreakTag; }
+    sal_Bool HasNoBreakTag() const { return bNoBreakTag; }
 };
 
 class SwHTMLTableLayoutCell
 {
     SwHTMLTableLayoutCnts *pContents;       // Content of cell.
 
-    USHORT nRowSpan;    // ROWSPAN of cell.
-    USHORT nColSpan;    // COLSPAN of cell.
-    USHORT nWidthOption;// Given width of cell in Twip or %.
+    sal_uInt16 nRowSpan;    // ROWSPAN of cell.
+    sal_uInt16 nColSpan;    // COLSPAN of cell.
+    sal_uInt16 nWidthOption;// Given width of cell in Twip or %.
 
-    BOOL bPrcWidthOption : 1;// nWidth is %-value.
-    BOOL bNoWrapOption : 1; // NOWRAP-option.
+    sal_Bool bPrcWidthOption : 1;// nWidth is %-value.
+    sal_Bool bNoWrapOption : 1; // NOWRAP-option.
 
 public:
 
     SwHTMLTableLayoutCell( SwHTMLTableLayoutCnts *pCnts,
-                         USHORT nRSpan, USHORT nCSpan,
-                         USHORT nWidthOpt, BOOL bPrcWdthOpt,
-                         BOOL nNWrapOpt );
+                         sal_uInt16 nRSpan, sal_uInt16 nCSpan,
+                         sal_uInt16 nWidthOpt, sal_Bool bPrcWdthOpt,
+                         sal_Bool nNWrapOpt );
 
     ~SwHTMLTableLayoutCell();
 
@@ -119,67 +119,67 @@ public:
     inline void SetProtected();
 
     // Set or get ROWSPAN/COLSPAN of cell.
-    void SetRowSpan( USHORT nRSpan ) { nRowSpan = nRSpan; }
-    USHORT GetRowSpan() const { return nRowSpan; }
-    USHORT GetColSpan() const { return nColSpan; }
+    void SetRowSpan( sal_uInt16 nRSpan ) { nRowSpan = nRSpan; }
+    sal_uInt16 GetRowSpan() const { return nRowSpan; }
+    sal_uInt16 GetColSpan() const { return nColSpan; }
 
-    USHORT GetWidthOption() const { return nWidthOption; }
-    BOOL IsPrcWidthOption() const { return bPrcWidthOption; }
+    sal_uInt16 GetWidthOption() const { return nWidthOption; }
+    sal_Bool IsPrcWidthOption() const { return bPrcWidthOption; }
 
-    BOOL HasNoWrapOption() const { return bNoWrapOption; }
+    sal_Bool HasNoWrapOption() const { return bNoWrapOption; }
 };
 
 class SwHTMLTableLayoutColumn
 {
 
     // Interim values of AutoLayoutPass1,
-    ULONG nMinNoAlign, nMaxNoAlign, nAbsMinNoAlign;
+    sal_uLong nMinNoAlign, nMaxNoAlign, nAbsMinNoAlign;
 
     // Results of AutoLayoutPass1
-    ULONG nMin, nMax;
+    sal_uLong nMin, nMax;
 
     // Results of Pass 2.
-    USHORT nAbsColWidth;                // In Twips.
-    USHORT nRelColWidth;                // In Twips or relative to USHRT_MAX.
+    sal_uInt16 nAbsColWidth;                // In Twips.
+    sal_uInt16 nRelColWidth;                // In Twips or relative to USHRT_MAX.
 
-    USHORT nWidthOption;                // Options of <COL> or <TD>/<TH>.
+    sal_uInt16 nWidthOption;                // Options of <COL> or <TD>/<TH>.
 
-    BOOL bRelWidthOption : 1;
-    BOOL bLeftBorder : 1;
+    sal_Bool bRelWidthOption : 1;
+    sal_Bool bLeftBorder : 1;
 
 public:
 
-    SwHTMLTableLayoutColumn( USHORT nColWidthOpt, BOOL bRelColWidthOpt,
-                             BOOL bLBorder );
+    SwHTMLTableLayoutColumn( sal_uInt16 nColWidthOpt, sal_Bool bRelColWidthOpt,
+                             sal_Bool bLBorder );
 
     ~SwHTMLTableLayoutColumn() {}
 
-    inline void MergeCellWidthOption( USHORT nWidth, BOOL bPrc );
-    inline void SetWidthOption( USHORT nWidth, BOOL bRelWidth, BOOL bTest );
+    inline void MergeCellWidthOption( sal_uInt16 nWidth, sal_Bool bPrc );
+    inline void SetWidthOption( sal_uInt16 nWidth, sal_Bool bRelWidth, sal_Bool bTest );
 
-    USHORT GetWidthOption() const { return nWidthOption; }
-    BOOL IsRelWidthOption() const { return bRelWidthOption; }
+    sal_uInt16 GetWidthOption() const { return nWidthOption; }
+    sal_Bool IsRelWidthOption() const { return bRelWidthOption; }
 
-    inline void MergeMinMaxNoAlign( ULONG nMin, ULONG nMax, ULONG nAbsMin );
-    ULONG GetMinNoAlign() const { return nMinNoAlign; }
-    ULONG GetMaxNoAlign() const { return nMaxNoAlign; }
-    ULONG GetAbsMinNoAlign() const { return nAbsMinNoAlign; }
-    inline void ClearPass1Info( BOOL bWidthOpt );
+    inline void MergeMinMaxNoAlign( sal_uLong nMin, sal_uLong nMax, sal_uLong nAbsMin );
+    sal_uLong GetMinNoAlign() const { return nMinNoAlign; }
+    sal_uLong GetMaxNoAlign() const { return nMaxNoAlign; }
+    sal_uLong GetAbsMinNoAlign() const { return nAbsMinNoAlign; }
+    inline void ClearPass1Info( sal_Bool bWidthOpt );
 
-    inline void SetMinMax( ULONG nMin, ULONG nMax );
-    void SetMax( ULONG nVal ) { nMax = nVal; }
-    void AddToMin( ULONG nVal ) { nMin += nVal; }
-    void AddToMax( ULONG nVal ) { nMax += nVal; }
-    ULONG GetMin() const { return nMin; }
-    ULONG GetMax() const { return nMax; }
+    inline void SetMinMax( sal_uLong nMin, sal_uLong nMax );
+    void SetMax( sal_uLong nVal ) { nMax = nVal; }
+    void AddToMin( sal_uLong nVal ) { nMin += nVal; }
+    void AddToMax( sal_uLong nVal ) { nMax += nVal; }
+    sal_uLong GetMin() const { return nMin; }
+    sal_uLong GetMax() const { return nMax; }
 
-    void SetAbsColWidth( USHORT nWidth ) { nAbsColWidth = nWidth; }
-    USHORT GetAbsColWidth() const { return nAbsColWidth; }
+    void SetAbsColWidth( sal_uInt16 nWidth ) { nAbsColWidth = nWidth; }
+    sal_uInt16 GetAbsColWidth() const { return nAbsColWidth; }
 
-    void SetRelColWidth( USHORT nWidth ) { nRelColWidth = nWidth; }
-    USHORT GetRelColWidth() const { return nRelColWidth; }
+    void SetRelColWidth( sal_uInt16 nWidth ) { nRelColWidth = nWidth; }
+    sal_uInt16 GetRelColWidth() const { return nRelColWidth; }
 
-    BOOL HasLeftBorder() const { return bLeftBorder; }
+    sal_Bool HasLeftBorder() const { return bLeftBorder; }
 };
 
 class SwHTMLTableLayout
@@ -193,61 +193,61 @@ class SwHTMLTableLayout
     SwTableBox *pLeftFillerBox;     // Left filler-box (table in table only).
     SwTableBox *pRightFillerBox;    // Right filler-box (table in Table only).
 
-    ULONG nMin;                     // Minimal width of table (Twips).
-    ULONG nMax;                     // Maximal width of table (Twips).
+    sal_uLong nMin;                     // Minimal width of table (Twips).
+    sal_uLong nMax;                     // Maximal width of table (Twips).
 
-    USHORT nRows;                   // Row count.
-    USHORT nCols;                   // Column count.
+    sal_uInt16 nRows;                   // Row count.
+    sal_uInt16 nCols;                   // Column count.
 
-    USHORT nLeftMargin;             // Space to left margin (from paragraph).
-    USHORT nRightMargin;            // Space to left margin (from paragraph).
+    sal_uInt16 nLeftMargin;             // Space to left margin (from paragraph).
+    sal_uInt16 nRightMargin;            // Space to left margin (from paragraph).
 
-    USHORT nInhAbsLeftSpace;        // Space inherited from surrounding box
-    USHORT nInhAbsRightSpace;       // that was added to boxes.
+    sal_uInt16 nInhAbsLeftSpace;        // Space inherited from surrounding box
+    sal_uInt16 nInhAbsRightSpace;       // that was added to boxes.
 
-    USHORT nRelLeftFill;            // Width of boxes relative to alignment
-    USHORT nRelRightFill;           // of tables in tables.
+    sal_uInt16 nRelLeftFill;            // Width of boxes relative to alignment
+    sal_uInt16 nRelRightFill;           // of tables in tables.
 
-    USHORT nRelTabWidth;            // Relative width of table.
+    sal_uInt16 nRelTabWidth;            // Relative width of table.
 
-    USHORT nWidthOption;            // Width of table (in Twips oder %).
-    USHORT nCellPadding;            // Space to contents (in Twips).
-    USHORT nCellSpacing;            // Cell spacing (in Twips).
-    USHORT nBorder;                 // Line strength of outer border, or rather the
+    sal_uInt16 nWidthOption;            // Width of table (in Twips oder %).
+    sal_uInt16 nCellPadding;            // Space to contents (in Twips).
+    sal_uInt16 nCellSpacing;            // Cell spacing (in Twips).
+    sal_uInt16 nBorder;                 // Line strength of outer border, or rather the
                                     // space needed for it as calculated by Netscape.
 
-    USHORT nLeftBorderWidth;
-    USHORT nRightBorderWidth;
-    USHORT nInhLeftBorderWidth;
-    USHORT nInhRightBorderWidth;
-    USHORT nBorderWidth;
+    sal_uInt16 nLeftBorderWidth;
+    sal_uInt16 nRightBorderWidth;
+    sal_uInt16 nInhLeftBorderWidth;
+    sal_uInt16 nInhRightBorderWidth;
+    sal_uInt16 nBorderWidth;
 
-    USHORT nDelayedResizeAbsAvail;  // Param for delayed Resize.
-    USHORT nLastResizeAbsAvail;
+    sal_uInt16 nDelayedResizeAbsAvail;  // Param for delayed Resize.
+    sal_uInt16 nLastResizeAbsAvail;
 
-    BYTE nPass1Done;                // Reference-values for
-    BYTE nWidthSet;                 // the runs through loop.
+    sal_uInt8 nPass1Done;               // Reference-values for
+    sal_uInt8 nWidthSet;                    // the runs through loop.
 
     SvxAdjust eTableAdjust;         // Alignment of table.
 
-    BOOL bColsOption : 1;           // Table has a COLS-option.
-    BOOL bColTags : 1;              // Tabelle has COL/COLGRP-tags.
-    BOOL bPrcWidthOption : 1;       // Width is given in percent.
-    BOOL bUseRelWidth : 1;          // SwTable gets relative width.
+    sal_Bool bColsOption : 1;           // Table has a COLS-option.
+    sal_Bool bColTags : 1;              // Tabelle has COL/COLGRP-tags.
+    sal_Bool bPrcWidthOption : 1;       // Width is given in percent.
+    sal_Bool bUseRelWidth : 1;          // SwTable gets relative width.
 
-    BOOL bMustResize : 1;           // Table width must be defined.
-    BOOL bExportable : 1;           // Layout may be used for export.
-    BOOL bBordersChanged : 1;       // Borders have been changed.
-    BOOL bMayBeInFlyFrame : 1;      // Table could be within frame.
+    sal_Bool bMustResize : 1;           // Table width must be defined.
+    sal_Bool bExportable : 1;           // Layout may be used for export.
+    sal_Bool bBordersChanged : 1;       // Borders have been changed.
+    sal_Bool bMayBeInFlyFrame : 1;      // Table could be within frame.
 
-    BOOL bDelayedResizeRecalc : 1;  // Param for delayed Resize.
-    BOOL bMustNotResize : 1;        // Table may not be resized.
-    BOOL bMustNotRecalc : 1;        // Table may not be adapted to its contents.
+    sal_Bool bDelayedResizeRecalc : 1;  // Param for delayed Resize.
+    sal_Bool bMustNotResize : 1;        // Table may not be resized.
+    sal_Bool bMustNotRecalc : 1;        // Table may not be adapted to its contents.
 
-    void AddBorderWidth( ULONG &rMin, ULONG &rMax, ULONG& rAbsMin,
-                         USHORT nCol, USHORT nColSpan,
-                         BOOL bSwBorders=TRUE ) const;
-    void SetBoxWidth( SwTableBox *pBox, USHORT nCol, USHORT nColSpan ) const;
+    void AddBorderWidth( sal_uLong &rMin, sal_uLong &rMax, sal_uLong& rAbsMin,
+                         sal_uInt16 nCol, sal_uInt16 nColSpan,
+                         sal_Bool bSwBorders=sal_True ) const;
+    void SetBoxWidth( SwTableBox *pBox, sal_uInt16 nCol, sal_uInt16 nColSpan ) const;
 
     const SwStartNode *GetAnyBoxStartNode() const;
     SwFrmFmt *FindFlyFrmFmt() const;
@@ -255,68 +255,68 @@ class SwHTMLTableLayout
 
     void ClearPass1Info() { nMin = nMax = 0; }
 
-    void _Resize( USHORT nAbsAvail, BOOL bRecalc=FALSE );
+    void _Resize( sal_uInt16 nAbsAvail, sal_Bool bRecalc=sal_False );
 
     DECL_STATIC_LINK( SwHTMLTableLayout, DelayedResize_Impl, void* );
 
-    static USHORT GetBrowseWidthByVisArea( const SwDoc& rDoc );
+    static sal_uInt16 GetBrowseWidthByVisArea( const SwDoc& rDoc );
 public:
 
     SwHTMLTableLayout( const SwTable *pSwTbl,
-                       USHORT nRows, USHORT nCols, BOOL bColsOpt, BOOL ColTgs,
-                       USHORT nWidth, BOOL bPrcWidth, USHORT nBorderOpt,
-                       USHORT nCellPad, USHORT nCellSp, SvxAdjust eAdjust,
-                       USHORT nLMargin, USHORT nRMargin, USHORT nBWidth,
-                       USHORT nLeftBWidth, USHORT nRightBWidth,
-                       USHORT nInhLeftBWidth, USHORT nInhRightBWidth );
+                       sal_uInt16 nRows, sal_uInt16 nCols, sal_Bool bColsOpt, sal_Bool ColTgs,
+                       sal_uInt16 nWidth, sal_Bool bPrcWidth, sal_uInt16 nBorderOpt,
+                       sal_uInt16 nCellPad, sal_uInt16 nCellSp, SvxAdjust eAdjust,
+                       sal_uInt16 nLMargin, sal_uInt16 nRMargin, sal_uInt16 nBWidth,
+                       sal_uInt16 nLeftBWidth, sal_uInt16 nRightBWidth,
+                       sal_uInt16 nInhLeftBWidth, sal_uInt16 nInhRightBWidth );
 
     ~SwHTMLTableLayout();
 
-    USHORT GetLeftCellSpace( USHORT nCol, USHORT nColSpan,
-                             BOOL bSwBorders=TRUE ) const;
-    USHORT GetRightCellSpace( USHORT nCol, USHORT nColSpan,
-                              BOOL bSwBorders=TRUE ) const;
-    inline USHORT GetInhCellSpace( USHORT nCol, USHORT nColSpan ) const;
+    sal_uInt16 GetLeftCellSpace( sal_uInt16 nCol, sal_uInt16 nColSpan,
+                             sal_Bool bSwBorders=sal_True ) const;
+    sal_uInt16 GetRightCellSpace( sal_uInt16 nCol, sal_uInt16 nColSpan,
+                              sal_Bool bSwBorders=sal_True ) const;
+    inline sal_uInt16 GetInhCellSpace( sal_uInt16 nCol, sal_uInt16 nColSpan ) const;
 
-    inline void SetInhBorderWidths( USHORT nLeft, USHORT nRight );
+    inline void SetInhBorderWidths( sal_uInt16 nLeft, sal_uInt16 nRight );
 
 
-    void GetAvail( USHORT nCol, USHORT nColSpan, USHORT& rAbsAvail,
-                   USHORT& rRelAvail ) const;
+    void GetAvail( sal_uInt16 nCol, sal_uInt16 nColSpan, sal_uInt16& rAbsAvail,
+                   sal_uInt16& rRelAvail ) const;
 
     void AutoLayoutPass1();
-    void AutoLayoutPass2( USHORT nAbsAvail, USHORT nRelAvail,
-                          USHORT nAbsLeftSpace, USHORT nAbsRightSpace,
-                          USHORT nParentInhSpace );
-    void SetWidths( BOOL bCallPass2=FALSE, USHORT nAbsAvail=0,
-                    USHORT nRelAvail=0, USHORT nAbsLeftSpace=0,
-                    USHORT nAbsRightSpace=0,
-                    USHORT nParentInhSpace=0 );
+    void AutoLayoutPass2( sal_uInt16 nAbsAvail, sal_uInt16 nRelAvail,
+                          sal_uInt16 nAbsLeftSpace, sal_uInt16 nAbsRightSpace,
+                          sal_uInt16 nParentInhSpace );
+    void SetWidths( sal_Bool bCallPass2=sal_False, sal_uInt16 nAbsAvail=0,
+                    sal_uInt16 nRelAvail=0, sal_uInt16 nAbsLeftSpace=0,
+                    sal_uInt16 nAbsRightSpace=0,
+                    sal_uInt16 nParentInhSpace=0 );
 
-    inline SwHTMLTableLayoutColumn *GetColumn( USHORT nCol ) const;
-    inline void SetColumn( SwHTMLTableLayoutColumn *pCol, USHORT nCol );
+    inline SwHTMLTableLayoutColumn *GetColumn( sal_uInt16 nCol ) const;
+    inline void SetColumn( SwHTMLTableLayoutColumn *pCol, sal_uInt16 nCol );
 
-    inline SwHTMLTableLayoutCell *GetCell( USHORT nRow, USHORT nCol ) const;
-    inline void SetCell( SwHTMLTableLayoutCell *pCell, USHORT nRow, USHORT nCol );
+    inline SwHTMLTableLayoutCell *GetCell( sal_uInt16 nRow, sal_uInt16 nCol ) const;
+    inline void SetCell( SwHTMLTableLayoutCell *pCell, sal_uInt16 nRow, sal_uInt16 nCol );
 
     void SetLeftFillerBox( SwTableBox *pBox ) { pLeftFillerBox = pBox; }
     void SetRightFillerBox( SwTableBox *pBox ) { pRightFillerBox = pBox; }
 
-    ULONG GetMin() const { return nMin; }
-    ULONG GetMax() const { return nMax; }
-    USHORT GetRelLeftFill() const { return nRelLeftFill; }
-    USHORT GetRelRightFill() const { return nRelRightFill; }
+    sal_uLong GetMin() const { return nMin; }
+    sal_uLong GetMax() const { return nMax; }
+    sal_uInt16 GetRelLeftFill() const { return nRelLeftFill; }
+    sal_uInt16 GetRelRightFill() const { return nRelRightFill; }
 
     inline long GetBrowseWidthMin() const;
 
-    BOOL HasColsOption() const { return bColsOption; }
-    BOOL HasColTags() const { return bColTags; }
+    sal_Bool HasColsOption() const { return bColsOption; }
+    sal_Bool HasColTags() const { return bColTags; }
 
-    BOOL IsTopTable() const  { return pSwTable != 0; }
+    sal_Bool IsTopTable() const  { return pSwTable != 0; }
 
-    void SetMustResize( BOOL bSet ) { bMustResize = bSet; }
-    void SetMustNotResize( BOOL bSet ) { bMustNotResize = bSet; }
-    void SetMustNotRecalc( BOOL bSet ) { bMustNotRecalc = bSet; }
+    void SetMustResize( sal_Bool bSet ) { bMustResize = bSet; }
+    void SetMustNotResize( sal_Bool bSet ) { bMustNotResize = bSet; }
+    void SetMustNotRecalc( sal_Bool bSet ) { bMustNotRecalc = bSet; }
 
     // Recalculation of table widths for available width that has been passed.
     // - If bRecalc is set, contents of boxes are included into calculation.
@@ -328,41 +328,41 @@ public:
     // - If nDelay == HTMLTABLE_RESIZE_NOW, resize immediately and do not
     //   consider any resize-calls that might possibly be in order.
     // - The return value indicates whether the table has been changed.
-    BOOL Resize( USHORT nAbsAvail, BOOL bRecalc=FALSE, BOOL bForce=FALSE,
-                 ULONG nDelay=0 );
+    sal_Bool Resize( sal_uInt16 nAbsAvail, sal_Bool bRecalc=sal_False, sal_Bool bForce=sal_False,
+                 sal_uLong nDelay=0 );
 
-    void BordersChanged( USHORT nAbsAvail, BOOL bRecalc=FALSE );
+    void BordersChanged( sal_uInt16 nAbsAvail, sal_Bool bRecalc=sal_False );
 
     // Calculate available width. This works only if a layout or a
     // ViewShell exists. Otherwise returns 0.
     // This is needed by HTML-filter because it doesn't have access to the layout.)
-    static USHORT GetBrowseWidth( const SwDoc& rDoc );
+    static sal_uInt16 GetBrowseWidth( const SwDoc& rDoc );
 
     // Calculates available width by table-frame.
-    USHORT GetBrowseWidthByTabFrm( const SwTabFrm& rTabFrm ) const;
+    sal_uInt16 GetBrowseWidthByTabFrm( const SwTabFrm& rTabFrm ) const;
 
     // Calculates available width by the table-frame or
     // static GetBrowseWidth if no layout exists.
-    USHORT GetBrowseWidthByTable( const SwDoc& rDoc ) const;
+    sal_uInt16 GetBrowseWidthByTable( const SwDoc& rDoc ) const;
 
     // For Export.
-    USHORT GetWidthOption() const { return nWidthOption; }
-    BOOL   HasPrcWidthOption() const { return bPrcWidthOption; }
+    sal_uInt16 GetWidthOption() const { return nWidthOption; }
+    sal_Bool   HasPrcWidthOption() const { return bPrcWidthOption; }
 
-    USHORT GetCellPadding() const { return nCellPadding; }
-    USHORT GetCellSpacing() const { return nCellSpacing; }
-    USHORT GetBorder() const { return nBorder; }
+    sal_uInt16 GetCellPadding() const { return nCellPadding; }
+    sal_uInt16 GetCellSpacing() const { return nCellSpacing; }
+    sal_uInt16 GetBorder() const { return nBorder; }
 
-    USHORT GetRowCount() const { return nRows; }
-    USHORT GetColCount() const { return nCols; }
+    sal_uInt16 GetRowCount() const { return nRows; }
+    sal_uInt16 GetColCount() const { return nCols; }
 
-    void SetExportable( BOOL bSet ) { bExportable = bSet; }
-    BOOL IsExportable() const { return bExportable; }
+    void SetExportable( sal_Bool bSet ) { bExportable = bSet; }
+    sal_Bool IsExportable() const { return bExportable; }
 
-    BOOL HaveBordersChanged() const { return bBordersChanged; }
+    sal_Bool HaveBordersChanged() const { return bBordersChanged; }
 
-    void SetMayBeInFlyFrame( BOOL bSet ) { bMayBeInFlyFrame = bSet; }
-    BOOL MayBeInFlyFrame() const { return bMayBeInFlyFrame; }
+    void SetMayBeInFlyFrame( sal_Bool bSet ) { bMayBeInFlyFrame = bSet; }
+    sal_Bool MayBeInFlyFrame() const { return bMayBeInFlyFrame; }
 };
 
 inline void SwHTMLTableLayoutCell::SetProtected()
@@ -373,8 +373,8 @@ inline void SwHTMLTableLayoutCell::SetProtected()
     pContents = 0;
 }
 
-inline void SwHTMLTableLayoutColumn::MergeMinMaxNoAlign( ULONG nCMin,
-    ULONG nCMax,    ULONG nAbsMin )
+inline void SwHTMLTableLayoutColumn::MergeMinMaxNoAlign( sal_uLong nCMin,
+    sal_uLong nCMax,    sal_uLong nAbsMin )
 {
     if( nCMin > nMinNoAlign )
         nMinNoAlign = nCMin;
@@ -384,19 +384,19 @@ inline void SwHTMLTableLayoutColumn::MergeMinMaxNoAlign( ULONG nCMin,
         nAbsMinNoAlign = nAbsMin;
 }
 
-inline void SwHTMLTableLayoutColumn::ClearPass1Info( BOOL bWidthOpt )
+inline void SwHTMLTableLayoutColumn::ClearPass1Info( sal_Bool bWidthOpt )
 {
     nMinNoAlign = nMaxNoAlign = nAbsMinNoAlign = MINLAY;
     nMin = nMax = 0;
     if( bWidthOpt )
     {
         nWidthOption = 0;
-        bRelWidthOption = FALSE;
+        bRelWidthOption = sal_False;
     }
 }
 
 inline void SwHTMLTableLayoutColumn::MergeCellWidthOption(
-    USHORT nWidth, BOOL bRel )
+    sal_uInt16 nWidth, sal_Bool bRel )
 {
     if( !nWidthOption ||
         (bRel==bRelWidthOption && nWidthOption < nWidth) )
@@ -406,31 +406,31 @@ inline void SwHTMLTableLayoutColumn::MergeCellWidthOption(
     }
 }
 
-inline void SwHTMLTableLayoutColumn::SetMinMax( ULONG nMn, ULONG nMx )
+inline void SwHTMLTableLayoutColumn::SetMinMax( sal_uLong nMn, sal_uLong nMx )
 {
     nMin = nMn;
     nMax = nMx;
 }
 
-inline USHORT SwHTMLTableLayout::GetInhCellSpace( USHORT nCol,
-                                                  USHORT nColSpan ) const
+inline sal_uInt16 SwHTMLTableLayout::GetInhCellSpace( sal_uInt16 nCol,
+                                                  sal_uInt16 nColSpan ) const
 {
-    USHORT nSpace = 0;
+    sal_uInt16 nSpace = 0;
     if( nCol==0 )
-        nSpace = nSpace + sal::static_int_cast< USHORT >(nInhAbsLeftSpace);
+        nSpace = nSpace + sal::static_int_cast< sal_uInt16 >(nInhAbsLeftSpace);
     if( nCol+nColSpan==nCols )
-        nSpace = nSpace + sal::static_int_cast< USHORT >(nInhAbsRightSpace);
+        nSpace = nSpace + sal::static_int_cast< sal_uInt16 >(nInhAbsRightSpace);
 
     return nSpace;
 }
 
-inline SwHTMLTableLayoutColumn *SwHTMLTableLayout::GetColumn( USHORT nCol ) const
+inline SwHTMLTableLayoutColumn *SwHTMLTableLayout::GetColumn( sal_uInt16 nCol ) const
 {
     return aColumns[nCol];
 }
 
 inline void SwHTMLTableLayoutColumn::SetWidthOption(
-    USHORT nWidth, BOOL bRelWidth, BOOL bTest )
+    sal_uInt16 nWidth, sal_Bool bRelWidth, sal_Bool bTest )
 {
     if( bTest && bRelWidthOption==bRelWidth )
     {
@@ -442,18 +442,18 @@ inline void SwHTMLTableLayoutColumn::SetWidthOption(
     bRelWidthOption = bRelWidth;
 }
 
-inline void SwHTMLTableLayout::SetColumn( SwHTMLTableLayoutColumn *pCol, USHORT nCol )
+inline void SwHTMLTableLayout::SetColumn( SwHTMLTableLayoutColumn *pCol, sal_uInt16 nCol )
 {
     aColumns[nCol] = pCol;
 }
 
-inline SwHTMLTableLayoutCell *SwHTMLTableLayout::GetCell( USHORT nRow, USHORT nCol ) const
+inline SwHTMLTableLayoutCell *SwHTMLTableLayout::GetCell( sal_uInt16 nRow, sal_uInt16 nCol ) const
 {
     return aCells[nRow*nCols+nCol];
 }
 
 inline void SwHTMLTableLayout::SetCell( SwHTMLTableLayoutCell *pCell,
-                               USHORT nRow, USHORT nCol )
+                               sal_uInt16 nRow, sal_uInt16 nCol )
 {
     aCells[nRow*nCols+nCol] = pCell;
 }
@@ -463,7 +463,7 @@ inline long SwHTMLTableLayout::GetBrowseWidthMin() const
     return (long)( (!nWidthOption || bPrcWidthOption) ? nMin : nRelTabWidth );
 }
 
-void SwHTMLTableLayout::SetInhBorderWidths( USHORT nLeft, USHORT nRight )
+void SwHTMLTableLayout::SetInhBorderWidths( sal_uInt16 nLeft, sal_uInt16 nRight )
 {
     nInhLeftBorderWidth = nLeft;
     nInhRightBorderWidth = nRight;