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

diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx
index 42be4412fe3a..db1f651b099f 100644
--- a/sw/source/ui/inc/wrtsh.hxx
+++ b/sw/source/ui/inc/wrtsh.hxx
@@ -108,7 +108,7 @@ public:
 
     using SwEditShell::Insert;
 
-    typedef long (SwWrtShell::*SELECTFUNC)(const Point *, BOOL bProp );
+    typedef long (SwWrtShell::*SELECTFUNC)(const Point *, sal_Bool bProp );
 
     SELECTFUNC  fnDrag;
     SELECTFUNC  fnSetCrsr;
@@ -116,160 +116,160 @@ public:
     SELECTFUNC  fnKillSel;
 
     // Alle Selektionen aufheben
-    long ResetSelect( const Point *, BOOL );
+    long ResetSelect( const Point *, sal_Bool );
 
     //setzt den Cursorstack nach dem Bewegen mit PageUp/-Down
     //zurueck, falls ein Stack aufgebaut ist
     inline void ResetCursorStack();
     SelectionType   GetSelectionType() const;
 
-    BOOL    IsModePushed() const { return 0 != pModeStack; }
+    sal_Bool    IsModePushed() const { return 0 != pModeStack; }
     void    PushMode();
     void    PopMode();
 
     void    SttSelect();
     void    EndSelect();
-    BOOL    IsInSelect() const { return bInSelect; }
-    void    SetInSelect(BOOL bSel = TRUE) { bInSelect = bSel; }
+    sal_Bool    IsInSelect() const { return bInSelect; }
+    void    SetInSelect(sal_Bool bSel = sal_True) { bInSelect = bSel; }
         // Liegt eine Text- oder Rahmenselektion vor?
