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, 181 insertions, 194 deletions

diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 71a438c27ddb..b9c747b22ffd 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -73,7 +73,6 @@ class SwFmtRefMark;
 
 class SwNumRule;
 
-class SwUndoIds;
 class SwTxtFmtColl;
 class SwGrfNode;
 class SwFlyFrmFmt;
@@ -123,6 +122,10 @@ namespace sfx2{
 class LinkManager;
 }
 
+namespace sw {
+    class UndoRedoContext;
+}
+
 #define GETSELTXT_PARABRK_TO_BLANK      0
 #define GETSELTXT_PARABRK_KEEP          1
 #define GETSELTXT_PARABRK_TO_ONLYCR     2
@@ -167,7 +170,7 @@ class SW_DLLPUBLIC SwEditShell: public SwCrsrShell
     // that will be used by GetGraphic() and GetGraphicSize().
     SW_DLLPRIVATE SwGrfNode *_GetGrfNode() const ;
 
-    SW_DLLPRIVATE void DeleteSel( SwPaM& rPam, BOOL* pUndo = 0 );
+    SW_DLLPRIVATE void DeleteSel( SwPaM& rPam, sal_Bool* pUndo = 0 );
 
     SW_DLLPRIVATE void _SetSectionAttr( SwSectionFmt& rSectFmt, const SfxItemSet& rSet );
 
@@ -176,7 +179,7 @@ class SW_DLLPUBLIC SwEditShell: public SwCrsrShell
 
 public:
     // Edit (all selected ranges).
-    void Insert( sal_Unicode, BOOL bOnlyCurrCrsr = FALSE );
+    void Insert( sal_Unicode, sal_Bool bOnlyCurrCrsr = sal_False );
     void Insert2( const String &, const bool bForceExpandHints = false );
     void Overwrite( const String & );
 
@@ -185,14 +188,14 @@ public:
     // bRegExpRplc - replace tabs (\\t) and insert found string (not \&).
     // E.g.: Fnd: "zzz", Repl: "xx\t\\t..&..\&"
     //       --> "xx\t<Tab>..zzz..&"
-    BOOL Replace( const String& rNewStr, BOOL bRegExpRplc = FALSE );
+    sal_Bool Replace( const String& rNewStr, sal_Bool bRegExpRplc = sal_False );
 
     // Delete content of all ranges.
     // If whole nodes are selected, these nodes get deleted.
     long Delete();
 
     // Remove a complete paragraph.
-    BOOL DelFullPara();
+    sal_Bool DelFullPara();
 
     // Change text to Upper/Lower/Hiragana/Katagana/...
     void TransliterateText( sal_uInt32 nType );
@@ -202,17 +205,17 @@ public:
 
     // Delete non-visible content in the document.
     // E.g. hidden ranges, hidden paragraphs.
-    BOOL RemoveInvisibleContent();
+    sal_Bool RemoveInvisibleContent();
 
     // Replace fields by text - mailmerge support.
-    BOOL ConvertFieldsToText();
+    sal_Bool ConvertFieldsToText();
 
     // Set all numbering start points to a fixed value - mailmerge support.
     void SetNumberingRestart();
 
     // Embedds all local links (ranges/graphics).
-    USHORT GetLinkUpdMode(BOOL bDocSettings = FALSE) const;
-    void SetLinkUpdMode( USHORT nMode );
+    sal_uInt16 GetLinkUpdMode(sal_Bool bDocSettings = sal_False) const;
+    void SetLinkUpdMode( sal_uInt16 nMode );
 
     // Copy content of all ranges at current position of cursor to given Shell.
     long Copy( SwEditShell* pDestShell = 0 );
@@ -221,59 +224,59 @@ public:
     //   If table is copied into table, move all cursors away from it.
     //   Copy and Paste must be in FEShell because of FlyFrames!
     //   Copy all selections and the document.
-    BOOL _CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pNdInsPos = 0 );
+    sal_Bool _CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pNdInsPos = 0 );
 
-    long SplitNode( BOOL bAutoFormat = FALSE, BOOL bCheckTableStart = TRUE );
+    long SplitNode( sal_Bool bAutoFormat = sal_False, sal_Bool bCheckTableStart = sal_True );
     sal_Bool AppendTxtNode();
     void AutoFmtBySplitNode();
 
     // If cursor is in a INetAttribute it will be deleted completely
     // including the descriptive text (needed at drag & drop).
-    BOOL DelINetAttrWithText();
+    sal_Bool DelINetAttrWithText();
 
     // If Cursor is at the end of a character style in which the DontExpand-flag
     // is not yet set, the latter will be set (==> return TRUE).
-    BOOL DontExpandFmt();
+    sal_Bool DontExpandFmt();
 
     // Apply / remove attributes.
     // Returns attributs in required AttributeSet.
     // When not unambiguous the set has a DONT_CARE !!
     // 2nd optional parameter <bMergeIndentValuesOfNumRule>.
-    // If <bMergeIndentValuesOfNumRule> == TRUE, the indent attributes of
+    // If <bMergeIndentValuesOfNumRule> == sal_True, the indent attributes of
     // the corresponding list level of an applied list style is merged into
     // the requested item set as a LR-SPACE item, if corresponding node has not
     // its own indent attributes and the position-and-space mode of the list
     // level is SvxNumberFormat::LABEL_ALIGNMENT.
