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

diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index 253552688031..6f7e9b84f428 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -48,25 +48,25 @@ class SW_DLLPUBLIC SwFmt : public SwModify
     String aFmtName;
     SwAttrSet aSet;
 
-    USHORT nWhichId;
-    USHORT nFmtId;            // Format-ID for reading / writing.
-    USHORT nPoolFmtId;        // Id for "automatically" created formats.
+    sal_uInt16 nWhichId;
+    sal_uInt16 nFmtId;            // Format-ID for reading / writing.
+    sal_uInt16 nPoolFmtId;        // Id for "automatically" created formats.
                               // (is not hard attribution!!!)
-    USHORT nPoolHelpId;       // HelpId for this Pool-style.
-    BYTE nPoolHlpFileId;      // FilePos to Doc to these style helps.
-    BOOL   bWritten : 1;      // TRUE: already written.
-    BOOL   bAutoFmt : 1;      // FALSE: it is a template.
+    sal_uInt16 nPoolHelpId;       // HelpId for this Pool-style.
+    sal_uInt8 nPoolHlpFileId;      // FilePos to Doc to these style helps.
+    sal_Bool   bWritten : 1;      // TRUE: already written.
+    sal_Bool   bAutoFmt : 1;      // FALSE: it is a template.
                               // default is true!
-    BOOL   bFmtInDTOR : 1;    // TRUE: Format becomes deleted. In order to be able
+    sal_Bool   bFmtInDTOR : 1;    // TRUE: Format becomes deleted. In order to be able
                               // to recognize this in FmtChg-message!!
-    BOOL   bAutoUpdateFmt : 1;// TRUE: Set attributes of a whole paragraph
+    sal_Bool   bAutoUpdateFmt : 1;// TRUE: Set attributes of a whole paragraph
                               // at format (UI-side!).
 
 protected:
     SwFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
-            const USHORT* pWhichRanges, SwFmt *pDrvdFrm, USHORT nFmtWhich );
-    SwFmt( SwAttrPool& rPool, const String &rFmtNm, const USHORT* pWhichRanges,
-            SwFmt *pDrvdFrm, USHORT nFmtWhich );
+            const sal_uInt16* pWhichRanges, SwFmt *pDrvdFrm, sal_uInt16 nFmtWhich );
+    SwFmt( SwAttrPool& rPool, const String &rFmtNm, const sal_uInt16* pWhichRanges,
+            SwFmt *pDrvdFrm, sal_uInt16 nFmtWhich );
     SwFmt( const SwFmt& rFmt );
 
 public:
@@ -76,38 +76,38 @@ public:
     SwFmt &operator=(const SwFmt&);
 
     // for Querying of Writer-functions.
-    USHORT Which() const { return nWhichId; }
+    sal_uInt16 Which() const { return nWhichId; }
 
     virtual void Modify( SfxPoolItem* pOldValue, SfxPoolItem* pNewValue );
 
     // Query format information.
-    virtual BOOL GetInfo( SfxPoolItem& ) const;
+    virtual sal_Bool GetInfo( SfxPoolItem& ) const;
 
     // Copy attributes even among documents.
-    void CopyAttrs( const SwFmt&, BOOL bReplace=TRUE );
+    void CopyAttrs( const SwFmt&, sal_Bool bReplace=sal_True );
 
     // Delete all attributes that are not in rFmt.
     void DelDiffs( const SfxItemSet& rSet );
     void DelDiffs( const SwFmt& rFmt ) { DelDiffs( rFmt.GetAttrSet() ); }
 
     // 0 is Default.
-    BOOL SetDerivedFrom(SwFmt *pDerivedFrom = 0);
+    sal_Bool SetDerivedFrom(SwFmt *pDerivedFrom = 0);
 
     // If bInParents is FALSE, search only in this format for attribute.