-    BOOL    HasSelection() const { return SwCrsrShell::HasSelection() ||
+    sal_Bool    HasSelection() const { return SwCrsrShell::HasSelection() ||
                                         IsMultiSelection() || IsSelFrmMode() || IsObjSelected(); }
-    BOOL Pop( BOOL bOldCrsr = TRUE );
+    sal_Bool Pop( sal_Bool bOldCrsr = sal_True );
 
     void    EnterStdMode();
-    BOOL    IsStdMode() const { return !bExtMode && !bAddMode && !bBlockMode; }
+    sal_Bool    IsStdMode() const { return !bExtMode && !bAddMode && !bBlockMode; }
 
     void    EnterExtMode();
     void    LeaveExtMode();
     long    ToggleExtMode();
-    BOOL    IsExtMode() const { return bExtMode; }
+    sal_Bool    IsExtMode() const { return bExtMode; }
 
     void    EnterAddMode();
     void    LeaveAddMode();
     long    ToggleAddMode();
-    BOOL    IsAddMode() const { return bAddMode; }
+    sal_Bool    IsAddMode() const { return bAddMode; }
 
     void    EnterBlockMode();
     void    LeaveBlockMode();
     long    ToggleBlockMode();
-    BOOL    IsBlockMode() const { return bBlockMode; }
+    sal_Bool    IsBlockMode() const { return bBlockMode; }
 
-    void    SetInsMode( BOOL bOn = TRUE );
+    void    SetInsMode( sal_Bool bOn = sal_True );
     void    ToggleInsMode() { SetInsMode( !bIns ); }
-    BOOL    IsInsMode() const { return bIns; }
-    void    SetRedlineModeAndCheckInsMode( USHORT eMode );
+    sal_Bool    IsInsMode() const { return bIns; }
+    void    SetRedlineModeAndCheckInsMode( sal_uInt16 eMode );
 
     void    EnterSelFrmMode(const Point *pStartDrag = 0);
     void    LeaveSelFrmMode();
-    BOOL    IsSelFrmMode() const { return bLayoutMode; }
+    sal_Bool    IsSelFrmMode() const { return bLayoutMode; }
         // Selektion von Rahmen aufheben
     void    UnSelectFrm();
 
     void    Invalidate();
 
     // Tabellenzellen selektieren fuer Bearbeiten von Formeln in der Ribbonbar
-    inline void SelTblCells( const Link &rLink, BOOL bMark = TRUE );
+    inline void SelTblCells( const Link &rLink, sal_Bool bMark = sal_True );
     inline void EndSelTblCells();
 
     //Wortweisen oder zeilenweisen Selektionsmodus verlassen. Wird
     //in der Regel in MB-Up gerufen.
-    BOOL    IsExtSel() const { return bSelWrd || bSelLn; }
+    sal_Bool    IsExtSel() const { return bSelWrd || bSelLn; }
 
     // erfrage, ob der akt. fnDrag - Pointer auf BeginDrag gesetzt ist
     // Wird fuer MouseMove gebraucht, um die Bugs 55592/55931 zu umgehen.
-    inline BOOL Is_FnDragEQBeginDrag() const;
+    inline sal_Bool Is_FnDragEQBeginDrag() const;
 
     //Basisabfragen
-    BOOL    IsInWrd()           { return IsInWord(); }
-    BOOL    IsSttWrd()          { return IsStartWord(); }
-    BOOL    IsEndWrd();
-    BOOL    IsSttOfPara() const { return IsSttPara(); }
-    BOOL    IsEndOfPara() const { return IsEndPara(); }
+    sal_Bool    IsInWrd()           { return IsInWord(); }
+    sal_Bool    IsSttWrd()          { return IsStartWord(); }
+    sal_Bool    IsEndWrd();
+    sal_Bool    IsSttOfPara() const { return IsSttPara(); }
+    sal_Bool    IsEndOfPara() const { return IsEndPara(); }
 
     //Word bzw. Satz selektieren.
-    BOOL    SelNearestWrd();
-    BOOL    SelWrd      (const Point * = 0, BOOL bProp=FALSE );
+    sal_Bool    SelNearestWrd();
+    sal_Bool    SelWrd      (const Point * = 0, sal_Bool bProp=sal_False );
     // --> FME 2004-07-30 #i32329# Enhanced selection
-    void    SelSentence (const Point * = 0, BOOL bProp=FALSE );
-    void    SelPara     (const Point * = 0, BOOL bProp=FALSE );
+    void    SelSentence (const Point * = 0, sal_Bool bProp=sal_False );
+    void    SelPara     (const Point * = 0, sal_Bool bProp=sal_False );
     // <--
     long    SelAll();
 
     //Basiscursortravelling
-typedef BOOL (SwWrtShell:: *FNSimpleMove)();
-    BOOL SimpleMove( FNSimpleMove, BOOL bSelect );
-
-    BOOL Left       ( USHORT nMode, BOOL bSelect,
-                            USHORT nCount, BOOL bBasicCall, BOOL bVisual = FALSE );
-    BOOL Right      ( USHORT nMode, BOOL bSelect,
-                            USHORT nCount, BOOL bBasicCall, BOOL bVisual = FALSE );
-    BOOL Up         ( BOOL bSelect = FALSE, USHORT nCount = 1,
-                            BOOL bBasicCall = FALSE );
-    BOOL Down       ( BOOL bSelect = FALSE, USHORT nCount = 1,
-                            BOOL bBasicCall = FALSE );
-    BOOL NxtWrd     ( BOOL bSelect = FALSE ) { return SimpleMove( &SwWrtShell::_NxtWrd, bSelect ); }
-    BOOL PrvWrd     ( BOOL bSelect = FALSE ) { return SimpleMove( &SwWrtShell::_PrvWrd, bSelect ); }
-
-    BOOL LeftMargin ( BOOL bSelect, BOOL bBasicCall );
-    BOOL RightMargin( BOOL bSelect, BOOL bBasicCall );
-
-    BOOL SttDoc     ( BOOL bSelect = FALSE );
-    BOOL EndDoc     ( BOOL bSelect = FALSE );
-
-    BOOL SttNxtPg   ( BOOL bSelect = FALSE );
-    BOOL SttPrvPg   ( BOOL bSelect = FALSE );
-    BOOL EndNxtPg   ( BOOL bSelect = FALSE );
-    BOOL EndPrvPg   ( BOOL bSelect = FALSE );
-    BOOL SttPg      ( BOOL bSelect = FALSE );
-    BOOL EndPg      ( BOOL bSelect = FALSE );
-    BOOL SttPara    ( BOOL bSelect = FALSE );
-    BOOL EndPara    ( BOOL bSelect = FALSE );
-    BOOL FwdPara    ( BOOL bSelect = FALSE )
+typedef sal_Bool (SwWrtShell:: *FNSimpleMove)();
+    sal_Bool SimpleMove( FNSimpleMove, sal_Bool bSelect );
+
+    sal_Bool Left       ( sal_uInt16 nMode, sal_Bool bSelect,
+                            sal_uInt16 nCount, sal_Bool bBasicCall, sal_Bool bVisual = sal_False );
+    sal_Bool Right      ( sal_uInt16 nMode, sal_Bool bSelect,
+                            sal_uInt16 nCount, sal_Bool bBasicCall, sal_Bool bVisual = sal_False );
+    sal_Bool Up         ( sal_Bool bSelect = sal_False, sal_uInt16 nCount = 1,
+                            sal_Bool bBasicCall = sal_False );
+    sal_Bool Down       ( sal_Bool bSelect = sal_False, sal_uInt16 nCount = 1,
+                            sal_Bool bBasicCall = sal_False );
+    sal_Bool NxtWrd     ( sal_Bool bSelect = sal_False ) { return SimpleMove( &SwWrtShell::_NxtWrd, bSelect ); }
+    sal_Bool PrvWrd     ( sal_Bool bSelect = sal_False ) { return SimpleMove( &SwWrtShell::_PrvWrd, bSelect ); }
+
+    sal_Bool LeftMargin ( sal_Bool bSelect, sal_Bool bBasicCall );
+    sal_Bool RightMargin( sal_Bool bSelect, sal_Bool bBasicCall );
+
+    sal_Bool SttDoc     ( sal_Bool bSelect = sal_False );
+    sal_Bool EndDoc     ( sal_Bool bSelect = sal_False );
+
+    sal_Bool SttNxtPg   ( sal_Bool bSelect = sal_False );
+    sal_Bool SttPrvPg   ( sal_Bool bSelect = sal_False );
+    sal_Bool EndNxtPg   ( sal_Bool bSelect = sal_False );
+    sal_Bool EndPrvPg   ( sal_Bool bSelect = sal_False );
+    sal_Bool SttPg      ( sal_Bool bSelect = sal_False );
+    sal_Bool EndPg      ( sal_Bool bSelect = sal_False );
+    sal_Bool SttPara    ( sal_Bool bSelect = sal_False );
+    sal_Bool EndPara    ( sal_Bool bSelect = sal_False );
+    sal_Bool FwdPara    ( sal_Bool bSelect = sal_False )
                 { return SimpleMove( &SwWrtShell::_FwdPara, bSelect ); }
-    BOOL BwdPara    ( BOOL bSelect = FALSE )
+    sal_Bool BwdPara    ( sal_Bool bSelect = sal_False )
                 { return SimpleMove( &SwWrtShell::_BwdPara, bSelect ); }
-    BOOL FwdSentence( BOOL bSelect = FALSE )
+    sal_Bool FwdSentence( sal_Bool bSelect = sal_False )
                 { return SimpleMove( &SwWrtShell::_FwdSentence, bSelect ); }
-    BOOL BwdSentence( BOOL bSelect = FALSE )
+    sal_Bool BwdSentence( sal_Bool bSelect = sal_False )
                 { return SimpleMove( &SwWrtShell::_BwdSentence, bSelect ); }
 
     // --> FME 2004-07-30 #i20126# Enhanced table selection
-    BOOL SelectTableRowCol( const Point& rPt, const Point* pEnd = 0, bool bRowDrag = false );
+    sal_Bool SelectTableRowCol( const Point& rPt, const Point* pEnd = 0, bool bRowDrag = false );
     // <--
-    BOOL SelectTableRow();
-    BOOL SelectTableCol();
-    BOOL SelectTableCell();
+    sal_Bool SelectTableRow();
+    sal_Bool SelectTableCol();
+    sal_Bool SelectTableCell();
 
-    BOOL SelectTxtAttr( USHORT nWhich, const SwTxtAttr* pAttr = 0 );
+    sal_Bool SelectTxtAttr( sal_uInt16 nWhich, const SwTxtAttr* pAttr = 0 );
 
     // Spaltenweise Spruenge
-    BOOL StartOfColumn      ( BOOL bSelect = FALSE );
-    BOOL EndOfColumn        ( BOOL bSelect = FALSE );
-    BOOL StartOfNextColumn  ( BOOL bSelect = FALSE );
-    BOOL EndOfNextColumn    ( BOOL bSelect = FALSE );
-    BOOL StartOfPrevColumn  ( BOOL bSelect = FALSE );
-    BOOL EndOfPrevColumn    ( BOOL bSelect = FALSE );
+    sal_Bool StartOfColumn      ( sal_Bool bSelect = sal_False );
+    sal_Bool EndOfColumn        ( sal_Bool bSelect = sal_False );
+    sal_Bool StartOfNextColumn  ( sal_Bool bSelect = sal_False );
+    sal_Bool EndOfNextColumn    ( sal_Bool bSelect = sal_False );
+    sal_Bool StartOfPrevColumn  ( sal_Bool bSelect = sal_False );
+    sal_Bool EndOfPrevColumn    ( sal_Bool bSelect = sal_False );
 
     // setze den Cursor auf die Seite "nPage" an den Anfang
     // zusaetzlich zu der gleichnamigen Implementierung in crsrsh.hxx
     // werden hier alle bestehenden Selektionen vor dem Setzen des
     // Cursors aufgehoben
-    BOOL    GotoPage( USHORT nPage, BOOL bRecord );
+    sal_Bool    GotoPage( sal_uInt16 nPage, sal_Bool bRecord );
 
     //setzen des Cursors; merken der alten Position fuer Zurueckblaettern.
     DECL_LINK( ExecFlyMac, void * );
 
-    BOOL    PageCrsr(SwTwips lOffset, BOOL bSelect);
+    sal_Bool    PageCrsr(SwTwips lOffset, sal_Bool bSelect);
 
     // Felder Update
-    void    UpdateInputFlds( SwInputFieldList* pLst = 0, BOOL bOnlyInSel = FALSE );
+    void    UpdateInputFlds( SwInputFieldList* pLst = 0, sal_Bool bOnlyInSel = sal_False );
 
-    void    NoEdit(BOOL bHideCrsr = TRUE);
+    void    NoEdit(sal_Bool bHideCrsr = sal_True);
     void    Edit();
-    BOOL    IsNoEdit() const { return bNoEdit; }
+    sal_Bool    IsNoEdit() const { return bNoEdit; }
 
-    BOOL IsRetainSelection() const { return mbRetainSelection; }
-    void SetRetainSelection( BOOL bRet ) { mbRetainSelection = bRet; }
+    sal_Bool IsRetainSelection() const { return mbRetainSelection; }
+    void SetRetainSelection( sal_Bool bRet ) { mbRetainSelection = bRet; }
 
     // change current data base and notify
     void ChgDBData(const SwDBData& SwDBData);
@@ -281,7 +281,7 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)();
     long    DelLeft();
 
     // loescht auch Rahmen bzw. setzt den Cursor in den Rahmen,
