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

diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index 49e993581649..7d0b8a816f03 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -31,7 +31,7 @@
 #define _SVSTDARR_STRINGS
 
 #include <string.h>
-#include <stdio.h>          // sscanf
+#include <stdio.h>                      // sscanf
 #include <hintids.hxx>
 #include <i18npool/lang.h>
 #include <i18npool/mslangid.hxx>
@@ -78,7 +78,7 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star;
 
 SwRead ReadAscii = 0, /*ReadSwg = 0, ReadSw3 = 0,*/
-        ReadHTML = 0, ReadXML = 0;
+                ReadHTML = 0, ReadXML = 0;
 
 Reader* GetRTFReader();
 Reader* GetWW8Reader();
@@ -87,17 +87,17 @@ Reader* GetWW8Reader();
 // ReaderWriterEnum and aFilterDetect in shellio.hxx
 SwReaderWriterEntry aReaderWriter[] =
 {
-    SwReaderWriterEntry( &::GetRTFReader, &::GetRTFWriter,  TRUE  ),
-    SwReaderWriterEntry( 0,               &::GetASCWriter,  FALSE ),
-    SwReaderWriterEntry( &::GetWW8Reader, &::GetWW8Writer,  TRUE  ),
-    SwReaderWriterEntry( &::GetWW8Reader, &::GetWW8Writer,  TRUE  ),
-    SwReaderWriterEntry( &::GetRTFReader, &::GetRTFWriter,  TRUE  ),
-    SwReaderWriterEntry( 0,               &::GetHTMLWriter, TRUE  ),
-    SwReaderWriterEntry( 0,               0,                TRUE  ),
-    SwReaderWriterEntry( &::GetWW8Reader, 0,                TRUE  ),
-    SwReaderWriterEntry( 0,               &::GetXMLWriter,  TRUE  ),
-    SwReaderWriterEntry( 0,               &::GetASCWriter,  TRUE  ),
-    SwReaderWriterEntry( 0,               &::GetASCWriter,  TRUE  )
+    SwReaderWriterEntry( &::GetRTFReader, &::GetRTFWriter,  sal_True  ),
+    SwReaderWriterEntry( 0,               &::GetASCWriter,  sal_False ),
+    SwReaderWriterEntry( &::GetWW8Reader, &::GetWW8Writer,  sal_True  ),
+    SwReaderWriterEntry( &::GetWW8Reader, &::GetWW8Writer,  sal_True  ),
+    SwReaderWriterEntry( &::GetRTFReader, &::GetRTFWriter,  sal_True  ),
+    SwReaderWriterEntry( 0,               &::GetHTMLWriter, sal_True  ),
+    SwReaderWriterEntry( 0,               0,                sal_True  ),
+    SwReaderWriterEntry( &::GetWW8Reader, 0,                sal_True  ),
+    SwReaderWriterEntry( 0,               &::GetXMLWriter,  sal_True  ),
+    SwReaderWriterEntry( 0,               &::GetASCWriter,  sal_True  ),
+    SwReaderWriterEntry( 0,               &::GetASCWriter,  sal_True  )
 };
 
 Reader* SwReaderWriterEntry::GetReader()
@@ -122,7 +122,7 @@ void SwReaderWriterEntry::GetWriter( const String& rNm, const String& rBaseURL,
 
 SwRead SwGetReaderXML() // SW_DLLPUBLIC
 {
-    return ReadXML;
+        return ReadXML;
 }
 
 bool IsDocShellRegistered()
@@ -130,9 +130,9 @@ bool IsDocShellRegistered()
     return 0 != SwDocShell::_GetInterface();
 }
 
-inline void _SetFltPtr( USHORT rPos, SwRead pReader )
+inline void _SetFltPtr( sal_uInt16 rPos, SwRead pReader )
 {
-    aReaderWriter[ rPos ].pReader = pReader;
+        aReaderWriter[ rPos ].pReader = pReader;
 }
 
 void _InitFilter()
@@ -147,13 +147,13 @@ void _InitFilter()
 
 void _FinitFilter()
 {
-    // die Reader vernichten
-    for( USHORT n = 0; n < MAXFILTER; ++n )
-    {
-        SwReaderWriterEntry& rEntry = aReaderWriter[n];
-        if( rEntry.bDelReader && rEntry.pReader )
-            delete rEntry.pReader, rEntry.pReader = NULL;
-    }
+        // die Reader vernichten
+        for( sal_uInt16 n = 0; n < MAXFILTER; ++n )
+        {
+                SwReaderWriterEntry& rEntry = aReaderWriter[n];
+                if( rEntry.bDelReader && rEntry.pReader )
+                        delete rEntry.pReader, rEntry.pReader = NULL;
+        }
 }
 
 