-    inline const SfxPoolItem& GetFmtAttr( USHORT nWhich,
-                                          BOOL bInParents = TRUE ) const;
-    inline SfxItemState GetItemState( USHORT nWhich, BOOL bSrchInParent = TRUE,
+    inline const SfxPoolItem& GetFmtAttr( sal_uInt16 nWhich,
+                                          sal_Bool bInParents = sal_True ) const;
+    inline SfxItemState GetItemState( sal_uInt16 nWhich, sal_Bool bSrchInParent = sal_True,
                                     const SfxPoolItem **ppItem = 0 ) const;
-    virtual BOOL SetFmtAttr( const SfxPoolItem& rAttr );
-    virtual BOOL SetFmtAttr( const SfxItemSet& rSet );
-    virtual BOOL ResetFmtAttr( USHORT nWhich1, USHORT nWhich2 = 0 );
+    virtual sal_Bool SetFmtAttr( const SfxPoolItem& rAttr );
+    virtual sal_Bool SetFmtAttr( const SfxItemSet& rSet );
+    virtual sal_Bool ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 );
 
     // Takes all hints from Delta-Array,
     // returns count of deleted hints.
-    virtual USHORT ResetAllFmtAttr();
+    virtual sal_uInt16 ResetAllFmtAttr();
 
     inline SwFmt* DerivedFrom() const { return (SwFmt*)pRegisteredIn; }
-    inline BOOL IsDefault() const { return DerivedFrom() == 0; }
+    inline sal_Bool IsDefault() const { return DerivedFrom() == 0; }
 
     inline const String& GetName() const        { return aFmtName; }
     void SetName( const String& rNewName, sal_Bool bBroadcast=sal_False );
@@ -143,14 +143,14 @@ public:
     IDocumentChartDataProviderAccess* getIDocumentChartDataProviderAccess();
 
     // Get and set Pool style IDs.
-    USHORT GetPoolFmtId() const { return nPoolFmtId; }
-    void SetPoolFmtId( USHORT nId ) { nPoolFmtId = nId; }
+    sal_uInt16 GetPoolFmtId() const { return nPoolFmtId; }
+    void SetPoolFmtId( sal_uInt16 nId ) { nPoolFmtId = nId; }
 
     // Get and set Help-IDs for document templates.