-    // wenn bDelFrm == FALSE ist
+    // wenn bDelFrm == sal_False ist
     long    DelRight();
     long    DelToEndOfPara();
     long    DelToStartOfPara();
@@ -300,7 +300,7 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)();
             WORD_SPACE_AFTER = 2,
             WORD_NO_SPACE = 3
         };
-    int     IntelligentCut(int nSelectionType, BOOL bCut = TRUE);
+    int     IntelligentCut(int nSelectionType, sal_Bool bCut = sal_True);
 
     // Editieren
     void    Insert(SwField &);
@@ -308,28 +308,28 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)();
     // Graphic
     void    Insert( const String &rPath, const String &rFilter,
                     const Graphic &, SwFlyFrmAttrMgr * = 0,
-                    BOOL bRule = FALSE );
+                    sal_Bool bRule = sal_False );
 
     void    InsertByWord( const String & );
-    void    InsertPageBreak(const String *pPageDesc = 0, USHORT nPgNum = 0 );
+    void    InsertPageBreak(const String *pPageDesc = 0, sal_uInt16 nPgNum = 0 );
     void    InsertLineBreak();
     void    InsertColumnBreak();
-    void    InsertFootnote(const String &, BOOL bEndNote = FALSE, BOOL bEdit = TRUE );
-    void    SplitNode( BOOL bAutoFormat = FALSE, BOOL bCheckTableStart = TRUE );
-    BOOL    CanInsert();
+    void    InsertFootnote(const String &, sal_Bool bEndNote = sal_False, sal_Bool bEdit = sal_True );
+    void    SplitNode( sal_Bool bAutoFormat = sal_False, sal_Bool bCheckTableStart = sal_True );
+    sal_Bool    CanInsert();
 
     // Verzeichnisse
     void    InsertTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0);