@@ -168,27 +168,27 @@ Reader* GetReader( ReaderWriterEnum eReader )
 
 void GetWriter( const String& rFltName, const String& rBaseURL, WriterRef& xRet )
 {
-    for( USHORT n = 0; n < MAXFILTER; ++n )
-        if( aFilterDetect[n].IsFilter( rFltName ) )
-        {
+        for( sal_uInt16 n = 0; n < MAXFILTER; ++n )
+                if( aFilterDetect[n].IsFilter( rFltName ) )
+                {
             aReaderWriter[n].GetWriter( rFltName, rBaseURL, xRet );
-            break;
-        }
+                        break;
+                }
 }
 
 SwRead GetReader( const String& rFltName )
 {
-    SwRead pRead = 0;
-    for( USHORT n = 0; n < MAXFILTER; ++n )
-        if( aFilterDetect[n].IsFilter( rFltName ) )
-        {
-            pRead = aReaderWriter[n].GetReader();
-            // fuer einige Reader noch eine Sonderbehandlung:
-            if ( pRead )
-                pRead->SetFltName( rFltName );
-            break;
-        }
-    return pRead;
+        SwRead pRead = 0;
+        for( sal_uInt16 n = 0; n < MAXFILTER; ++n )
+                if( aFilterDetect[n].IsFilter( rFltName ) )
+                {
+                        pRead = aReaderWriter[n].GetReader();
+                        // fuer einige Reader noch eine Sonderbehandlung:
+                        if ( pRead )
+                                pRead->SetFltName( rFltName );
+                        break;
+                }
+        return pRead;
 }
 
 } // namespace SwReaderWriter
@@ -199,24 +199,24 @@ void Writer::SetPasswd( const String& ) {}
 void Writer::SetVersion( const String&, long ) {}
 
 
-BOOL Writer::IsStgWriter() const { return FALSE; }
+sal_Bool Writer::IsStgWriter() const { return sal_False; }
 
-BOOL StgWriter::IsStgWriter() const { return TRUE; }
+sal_Bool StgWriter::IsStgWriter() const { return sal_True; }
 
 /*  */
 
 
 
-BOOL SwReader::NeedsPasswd( const Reader& /*rOptions*/ )
+sal_Bool SwReader::NeedsPasswd( const Reader& /*rOptions*/ )
 {
-    BOOL bRes = FALSE;
+        sal_Bool bRes = sal_False;
     return bRes;
 }
 
 
-BOOL SwReader::CheckPasswd( const String& /*rPasswd*/, const Reader& /*rOptions*/ )
+sal_Bool SwReader::CheckPasswd( const String& /*rPasswd*/, const Reader& /*rOptions*/ )
 {
-    return TRUE;
+    return sal_True;
 }
 
 
@@ -261,38 +261,38 @@ BOOL SwReader::CheckPasswd( const String& /*rPasswd*/, const Reader& /*rOptions*
 </FilterFlags>
 */
 
-#define FILTER_OPTION_ROOT      String::CreateFromAscii( \
-                RTL_CONSTASCII_STRINGPARAM( "Office.Writer/FilterFlags" ) )
+#define FILTER_OPTION_ROOT              String::CreateFromAscii( \
+                                RTL_CONSTASCII_STRINGPARAM( "Office.Writer/FilterFlags" ) )
 
 SwFilterOptions::SwFilterOptions( sal_uInt16 nCnt, const sal_Char** ppNames,
-                                  sal_uInt32* pValues )
-    : ConfigItem( FILTER_OPTION_ROOT )
+                                                                sal_uInt32* pValues )
+        : ConfigItem( FILTER_OPTION_ROOT )
 {
-    GetValues( nCnt, ppNames, pValues );
+        GetValues( nCnt, ppNames, pValues );
 }
 
 void SwFilterOptions::GetValues( sal_uInt16 nCnt, const sal_Char** ppNames,
-                                      sal_uInt32* pValues )
+                                                                        sal_uInt32* pValues )
 {
-    Sequence<OUString> aNames( nCnt );
-    OUString* pNames = aNames.getArray();
-    USHORT n;
-
-    for( n = 0; n < nCnt; ++n )
-        pNames[ n ] = OUString::createFromAscii( ppNames[ n ] );
-    Sequence<Any> aValues = GetProperties( aNames );
+        Sequence<OUString> aNames( nCnt );
+        OUString* pNames = aNames.getArray();
+        sal_uInt16 n;
 
-    if( nCnt == aValues.getLength() )
-    {
-        const Any* pAnyValues = aValues.getConstArray();
         for( n = 0; n < nCnt; ++n )
-            pValues[ n ] = pAnyValues[ n ].hasValue()
-                            ? *(sal_uInt32*)pAnyValues[ n ].getValue()
-                            : 0;
-    }
-    else
-        for( n = 0; n < nCnt; ++n )
-            pValues[ n ] = 0;
+                pNames[ n ] = OUString::createFromAscii( ppNames[ n ] );
+        Sequence<Any> aValues = GetProperties( aNames );
+
+        if( nCnt == aValues.getLength() )
+        {
+                const Any* pAnyValues = aValues.getConstArray();
+                for( n = 0; n < nCnt; ++n )
+                        pValues[ n ] = pAnyValues[ n ].hasValue()
+                                                        ? *(sal_uInt32*)pAnyValues[ n ].getValue()
+                                                        : 0;
+        }
+        else
+                for( n = 0; n < nCnt; ++n )
+                        pValues[ n ] = 0;
 }
 
 void SwFilterOptions::Commit() {}