-    USHORT GetPoolHelpId() const { return nPoolHelpId; }
-    void SetPoolHelpId( USHORT nId ) { nPoolHelpId = nId; }
-    BYTE GetPoolHlpFileId() const { return nPoolHlpFileId; }
-    void SetPoolHlpFileId( BYTE nId ) { nPoolHlpFileId = nId; }
+    sal_uInt16 GetPoolHelpId() const { return nPoolHelpId; }
+    void SetPoolHelpId( sal_uInt16 nId ) { nPoolHelpId = nId; }
+    sal_uInt8 GetPoolHlpFileId() const { return nPoolHlpFileId; }
+    void SetPoolHlpFileId( sal_uInt8 nId ) { nPoolHlpFileId = nId; }
 
     // Get attribute-description. Returns passed string.
     void GetPresentation( SfxItemPresentation ePres,
@@ -158,140 +158,140 @@ public:
         { aSet.GetPresentation( ePres, eCoreMetric, ePresMetric, rText ); }
 
     // Format-ID for reading/writing:
-    void   ResetWritten()    { bWritten = FALSE; }
+    void   ResetWritten()    { bWritten = sal_False; }
 
     // Query / set AutoFmt-flag.
-    BOOL IsAuto() const                 { return bAutoFmt; }
-    void SetAuto( BOOL bNew = FALSE )   { bAutoFmt = bNew; }
+    sal_Bool IsAuto() const                 { return bAutoFmt; }
+    void SetAuto( sal_Bool bNew = sal_False )   { bAutoFmt = bNew; }
 
     // Query / set bAutoUpdateFmt-flag.
-    BOOL IsAutoUpdateFmt() const                { return bAutoUpdateFmt; }
-    void SetAutoUpdateFmt( BOOL bNew = TRUE )   { bAutoUpdateFmt = bNew; }
+    sal_Bool IsAutoUpdateFmt() const                { return bAutoUpdateFmt; }
+    void SetAutoUpdateFmt( sal_Bool bNew = sal_True )   { bAutoUpdateFmt = bNew; }
 
-    BOOL IsFmtInDTOR() const { return bFmtInDTOR; }
+    sal_Bool IsFmtInDTOR() const { return bFmtInDTOR; }
 
     // GetMethods: Bool indicates whether to search only in Set (FALSE)
     // or also in Parents.
     // If nothing is found the defaulted attribute is returned.
 
     // Character-attributes - implemented in charatr.hxx
-    inline const SvxPostureItem      &GetPosture( BOOL = TRUE ) const;
-    inline const SvxWeightItem       &GetWeight( BOOL = TRUE ) const;
-    inline const SvxShadowedItem     &GetShadowed( BOOL = TRUE ) const;
-    inline const SvxAutoKernItem     &GetAutoKern( BOOL = TRUE ) const;
-    inline const SvxWordLineModeItem &GetWordLineMode( BOOL = TRUE ) const;
-    inline const SvxContourItem      &GetContour( BOOL = TRUE ) const;
-    inline const SvxKerningItem      &GetKerning( BOOL = TRUE ) const;
-    inline const SvxUnderlineItem    &GetUnderline( BOOL = TRUE ) const;
-    inline const SvxOverlineItem     &GetOverline( BOOL = TRUE ) const;
-    inline const SvxCrossedOutItem   &GetCrossedOut( BOOL = TRUE ) const;
-    inline const SvxFontHeightItem   &GetSize( BOOL = TRUE ) const;
-    inline const SvxPropSizeItem     &GetPropSize( BOOL = TRUE ) const;
-    inline const SvxFontItem         &GetFont( BOOL = TRUE ) const;
-    inline const SvxColorItem        &GetColor( BOOL = TRUE ) const;
-    inline const SvxCharSetColorItem &GetCharSetColor( BOOL = TRUE ) const;
-    inline const SvxLanguageItem     &GetLanguage( BOOL = TRUE ) const;
-    inline const SvxEscapementItem   &GetEscapement( BOOL = TRUE ) const;
-    inline const SvxCaseMapItem      &GetCaseMap( BOOL = TRUE ) const;
-    inline const SvxNoHyphenItem     &GetNoHyphenHere( BOOL = TRUE ) const;
-    inline const SvxBlinkItem        &GetBlink( BOOL = TRUE ) const;
-    inline const SvxBrushItem        &GetChrBackground( BOOL = TRUE ) const;
-
-    inline const SvxFontItem         &GetCJKFont( BOOL = TRUE ) const;
-    inline const SvxFontHeightItem   &GetCJKSize( BOOL = TRUE ) const;
-    inline const SvxLanguageItem     &GetCJKLanguage( BOOL = TRUE ) const;
-    inline const SvxPostureItem      &GetCJKPosture( BOOL = TRUE ) const;
-    inline const SvxWeightItem       &GetCJKWeight( BOOL = TRUE ) const;
-    inline const SvxFontItem         &GetCTLFont( BOOL = TRUE ) const;
-    inline const SvxFontHeightItem   &GetCTLSize( BOOL = TRUE ) const;
-    inline const SvxLanguageItem     &GetCTLLanguage( BOOL = TRUE ) const;
-    inline const SvxPostureItem      &GetCTLPosture( BOOL = TRUE ) const;
-    inline const SvxWeightItem       &GetCTLWeight( BOOL = TRUE ) const;
-    inline const SfxBoolItem           &GetWritingDirection( BOOL = TRUE ) const;
-    inline const SvxEmphasisMarkItem &GetEmphasisMark( BOOL = TRUE ) const;
-    inline const SvxTwoLinesItem   &Get2Lines( BOOL = TRUE ) const;
-    inline const SvxCharScaleWidthItem &GetCharScaleW( BOOL = TRUE ) const;
-    inline const SvxCharRotateItem     &GetCharRotate( BOOL = TRUE ) const;
-    inline const SvxCharReliefItem     &GetCharRelief( BOOL = TRUE ) const;
-    inline const SvxCharHiddenItem   &GetCharHidden( BOOL = TRUE ) const;
+    inline const SvxPostureItem      &GetPosture( sal_Bool = sal_True ) const;
+    inline const SvxWeightItem       &GetWeight( sal_Bool = sal_True ) const;
+    inline const SvxShadowedItem     &GetShadowed( sal_Bool = sal_True ) const;
+    inline const SvxAutoKernItem     &GetAutoKern( sal_Bool = sal_True ) const;
+    inline const SvxWordLineModeItem &GetWordLineMode( sal_Bool = sal_True ) const;
+    inline const SvxContourItem      &GetContour( sal_Bool = sal_True ) const;
+    inline const SvxKerningItem      &GetKerning( sal_Bool = sal_True ) const;
+    inline const SvxUnderlineItem    &GetUnderline( sal_Bool = sal_True ) const;
+    inline const SvxOverlineItem     &GetOverline( sal_Bool = sal_True ) const;
+    inline const SvxCrossedOutItem   &GetCrossedOut( sal_Bool = sal_True ) const;
+    inline const SvxFontHeightItem   &GetSize( sal_Bool = sal_True ) const;
+    inline const SvxPropSizeItem     &GetPropSize( sal_Bool = sal_True ) const;
+    inline const SvxFontItem         &GetFont( sal_Bool = sal_True ) const;
+    inline const SvxColorItem        &GetColor( sal_Bool = sal_True ) const;
+    inline const SvxCharSetColorItem &GetCharSetColor( sal_Bool = sal_True ) const;
+    inline const SvxLanguageItem     &GetLanguage( sal_Bool = sal_True ) const;
+    inline const SvxEscapementItem   &GetEscapement( sal_Bool = sal_True ) const;
+    inline const SvxCaseMapItem      &GetCaseMap( sal_Bool = sal_True ) const;
+    inline const SvxNoHyphenItem     &GetNoHyphenHere( sal_Bool = sal_True ) const;
+    inline const SvxBlinkItem        &GetBlink( sal_Bool = sal_True ) const;
+    inline const SvxBrushItem        &GetChrBackground( sal_Bool = sal_True ) const;
+
+    inline const SvxFontItem         &GetCJKFont( sal_Bool = sal_True ) const;
+    inline const SvxFontHeightItem   &GetCJKSize( sal_Bool = sal_True ) const;
+    inline const SvxLanguageItem     &GetCJKLanguage( sal_Bool = sal_True ) const;
+    inline const SvxPostureItem      &GetCJKPosture( sal_Bool = sal_True ) const;
+    inline const SvxWeightItem       &GetCJKWeight( sal_Bool = sal_True ) const;
+    inline const SvxFontItem         &GetCTLFont( sal_Bool = sal_True ) const;
+    inline const SvxFontHeightItem   &GetCTLSize( sal_Bool = sal_True ) const;
+    inline const SvxLanguageItem     &GetCTLLanguage( sal_Bool = sal_True ) const;
+    inline const SvxPostureItem      &GetCTLPosture( sal_Bool = sal_True ) const;
+    inline const SvxWeightItem       &GetCTLWeight( sal_Bool = sal_True ) const;
+    inline const SfxBoolItem           &GetWritingDirection( sal_Bool = sal_True ) const;
+    inline const SvxEmphasisMarkItem &GetEmphasisMark( sal_Bool = sal_True ) const;
+    inline const SvxTwoLinesItem   &Get2Lines( sal_Bool = sal_True ) const;
+    inline const SvxCharScaleWidthItem &GetCharScaleW( sal_Bool = sal_True ) const;
+    inline const SvxCharRotateItem     &GetCharRotate( sal_Bool = sal_True ) const;
+    inline const SvxCharReliefItem     &GetCharRelief( sal_Bool = sal_True ) const;
+    inline const SvxCharHiddenItem   &GetCharHidden( sal_Bool = sal_True ) const;
 
     // Frame-attributes - implemented in frmatr.hxx.
-    inline const SwFmtFillOrder           &GetFillOrder( BOOL = TRUE ) const;
-    inline const SwFmtFrmSize             &GetFrmSize( BOOL = TRUE ) const;
-    inline const SwFmtHeader          &GetHeader( BOOL = TRUE ) const;
-    inline const SwFmtFooter          &GetFooter( BOOL = TRUE ) const;
-    inline const SwFmtSurround            &GetSurround( BOOL = TRUE ) const;
-    inline const SwFmtHoriOrient      &GetHoriOrient( BOOL = TRUE ) const;
-    inline const SwFmtAnchor          &GetAnchor( BOOL = TRUE ) const;
-    inline const SwFmtCol                 &GetCol( BOOL = TRUE ) const;
-    inline const SvxPaperBinItem      &GetPaperBin( BOOL = TRUE ) const;
-    inline const SvxLRSpaceItem           &GetLRSpace( BOOL = TRUE ) const;
-    inline const SvxULSpaceItem           &GetULSpace( BOOL = TRUE ) const;
-    inline const SwFmtCntnt           &GetCntnt( BOOL = TRUE ) const;
-    inline const SvxPrintItem             &GetPrint( BOOL = TRUE ) const;
-    inline const SvxOpaqueItem            &GetOpaque( BOOL = TRUE ) const;
-    inline const SvxProtectItem           &GetProtect( BOOL = TRUE ) const;
-    inline const SwFmtVertOrient      &GetVertOrient( BOOL = TRUE ) const;
-    inline const SvxBoxItem               &GetBox( BOOL = TRUE ) const;
-    inline const SvxFmtKeepItem         &GetKeep( BOOL = TRUE ) const;
-    inline const SvxBrushItem           &GetBackground( BOOL = TRUE ) const;
-    inline const SvxShadowItem            &GetShadow( BOOL = TRUE ) const;
-    inline const SwFmtPageDesc            &GetPageDesc( BOOL = TRUE ) const;
-    inline const SvxFmtBreakItem      &GetBreak( BOOL = TRUE ) const;
-    inline const SvxMacroItem             &GetMacro( BOOL = TRUE ) const;
-    inline const SwFmtURL             &GetURL( BOOL = TRUE ) const;
-    inline const SwFmtEditInReadonly  &GetEditInReadonly( BOOL = TRUE ) const;
-    inline const SwFmtLayoutSplit     &GetLayoutSplit( BOOL = TRUE ) const;
-    inline const SwFmtRowSplit          &GetRowSplit( BOOL = TRUE ) const;
-    inline const SwFmtChain               &GetChain( BOOL = TRUE ) const;
-    inline const SwFmtLineNumber      &GetLineNumber( BOOL = TRUE ) const;
-    inline const SwFmtFtnAtTxtEnd     &GetFtnAtTxtEnd( BOOL = TRUE ) const;
-    inline const SwFmtEndAtTxtEnd     &GetEndAtTxtEnd( BOOL = TRUE ) const;
-    inline const SwFmtNoBalancedColumns &GetBalancedColumns( BOOL = TRUE ) const;
-    inline const SvxFrameDirectionItem    &GetFrmDir( BOOL = TRUE ) const;
-    inline const SwTextGridItem         &GetTextGrid( BOOL = TRUE ) const;
-    inline const SwHeaderAndFooterEatSpacingItem &GetHeaderAndFooterEatSpacing( BOOL = TRUE ) const;
+    inline const SwFmtFillOrder           &GetFillOrder( sal_Bool = sal_True ) const;
+    inline const SwFmtFrmSize             &GetFrmSize( sal_Bool = sal_True ) const;
+    inline const SwFmtHeader          &GetHeader( sal_Bool = sal_True ) const;
+    inline const SwFmtFooter          &GetFooter( sal_Bool = sal_True ) const;
+    inline const SwFmtSurround            &GetSurround( sal_Bool = sal_True ) const;
+    inline const SwFmtHoriOrient      &GetHoriOrient( sal_Bool = sal_True ) const;
+    inline const SwFmtAnchor          &GetAnchor( sal_Bool = sal_True ) const;
+    inline const SwFmtCol                 &GetCol( sal_Bool = sal_True ) const;
+    inline const SvxPaperBinItem      &GetPaperBin( sal_Bool = sal_True ) const;
+    inline const SvxLRSpaceItem           &GetLRSpace( sal_Bool = sal_True ) const;
+    inline const SvxULSpaceItem           &GetULSpace( sal_Bool = sal_True ) const;
+    inline const SwFmtCntnt           &GetCntnt( sal_Bool = sal_True ) const;
+    inline const SvxPrintItem             &GetPrint( sal_Bool = sal_True ) const;
+    inline const SvxOpaqueItem            &GetOpaque( sal_Bool = sal_True ) const;
+    inline const SvxProtectItem           &GetProtect( sal_Bool = sal_True ) const;
+    inline const SwFmtVertOrient      &GetVertOrient( sal_Bool = sal_True ) const;
+    inline const SvxBoxItem               &GetBox( sal_Bool = sal_True ) const;
+    inline const SvxFmtKeepItem         &GetKeep( sal_Bool = sal_True ) const;
+    inline const SvxBrushItem           &GetBackground( sal_Bool = sal_True ) const;
+    inline const SvxShadowItem            &GetShadow( sal_Bool = sal_True ) const;
+    inline const SwFmtPageDesc            &GetPageDesc( sal_Bool = sal_True ) const;
+    inline const SvxFmtBreakItem      &GetBreak( sal_Bool = sal_True ) const;
+    inline const SvxMacroItem             &GetMacro( sal_Bool = sal_True ) const;
+    inline const SwFmtURL             &GetURL( sal_Bool = sal_True ) const;
+    inline const SwFmtEditInReadonly  &GetEditInReadonly( sal_Bool = sal_True ) const;
+    inline const SwFmtLayoutSplit     &GetLayoutSplit( sal_Bool = sal_True ) const;
+    inline const SwFmtRowSplit          &GetRowSplit( sal_Bool = sal_True ) const;
+    inline const SwFmtChain               &GetChain( sal_Bool = sal_True ) const;
+    inline const SwFmtLineNumber      &GetLineNumber( sal_Bool = sal_True ) const;
+    inline const SwFmtFtnAtTxtEnd     &GetFtnAtTxtEnd( sal_Bool = sal_True ) const;
+    inline const SwFmtEndAtTxtEnd     &GetEndAtTxtEnd( sal_Bool = sal_True ) const;
+    inline const SwFmtNoBalancedColumns &GetBalancedColumns( sal_Bool = sal_True ) const;
+    inline const SvxFrameDirectionItem    &GetFrmDir( sal_Bool = sal_True ) const;
+    inline const SwTextGridItem         &GetTextGrid( sal_Bool = sal_True ) const;
+    inline const SwHeaderAndFooterEatSpacingItem &GetHeaderAndFooterEatSpacing( sal_Bool = sal_True ) const;
     // #i18732#
-    inline const SwFmtFollowTextFlow    &GetFollowTextFlow(BOOL = TRUE) const;
+    inline const SwFmtFollowTextFlow    &GetFollowTextFlow(sal_Bool = sal_True) const;
     // #i28701#
-    inline const SwFmtWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(BOOL = TRUE) const;
+    inline const SwFmtWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(sal_Bool = sal_True) const;
 
     // Graphics-attributes - implemented in grfatr.hxx
-    inline const SwMirrorGrf          &GetMirrorGrf( BOOL = TRUE ) const;
-    inline const SwCropGrf            &GetCropGrf( BOOL = TRUE ) const;
-    inline const SwRotationGrf            &GetRotationGrf(BOOL = TRUE ) const;
-    inline const SwLuminanceGrf       &GetLuminanceGrf(BOOL = TRUE ) const;
-    inline const SwContrastGrf            &GetContrastGrf(BOOL = TRUE ) const;
-    inline const SwChannelRGrf            &GetChannelRGrf(BOOL = TRUE ) const;
-    inline const SwChannelGGrf            &GetChannelGGrf(BOOL = TRUE ) const;
-    inline const SwChannelBGrf            &GetChannelBGrf(BOOL = TRUE ) const;
-    inline const SwGammaGrf           &GetGammaGrf(BOOL = TRUE ) const;
-    inline const SwInvertGrf          &GetInvertGrf(BOOL = TRUE ) const;
-    inline const SwTransparencyGrf        &GetTransparencyGrf(BOOL = TRUE ) const;
-    inline const SwDrawModeGrf            &GetDrawModeGrf(BOOL = TRUE ) const;
+    inline const SwMirrorGrf          &GetMirrorGrf( sal_Bool = sal_True ) const;
+    inline const SwCropGrf            &GetCropGrf( sal_Bool = sal_True ) const;
+    inline const SwRotationGrf            &GetRotationGrf(sal_Bool = sal_True ) const;
+    inline const SwLuminanceGrf       &GetLuminanceGrf(sal_Bool = sal_True ) const;
+    inline const SwContrastGrf            &GetContrastGrf(sal_Bool = sal_True ) const;
+    inline const SwChannelRGrf            &GetChannelRGrf(sal_Bool = sal_True ) const;
+    inline const SwChannelGGrf            &GetChannelGGrf(sal_Bool = sal_True ) const;
+    inline const SwChannelBGrf            &GetChannelBGrf(sal_Bool = sal_True ) const;
+    inline const SwGammaGrf           &GetGammaGrf(sal_Bool = sal_True ) const;
+    inline const SwInvertGrf          &GetInvertGrf(sal_Bool = sal_True ) const;
+    inline const SwTransparencyGrf        &GetTransparencyGrf(sal_Bool = sal_True ) const;
+    inline const SwDrawModeGrf            &GetDrawModeGrf(sal_Bool = sal_True ) const;
 
     // Paragraph-attributes - implemented in paratr.hxx.
-    inline const SvxLineSpacingItem       &GetLineSpacing( BOOL = TRUE ) const;
-    inline const SvxAdjustItem            &GetAdjust( BOOL = TRUE ) const;
-    inline const SvxFmtSplitItem      &GetSplit( BOOL = TRUE ) const;
-    inline const SwRegisterItem           &GetRegister( BOOL = TRUE ) const;
-    inline const SwNumRuleItem            &GetNumRule( BOOL = TRUE ) const;
-    inline const SvxWidowsItem            &GetWidows( BOOL = TRUE ) const;
-    inline const SvxOrphansItem           &GetOrphans( BOOL = TRUE ) const;
-    inline const SvxTabStopItem           &GetTabStops( BOOL = TRUE ) const;
-    inline const SvxHyphenZoneItem        &GetHyphenZone( BOOL = TRUE ) const;
-    inline const SwFmtDrop                &GetDrop( BOOL = TRUE ) const;
-    inline const SvxScriptSpaceItem       &GetScriptSpace(BOOL = TRUE) const;
-    inline const SvxHangingPunctuationItem &GetHangingPunctuation(BOOL = TRUE) const;
-    inline const SvxForbiddenRuleItem     &GetForbiddenRule(BOOL = TRUE) const;
-    inline const SvxParaVertAlignItem &GetParaVertAlign(BOOL = TRUE) const;
-    inline const SvxParaGridItem        &GetParaGrid(BOOL = TRUE) const;
-    inline const SwParaConnectBorderItem &GetParaConnectBorder(BOOL = TRUE ) const;
+    inline const SvxLineSpacingItem       &GetLineSpacing( sal_Bool = sal_True ) const;
+    inline const SvxAdjustItem            &GetAdjust( sal_Bool = sal_True ) const;
+    inline const SvxFmtSplitItem      &GetSplit( sal_Bool = sal_True ) const;
+    inline const SwRegisterItem           &GetRegister( sal_Bool = sal_True ) const;
+    inline const SwNumRuleItem            &GetNumRule( sal_Bool = sal_True ) const;
+    inline const SvxWidowsItem            &GetWidows( sal_Bool = sal_True ) const;
+    inline const SvxOrphansItem           &GetOrphans( sal_Bool = sal_True ) const;
+    inline const SvxTabStopItem           &GetTabStops( sal_Bool = sal_True ) const;
+    inline const SvxHyphenZoneItem        &GetHyphenZone( sal_Bool = sal_True ) const;
+    inline const SwFmtDrop                &GetDrop( sal_Bool = sal_True ) const;
+    inline const SvxScriptSpaceItem       &GetScriptSpace(sal_Bool = sal_True) const;
+    inline const SvxHangingPunctuationItem &GetHangingPunctuation(sal_Bool = sal_True) const;
+    inline const SvxForbiddenRuleItem     &GetForbiddenRule(sal_Bool = sal_True) const;
+    inline const SvxParaVertAlignItem &GetParaVertAlign(sal_Bool = sal_True) const;
+    inline const SvxParaGridItem        &GetParaGrid(sal_Bool = sal_True) const;
+    inline const SwParaConnectBorderItem &GetParaConnectBorder(sal_Bool = sal_True ) const;
 
     // TableBox attributes - implemented in cellatr.hxx.
-    inline  const SwTblBoxNumFormat     &GetTblBoxNumFmt( BOOL = TRUE ) const;
-    inline  const SwTblBoxFormula       &GetTblBoxFormula( BOOL = TRUE ) const;
-    inline  const SwTblBoxValue         &GetTblBoxValue( BOOL = TRUE ) const;
+    inline  const SwTblBoxNumFormat     &GetTblBoxNumFmt( sal_Bool = sal_True ) const;
+    inline  const SwTblBoxFormula       &GetTblBoxFormula( sal_Bool = sal_True ) const;
+    inline  const SwTblBoxValue         &GetTblBoxValue( sal_Bool = sal_True ) const;
 
     /** SwFmt::IsBackgroundTransparent
 
@@ -320,8 +320,8 @@ public:
 
 // --------------- inline Implementations ------------------------
 
-inline const SfxPoolItem& SwFmt::GetFmtAttr( USHORT nWhich,
-                                             BOOL bInParents ) const
+inline const SfxPoolItem& SwFmt::GetFmtAttr( sal_uInt16 nWhich,
+                                             sal_Bool bInParents ) const
 {
     return aSet.Get( nWhich, bInParents );
 }
@@ -333,7 +333,7 @@ inline void SwFmt::SetName( const sal_Char* pNewName,
     SetName( aTmp, bBroadcast );
 }
 
-inline SfxItemState SwFmt::GetItemState( USHORT nWhich, BOOL bSrchInParent,
+inline SfxItemState SwFmt::GetItemState( sal_uInt16 nWhich, sal_Bool bSrchInParent,
                                         const SfxPoolItem **ppItem ) const
 {
     return aSet.GetItemState( nWhich, bSrchInParent, ppItem );