-    BOOL    UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0);
+    sal_Bool    UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0);
 
     // Numerierung und Bullets
     /**
        Turns on numbering or bullets.
 
-       @param bNum    TRUE: turn on numbering
-                      FALSE: turn on bullets
+       @param bNum    sal_True: turn on numbering
+                      sal_False: turn on bullets
     */
-    void    NumOrBulletOn(BOOL bNum); // #i29560#
+    void    NumOrBulletOn(sal_Bool bNum); // #i29560#
     void    NumOrBulletOff(); // #i29560#
     void    NumOn();
     void    BulletOn();
@@ -338,12 +338,12 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)();
     void    InsertObject(     /*SvInPlaceObjectRef *pObj, */       // != 0 fuer Clipboard
                           const svt::EmbeddedObjectRef&,
                           SvGlobalName *pName = 0,      // != 0 entspr. Object erzeugen.
-                          BOOL bActivate = TRUE,
-                          USHORT nSlotId = 0);       // SlotId fuer Dialog
+                          sal_Bool bActivate = sal_True,
+                          sal_uInt16 nSlotId = 0);       // SlotId fuer Dialog
 
-    BOOL    InsertOleObject( const svt::EmbeddedObjectRef& xObj, SwFlyFrmFmt **pFlyFrmFmt = 0 );
+    sal_Bool    InsertOleObject( const svt::EmbeddedObjectRef& xObj, SwFlyFrmFmt **pFlyFrmFmt = 0 );
     void    LaunchOLEObj( long nVerb = 0 );             // Server starten
-    BOOL    IsOLEObj() const { return GetCntType() == CNT_OLE;}
+    sal_Bool    IsOLEObj() const { return GetCntType() == CNT_OLE;}
     virtual void MoveObjectIfActive( svt::EmbeddedObjectRef& xObj, const Point& rOffset );
     virtual void CalcAndSetScale( svt::EmbeddedObjectRef& xObj,
                                   const SwRect *pFlyPrtRect = 0,
@@ -366,32 +366,32 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)();
 
     void    SetPageStyle(const String &rCollName);
 
-    String  GetCurPageStyle( const BOOL bCalcFrm = TRUE ) const;
+    String  GetCurPageStyle( const sal_Bool bCalcFrm = sal_True ) const;
 
     // Aktuelle Vorlage anhand der geltenden Attribute aendern
     void    QuickUpdateStyle();
 
     enum DoType { UNDO, REDO, REPEAT };
 
-    void    Do( DoType eDoType, USHORT nCnt = 1 );
+    void    Do( DoType eDoType, sal_uInt16 nCnt = 1 );
     String  GetDoString( DoType eDoType ) const;
     String  GetRepeatString() const;
-    USHORT  GetDoStrings( DoType eDoType, SfxStringListItem& rStrLstItem ) const;
+    sal_uInt16  GetDoStrings( DoType eDoType, SfxStringListItem& rStrLstItem ) const;
 
     //Suchen oder Ersetzen