@@ -303,66 +303,66 @@ void SwFilterOptions::Notify( const ::com::sun::star::uno::Sequence< rtl::OUStri
 
 void StgReader::SetFltName( const String& rFltNm )
 {
-    if( SW_STORAGE_READER & GetReaderType() )
-        aFltName = rFltNm;
+        if( SW_STORAGE_READER & GetReaderType() )
+                aFltName = rFltNm;
 }
 
 
 /*  */
 
-SwRelNumRuleSpaces::SwRelNumRuleSpaces( SwDoc& rDoc, BOOL bNDoc )
-    : bNewDoc( bNDoc )
+SwRelNumRuleSpaces::SwRelNumRuleSpaces( SwDoc& rDoc, sal_Bool bNDoc )
+        : bNewDoc( bNDoc )
 {
-    pNumRuleTbl = new SwNumRuleTbl( 8, 8 );
-    if( !bNDoc )
-        pNumRuleTbl->Insert( &rDoc.GetNumRuleTbl(), 0 );
+        pNumRuleTbl = new SwNumRuleTbl( 8, 8 );
+        if( !bNDoc )
+                pNumRuleTbl->Insert( &rDoc.GetNumRuleTbl(), 0 );
 }
 
 SwRelNumRuleSpaces::~SwRelNumRuleSpaces()
 {
-    if( pNumRuleTbl )
-    {
-        pNumRuleTbl->Remove( 0, pNumRuleTbl->Count() );
-        delete pNumRuleTbl;
-    }
+        if( pNumRuleTbl )
+        {
+                pNumRuleTbl->Remove( 0, pNumRuleTbl->Count() );
+                delete pNumRuleTbl;
+        }
 }
 
 void SwRelNumRuleSpaces::SetNumRelSpaces( SwDoc& rDoc )
 {
-    const SwNumRuleTbl* pRuleTbl = NULL;
+        const SwNumRuleTbl* pRuleTbl = NULL;
 
-    if( !bNewDoc )
-    {
-        // jetzt alle schon vorhanden NumRules aus dem Array entfernen,
-        // damit nur die neuen angepasst werden
-        SwNumRuleTbl aNumRuleTbl;
-        aNumRuleTbl.Insert( pNumRuleTbl, 0 );
-        pNumRuleTbl->Remove( 0, pNumRuleTbl->Count() );
-        const SwNumRuleTbl& rRuleTbl = rDoc.GetNumRuleTbl();
-        SwNumRule* pRule;
+        if( !bNewDoc )
+        {
+                // jetzt alle schon vorhanden NumRules aus dem Array entfernen,
+                // damit nur die neuen angepasst werden
+                SwNumRuleTbl aNumRuleTbl;
+                aNumRuleTbl.Insert( pNumRuleTbl, 0 );
+                pNumRuleTbl->Remove( 0, pNumRuleTbl->Count() );
+                const SwNumRuleTbl& rRuleTbl = rDoc.GetNumRuleTbl();
+                SwNumRule* pRule;
 
-        for( USHORT n = 0; n < rRuleTbl.Count(); ++n )
-            if( USHRT_MAX == aNumRuleTbl.GetPos( ( pRule = rRuleTbl[ n ] )))
-                // war noch nicht vorhanden, also neu
-                pNumRuleTbl->Insert( pRule, pNumRuleTbl->Count() );
+                for( sal_uInt16 n = 0; n < rRuleTbl.Count(); ++n )
+                        if( USHRT_MAX == aNumRuleTbl.GetPos( ( pRule = rRuleTbl[ n ] )))
+                                // war noch nicht vorhanden, also neu
+                                pNumRuleTbl->Insert( pRule, pNumRuleTbl->Count() );
 
-        aNumRuleTbl.Remove( 0, aNumRuleTbl.Count() );
+                aNumRuleTbl.Remove( 0, aNumRuleTbl.Count() );
 
         pRuleTbl = pNumRuleTbl;
-    }
+        }
     else
     {
         pRuleTbl = &rDoc.GetNumRuleTbl();
     }
 
-    if( pRuleTbl )
-    {
-        for( USHORT n = pRuleTbl->Count(); n; )
+        if( pRuleTbl )
         {
-            SwNumRule* pRule = (*pRuleTbl)[ --n ];
-            // Rule noch gueltig und am Doc vorhanden?
-            if( USHRT_MAX != rDoc.GetNumRuleTbl().GetPos( pRule ))
-            {
+                for( sal_uInt16 n = pRuleTbl->Count(); n; )
+                {
+                        SwNumRule* pRule = (*pRuleTbl)[ --n ];
+                        // Rule noch gueltig und am Doc vorhanden?
+                        if( USHRT_MAX != rDoc.GetNumRuleTbl().GetPos( pRule ))
+                        {
                 SwNumRule::tTxtNodeList aTxtNodeList;
                 pRule->GetTxtNodeList( aTxtNodeList );
                 for ( SwNumRule::tTxtNodeList::iterator aIter = aTxtNodeList.begin();
@@ -371,220 +371,220 @@ void SwRelNumRuleSpaces::SetNumRelSpaces( SwDoc& rDoc )
                     SwTxtNode* pNd = *aIter;
                     SetNumLSpace( *pNd, *pRule );
                 }
-            }
+                        }
+                }
         }
-    }
 
-    if( pNumRuleTbl )
-    {
-        pNumRuleTbl->Remove( 0, pNumRuleTbl->Count() );
-        delete pNumRuleTbl, pNumRuleTbl = 0;
-    }
+        if( pNumRuleTbl )
+        {
+                pNumRuleTbl->Remove( 0, pNumRuleTbl->Count() );
+                delete pNumRuleTbl, pNumRuleTbl = 0;
+        }
 
-    if( bNewDoc )
-    {
-        SetOultineRelSpaces( SwNodeIndex( rDoc.GetNodes() ),
-                            SwNodeIndex( rDoc.GetNodes().GetEndOfContent()));
-    }
+        if( bNewDoc )
+        {
+                SetOultineRelSpaces( SwNodeIndex( rDoc.GetNodes() ),
+                                                        SwNodeIndex( rDoc.GetNodes().GetEndOfContent()));
+        }
 }
 
 void SwRelNumRuleSpaces::SetOultineRelSpaces( const SwNodeIndex& rStt,
-                                            const SwNodeIndex& rEnd )
+                                                                                        const SwNodeIndex& rEnd )
 {
-    SwDoc* pDoc = rStt.GetNode().GetDoc();
-    const SwOutlineNodes& rOutlNds = pDoc->GetNodes().GetOutLineNds();
-    if( rOutlNds.Count() )
-    {
-        USHORT nPos;
-        rOutlNds.Seek_Entry( &rStt.GetNode(), &nPos );
-        for( ; nPos < rOutlNds.Count() &&
-                rOutlNds[ nPos ]->GetIndex() < rEnd.GetIndex(); ++nPos )
+        SwDoc* pDoc = rStt.GetNode().GetDoc();
+        const SwOutlineNodes& rOutlNds = pDoc->GetNodes().GetOutLineNds();
+        if( rOutlNds.Count() )
         {
-            SwTxtNode* pNd = rOutlNds[ nPos ]->GetTxtNode();
-            if( pNd->IsOutline() && !pNd->GetNumRule() )
-                SetNumLSpace( *pNd, *pDoc->GetOutlineNumRule() );
+                sal_uInt16 nPos;
+                rOutlNds.Seek_Entry( &rStt.GetNode(), &nPos );
+                for( ; nPos < rOutlNds.Count() &&
+                                rOutlNds[ nPos ]->GetIndex() < rEnd.GetIndex(); ++nPos )
+                {
+                        SwTxtNode* pNd = rOutlNds[ nPos ]->GetTxtNode();
+                        if( pNd->IsOutline() && !pNd->GetNumRule() )
+                                SetNumLSpace( *pNd, *pDoc->GetOutlineNumRule() );
+                }
         }
-    }
 }
 
 void SwRelNumRuleSpaces::SetNumLSpace( SwTxtNode& rNd, const SwNumRule& rRule )
 {
-    BOOL bOutlineRule = OUTLINE_RULE == rRule.GetRuleType();
+        sal_Bool bOutlineRule = OUTLINE_RULE == rRule.GetRuleType();
     // correction of refactoring done by cws swnumtree:
     // - assure a correct level for retrieving numbering format.
-    BYTE nLvl = 0;
+    sal_uInt8 nLvl = 0;
     if ( rNd.GetActualListLevel() >= 0 && rNd.GetActualListLevel() < MAXLEVEL )
     {
-        nLvl = static_cast< BYTE >(rNd.GetActualListLevel());
+        nLvl = static_cast< sal_uInt8 >(rNd.GetActualListLevel());
     }
 
-    const SwNumFmt& rFmt = rRule.Get( nLvl );
-    const SvxLRSpaceItem& rLR = rNd.GetSwAttrSet().GetLRSpace();
+        const SwNumFmt& rFmt = rRule.Get( nLvl );
+        const SvxLRSpaceItem& rLR = rNd.GetSwAttrSet().GetLRSpace();
 
-    SvxLRSpaceItem aLR( rLR );
-    aLR.SetTxtFirstLineOfst( 0 );
+        SvxLRSpaceItem aLR( rLR );
+        aLR.SetTxtFirstLineOfst( 0 );
 
-    // sagt der Node, das die Numerierung den Wert vorgibt?
-    if( !bOutlineRule && rNd.IsSetNumLSpace() )
-        aLR.SetTxtLeft( 0 );
-    else
-    {
-        long nLeft = rFmt.GetAbsLSpace(), nParaLeft = rLR.GetTxtLeft();
-        if( 0 < rLR.GetTxtFirstLineOfst() )
-            nParaLeft += rLR.GetTxtFirstLineOfst();
-        else if( nParaLeft >= nLeft )
-            // set correct paragraph indent
-            nParaLeft -= nLeft;
+        // sagt der Node, das die Numerierung den Wert vorgibt?
+        if( !bOutlineRule && rNd.IsSetNumLSpace() )
+                aLR.SetTxtLeft( 0 );
         else
-            nParaLeft = rLR.GetTxtLeft()+rLR.GetTxtFirstLineOfst();
-        aLR.SetTxtLeft( nParaLeft );
-    }
+        {
+                long nLeft = rFmt.GetAbsLSpace(), nParaLeft = rLR.GetTxtLeft();
+                if( 0 < rLR.GetTxtFirstLineOfst() )
+                        nParaLeft += rLR.GetTxtFirstLineOfst();
+                else if( nParaLeft >= nLeft )
+            // set correct paragraph indent
+                        nParaLeft -= nLeft;
+                else
+                        nParaLeft = rLR.GetTxtLeft()+rLR.GetTxtFirstLineOfst();
+                aLR.SetTxtLeft( nParaLeft );
+        }
 
-    if( aLR.GetTxtLeft() != rLR.GetTxtLeft() )
-    {
-        //bevor rLR geloescht wird!
-        long nOffset = rLR.GetTxtLeft() - aLR.GetTxtLeft();
+        if( aLR.GetTxtLeft() != rLR.GetTxtLeft() )
+        {
+                //bevor rLR geloescht wird!
+                long nOffset = rLR.GetTxtLeft() - aLR.GetTxtLeft();
         rNd.SetAttr( aLR );
 
-        // Tabs anpassen !!
-        const SfxPoolItem* pItem;
-        if( SFX_ITEM_SET == rNd.GetSwAttrSet().GetItemState(
-                RES_PARATR_TABSTOP, TRUE, &pItem ))
-        {
-            SvxTabStopItem aTStop( *(SvxTabStopItem*)pItem );
-            for( USHORT n = 0; n < aTStop.Count(); ++n )
-            {
-                SvxTabStop& rTab = (SvxTabStop&)aTStop[ n ];
-                if( SVX_TAB_ADJUST_DEFAULT != rTab.GetAdjustment() )
+                // Tabs anpassen !!
+                const SfxPoolItem* pItem;
+                if( SFX_ITEM_SET == rNd.GetSwAttrSet().GetItemState(
+                                RES_PARATR_TABSTOP, sal_True, &pItem ))
                 {
-                    if( !rTab.GetTabPos() )
-                    {
-                        aTStop.Remove( n );
-                        --n;
-                    }
-                    else
-                        rTab.GetTabPos() += nOffset;
-                }
-            }
+                        SvxTabStopItem aTStop( *(SvxTabStopItem*)pItem );
+                        for( sal_uInt16 n = 0; n < aTStop.Count(); ++n )
+                        {
+                                SvxTabStop& rTab = (SvxTabStop&)aTStop[ n ];
+                                if( SVX_TAB_ADJUST_DEFAULT != rTab.GetAdjustment() )
+                                {
+                                        if( !rTab.GetTabPos() )
+                                        {
+                                                aTStop.Remove( n );
+                                                --n;
+                                        }
+                                        else
+                                                rTab.GetTabPos() += nOffset;
+                                }
+                        }
             rNd.SetAttr( aTStop );
+                }
         }
-    }
 }
 
 /*  */
 
 
 void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor,