-    BOOL GetCurAttr( SfxItemSet& ,
+    sal_Bool GetCurAttr( SfxItemSet& ,
                      const bool bMergeIndentValuesOfNumRule = false ) const;
-    void SetAttr( const SfxPoolItem&, USHORT nFlags = 0 );
-    void SetAttr( const SfxItemSet&, USHORT nFlags = 0 );
+    void SetAttr( const SfxPoolItem&, sal_uInt16 nFlags = 0 );
+    void SetAttr( const SfxItemSet&, sal_uInt16 nFlags = 0 );
 
     // Set attribute as new default attribute in document.
     void SetDefault( const SfxPoolItem& );
 
     // Query default attribute of document.
-    const SfxPoolItem& GetDefault( USHORT nFmtHint ) const;
+    const SfxPoolItem& GetDefault( sal_uInt16 nFmtHint ) const;
 
     void ResetAttr( const SvUShortsSort* pAttrs = 0 );
     void GCAttr();
 
     // Returns the scripttpye of the selection.
-    USHORT GetScriptType() const;
+    sal_uInt16 GetScriptType() const;
 
     // Returns the language at current cursor position.
-    USHORT GetCurLang() const;
+    sal_uInt16 GetCurLang() const;
 
     // TABLE
-    USHORT GetTblFrmFmtCount( BOOL bUsed = FALSE ) const;
-    SwFrmFmt& GetTblFrmFmt(USHORT nFmt, BOOL bUsed = FALSE ) const;
+    sal_uInt16 GetTblFrmFmtCount( sal_Bool bUsed = sal_False ) const;
+    SwFrmFmt& GetTblFrmFmt(sal_uInt16 nFmt, sal_Bool bUsed = sal_False ) const;
     String GetUniqueTblName() const;
 
     // CHAR
-    USHORT GetCharFmtCount() const;
-    SwCharFmt& GetCharFmt(USHORT nFmt) const;
+    sal_uInt16 GetCharFmtCount() const;
+    SwCharFmt& GetCharFmt(sal_uInt16 nFmt) const;
     SwCharFmt* GetCurCharFmt() const;
-    void FillByEx(SwCharFmt*, BOOL bReset = FALSE);
+    void FillByEx(SwCharFmt*, sal_Bool bReset = sal_False);
     SwCharFmt* MakeCharFmt( const String& rName, SwCharFmt* pDerivedFrom = 0 );
     SwCharFmt* FindCharFmtByName( const String& rName ) const;
 
@@ -290,8 +293,8 @@ public:
 
     // TXT
     SwTxtFmtColl& GetDfltTxtFmtColl() const;
-    USHORT GetTxtFmtCollCount() const;
-    SwTxtFmtColl& GetTxtFmtColl( USHORT nTxtFmtColl) const;
+    sal_uInt16 GetTxtFmtCollCount() const;
+    SwTxtFmtColl& GetTxtFmtColl( sal_uInt16 nTxtFmtColl) const;
     SwTxtFmtColl* GetCurTxtFmtColl() const;
 
     // #i62675#
@@ -300,25 +303,25 @@ public:
                         bool bResetListAttrs = false );
     SwTxtFmtColl *MakeTxtFmtColl(const String &rFmtCollName,
         SwTxtFmtColl *pDerivedFrom = 0);
-    void FillByEx(SwTxtFmtColl*, BOOL bReset = FALSE);
+    void FillByEx(SwTxtFmtColl*, sal_Bool bReset = sal_False);
     SwTxtFmtColl* FindTxtFmtCollByName( const String& rName ) const;
 
     // Return "Auto-Collection" with given Id. If it does not exist create it.
-    SwTxtFmtColl* GetTxtCollFromPool( USHORT nId );
+    SwTxtFmtColl* GetTxtCollFromPool( sal_uInt16 nId );
 
     // Return required automatic format base class.
-    SwFmt* GetFmtFromPool( USHORT nId );
+    SwFmt* GetFmtFromPool( sal_uInt16 nId );
 
     // Return required automatic page style.
-    SwPageDesc* GetPageDescFromPool( USHORT nId );
+    SwPageDesc* GetPageDescFromPool( sal_uInt16 nId );
 
     // Query if the paragraph-/character-/frame-/page-style is used.
-    BOOL IsUsed( const SwModify& ) const;
+    sal_Bool IsUsed( const SwModify& ) const;
 
     // Return required automatic format.
-    SwFrmFmt* GetFrmFmtFromPool( USHORT nId )
+    SwFrmFmt* GetFrmFmtFromPool( sal_uInt16 nId )
         { return (SwFrmFmt*)SwEditShell::GetFmtFromPool( nId ); }
-    SwCharFmt* GetCharFmtFromPool( USHORT nId )
+    SwCharFmt* GetCharFmtFromPool( sal_uInt16 nId )
         { return (SwCharFmt*)SwEditShell::GetFmtFromPool( nId ); }
 
     void Insert2(SwField&, const bool bForceExpandHints = false);
@@ -326,12 +329,12 @@ public:
 
     void UpdateFlds( SwField & );   // One single field.
 
-    USHORT GetFldTypeCount(USHORT nResId = USHRT_MAX, BOOL bUsed = FALSE) const;
-    SwFieldType* GetFldType(USHORT nId, USHORT nResId = USHRT_MAX, BOOL bUsed = FALSE) const;
-    SwFieldType* GetFldType(USHORT nResId, const String& rName) const;
+    sal_uInt16 GetFldTypeCount(sal_uInt16 nResId = USHRT_MAX, sal_Bool bUsed = sal_False) const;
+    SwFieldType* GetFldType(sal_uInt16 nId, sal_uInt16 nResId = USHRT_MAX, sal_Bool bUsed = sal_False) const;
+    SwFieldType* GetFldType(sal_uInt16 nResId, const String& rName) const;
 
-    void RemoveFldType(USHORT nId, USHORT nResId = USHRT_MAX);
-    void RemoveFldType(USHORT nResId, const String& rName);
+    void RemoveFldType(sal_uInt16 nId, sal_uInt16 nResId = USHRT_MAX);
+    void RemoveFldType(sal_uInt16 nResId, const String& rName);
 
     void FieldToText( SwFieldType* pType );
 