-    ULONG SearchPattern(const com::sun::star::util::SearchOptions& rSearchOpt,
-                         BOOL bSearchInNotes,
+    sal_uLong SearchPattern(const com::sun::star::util::SearchOptions& rSearchOpt,
+                         sal_Bool bSearchInNotes,
                          SwDocPositions eStart, SwDocPositions eEnde,
                          FindRanges eFlags = FND_IN_BODY,
-                         int bReplace = FALSE );
+                         int bReplace = sal_False );
 
-    ULONG SearchTempl  (const String &rTempl,
+    sal_uLong SearchTempl  (const String &rTempl,
                          SwDocPositions eStart, SwDocPositions eEnde,
                          FindRanges eFlags = FND_IN_BODY,
                          const String* pReplTempl = 0 );
 
-    ULONG SearchAttr   (const SfxItemSet& rFindSet,
-                         BOOL bNoColls,
+    sal_uLong SearchAttr   (const SfxItemSet& rFindSet,
+                         sal_Bool bNoColls,
                          SwDocPositions eStart,SwDocPositions eEnde,
                          FindRanges eFlags = FND_IN_BODY,
                          const com::sun::star::util::SearchOptions* pSearchOpt = 0,
@@ -401,30 +401,30 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)();
 
     // Aktion vor Cursorbewegung
     // Hebt gfs. Selektionen auf, triggert Timer und GCAttr()
-    void    MoveCrsr( BOOL bWithSelect = FALSE );
+    void    MoveCrsr( sal_Bool bWithSelect = sal_False );
 
     // Eingabefelder updaten
-    BOOL    StartInputFldDlg(SwField*, BOOL bNextButton, Window* pParentWin = 0, ByteString* pWindowState = 0);
+    sal_Bool    StartInputFldDlg(SwField*, sal_Bool bNextButton, Window* pParentWin = 0, ByteString* pWindowState = 0);
     // update DropDown fields
-    BOOL    StartDropDownFldDlg(SwField*, BOOL bNextButton, ByteString* pWindowState = 0);
+    sal_Bool    StartDropDownFldDlg(SwField*, sal_Bool bNextButton, ByteString* pWindowState = 0);
 
     //"Handler" fuer Anederungen an der DrawView - fuer Controls.
     virtual void DrawSelChanged( );
 
     // springe zum Bookmark und setze die "Selections-Flags" wieder richtig
-    BOOL GotoMark( const ::sw::mark::IMark* const pMark );
-    BOOL GotoMark( const ::sw::mark::IMark* const pMark, BOOL bSelect, BOOL bStart );
-    BOOL GotoMark( const ::rtl::OUString& rName );
-    BOOL GoNextBookmark(); // TRUE, wenn's noch eine gab
-    BOOL GoPrevBookmark();
+    sal_Bool GotoMark( const ::sw::mark::IMark* const pMark );
+    sal_Bool GotoMark( const ::sw::mark::IMark* const pMark, sal_Bool bSelect, sal_Bool bStart );
+    sal_Bool GotoMark( const ::rtl::OUString& rName );
+    sal_Bool GoNextBookmark(); // sal_True, wenn's noch eine gab
+    sal_Bool GoPrevBookmark();
 
     bool GotoFieldmark(::sw::mark::IFieldmark const * const pMark);
 
-    BOOL GotoField( const SwFmtFld& rFld );
+    sal_Bool GotoField( const SwFmtFld& rFld );
 
     // jump to the next / previous hyperlink - inside text and also
     // on graphics
-    BOOL SelectNextPrevHyperlink( BOOL bNext = TRUE );
+    sal_Bool SelectNextPrevHyperlink( sal_Bool bNext = sal_True );
 
     // Zugehoerige SwView ermitteln
     const SwView&       GetView() const { return rView; }
@@ -433,23 +433,23 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)();
     //Weil es sonst keiner macht, gibt es hier eine ExecMacro()
     void ExecMacro( const SvxMacro& rMacro, String* pRet = 0, SbxArray* pArgs = 0 );
     // rufe ins dunkle Basic/JavaScript
-    USHORT CallEvent( USHORT nEvent, const SwCallMouseEvent& rCallEvent,
-                        BOOL bCheckPtr = FALSE, SbxArray* pArgs = 0,
+    sal_uInt16 CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEvent,
+                        sal_Bool bCheckPtr = sal_False, SbxArray* pArgs = 0,
                         const Link* pCallBack = 0 );
 
     // ein Klick aus das angegebene Feld. Der Cursor steht auf diesem.
     // Fuehre die vor definierten Aktionen aus.
     void ClickToField( const SwField& rFld );
-    void ClickToINetAttr( const SwFmtINetFmt& rItem, USHORT nFilter = URLLOAD_NOFILTER );
-    BOOL ClickToINetGrf( const Point& rDocPt, USHORT nFilter = URLLOAD_NOFILTER );
-    inline BOOL IsInClickToEdit() const ;
+    void ClickToINetAttr( const SwFmtINetFmt& rItem, sal_uInt16 nFilter = URLLOAD_NOFILTER );
+    sal_Bool ClickToINetGrf( const Point& rDocPt, sal_uInt16 nFilter = URLLOAD_NOFILTER );
+    inline sal_Bool IsInClickToEdit() const ;
 
     // fall ein URL-Button selektiert ist, dessen URL returnen, ansonsten
     // einen LeerString
-    BOOL GetURLFromButton( String& rURL, String& rDescr ) const;
+    sal_Bool GetURLFromButton( String& rURL, String& rDescr ) const;
 
     void NavigatorPaste( const NaviContentBookmark& rBkmk,
-                         const USHORT nAction );
+                         const sal_uInt16 nAction );
 
     // die Core erzeugt eine Selektion, das SttSelect muss gerufen werden
     virtual void NewCoreSelection();