-    SwTwips nPageWidth)
+        SwTwips nPageWidth)
 {
-    const SfxPoolItem* pItem = 0;
-    if( SFX_ITEM_SET != rFlySet.GetItemState( RES_FRM_SIZE, TRUE, &pItem ) ||
-        MINFLY > ((SwFmtFrmSize*)pItem)->GetWidth() )
-    {
-        SwFmtFrmSize aSz((SwFmtFrmSize&)rFlySet.Get(RES_FRM_SIZE, TRUE));
-        if (pItem)
-            aSz = (SwFmtFrmSize&)(*pItem);
-
-        SwTwips nWidth;
-        // dann die Breite des Flys selbst bestimmen. Ist eine Tabelle
-        // defininiert, dann benutze deren Breite, sonst die Breite der
-        // Seite
-        const SwTableNode* pTblNd = rAnchor.GetNode().FindTableNode();
-        if( pTblNd )
-            nWidth = pTblNd->GetTable().GetFrmFmt()->GetFrmSize().GetWidth();
-        else
-            nWidth = nPageWidth;
-
-        const SwNodeIndex* pSttNd = ((SwFmtCntnt&)rFlySet.Get( RES_CNTNT )).
-                                    GetCntntIdx();
-        if( pSttNd )
+        const SfxPoolItem* pItem = 0;
+        if( SFX_ITEM_SET != rFlySet.GetItemState( RES_FRM_SIZE, sal_True, &pItem ) ||
+                MINFLY > ((SwFmtFrmSize*)pItem)->GetWidth() )
         {
-            BOOL bOnlyOneNode = TRUE;
-            ULONG nMinFrm = 0;
-            ULONG nMaxFrm = 0;
-            SwTxtNode* pFirstTxtNd = 0;
-            SwNodeIndex aIdx( *pSttNd, 1 );
-            SwNodeIndex aEnd( *pSttNd->GetNode().EndOfSectionNode() );
-            while( aIdx < aEnd )
-            {
-                SwTxtNode *pTxtNd = aIdx.GetNode().GetTxtNode();
-                if( pTxtNd )
-                {
-                    if( !pFirstTxtNd )
-                        pFirstTxtNd = pTxtNd;
-                    else if( pFirstTxtNd != pTxtNd )
-                    {
-                        // forget it
-                        bOnlyOneNode = FALSE;
-                        break;
-                    }
-
-                    ULONG nAbsMinCnts;
-                    pTxtNd->GetMinMaxSize( aIdx.GetIndex(), nMinFrm,
-                                            nMaxFrm, nAbsMinCnts );
-                }
-                aIdx++;
-            }
+                SwFmtFrmSize aSz((SwFmtFrmSize&)rFlySet.Get(RES_FRM_SIZE, sal_True));
+                if (pItem)
+                        aSz = (SwFmtFrmSize&)(*pItem);
+
+                SwTwips nWidth;
+                // dann die Breite des Flys selbst bestimmen. Ist eine Tabelle
+                // defininiert, dann benutze deren Breite, sonst die Breite der
+                // Seite
+                const SwTableNode* pTblNd = rAnchor.GetNode().FindTableNode();
+                if( pTblNd )
+                        nWidth = pTblNd->GetTable().GetFrmFmt()->GetFrmSize().GetWidth();
+                else
+                        nWidth = nPageWidth;
 
-            if( bOnlyOneNode )
-            {
-                if( nMinFrm < MINLAY && pFirstTxtNd )
+                const SwNodeIndex* pSttNd = ((SwFmtCntnt&)rFlySet.Get( RES_CNTNT )).
+                                                                        GetCntntIdx();
+                if( pSttNd )
                 {
-                    // if the first node dont contained any content, then
-                    // insert one char in it calc again and delete once again
-                    SwIndex aNdIdx( pFirstTxtNd );
+                        sal_Bool bOnlyOneNode = sal_True;
+                        sal_uLong nMinFrm = 0;
+                        sal_uLong nMaxFrm = 0;
+                        SwTxtNode* pFirstTxtNd = 0;
+                        SwNodeIndex aIdx( *pSttNd, 1 );
+                        SwNodeIndex aEnd( *pSttNd->GetNode().EndOfSectionNode() );
+                        while( aIdx < aEnd )
+                        {
+                                SwTxtNode *pTxtNd = aIdx.GetNode().GetTxtNode();
+                                if( pTxtNd )
+                                {
+                                        if( !pFirstTxtNd )
+                                                pFirstTxtNd = pTxtNd;
+                                        else if( pFirstTxtNd != pTxtNd )
+                                        {
+                                                // forget it
+                                                bOnlyOneNode = sal_False;
+                                                break;
+                                        }
+
+                                        sal_uLong nAbsMinCnts;
+                                        pTxtNd->GetMinMaxSize( aIdx.GetIndex(), nMinFrm,
+                                                                                        nMaxFrm, nAbsMinCnts );
+                                }
+                                aIdx++;
+                        }
+
+                        if( bOnlyOneNode )
+                        {
+                                if( nMinFrm < MINLAY && pFirstTxtNd )
+                                {
+                                        // if the first node dont contained any content, then
+                                        // insert one char in it calc again and delete once again
+                                        SwIndex aNdIdx( pFirstTxtNd );
                     pFirstTxtNd->InsertText( String::CreateFromAscii(
                             RTL_CONSTASCII_STRINGPARAM( "MM" )), aNdIdx );
-                    ULONG nAbsMinCnts;
-                    pFirstTxtNd->GetMinMaxSize( pFirstTxtNd->GetIndex(),
-                                            nMinFrm, nMaxFrm, nAbsMinCnts );
-                    aNdIdx -= 2;
+                                        sal_uLong nAbsMinCnts;
+                                        pFirstTxtNd->GetMinMaxSize( pFirstTxtNd->GetIndex(),
+                                                                                        nMinFrm, nMaxFrm, nAbsMinCnts );
+                                        aNdIdx -= 2;
                     pFirstTxtNd->EraseText( aNdIdx, 2 );
                 }
 
-                // Umrandung und Abstand zum Inhalt beachten
-                const SvxBoxItem& rBoxItem = (SvxBoxItem&)rFlySet.Get( RES_BOX );
-                USHORT nLine = BOX_LINE_LEFT;
-                for( int i = 0; i < 2; ++i )
-                {
-                    const SvxBorderLine* pLn = rBoxItem.GetLine( nLine );
-                    if( pLn )
-                    {
-                        USHORT nWidthTmp = pLn->GetOutWidth() + pLn->GetInWidth();
+                                // Umrandung und Abstand zum Inhalt beachten
+                                const SvxBoxItem& rBoxItem = (SvxBoxItem&)rFlySet.Get( RES_BOX );
+                                sal_uInt16 nLine = BOX_LINE_LEFT;
+                                for( int i = 0; i < 2; ++i )
+                                {
+                                        const SvxBorderLine* pLn = rBoxItem.GetLine( nLine );
+                                        if( pLn )
+                                        {
+                                                sal_uInt16 nWidthTmp = pLn->GetOutWidth() + pLn->GetInWidth();
                         nWidthTmp = nWidthTmp + rBoxItem.GetDistance( nLine );
-                        nMinFrm += nWidthTmp;
-                        nMaxFrm += nWidthTmp;
-                    }
-                    nLine = BOX_LINE_RIGHT;
+                                                nMinFrm += nWidthTmp;
+                                                nMaxFrm += nWidthTmp;
+                                        }
+                                        nLine = BOX_LINE_RIGHT;
+                                }
+
+                                // Mindestbreite fuer Inhalt einhalten
+                                if( nMinFrm < MINLAY )
+                                        nMinFrm = MINLAY;
+                                if( nMaxFrm < MINLAY )
+                                        nMaxFrm = MINLAY;
+
+                                if( nWidth > (sal_uInt16)nMaxFrm )
+                                        nWidth = nMaxFrm;
+                                else if( nWidth > (sal_uInt16)nMinFrm )
+                                        nWidth = nMinFrm;
+                        }
                 }
 
-                // Mindestbreite fuer Inhalt einhalten
-                if( nMinFrm < MINLAY )
-                    nMinFrm = MINLAY;
-                if( nMaxFrm < MINLAY )
-                    nMaxFrm = MINLAY;
-
-                if( nWidth > (USHORT)nMaxFrm )
-                    nWidth = nMaxFrm;
-                else if( nWidth > (USHORT)nMinFrm )
-                    nWidth = nMinFrm;
-            }
-        }
-
-        if( MINFLY > nWidth )
-            nWidth = MINFLY;
+                if( MINFLY > nWidth )
+                        nWidth = MINFLY;
 
-        aSz.SetWidth( nWidth );
-        if( MINFLY > aSz.GetHeight() )
-            aSz.SetHeight( MINFLY );
-        rFlySet.Put( aSz );
-    }
-    else if( MINFLY > ((SwFmtFrmSize*)pItem)->GetHeight() )
-    {
-        SwFmtFrmSize aSz( *(SwFmtFrmSize*)pItem );
-        aSz.SetHeight( MINFLY );
-        rFlySet.Put( aSz );
-    }
+                aSz.SetWidth( nWidth );
+                if( MINFLY > aSz.GetHeight() )
+                        aSz.SetHeight( MINFLY );
+                rFlySet.Put( aSz );
+        }
+        else if( MINFLY > ((SwFmtFrmSize*)pItem)->GetHeight() )
+        {
+                SwFmtFrmSize aSz( *(SwFmtFrmSize*)pItem );
+                aSz.SetHeight( MINFLY );
+                rFlySet.Put( aSz );
+        }
 }
 
 /*  */