@@ -346,17 +349,17 @@ public:
     void GetAllUsedDB( SvStringsDtor& rDBNameList,
                         SvStringsDtor* pAllDBNames = 0 );
 
-    BOOL IsAnyDatabaseFieldInDoc()const;
+    sal_Bool IsAnyDatabaseFieldInDoc()const;
 
     // Check whether DB fields point to an available data source and returns it.
-    BOOL IsFieldDataSourceAvailable(String& rUsedDataSource) const;
-    void UpdateExpFlds(BOOL bCloseDB = FALSE);// nur alle ExpressionFelder updaten
-    void SetFixFields( BOOL bOnlyTimeDate = FALSE,
+    sal_Bool IsFieldDataSourceAvailable(String& rUsedDataSource) const;
+    void UpdateExpFlds(sal_Bool bCloseDB = sal_False);// nur alle ExpressionFelder updaten
+    void SetFixFields( sal_Bool bOnlyTimeDate = sal_False,
                         const DateTime* pNewDateTime = 0 );
     void LockExpFlds();
     void UnlockExpFlds();
 
-    SwFldUpdateFlags GetFldUpdateFlags(BOOL bDocSettings = FALSE) const;
+    SwFldUpdateFlags GetFldUpdateFlags(sal_Bool bDocSettings = sal_False) const;
     void SetFldUpdateFlags( SwFldUpdateFlags eFlags );
 
     // For evaluation of DB fields (new DB-manager).
@@ -365,7 +368,7 @@ public:
     SwFieldType* InsertFldType(const SwFieldType &);
 
     // Changes in document?
-    BOOL IsModified() const;
+    sal_Bool IsModified() const;
     void SetModified();
     void ResetModified();
     void SetUndoNoResetModified();
@@ -378,31 +381,31 @@ public:
     void    DeleteTOXMark(SwTOXMark* pMark);
 
     // Get all marks at current SPoint.
-    USHORT  GetCurTOXMarks(SwTOXMarks& rMarks) const ;
+    sal_uInt16  GetCurTOXMarks(SwTOXMarks& rMarks) const ;
 
     // Insert content table. Renew if required.
     void                InsertTableOf(const SwTOXBase& rTOX,
                                         const SfxItemSet* pSet = 0);
-    BOOL                UpdateTableOf(const SwTOXBase& rTOX,
+    sal_Bool                UpdateTableOf(const SwTOXBase& rTOX,
                                         const SfxItemSet* pSet = 0);
     const SwTOXBase*    GetCurTOX() const;
-    const SwTOXBase*    GetDefaultTOXBase( TOXTypes eTyp, BOOL bCreate = FALSE );
+    const SwTOXBase*    GetDefaultTOXBase( TOXTypes eTyp, sal_Bool bCreate = sal_False );
     void                SetDefaultTOXBase(const SwTOXBase& rBase);
 
-    BOOL                IsTOXBaseReadonly(const SwTOXBase& rTOXBase) const;
-    void                SetTOXBaseReadonly(const SwTOXBase& rTOXBase, BOOL bReadonly);
+    sal_Bool                IsTOXBaseReadonly(const SwTOXBase& rTOXBase) const;
+    void                SetTOXBaseReadonly(const SwTOXBase& rTOXBase, sal_Bool bReadonly);
 
-    USHORT              GetTOXCount() const;
-    const SwTOXBase*    GetTOX( USHORT nPos ) const;
-    BOOL                DeleteTOX( const SwTOXBase& rTOXBase, BOOL bDelNodes = FALSE );
+    sal_uInt16              GetTOXCount() const;
+    const SwTOXBase*    GetTOX( sal_uInt16 nPos ) const;
+    sal_Bool                DeleteTOX( const SwTOXBase& rTOXBase, sal_Bool bDelNodes = sal_False );
 
     // After reading file update all content tables.
-    void SetUpdateTOX( BOOL bFlag = TRUE );
-    BOOL IsUpdateTOX() const;
+    void SetUpdateTOX( sal_Bool bFlag = sal_True );
+    sal_Bool IsUpdateTOX() const;
 
     // Manage types of content tables.
-    USHORT              GetTOXTypeCount(TOXTypes eTyp) const;
-    const SwTOXType*    GetTOXType(TOXTypes eTyp, USHORT nId) const;
+    sal_uInt16              GetTOXTypeCount(TOXTypes eTyp) const;
+    const SwTOXType*    GetTOXType(TOXTypes eTyp, sal_uInt16 nId) const;
     void                InsertTOXType(const SwTOXType& rTyp);
 
     // AutoMark file
@@ -411,30 +414,30 @@ public:
     void            ApplyAutoMark();
 
     // Key for managing index.
-    USHORT GetTOIKeys( SwTOIKeyType eTyp, SvStringsSort& rArr ) const;
+    sal_uInt16 GetTOIKeys( SwTOIKeyType eTyp, SvStringsSort& rArr ) const;
 
     void SetOutlineNumRule(const SwNumRule&);
     const SwNumRule* GetOutlineNumRule() const;
 
-    BOOL OutlineUpDown( short nOffset = 1 );
+    sal_Bool OutlineUpDown( short nOffset = 1 );
 
-    BOOL MoveOutlinePara( short nOffset = 1);
+    sal_Bool MoveOutlinePara( short nOffset = 1);
 
-    BOOL IsProtectedOutlinePara() const;
+    sal_Bool IsProtectedOutlinePara() const;
 
     // Returns numbering rulse pf current enumeration list (else FALSE).
     const SwNumRule* GetCurNumRule() const;
 
     // If there is not already a numbering, set one, else change.
     // Works with old and new rules. Update only differences.
-    // Add optional parameter <bResetIndentAttrs> (default value FALSE).
+    // Add optional parameter <bResetIndentAttrs> (default value sal_False).
     // If <bResetIndentAttrs> equals true, the indent attributes "before text"
     // and "first line indent" are additionally reset at the current selection,
     // if the list style makes use of the new list level attributes.
     // introduce parameters <bCreateNewList> and <sContinuedListId>
     // <bCreateNewList> indicates, if a new list is created by applying the
     // given list style.
-    // If <bCreateNewList> equals FALSE, <sContinuedListId> may contain the
+    // If <bCreateNewList> equals sal_False, <sContinuedListId> may contain the
     // list Id of a list, which has to be continued by applying the given list style.
     void SetCurNumRule( const SwNumRule&,
                         const bool bCreateNewList /*= false*/,
@@ -442,18 +445,18 @@ public:
                         const bool bResetIndentAttrs = false );
 
     // Paragraphs without enumeration but with indents.
-    BOOL NoNum();
+    sal_Bool NoNum();
 
     // Delete, split enumeration list.
     void DelNumRules();
 
-    BOOL NumUpDown( BOOL bDown = TRUE );
+    sal_Bool NumUpDown( sal_Bool bDown = sal_True );
 
-    BOOL MoveParagraph( long nOffset = 1);
-    BOOL MoveNumParas( BOOL bUpperLower, BOOL bUpperLeft );
+    sal_Bool MoveParagraph( long nOffset = 1);
+    sal_Bool MoveNumParas( sal_Bool bUpperLower, sal_Bool bUpperLeft );
 
     // Switch on/off of numbering via Delete/Backspace.
-    BOOL NumOrNoNum( BOOL bDelete = FALSE, BOOL bChkStart = TRUE);
+    sal_Bool NumOrNoNum( sal_Bool bDelete = sal_False, sal_Bool bChkStart = sal_True);
 
     // #i23726#
     // #i90078#
@@ -462,15 +465,15 @@ public:
     void ChangeIndentOfAllListLevels( short nDiff );
     // Adjust method name
     void SetIndent(short nIndent, const SwPosition & rPos);
-    BOOL IsFirstOfNumRule() const;
-    BOOL IsFirstOfNumRule(const SwPaM & rPaM) const;
+    sal_Bool IsFirstOfNumRule() const;
+    sal_Bool IsFirstOfNumRule(const SwPaM & rPaM) const;
 
-    BOOL IsNoNum( BOOL bChkStart = TRUE ) const;
+    sal_Bool IsNoNum( sal_Bool bChkStart = sal_True ) const;
 
     // Return Num-Level of the node in which point of cursor is.
     // Return values can be: NO_NUMBERING,
     // 0..MAXLEVEL-1, NO_NUMLEVEL .. NO_NUMLEVEL|MAXLEVEL-1
-    BYTE GetNumLevel() const;
+    sal_uInt8 GetNumLevel() const;
 
     // Detect highest and lowest level to check moving of outline levels.
     void GetCurrentOutlineLevels( sal_uInt8& rUpper, sal_uInt8& rLower );
@@ -480,20 +483,20 @@ public:
     int GetCurrentParaOutlineLevel( ) const;// #outlinelevel add by zhaojianwei
 
     // i29560
-    BOOL HasNumber() const;
-    BOOL HasBullet() const;
+    sal_Bool HasNumber() const;
+    sal_Bool HasBullet() const;
 
-    String GetUniqueNumRuleName( const String* pChkStr = 0, BOOL bAutoNum = TRUE ) const;
+    String GetUniqueNumRuleName( const String* pChkStr = 0, sal_Bool bAutoNum = sal_True ) const;
     void ChgNumRuleFmts( const SwNumRule& rRule );
 
     // Set (and query if) a numbering with StartFlag starts at current PointPos.
-    void SetNumRuleStart( BOOL bFlag = TRUE );
-    BOOL IsNumRuleStart() const;
-    void SetNodeNumStart( USHORT nStt );
+    void SetNumRuleStart( sal_Bool bFlag = sal_True );
+    sal_Bool IsNumRuleStart() const;
+    void SetNodeNumStart( sal_uInt16 nStt );
 
-    USHORT GetNodeNumStart() const;
+    sal_uInt16 GetNodeNumStart() const;
 
-    BOOL ReplaceNumRule( const String& rOldRule, const String& rNewRule );
+    sal_Bool ReplaceNumRule( const String& rOldRule, const String& rNewRule );
 
     // Searches for a text node with a numbering rule.
     // in case a list style is found, <sListId> holds the list id, to which the
@@ -507,10 +510,10 @@ public:
     // Undo.
     // Maintain UndoHistory in Document.
     // Reset UndoHistory at Save, SaveAs, Create ???
-    void DoUndo( BOOL bOn = TRUE );
-    BOOL DoesUndo() const;
-    void DoGroupUndo( BOOL bUn = TRUE );
-    BOOL DoesGroupUndo() const;
+    void DoUndo( sal_Bool bOn = sal_True );
+    sal_Bool DoesUndo() const;
+    void DoGroupUndo( sal_Bool bUn = sal_True );
+    sal_Bool DoesGroupUndo() const;
     void DelAllUndoObj();
 
     // Undo: set up Undo parenthesis, return nUndoId of this parenthesis.
@@ -519,35 +522,21 @@ public:
     // Closes parenthesis of nUndoId, not used by UI.
     SwUndoId EndUndo( SwUndoId eUndoId = UNDO_EMPTY, const SwRewriter * pRewriter = 0 );
 
-    // Returns Id of last undo-able action. Fills VARARR with User-UndoIds if required.
-    SwUndoId GetUndoIds( String* pUndoStr = 0, SwUndoIds *pUndoIds = 0) const;
-    String GetUndoIdsStr( String* pUndoStr = 0, SwUndoIds *pUndoIds = 0) const;
-
-    // Get count of possible undo-actions.
-    static USHORT GetUndoActionCount();
-
-    // Query count of possible undo-actions.
-    static void SetUndoActionCount( USHORT nNew );
-
-    // Redo.
-    // Returns Id of las undo-able action. Fills VARARR with RedoIds if required.
-    SwUndoId GetRedoIds( String* pRedoStr = 0, SwUndoIds *pRedoIds = 0) const;
-    String GetRedoIdsStr( String* pRedoStr = 0, SwUndoIds *pRedoIds = 0) const;
+    bool     GetLastUndoInfo(::rtl::OUString *const o_pStr,
+                             SwUndoId *const o_pId) const;
+    bool     GetFirstRedoInfo(::rtl::OUString *const o_pStr) const;
+    SwUndoId GetRepeatInfo(::rtl::OUString *const o_pStr) const;
 
-    // Repeat.
-    // Returns Id of last repeatable action. Fills VARARR with RedoIds if required.
-    SwUndoId GetRepeatIds( String* pRepeatStr = 0, SwUndoIds *pRedoIds = 0) const;
-    String GetRepeatIdsStr( String* pRepeatStr = 0,
-                            SwUndoIds *pRedoIds = 0) const;
+    /// is it forbidden to modify cursors via API calls?
+    bool CursorsLocked() const;
+    /// set selections to those contained in the UndoRedoContext
+    /// should only be called by sw::UndoManager!
+    void HandleUndoRedoContext(::sw::UndoRedoContext & rContext);
 
+    bool Undo(sal_uInt16 const nCount = 1);
+    bool Redo(sal_uInt16 const nCount = 1);
+    bool Repeat(sal_uInt16 const nCount);
 
-    // 0 if last action, else actions until start of parenthesis nUndoId
-    // with  KillPaMs, ClearMark.
-    BOOL Undo(SwUndoId nUndoId = UNDO_EMPTY, USHORT nCnt = 1 );
-
-    USHORT Repeat( USHORT nCount );
-
-    USHORT Redo( USHORT nCnt = 1 );
 
     // For all views of this document.
     void StartAllAction();
@@ -557,10 +546,10 @@ public:
     void CalcLayout();
 
     // Determine form of content. Return Type at CurCrsr->SPoint.
-    USHORT GetCntType() const;
+    sal_uInt16 GetCntType() const;
 
     // Are there frames, footnotes, etc.
-    BOOL HasOtherCnt() const;
+    sal_Bool HasOtherCnt() const;
 
     // Apply ViewOptions with Start-/EndAction.
     inline void ApplyViewOptions( const SwViewOption &rOpt );
@@ -568,17 +557,17 @@ public:
     // Query text within selection.
     // Returns FALSE, if selected range is too large to be copied
     // into string buffer or if other errors occur.
-    BOOL GetSelectedText( String &rBuf,
+    sal_Bool GetSelectedText( String &rBuf,
                         int nHndlParaBreak = GETSELTXT_PARABRK_TO_BLANK );
 
     // Returns graphic, if CurCrsr->Point() points to a SwGrfNode
     // (and mark is not set or points to the same graphic).
 
-    const Graphic* GetGraphic( BOOL bWait = TRUE ) const;
+    const Graphic* GetGraphic( sal_Bool bWait = sal_True ) const;
     const GraphicObject* GetGraphicObj() const;
 
-    BOOL IsGrfSwapOut( BOOL bOnlyLinked = FALSE ) const;
-    USHORT GetGraphicType() const;
+    sal_Bool IsGrfSwapOut( sal_Bool bOnlyLinked = sal_False ) const;
+    sal_uInt16 GetGraphicType() const;
 
     const PolyPolygon *GetGraphicPolygon() const;
     void SetGraphicPolygon( const PolyPolygon *pPoly );
@@ -588,7 +577,7 @@ public:
     void ClearAutomaticContour();
 
     // Returns the size of a graphic in Twips if cursor is in a graphic.
-    BOOL GetGrfSize(Size&) const;
+    sal_Bool GetGrfSize(Size&) const;
 
     // Returns name and filter of a graphic if the cursor is in a graphic,
     // else give a rap on the knuckles!
@@ -607,8 +596,7 @@ public:
     // #i73788#
     // Remove default parameter, because method always called this default value.
     Graphic GetIMapGraphic() const; // Returns a graphic for all Flys!
-
-    const SwFlyFrmFmt* FindFlyByName( const String& rName, BYTE nNdTyp = 0 ) const;
+    const SwFlyFrmFmt* FindFlyByName( const String& rName, sal_uInt8 nNdTyp = 0 ) const;
 
     // Returns a ClientObject, if CurCrsr->Point() points to a SwOLENode
     // (and mark is neither set not pointint to same ClientObject)
@@ -616,7 +604,7 @@ public:
     svt::EmbeddedObjectRef&  GetOLEObject() const;
 
     // Is there an OLEObject with this name (SwFmt)?
-    BOOL HasOLEObj( const String &rName ) const;
+    sal_Bool HasOLEObj( const String &rName ) const;
 
     // Returns pointer to the data of the chart in which Cursr is.
     void SetChartName( const String &rName );
@@ -632,15 +620,15 @@ public:
 
     // Make current selection glossary and insert into glossary document
     // including styles.
-    USHORT MakeGlossary( SwTextBlocks& rToFill, const String& rName,
-                         const String& rShortName, BOOL bSaveRelFile = FALSE,
+    sal_uInt16 MakeGlossary( SwTextBlocks& rToFill, const String& rName,
+                         const String& rShortName, sal_Bool bSaveRelFile = sal_False,
                          const String* pOnlyTxt=0 );
 
     // Save complete content of doc as glossary.
-    USHORT SaveGlossaryDoc( SwTextBlocks& rGlossary, const String& rName,
+    sal_uInt16 SaveGlossaryDoc( SwTextBlocks& rGlossary, const String& rName,
                             const String& rShortName,
-                            BOOL bSaveRelFile = FALSE,
-                            BOOL bOnlyTxt = FALSE );
+                            sal_Bool bSaveRelFile = sal_False,
+                            sal_Bool bOnlyTxt = sal_False );
 
     // Linguistics...
     // Save selections.
@@ -649,7 +637,7 @@ public:
     // restore selections.
     void HyphEnd();
     com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>
-                HyphContinue( USHORT* pPageCnt, USHORT* pPageSt );
+                HyphContinue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt );
 
     void HyphIgnore();
 
@@ -657,47 +645,47 @@ public:
     void InsertSoftHyph( const xub_StrLen nHyphPos );
 
     const SwTable& InsertTable( const SwInsertTableOptions& rInsTblOpts,  // ALL_TBL_INS_ATTR
-                                USHORT nRows, USHORT nCols,
+                                sal_uInt16 nRows, sal_uInt16 nCols,
                                 sal_Int16 eAdj = com::sun::star::text::HoriOrientation::FULL,
                                 const SwTableAutoFmt* pTAFmt = 0 );
 
     void InsertDDETable( const SwInsertTableOptions& rInsTblOpts,  // HEADLINE_NO_BORDER
                          SwDDEFieldType* pDDEType,
-                         USHORT nRows, USHORT nCols,
+                         sal_uInt16 nRows, sal_uInt16 nCols,
                          sal_Int16 eAdj = com::sun::star::text::HoriOrientation::FULL );
 
     void UpdateTable();
     void SetTableName( SwFrmFmt& rTblFmt, const String &rNewName );
 
     SwFrmFmt *GetTableFmt();
-    BOOL TextToTable( const SwInsertTableOptions& rInsTblOpts,  //ALL_TBL_INS_ATTR
+    sal_Bool TextToTable( const SwInsertTableOptions& rInsTblOpts,  //ALL_TBL_INS_ATTR
                       sal_Unicode cCh,
                       sal_Int16 eAdj = com::sun::star::text::HoriOrientation::FULL,
                       const SwTableAutoFmt* pTAFmt = 0 );
-    BOOL TableToText( sal_Unicode cCh );
-    BOOL IsTextToTableAvailable() const;
+    sal_Bool TableToText( sal_Unicode cCh );
+    sal_Bool IsTextToTableAvailable() const;
 
-    BOOL GetTblBoxFormulaAttrs( SfxItemSet& rSet ) const;
+    sal_Bool GetTblBoxFormulaAttrs( SfxItemSet& rSet ) const;
     void SetTblBoxFormulaAttrs( const SfxItemSet& rSet );
 
-    BOOL IsTableBoxTextFormat() const;
+    sal_Bool IsTableBoxTextFormat() const;
     String GetTableBoxText() const;
 
     TblChgMode GetTblChgMode() const;
     void SetTblChgMode( TblChgMode eMode );
 
     // Split table at cursor position.
-    BOOL SplitTable( USHORT eMode );
+    sal_Bool SplitTable( sal_uInt16 eMode );
 
     // Merge tables.
 
     // Can Merge checks if Prev or Next are possible.
     //    If pointer pChkNxtPrv is passed possible direction is given.
-    BOOL CanMergeTable( BOOL bWithPrev = TRUE, BOOL* pChkNxtPrv = 0 ) const;
-    BOOL MergeTable( BOOL bWithPrev = TRUE, USHORT nMode = 0 );
+    sal_Bool CanMergeTable( sal_Bool bWithPrev = sal_True, sal_Bool* pChkNxtPrv = 0 ) const;
+    sal_Bool MergeTable( sal_Bool bWithPrev = sal_True, sal_uInt16 nMode = 0 );
 
     // Set up InsertDB as table Undo.
-    void AppendUndoForInsertFromDB( BOOL bIsTable );
+    void AppendUndoForInsertFromDB( sal_Bool bIsTable );
 
     // Functions used for spell checking and text conversion.
 
@@ -708,7 +696,7 @@ public:
     // Restore selections.
     void SpellEnd( SwConversionArgs *pConvArgs = 0, bool bRestoreSelection = true );
     ::com::sun::star::uno::Any SpellContinue(
-                    USHORT* pPageCnt, USHORT* pPageSt,
+                    sal_uInt16* pPageCnt, sal_uInt16* pPageSt,
                     SwConversionArgs *pConvArgs = 0 );
 
     // Spells on a sentence basis - the SpellPortions are needed
@@ -728,10 +716,10 @@ public:
     bool HasLastSentenceGotGrammarChecked() const;
 
     // Is text conversion active somewhere else?
-    BOOL HasConvIter() const;
+    sal_Bool HasConvIter() const;
 
     // Is hyphenation active somewhere else?
-    BOOL HasHyphIter() const;
+    sal_Bool HasHyphIter() const;
 
     ::com::sun::star::uno::Reference<
         ::com::sun::star::linguistic2::XSpellAlternatives >
@@ -752,12 +740,12 @@ public:
 
     //  Return names of all references set in document.
     //  If ArrayPointer == 0 then return only whether a RefMark is set in document.
-    USHORT GetRefMarks( SvStringsDtor* = 0 ) const;
+    sal_uInt16 GetRefMarks( SvStringsDtor* = 0 ) const;
 
     // Call AutoCorrect
-    void AutoCorrect( SvxAutoCorrect& rACorr, BOOL bInsertMode = TRUE,
+    void AutoCorrect( SvxAutoCorrect& rACorr, sal_Bool bInsertMode = sal_True,
                         sal_Unicode cChar = ' ' );
-    BOOL GetPrevAutoCorrWord( SvxAutoCorrect& rACorr, String& rWord );
+    sal_Bool GetPrevAutoCorrWord( SvxAutoCorrect& rACorr, String& rWord );
 
     // Set our styles according to the respective rules.
     void AutoFormat( const SvxSwAutoFmtFlags* pAFlags = 0 );
@@ -768,33 +756,31 @@ public:
     // Calculates selection.
     String Calculate();
 
-    BOOL InsertURL( const SwFmtINetFmt& rFmt, const String& rStr,
-                    BOOL bKeepSelection = FALSE );
-    USHORT GetINetAttrs( SwGetINetAttrs& rArr );
+    sal_Bool InsertURL( const SwFmtINetFmt& rFmt, const String& rStr,
+                    sal_Bool bKeepSelection = sal_False );
+    sal_uInt16 GetINetAttrs( SwGetINetAttrs& rArr );
 
-    String GetDropTxt( const USHORT nChars ) const;
+    String GetDropTxt( const sal_uInt16 nChars ) const;
     void   ReplaceDropTxt( const String &rStr );
 
     // May an outline be moved or copied?
     // Check whether it's in text body, not in table, and not read-only (move).
-    BOOL IsOutlineMovable( USHORT nIdx ) const;
-    BOOL IsOutlineCopyable( USHORT nIdx ) const;
+    sal_Bool IsOutlineMovable( sal_uInt16 nIdx ) const;
+    sal_Bool IsOutlineCopyable( sal_uInt16 nIdx ) const;
 
-    USHORT GetLineCount( BOOL bActPos = TRUE );
+    sal_uInt16 GetLineCount( sal_Bool bActPos = sal_True );
 
     // Query and set footnote-text/number. Set.. to current SSelection!
-    BOOL GetCurFtn( SwFmtFtn* pToFillFtn = 0 );
+    sal_Bool GetCurFtn( SwFmtFtn* pToFillFtn = 0 );
     bool SetCurFtn( const SwFmtFtn& rFillFtn );
     bool HasFtns( bool bEndNotes = false ) const;
 
-    // USHORT GetFtnCnt( BOOL bEndNotes = FALSE ) const; //Currently not required.
-
+    sal_uInt16 GetSeqFtnList( SwSeqFldList& rList, bool bEndNotes = false );
     // Return list of all footnotes and their first portions of text.
-    USHORT GetSeqFtnList( SwSeqFldList& rList, bool bEndNotes = false );
 
     SwSection const* InsertSection(
             SwSectionData & rNewData, SfxItemSet const*const = 0 );
-    BOOL IsInsRegionAvailable() const;
+    sal_Bool IsInsRegionAvailable() const;
     const SwSection* GetCurrSection() const;
 
     // Returns current range like Cet CurrSection(). But this function iterates
@@ -802,17 +788,17 @@ public:
     // a footnote the reference of which is in a columned range.
     // If bOutOfTab is set, the range comprising the table is searched
     // and not an inner one.
-    const SwSection* GetAnySection( BOOL bOutOfTab = FALSE, const Point* pPt = 0 ) const;
+    const SwSection* GetAnySection( sal_Bool bOutOfTab = sal_False, const Point* pPt = 0 ) const;
 
-    USHORT GetSectionFmtCount() const;
-    USHORT GetSectionFmtPos( const SwSectionFmt& ) const;
-    const SwSectionFmt& GetSectionFmt(USHORT nFmt) const;
-    void DelSectionFmt( USHORT nFmt );
+    sal_uInt16 GetSectionFmtCount() const;
+    sal_uInt16 GetSectionFmtPos( const SwSectionFmt& ) const;
+    const SwSectionFmt& GetSectionFmt(sal_uInt16 nFmt) const;
+    void DelSectionFmt( sal_uInt16 nFmt );
     void UpdateSection(sal_uInt16 const nSect, SwSectionData &,
             SfxItemSet const*const  = 0);
-    BOOL IsAnySectionInDoc( BOOL bChkReadOnly = FALSE,
-                            BOOL bChkHidden = FALSE,
-                            BOOL BChkTOX = FALSE ) const;
+    sal_Bool IsAnySectionInDoc( sal_Bool bChkReadOnly = sal_False,
+                            sal_Bool bChkHidden = sal_False,
+                            sal_Bool BChkTOX = sal_False ) const;
 
     String GetUniqueSectionName( const String* pChkStr = 0 ) const;
 
@@ -822,7 +808,7 @@ public:
     // Search inside the cursor selection for full selected sections.
     // if any part of section in the selection return 0.
     // if more than one in the selection return the count.
-    USHORT GetFullSelectedSectionCount() const;
+    sal_uInt16 GetFullSelectedSectionCount() const;
 
     // Special insert: Insert a new text node just before or after a section or
     // table, if the cursor is positioned at the start/end of said
@@ -833,16 +819,16 @@ public:
     bool CanSpecialInsert() const;
 
     // Optimizing UI.
-    void SetNewDoc(BOOL bNew = TRUE);
+    void SetNewDoc(sal_Bool bNew = sal_True);
 
     sfx2::LinkManager& GetLinkManager();
     inline const sfx2::LinkManager& GetLinkManager() const;
 
     // linken Rand ueber Objectleiste einstellen (aenhlich dem Stufen von
     // Numerierungen), optional kann man "um" den Offset stufen oder "auf"
-    // die Position gestuft werden (bModulus = TRUE)
-    BOOL IsMoveLeftMargin( BOOL bRight = TRUE, BOOL bModulus = TRUE ) const;
-    void MoveLeftMargin( BOOL bRight = TRUE, BOOL bModulus = TRUE );
+    // die Position gestuft werden (bModulus = sal_True)
+    sal_Bool IsMoveLeftMargin( sal_Bool bRight = sal_True, sal_Bool bModulus = sal_True ) const;
+    void MoveLeftMargin( sal_Bool bRight = sal_True, sal_Bool bModulus = sal_True );
 
     // Query NumberFormater from document.
           SvNumberFormatter* GetNumberFormatter();
@@ -850,38 +836,39 @@ public:
     {   return ((SwEditShell*)this)->GetNumberFormatter();  }
 
     // Interfaces for GlobalDocument.
-    BOOL IsGlobalDoc() const;
-    void SetGlblDocSaveLinks( BOOL bFlag = TRUE );
-    BOOL IsGlblDocSaveLinks() const;
-    USHORT GetGlobalDocContent( SwGlblDocContents& rArr ) const;
-    BOOL InsertGlobalDocContent( const SwGlblDocContent& rPos,
+    sal_Bool IsGlobalDoc() const;
+    void SetGlblDocSaveLinks( sal_Bool bFlag = sal_True );
+    sal_Bool IsGlblDocSaveLinks() const;
+    sal_uInt16 GetGlobalDocContent( SwGlblDocContents& rArr ) const;
+    sal_Bool InsertGlobalDocContent( const SwGlblDocContent& rPos,
                                  SwSectionData & rNew );
-    BOOL InsertGlobalDocContent( const SwGlblDocContent& rPos,
+    sal_Bool InsertGlobalDocContent( const SwGlblDocContent& rPos,
                                  const SwTOXBase& rTOX );
-    BOOL InsertGlobalDocContent( const SwGlblDocContent& rPos );
-    BOOL DeleteGlobalDocContent( const SwGlblDocContents& rArr,
-                                USHORT nPos );
-    BOOL MoveGlobalDocContent( const SwGlblDocContents& rArr ,
-                                USHORT nFromPos, USHORT nToPos,
-                                USHORT nNewPos );
-    BOOL GotoGlobalDocContent( const SwGlblDocContent& rPos );
+    sal_Bool InsertGlobalDocContent( const SwGlblDocContent& rPos );
+    sal_Bool DeleteGlobalDocContent( const SwGlblDocContents& rArr,
+                                sal_uInt16 nPos );
+    sal_Bool MoveGlobalDocContent( const SwGlblDocContents& rArr ,
+                                sal_uInt16 nFromPos, sal_uInt16 nToPos,
+                                sal_uInt16 nNewPos );
+    sal_Bool GotoGlobalDocContent( const SwGlblDocContent& rPos );
 
     // For Redlining.
-    USHORT GetRedlineMode() const;
-    void SetRedlineMode( USHORT eMode );
-    BOOL IsRedlineOn() const;
-    USHORT GetRedlineCount() const;
-    const SwRedline& GetRedline( USHORT nPos ) const;
-    BOOL AcceptRedline( USHORT nPos );
-    BOOL RejectRedline( USHORT nPos );
+    sal_uInt16 GetRedlineMode() const;
+    void SetRedlineMode( sal_uInt16 eMode );
+    sal_Bool IsRedlineOn() const;
+    sal_uInt16 GetRedlineCount() const;
+    const SwRedline& GetRedline( sal_uInt16 nPos ) const;
+    sal_Bool AcceptRedline( sal_uInt16 nPos );
+    sal_Bool RejectRedline( sal_uInt16 nPos );
 
 
     // Search Redline for this Data and return position in array.
     // If not found, return USHRT_MAX.
-    USHORT FindRedlineOfData( const SwRedlineData& ) const;
+    sal_uInt16 FindRedlineOfData( const SwRedlineData& ) const;
+
 
     // Set comment to Redline at position.
-    BOOL SetRedlineComment( const String& rS );
+    sal_Bool SetRedlineComment( const String& rS );
     const SwRedline* GetCurrRedline() const;
 
     // Redline attributes have been changed. Updated views.
@@ -903,12 +890,12 @@ public:
     void  SetLineNumberInfo( const SwLineNumberInfo& rInfo);
 
     // Labels: Synchronize ranges.
-    void SetLabelDoc( BOOL bFlag = TRUE );
-    BOOL IsLabelDoc() const;
+    void SetLabelDoc( sal_Bool bFlag = sal_True );
+    sal_Bool IsLabelDoc() const;
 
     // Interface for TextInputData - (for input of Japanese/Chinese chars.)
     SwExtTextInput* CreateExtTextInput(LanguageType eInputLanguage);
-    String DeleteExtTextInput( SwExtTextInput* pDel = 0, BOOL bInsText = TRUE);
+    String DeleteExtTextInput( SwExtTextInput* pDel = 0, sal_Bool bInsText = sal_True);
     void SetExtTextInputData( const CommandExtTextInputData& );
 
     // Interface for access to AutoComplete-list.
@@ -916,7 +903,7 @@ public:
 
     // Returns a scaling factor of selected text. Used for the rotated
     // character attribut dialog.
-    USHORT GetScalingOfSelectedText() const;
+    sal_uInt16 GetScalingOfSelectedText() const;
 
     // Ctor/Dtor.
     SwEditShell( SwDoc&, Window*, const SwViewOption *pOpt = 0 );