@@ -469,29 +469,29 @@ typedef BOOL (SwWrtShell:: *FNSimpleMove)();
                 const SwViewOption *pViewOpt = 0);
     virtual ~SwWrtShell();
 
-    BOOL TryRemoveIndent(); // #i23725#
+    sal_Bool TryRemoveIndent(); // #i23725#
 
     String GetSelDescr() const;
 
     SwNavigationMgr& GetNavigationMgr();
     void addCurrentPosition();
-    BOOL GotoFly( const String& rName, FlyCntType eType = FLYCNTTYPE_ALL,
-         BOOL bSelFrame = TRUE );
-    BOOL GotoINetAttr( const SwTxtINetFmt& rAttr );
-    void GotoOutline( USHORT nIdx );
-    BOOL GotoOutline( const String& rName );
-    BOOL GotoRegion( const String& rName );
-    BOOL GotoRefMark( const String& rRefMark, USHORT nSubType = 0,
-        USHORT nSeqNo = 0 );
-    BOOL GotoNextTOXBase( const String* pName = 0);
-    BOOL GotoTable( const String& rName );
-    BOOL GotoFld( const SwFmtFld& rFld );
-    const SwRedline* GotoRedline( USHORT nArrPos, BOOL bSelect = FALSE);
+    sal_Bool GotoFly( const String& rName, FlyCntType eType = FLYCNTTYPE_ALL,
+         sal_Bool bSelFrame = sal_True );
+    sal_Bool GotoINetAttr( const SwTxtINetFmt& rAttr );
+    void GotoOutline( sal_uInt16 nIdx );
+    sal_Bool GotoOutline( const String& rName );
+    sal_Bool GotoRegion( const String& rName );
+    sal_Bool GotoRefMark( const String& rRefMark, sal_uInt16 nSubType = 0,
+        sal_uInt16 nSeqNo = 0 );
+    sal_Bool GotoNextTOXBase( const String* pName = 0);
+    sal_Bool GotoTable( const String& rName );
+    sal_Bool GotoFld( const SwFmtFld& rFld );
+    const SwRedline* GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect = sal_False);
 
 private:
 
     SW_DLLPRIVATE void  OpenMark();
-    SW_DLLPRIVATE void  CloseMark( BOOL bOkFlag );
+    SW_DLLPRIVATE void  CloseMark( sal_Bool bOkFlag );
 
     SW_DLLPRIVATE String    GetWrdDelim();
     SW_DLLPRIVATE String    GetSDelim();