@@ -714,7 +714,7 @@ rtl_TextEncoding CharSetFromName(const String& rChrSetStr)
 
     OSL_ENSURE(nRet != pStart->eCode, "TXT: That was an unknown language!");
 
-    return nRet;
+        return nRet;
 }
 
 
@@ -743,55 +743,55 @@ String NameFromCharSet(rtl_TextEncoding nChrSet)
 // for the automatic conversion (mail/news/...)
 // The user data contains the options for the ascii import/export filter.
 // The format is:
-//  1. CharSet - as ascii chars
-//  2. LineEnd - as CR/LR/CRLF
-//  3. Fontname
-//  4. Language
+//      1. CharSet - as ascii chars
+//      2. LineEnd - as CR/LR/CRLF
+//      3. Fontname
+//      4. Language
 // the delimetercharacter is ","
 //
 
 void SwAsciiOptions::ReadUserData( const String& rStr )
 {
-    xub_StrLen nToken = 0;
-    USHORT nCnt = 0;
-    String sToken;
-    do {
-        if( 0 != (sToken = rStr.GetToken( 0, ',', nToken )).Len() )
-        {
-            switch( nCnt )
-            {
-            case 0:     // CharSet
+        xub_StrLen nToken = 0;
+        sal_uInt16 nCnt = 0;
+        String sToken;
+        do {
+                if( 0 != (sToken = rStr.GetToken( 0, ',', nToken )).Len() )
+                {
+                        switch( nCnt )
+                        {
+                        case 0:         // CharSet
                 eCharSet = CharSetFromName(sToken);
-                break;
-            case 1:     // LineEnd
-                if( sToken.EqualsIgnoreCaseAscii( "CRLF" ))
-                    eCRLF_Flag = LINEEND_CRLF;
-                else if( sToken.EqualsIgnoreCaseAscii( "LF" ))
-                    eCRLF_Flag = LINEEND_LF;
-                else
-                    eCRLF_Flag = LINEEND_CR;
-                break;
-            case 2:     // fontname
-                sFont = sToken;
-                break;
-            case 3:     // Language
+                                break;
+                        case 1:         // LineEnd
+                                if( sToken.EqualsIgnoreCaseAscii( "CRLF" ))
+                                        eCRLF_Flag = LINEEND_CRLF;
+                                else if( sToken.EqualsIgnoreCaseAscii( "LF" ))
+                                        eCRLF_Flag = LINEEND_LF;
+                                else
+                                        eCRLF_Flag = LINEEND_CR;
+                                break;
+                        case 2:         // fontname
+                                sFont = sToken;
+                                break;
+                        case 3:         // Language
                 nLanguage = MsLangId::convertIsoStringToLanguage( sToken );
-                break;
-            }
-        }
-        ++nCnt;
-    } while( STRING_NOTFOUND != nToken );
+                                break;
+                        }
+                }
+                ++nCnt;
+        } while( STRING_NOTFOUND != nToken );
 }
 
 void SwAsciiOptions::WriteUserData( String& rStr )
 {
-    // 1. charset
-    rStr = NameFromCharSet(eCharSet);
-    rStr += ',';
+        // 1. charset
+        rStr = NameFromCharSet(eCharSet);
+        rStr += ',';
 
-    // 2. LineEnd
-    switch(eCRLF_Flag)
-    {
+        // 2. LineEnd
+        switch(eCRLF_Flag)
+        {
         case LINEEND_CRLF:
             rStr.AppendAscii( "CRLF" );
             break;
@@ -801,20 +801,20 @@ void SwAsciiOptions::WriteUserData( String& rStr )
         case LINEEND_LF:
             rStr.AppendAscii(  "LF" );
             break;
-    }
-    rStr += ',';
+        }
+        rStr += ',';
 
-    // 3. Fontname
-    rStr += sFont;
-    rStr += ',';
+        // 3. Fontname
+        rStr += sFont;
+        rStr += ',';
 
-    // 4. Language
-    if (nLanguage)
-    {
+        // 4. Language
+        if (nLanguage)
+        {
         rtl::OUString sTmp = MsLangId::convertLanguageToIsoString( nLanguage );
         rStr += (String)sTmp;
-    }
-    rStr += ',';
+        }
+        rStr += ',';
 }
 
 extern "C" { static void SAL_CALL thisModule() {} }