@@ -500,11 +500,11 @@ private:
     struct ModeStack
     {
         ModeStack   *pNext;
-        BOOL        bAdd,
+        sal_Bool        bAdd,
                     bBlock,
                     bExt,
                     bIns;
-        ModeStack(ModeStack *pNextMode, BOOL _bIns, BOOL _bExt, BOOL _bAdd, BOOL _bBlock):
+        ModeStack(ModeStack *pNextMode, sal_Bool _bIns, sal_Bool _bExt, sal_Bool _bAdd, sal_Bool _bBlock):
             pNext(pNextMode),
             bAdd(_bAdd),
             bBlock(_bBlock),
@@ -525,11 +525,11 @@ private:
     {
         Point aDocPos;
         CrsrStack *pNext;
-        BOOL bValidCurPos : 1;
-        BOOL bIsFrmSel : 1;
+        sal_Bool bValidCurPos : 1;
+        sal_Bool bIsFrmSel : 1;
         SwTwips lOffset;
 
-        CrsrStack( BOOL bValid, BOOL bFrmSel, const Point &rDocPos,
+        CrsrStack( sal_Bool bValid, sal_Bool bFrmSel, const Point &rDocPos,
                     SwTwips lOff, CrsrStack *pN )
             : aDocPos(rDocPos),
             pNext(pN),
@@ -547,39 +547,39 @@ private:
     SwNavigationMgr aNavigationMgr;
 
     Point   aDest;
-    BOOL    bDestOnStack;
-    BOOL    HasCrsrStack() const { return 0 != pCrsrStack; }
-    SW_DLLPRIVATE BOOL  PushCrsr(SwTwips lOffset, BOOL bSelect);
-    SW_DLLPRIVATE BOOL  PopCrsr(BOOL bUpdate, BOOL bSelect = FALSE);
+    sal_Bool    bDestOnStack;
+    sal_Bool    HasCrsrStack() const { return 0 != pCrsrStack; }
+    SW_DLLPRIVATE sal_Bool  PushCrsr(SwTwips lOffset, sal_Bool bSelect);
+    SW_DLLPRIVATE sal_Bool  PopCrsr(sal_Bool bUpdate, sal_Bool bSelect = sal_False);
 
     // ENDE Cursor bei PageUp / -Down mitnehmen
-    SW_DLLPRIVATE BOOL _SttWrd();
-    SW_DLLPRIVATE BOOL _EndWrd();
-    SW_DLLPRIVATE BOOL _NxtWrd();
-    SW_DLLPRIVATE BOOL _PrvWrd();
+    SW_DLLPRIVATE sal_Bool _SttWrd();
+    SW_DLLPRIVATE sal_Bool _EndWrd();
+    SW_DLLPRIVATE sal_Bool _NxtWrd();
+    SW_DLLPRIVATE sal_Bool _PrvWrd();
     // --> OD 2008-08-06 #i92468#
-    SW_DLLPRIVATE BOOL _NxtWrdForDelete();
-    SW_DLLPRIVATE BOOL _PrvWrdForDelete();
+    SW_DLLPRIVATE sal_Bool _NxtWrdForDelete();
+    SW_DLLPRIVATE sal_Bool _PrvWrdForDelete();
     // <--
-    SW_DLLPRIVATE BOOL _FwdSentence();
-    SW_DLLPRIVATE BOOL _BwdSentence();
-    BOOL _FwdPara();
-    SW_DLLPRIVATE BOOL _BwdPara();
+    SW_DLLPRIVATE sal_Bool _FwdSentence();
+    SW_DLLPRIVATE sal_Bool _BwdSentence();
+    sal_Bool _FwdPara();
+    SW_DLLPRIVATE sal_Bool _BwdPara();
 
         //  Selektionen
-    BOOL    bIns            :1;
-    BOOL    bInSelect       :1;
-    BOOL    bExtMode        :1;
-    BOOL    bAddMode        :1;
-    BOOL    bBlockMode      :1;
-    BOOL    bLayoutMode     :1;
-    BOOL    bNoEdit         :1;
-    BOOL    bCopy           :1;
-    BOOL    bSelWrd         :1;
-    BOOL    bSelLn          :1;
-    BOOL    bIsInClickToEdit:1;
-    BOOL    bClearMark      :1;     // Selektion fuer ChartAutoPilot nicht loeschen
-    BOOL    mbRetainSelection :1; // Do not remove selections
+    sal_Bool    bIns            :1;
+    sal_Bool    bInSelect       :1;
+    sal_Bool    bExtMode        :1;
+    sal_Bool    bAddMode        :1;
+    sal_Bool    bBlockMode      :1;
+    sal_Bool    bLayoutMode     :1;
+    sal_Bool    bNoEdit         :1;
+    sal_Bool    bCopy           :1;
+    sal_Bool    bSelWrd         :1;
+    sal_Bool    bSelLn          :1;
+    sal_Bool    bIsInClickToEdit:1;
+    sal_Bool    bClearMark      :1;     // Selektion fuer ChartAutoPilot nicht loeschen
+    sal_Bool    mbRetainSelection :1; // Do not remove selections
 
     Point   aStart;
     Link    aSelTblLink;
@@ -592,37 +592,37 @@ private:
     SW_DLLPRIVATE void  SttDragDrop(Timer *);
 
     using SwCrsrShell::SetCrsr;
-    SW_DLLPRIVATE long  SetCrsr(const Point *, BOOL bProp=FALSE );
+    SW_DLLPRIVATE long  SetCrsr(const Point *, sal_Bool bProp=sal_False );
 
-    SW_DLLPRIVATE long  SetCrsrKillSel(const Point *, BOOL bProp=FALSE );
+    SW_DLLPRIVATE long  SetCrsrKillSel(const Point *, sal_Bool bProp=sal_False );
 
-    SW_DLLPRIVATE long  StdSelect(const Point *, BOOL bProp=FALSE );
-    SW_DLLPRIVATE long  BeginDrag(const Point *, BOOL bProp=FALSE );
-    SW_DLLPRIVATE long  Drag(const Point *, BOOL bProp=FALSE );
-    SW_DLLPRIVATE long  EndDrag(const Point *, BOOL bProp=FALSE );
+    SW_DLLPRIVATE long  StdSelect(const Point *, sal_Bool bProp=sal_False );
+    SW_DLLPRIVATE long  BeginDrag(const Point *, sal_Bool bProp=sal_False );
+    SW_DLLPRIVATE long  Drag(const Point *, sal_Bool bProp=sal_False );
+    SW_DLLPRIVATE long  EndDrag(const Point *, sal_Bool bProp=sal_False );
 
-    SW_DLLPRIVATE long  ExtSelWrd(const Point *, BOOL bProp=FALSE );
-    SW_DLLPRIVATE long  ExtSelLn(const Point *, BOOL bProp=FALSE );
+    SW_DLLPRIVATE long  ExtSelWrd(const Point *, sal_Bool bProp=sal_False );
+    SW_DLLPRIVATE long  ExtSelLn(const Point *, sal_Bool bProp=sal_False );
 
     //Verschieben von Text aus Drag and Drop; Point ist
     //Destination fuer alle Selektionen.
-    SW_DLLPRIVATE long  MoveText(const Point *, BOOL bProp=FALSE );
+    SW_DLLPRIVATE long  MoveText(const Point *, sal_Bool bProp=sal_False );
 
-    SW_DLLPRIVATE long  BeginFrmDrag(const Point *, BOOL bProp=FALSE );
+    SW_DLLPRIVATE long  BeginFrmDrag(const Point *, sal_Bool bProp=sal_False );
 
     //nach SSize/Move eines Frames Update; Point ist Destination.
-    SW_DLLPRIVATE long  UpdateLayoutFrm(const Point *, BOOL bProp=FALSE );
+    SW_DLLPRIVATE long  UpdateLayoutFrm(const Point *, sal_Bool bProp=sal_False );
 
-    SW_DLLPRIVATE long  SttLeaveSelect(const Point *, BOOL bProp=FALSE );
-    SW_DLLPRIVATE long  AddLeaveSelect(const Point *, BOOL bProp=FALSE );
-    SW_DLLPRIVATE long  Ignore(const Point *, BOOL bProp=FALSE );
+    SW_DLLPRIVATE long  SttLeaveSelect(const Point *, sal_Bool bProp=sal_False );
+    SW_DLLPRIVATE long  AddLeaveSelect(const Point *, sal_Bool bProp=sal_False );
+    SW_DLLPRIVATE long  Ignore(const Point *, sal_Bool bProp=sal_False );
 
-    SW_DLLPRIVATE void  LeaveExtSel() { bSelWrd = bSelLn = FALSE;}
-    SW_DLLPRIVATE BOOL  _CanInsert();
+    SW_DLLPRIVATE void  LeaveExtSel() { bSelWrd = bSelLn = sal_False;}
+    SW_DLLPRIVATE sal_Bool  _CanInsert();
 
-    SW_DLLPRIVATE BOOL  GoStart(BOOL KeepArea = FALSE, BOOL * = 0,
-            BOOL bSelect = FALSE, BOOL bDontMoveRegion = FALSE);
-    SW_DLLPRIVATE BOOL  GoEnd(BOOL KeepArea = FALSE, BOOL * = 0);
+    SW_DLLPRIVATE sal_Bool  GoStart(sal_Bool KeepArea = sal_False, sal_Bool * = 0,
+            sal_Bool bSelect = sal_False, sal_Bool bDontMoveRegion = sal_False);
+    SW_DLLPRIVATE sal_Bool  GoEnd(sal_Bool KeepArea = sal_False, sal_Bool * = 0);
 
     enum BookMarkMove
     {
@@ -632,7 +632,7 @@ private:
         BOOKMARK_LAST_LAST_ENTRY
     };
 
-    SW_DLLPRIVATE BOOL MoveBookMark(BookMarkMove eFuncId, const ::sw::mark::IMark* const pMark=NULL);
+    SW_DLLPRIVATE sal_Bool MoveBookMark(BookMarkMove eFuncId, const ::sw::mark::IMark* const pMark=NULL);
 };
 
 inline void SwWrtShell::ResetCursorStack()
@@ -641,27 +641,27 @@ inline void SwWrtShell::ResetCursorStack()
         _ResetCursorStack();
 }
 
-inline void SwWrtShell::SelTblCells(const Link &rLink, BOOL bMark )
+inline void SwWrtShell::SelTblCells(const Link &rLink, sal_Bool bMark )
 {
-    SetSelTblCells( TRUE );
+    SetSelTblCells( sal_True );
     bClearMark = bMark;
     aSelTblLink = rLink;
 }
 inline void SwWrtShell::EndSelTblCells()
 {
-    SetSelTblCells( FALSE );
-    bClearMark = TRUE;
+    SetSelTblCells( sal_False );
+    bClearMark = sal_True;
 }
 
-inline BOOL SwWrtShell::IsInClickToEdit() const { return bIsInClickToEdit; }
+inline sal_Bool SwWrtShell::IsInClickToEdit() const { return bIsInClickToEdit; }
 
-inline BOOL SwWrtShell::Is_FnDragEQBeginDrag() const
+inline sal_Bool SwWrtShell::Is_FnDragEQBeginDrag() const
 {
 #ifdef GCC
     SELECTFUNC  fnTmp = &SwWrtShell::BeginDrag;
     return fnDrag == fnTmp;
 #else
-    return sal::static_int_cast< BOOL >(fnDrag == &SwWrtShell::BeginDrag);
+    return sal::static_int_cast< sal_Bool >(fnDrag == &SwWrtShell::BeginDrag);
 #endif
 }