@@ -822,11 +822,11 @@ extern "C" { static void SAL_CALL thisModule() {} }
 static oslGenericFunction GetMswordLibSymbol( const char *pSymbol )
 {
     static ::osl::Module aModule;
-    static sal_Bool bLoaded = sal_False;
+        static sal_Bool bLoaded = sal_False;
     static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "msword" ) ) );
-    if (!bLoaded)
-        bLoaded = SvLibrary::LoadModule( aModule, aLibName, &thisModule );
-    if (bLoaded)
+        if (!bLoaded)
+                bLoaded = SvLibrary::LoadModule( aModule, aLibName, &thisModule );
+        if (bLoaded)
         return aModule.getFunctionSymbol( ::rtl::OUString::createFromAscii( pSymbol ) );
     return NULL;
 }
@@ -871,23 +871,23 @@ void GetWW8Writer( const String& rFltName, const String& rBaseURL, WriterRef& xR
         xRet = WriterRef(0);
 }
 
-typedef ULONG ( __LOADONCALLAPI *SaveOrDel )( SfxObjectShell&, SotStorage&, BOOL, const String& );
-typedef ULONG ( __LOADONCALLAPI *GetSaveWarning )( SfxObjectShell& );
+typedef sal_uLong ( __LOADONCALLAPI *SaveOrDel )( SfxObjectShell&, SotStorage&, sal_Bool, const String& );
+typedef sal_uLong ( __LOADONCALLAPI *GetSaveWarning )( SfxObjectShell& );
 
-ULONG SaveOrDelMSVBAStorage( SfxObjectShell& rDoc, SotStorage& rStor, BOOL bSaveInto, const String& rStorageName )
+sal_uLong SaveOrDelMSVBAStorage( SfxObjectShell& rDoc, SotStorage& rStor, sal_Bool bSaveInto, const String& rStorageName )
 {
     SaveOrDel pFunction = reinterpret_cast<SaveOrDel>( GetMswordLibSymbol( "SaveOrDelMSVBAStorage_ww8" ) );
     if( pFunction )
-        return pFunction( rDoc, rStor, bSaveInto, rStorageName );
-    return ERRCODE_NONE;
+                return pFunction( rDoc, rStor, bSaveInto, rStorageName );
+        return ERRCODE_NONE;
 }
 
-ULONG GetSaveWarningOfMSVBAStorage( SfxObjectShell &rDocS )
+sal_uLong GetSaveWarningOfMSVBAStorage( SfxObjectShell &rDocS )
 {
     GetSaveWarning pFunction = reinterpret_cast<GetSaveWarning>( GetMswordLibSymbol( "GetSaveWarningOfMSVBAStorage_ww8" ) );
     if( pFunction )
-            return pFunction( rDocS );
-    return ERRCODE_NONE;
+                        return pFunction( rDocS );
+        return ERRCODE_NONE;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */