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, 179 insertions, 164 deletions

diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index d4c9b960498b..d7b646c678b6 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -30,6 +30,7 @@
 
 #include <com/sun/star/text/RelOrientation.hpp>
 #include <com/sun/star/embed/XClassifiedObject.hpp>
+#include <com/sun/star/embed/XEmbeddedObject.hpp>
 
 #include <svx/svdobj.hxx>
 #include "swdllapi.h"
@@ -71,41 +72,41 @@ namespace svx
 
 // return values for GetFrmType() und GetSelFrmType().
 //! values can be combined via logival or
-#define FRMTYPE_NONE            (USHORT)     0
-#define FRMTYPE_PAGE            (USHORT)     1
-#define FRMTYPE_HEADER          (USHORT)     2
-#define FRMTYPE_FOOTER          (USHORT)     4
-#define FRMTYPE_BODY            (USHORT)     8
-#define FRMTYPE_COLUMN          (USHORT)    16
-#define FRMTYPE_TABLE           (USHORT)    32
-#define FRMTYPE_FLY_FREE        (USHORT)    64
-#define FRMTYPE_FLY_ATCNT       (USHORT)   128
-#define FRMTYPE_FLY_INCNT       (USHORT)   256
-#define FRMTYPE_FOOTNOTE        (USHORT)   512
-#define FRMTYPE_FTNPAGE         (USHORT)  1024
-#define FRMTYPE_FLY_ANY         (USHORT)  2048
-#define FRMTYPE_DRAWOBJ         (USHORT)  4096
-#define FRMTYPE_COLSECT         (USHORT)  8192
-#define FRMTYPE_COLSECTOUTTAB   (USHORT) 16384
+#define FRMTYPE_NONE            (sal_uInt16)     0
+#define FRMTYPE_PAGE            (sal_uInt16)     1
+#define FRMTYPE_HEADER          (sal_uInt16)     2
+#define FRMTYPE_FOOTER          (sal_uInt16)     4
+#define FRMTYPE_BODY            (sal_uInt16)     8
+#define FRMTYPE_COLUMN          (sal_uInt16)    16
+#define FRMTYPE_TABLE           (sal_uInt16)    32
+#define FRMTYPE_FLY_FREE        (sal_uInt16)    64
+#define FRMTYPE_FLY_ATCNT       (sal_uInt16)   128
+#define FRMTYPE_FLY_INCNT       (sal_uInt16)   256
+#define FRMTYPE_FOOTNOTE        (sal_uInt16)   512
+#define FRMTYPE_FTNPAGE         (sal_uInt16)  1024
+#define FRMTYPE_FLY_ANY         (sal_uInt16)  2048
+#define FRMTYPE_DRAWOBJ         (sal_uInt16)  4096
+#define FRMTYPE_COLSECT         (sal_uInt16)  8192
+#define FRMTYPE_COLSECTOUTTAB   (sal_uInt16) 16384
 
 #define FRMTYPE_ANYCOLSECT ( FRMTYPE_COLSECT | FRMTYPE_COLSECTOUTTAB )
 
 //! values can be combined via logival or
-#define GOTOOBJ_DRAW_CONTROL    (USHORT)  1
-#define GOTOOBJ_DRAW_SIMPLE     (USHORT)  2
-#define GOTOOBJ_DRAW_ANY        (USHORT)  3
-#define GOTOOBJ_FLY_FRM         (USHORT)  4
-#define GOTOOBJ_FLY_GRF         (USHORT)  8
-#define GOTOOBJ_FLY_OLE         (USHORT) 16
-#define GOTOOBJ_FLY_ANY         (USHORT) 28
-#define GOTOOBJ_GOTO_ANY        (USHORT) 31
+#define GOTOOBJ_DRAW_CONTROL    (sal_uInt16)  1
+#define GOTOOBJ_DRAW_SIMPLE     (sal_uInt16)  2
+#define GOTOOBJ_DRAW_ANY        (sal_uInt16)  3
+#define GOTOOBJ_FLY_FRM         (sal_uInt16)  4
+#define GOTOOBJ_FLY_GRF         (sal_uInt16)  8
+#define GOTOOBJ_FLY_OLE         (sal_uInt16) 16
+#define GOTOOBJ_FLY_ANY         (sal_uInt16) 28
+#define GOTOOBJ_GOTO_ANY        (sal_uInt16) 31
 
 //! values can be combined via logival or
-#define FLYPROTECT_CONTENT      (USHORT)  1
-#define FLYPROTECT_SIZE         (USHORT)  2
-#define FLYPROTECT_POS          (USHORT)  4
-#define FLYPROTECT_PARENT       (USHORT)  8     // Check only parents.
-#define FLYPROTECT_FIXED        (USHORT) 16     // Only protection that cannot be withdrawn
+#define FLYPROTECT_CONTENT      (sal_uInt16)  1
+#define FLYPROTECT_SIZE         (sal_uInt16)  2
+#define FLYPROTECT_POS          (sal_uInt16)  4
+#define FLYPROTECT_PARENT       (sal_uInt16)  8     // Check only parents.
+#define FLYPROTECT_FIXED        (sal_uInt16) 16     // Only protection that cannot be withdrawn
                                                 // e.g. by OLE-server; also relevant for dialog.
 
 // For figuring out contents by position (D&D)
@@ -182,7 +183,7 @@ class SdrDropMarkerOverlay;
 class SW_DLLPUBLIC SwFEShell : public SwEditShell
 {
     SdrDropMarkerOverlay *pChainFrom, *pChainTo;
-    BOOL bCheckForOLEInCaption;
+    sal_Bool bCheckForOLEInCaption;
 
     SW_DLLPRIVATE SwFlyFrm *FindFlyFrm() const;
     SW_DLLPRIVATE SwFlyFrm *FindFlyFrm( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&  ) const;
@@ -199,26 +200,26 @@ class SW_DLLPUBLIC SwFEShell : public SwEditShell
     SW_DLLPRIVATE const SwFrm *GetBox( const Point &rPt, bool* pbRow = 0, bool* pbCol = 0 ) const;
 
     // 0 == not in any column.
-    SW_DLLPRIVATE USHORT _GetCurColNum( const SwFrm *pFrm,
+    SW_DLLPRIVATE sal_uInt16 _GetCurColNum( const SwFrm *pFrm,
                           SwGetCurColNumPara* pPara ) const;
 
     SW_DLLPRIVATE void _GetTabCols( SwTabCols &rToFill, const SwFrm *pBox ) const;
     SW_DLLPRIVATE void _GetTabRows( SwTabCols &rToFill, const SwFrm *pBox ) const;
 
-    SW_DLLPRIVATE BOOL ImpEndCreate();
+    SW_DLLPRIVATE sal_Bool ImpEndCreate();
 
     SW_DLLPRIVATE ObjCntType GetObjCntType( const SdrObject& rObj ) const;
 
     // Methods for copying of draw objects.
-    SW_DLLPRIVATE BOOL CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
-                                const Point& rInsPt, BOOL bIsMove,
-                                BOOL bSelectInsert );
+    SW_DLLPRIVATE sal_Bool CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
+                                const Point& rInsPt, sal_Bool bIsMove,
+                                sal_Bool bSelectInsert );
 
     // Get list of marked SdrObjects;
     // helper method for GetSelFrmType, IsSelContainsControl.
     SW_DLLPRIVATE const SdrMarkList* _GetMarkList() const;
 
-    SW_DLLPRIVATE BOOL CheckHeadline( bool bRepeat ) const;
+    SW_DLLPRIVATE sal_Bool CheckHeadline( bool bRepeat ) const;
 
     using SwEditShell::Copy;
 
@@ -232,17 +233,17 @@ public:
     virtual ~SwFEShell();
 
     // Copy and Paste methods for internal clipboard.
-    BOOL Copy( SwDoc* pClpDoc, const String* pNewClpTxt = 0 );
-    BOOL Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames = sal_False);
+    sal_Bool Copy( SwDoc* pClpDoc, const String* pNewClpTxt = 0 );
+    sal_Bool Paste( SwDoc* pClpDoc, sal_Bool bIncludingPageFrames = sal_False);
 
     //Paste some pages into another doc - used in mailmerge.
-    BOOL PastePages( SwFEShell& rToFill, USHORT nStartPage, USHORT nEndPage);
+    sal_Bool PastePages( SwFEShell& rToFill, sal_uInt16 nStartPage, sal_uInt16 nEndPage);
 
     // Copy-Method for Drag&Drop
-    BOOL Copy( SwFEShell*, const Point& rSttPt, const Point& rInsPt,
-                BOOL bIsMove = FALSE, BOOL bSelectInsert = TRUE );
+    sal_Bool Copy( SwFEShell*, const Point& rSttPt, const Point& rInsPt,
+                sal_Bool bIsMove = sal_False, sal_Bool bSelectInsert = sal_True );
 
-    void SelectFlyFrm( SwFlyFrm& rFrm, BOOL bNew = FALSE );
+    void SelectFlyFrm( SwFlyFrm& rFrm, sal_Bool bNew = sal_False );
 
     // Is selected frame within another frame?
     const SwFrmFmt* IsFlyInFly();
@@ -250,14 +251,14 @@ public:
 
     // If an object as been given, exactly this object is selected
     // (instead of searching over position).
-    BOOL SelectObj( const Point& rSelPt, BYTE nFlag = 0, SdrObject *pObj = 0 );
+    sal_Bool SelectObj( const Point& rSelPt, sal_uInt8 nFlag = 0, SdrObject *pObj = 0 );
     void DelSelectedObj();
 
     // Move selection upwards or downwards (Z-Order).
     // TRUE = to top or bottom.
     // FALSE = run past one other.
-    void SelectionToTop   ( BOOL bTop = TRUE );
-    void SelectionToBottom( BOOL bBottom = TRUE );
+    void SelectionToTop   ( sal_Bool bTop = sal_True );
+    void SelectionToBottom( sal_Bool bBottom = sal_True );
 
     short GetLayerId() const;   // 1 Heaven, 0 Hell, -1 Ambiguous.
     void  SelectionToHeaven();  // Above document.
@@ -273,7 +274,7 @@ public:
     // the draw object.
     sal_Bool ShouldObjectBeSelected(const Point& rPt);
 
-    sal_Bool MoveAnchor( USHORT nDir );
+    sal_Bool MoveAnchor( sal_uInt16 nDir );
 
     // Returns if Upper of frame at current position is section frame
     // Currently only used by the rules. To be replaced by something more
@@ -284,8 +285,8 @@ public:
     // pPt: Cursr or DocPos respectively; bStopAtFly: Stop at flys or continue over anchor.
     // Although (0,TRUE) is kind of a standard, the parameters are not defaulted here
     // in order to force more conscious use especially of bStopAtFly.
-    USHORT GetFrmType( const Point *pPt, BOOL bStopAtFly ) const;
-    USHORT GetSelFrmType() const;               //Selektion (Drawing)
+    sal_uInt16 GetFrmType( const Point *pPt, sal_Bool bStopAtFly ) const;
+    sal_uInt16 GetSelFrmType() const;               //Selektion (Drawing)
 
     /** check whether selected frame contains a control;
      * companion method to GetSelFrmType, used for preventing
@@ -317,9 +318,9 @@ public:
     // Set size of draw objects.
     void SetObjRect( const SwRect& rRect );
 
-    long BeginDrag( const Point *pPt, BOOL bProp );
-    long Drag     ( const Point *pPt, BOOL bProp );
-    long EndDrag  ( const Point *pPt, BOOL bProp );
+    long BeginDrag( const Point *pPt, sal_Bool bProp );
+    long Drag     ( const Point *pPt, sal_Bool bProp );
+    long EndDrag  ( const Point *pPt, sal_Bool bProp );
     void BreakDrag();
 
     //Methods for status line.
@@ -342,13 +343,13 @@ public:
     const SwFrmFmt* GetFmtFromAnyObj( const Point& rPt ) const;
 
     // Which Protection is set at selected object?
-    //!! Returns several flags in BYTE.
-    BYTE IsSelObjProtected( USHORT /*FLYPROTECT_...*/ eType ) const;
+    //!! returns several flags in sal_uInt8
+    sal_uInt8 IsSelObjProtected( sal_uInt16 /*FLYPROTECT_...*/ eType ) const;
 
     // Deliver graphic in rName besides graphic name. If graphic is
     // linked give name with path. rbLink is TRUE if graphic is linked.
     const Graphic *GetGrfAtPos( const Point &rDocPos,
-                                String &rName, BOOL &rbLink ) const;
+                                String &rName, sal_Bool &rbLink ) const;
 
     const String GetObjTitle() const;
     void SetObjTitle( const String& rTitle );
@@ -356,34 +357,36 @@ public:
     void SetObjDescription( const String& rDescription );
 
 
-    BOOL IsFrmSelected() const;
-    BOOL GetFlyFrmAttr( SfxItemSet &rSet ) const;
-    BOOL SetFlyFrmAttr( SfxItemSet &rSet );
-    BOOL ResetFlyFrmAttr( USHORT nWhich, const SfxItemSet* pSet = 0 );
-    const SwFrmFmt *NewFlyFrm( const SfxItemSet &rSet, BOOL bAnchValid = FALSE,
+    sal_Bool IsFrmSelected() const;
+    sal_Bool GetFlyFrmAttr( SfxItemSet &rSet ) const;
+    sal_Bool SetFlyFrmAttr( SfxItemSet &rSet );
+    sal_Bool ResetFlyFrmAttr( sal_uInt16 nWhich, const SfxItemSet* pSet = 0 );
+    const SwFrmFmt *NewFlyFrm( const SfxItemSet &rSet, sal_Bool bAnchValid = sal_False,
                          SwFrmFmt *pParent = 0 );
     void SetFlyPos( const Point &rAbsPos);
-    Point FindAnchorPos( const Point &rAbsPos, BOOL bMoveIt = FALSE );
+    Point FindAnchorPos( const Point &rAbsPos, sal_Bool bMoveIt = sal_False );
 
     // Determines whether a frame or its environment is vertically formatted and right-to-left.
-    BOOL IsFrmVertical(BOOL bEnvironment, BOOL& bRightToLeft) const;
+    // also determines, if frame or its environmane is in mongolianlayout (vertical left-to-right)
+    // - add output parameter <bVertL2R>
+    sal_Bool IsFrmVertical(const sal_Bool bEnvironment, sal_Bool& bRightToLeft, sal_Bool& bVertL2R) const;
 
     SwFrmFmt* GetCurFrmFmt() const; //If frame then frame style, else 0.
-    void SetFrmFmt( SwFrmFmt *pFmt, BOOL bKeepOrient = FALSE, Point* pDocPos = 0 ); //If frame then set frame style.
+    void SetFrmFmt( SwFrmFmt *pFmt, sal_Bool bKeepOrient = sal_False, Point* pDocPos = 0 ); //If frame then set frame style.
     const SwFlyFrm *GetCurrFlyFrm() const { return FindFlyFrm(); }
 
     // Find/delete fly containing the cursor.
     SwFrmFmt* WizzardGetFly();
 
     // Independent selecting of flys.
-    BOOL GotoNextFly( USHORT /*GOTOOBJ_...*/ eType = GOTOOBJ_FLY_ANY )
-                                { return GotoObj( TRUE, eType ); }
-    BOOL GotoPrevFly( USHORT /*GOTOOBJ_...*/ eType = GOTOOBJ_FLY_ANY)
-                                { return GotoObj( FALSE, eType); }
+    sal_Bool GotoNextFly( sal_uInt16 /*GOTOOBJ_...*/ eType = GOTOOBJ_FLY_ANY )
+                                { return GotoObj( sal_True, eType ); }
+    sal_Bool GotoPrevFly( sal_uInt16 /*GOTOOBJ_...*/ eType = GOTOOBJ_FLY_ANY)
+                                { return GotoObj( sal_False, eType); }
 
    // Iterate over flys  - for Basic-collections.
-    USHORT GetFlyCount( FlyCntType eType = FLYCNTTYPE_ALL ) const;
-    const SwFrmFmt* GetFlyNum(USHORT nIdx, FlyCntType eType = FLYCNTTYPE_ALL) const;
+    sal_uInt16 GetFlyCount( FlyCntType eType = FLYCNTTYPE_ALL ) const;
+    const SwFrmFmt* GetFlyNum(sal_uInt16 nIdx, FlyCntType eType = FLYCNTTYPE_ALL) const;
 
     // If a fly is selected, it draws cursor into the first CntntFrm.
     const SwFrmFmt* SelFlyGrabCrsr();
@@ -419,21 +422,24 @@ public:
     void MakeObjVisible( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& ) const;
 
     // Check resize of OLE-Object.
-    BOOL IsCheckForOLEInCaption() const         { return bCheckForOLEInCaption; }
-    void SetCheckForOLEInCaption( BOOL bFlag )  { bCheckForOLEInCaption = bFlag; }
+    sal_Bool IsCheckForOLEInCaption() const         { return bCheckForOLEInCaption; }
+    void SetCheckForOLEInCaption( sal_Bool bFlag )  { bCheckForOLEInCaption = bFlag; }
 
     // Set name at selected FlyFrame.
     void SetFlyName( const String& rName );
     const String& GetFlyName() const;
 
+    // get reference to OLE object (if there is one) for selected FlyFrame
+    const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetOleRef() const;
+
     // Created unique name for frame.
     String GetUniqueGrfName() const;
     String GetUniqueOLEName() const;
     String GetUniqueFrameName() const;
 
     // Jump to named Fly (graphic/OLE).
-    BOOL GotoFly( const String& rName, FlyCntType eType = FLYCNTTYPE_ALL,
-                    BOOL bSelFrame = TRUE );
+    sal_Bool GotoFly( const String& rName, FlyCntType eType = FLYCNTTYPE_ALL,
+                    sal_Bool bSelFrame = sal_True );
 
     // Position is a graphic with URL?
     const SwFrmFmt* IsURLGrfAtPos( const Point& rPt, String* pURL = 0,
@@ -455,16 +461,16 @@ public:
     void CheckUnboundObjects();
 
     // Attention: Ambiguities if multiple selections.
-    BOOL GetObjAttr( SfxItemSet &rSet ) const;
-    BOOL SetObjAttr( const SfxItemSet &rSet );
+    sal_Bool GetObjAttr( SfxItemSet &rSet ) const;
+    sal_Bool SetObjAttr( const SfxItemSet &rSet );
 
-    const SdrObject* GetBestObject( BOOL bNext, USHORT eType = GOTOOBJ_DRAW_ANY, BOOL bFlat = TRUE, const ::svx::ISdrObjectFilter* pFilter = NULL );
-    BOOL GotoObj( BOOL bNext, USHORT /*GOTOOBJ_...*/ eType = GOTOOBJ_DRAW_ANY);
+    const SdrObject* GetBestObject( sal_Bool bNext, sal_uInt16 eType = GOTOOBJ_DRAW_ANY, sal_Bool bFlat = sal_True, const ::svx::ISdrObjectFilter* pFilter = NULL );
+    sal_Bool GotoObj( sal_Bool bNext, sal_uInt16 /*GOTOOBJ_...*/ eType = GOTOOBJ_DRAW_ANY);
 
     // Set DragMode (e.g. Rotae), but do nothing when frame is selected.
-    void SetDragMode( UINT16 eSdrDragMode );
+    void SetDragMode( sal_uInt16 eSdrDragMode );
 
-    USHORT IsObjSelected() const;   // Returns object count, but doesn't count the objects in groups.
+    sal_uInt16 IsObjSelected() const;   // Returns object count, but doesn't count the objects in groups.
     sal_Bool IsObjSelected( const SdrObject& rObj ) const;
 
     void EndTextEdit();             // Deletes object if required.
@@ -478,47 +484,47 @@ public:
     // or SDRCREATE_NEXTPOINT for a polygon may be relevant.
     // After RESTRAINTEND the object is created and selected.
     // BreakCreate interrupts the process. In this case no object is selected.
-    BOOL BeginCreate( UINT16 /*SdrObjKind ?*/ eSdrObjectKind, const Point &rPos );
-    BOOL BeginCreate( UINT16 /*SdrObjKind ?*/ eSdrObjectKind, UINT32 eObjInventor, const Point &);
+    sal_Bool BeginCreate( sal_uInt16 /*SdrObjKind ?*/ eSdrObjectKind, const Point &rPos );
+    sal_Bool BeginCreate( sal_uInt16 /*SdrObjKind ?*/ eSdrObjectKind, sal_uInt32 eObjInventor, const Point &);
     void MoveCreate ( const Point &rPos );
-    BOOL EndCreate  ( UINT16 eSdrCreateCmd );
+    sal_Bool EndCreate  ( sal_uInt16 eSdrCreateCmd );
     void BreakCreate();
-    BOOL IsDrawCreate() const;
-    void CreateDefaultShape( UINT16 /*SdrObjKind ?*/ eSdrObjectKind, const Rectangle& rRect, USHORT nSlotId);
+    sal_Bool IsDrawCreate() const;
+    void CreateDefaultShape( sal_uInt16 /*SdrObjKind ?*/ eSdrObjectKind, const Rectangle& rRect, sal_uInt16 nSlotId);
 
     // Functions for Rubberbox, ti select Draw-Objects
-    BOOL BeginMark( const Point &rPos );
+    sal_Bool BeginMark( const Point &rPos );
     void MoveMark ( const Point &rPos );
-    BOOL EndMark  ();
+    sal_Bool EndMark  ();
     void BreakMark();
 
     // Create and destroy group, don't when frame is selected.
-    BOOL IsGroupSelected();     // Can be a mixed selection!
+    sal_Bool IsGroupSelected();     // Can be a mixed selection!
     void GroupSelection();      // Afterwards the group is selected.
     void UnGroupSelection();    // The individual objects are selected, but
                                 // it is possible that there are groups included.
 
     bool IsGroupAllowed() const;
 
-    void MirrorSelection( BOOL bHorizontal );   //Vertical if FALSE.
+    void MirrorSelection( sal_Bool bHorizontal );   //Vertical if FALSE.
 
     // frmatr.hxx. Here no enum because of dependencies.
-    // BOOL value only for internal use! Anchor is newly set according
+    // bool value only for internal use! Anchor is newly set according
     // to current document position. Anchor is not re-set.
-    void ChgAnchor( int eAnchorId, BOOL bSameOnly = FALSE,
-                                   BOOL bPosCorr = TRUE );
+    void ChgAnchor( int eAnchorId, sal_Bool bSameOnly = sal_False,
+                                   sal_Bool bPosCorr = sal_True );
 
-    BOOL SetDrawingAttr( SfxItemSet &rSet );
+    sal_Bool SetDrawingAttr( SfxItemSet &rSet );
 
     // Get selected DrawObj as graphics (MetaFile/Bitmap).
     // Return value indicates if it was converted.
-    BOOL GetDrawObjGraphic( ULONG nFmt, Graphic& rGrf ) const;
+    sal_Bool GetDrawObjGraphic( sal_uLong nFmt, Graphic& rGrf ) const;
 
-    void Paste( SvStream& rStm, USHORT nAction, const Point* pPt = 0 );
-    BOOL Paste( const Graphic &rGrf );
-    BOOL Paste( SotDataObject& rObj, const Point& rPt );
+    void Paste( SvStream& rStm, sal_uInt16 nAction, const Point* pPt = 0 );
+    sal_Bool Paste( const Graphic &rGrf );
+    sal_Bool Paste( SotDataObject& rObj, const Point& rPt );
 
-    BOOL IsAlignPossible() const;
+    sal_Bool IsAlignPossible() const;
     void SetCalcFieldValueHdl(Outliner* pOutliner);
 
     void Insert(const String& rGrfName,
@@ -532,32 +538,41 @@ public:
     void InsertDrawObj( SdrObject& rDrawObj,
                         const Point& rInsertPosition );
 
-    BOOL ReplaceSdrObj( const String& rGrfName, const String& rFltName,
+    sal_Bool ReplaceSdrObj( const String& rGrfName, const String& rFltName,
                         const Graphic* pGrf = 0 );
 
+    // --> #i972#
+    // for starmath formulas anchored 'as char' it alignes it baseline to baseline
+    // changing the previous vertical orientation
+    void AlignFormulaToBaseline( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, SwFlyFrm * pFly = 0 );
+
+    // aligns all formulas with anchor 'as char' to baseline
+    void AlignAllFormulasToBaseline();
+    // <--
+
 
 
     // Provide information about content situated closes to given Point.
-    Point GetCntntPos( const Point& rPoint, BOOL bNext ) const;
+    Point GetCntntPos( const Point& rPoint, sal_Bool bNext ) const;
 
     // Convert document position into position relative to the current page.
     Point GetRelativePagePosition(const Point& rDocPos);
 
     // Hide or show layout-selection and pass call to CrsrSh.
     void ShLooseFcs();
-    void ShGetFcs( BOOL bUpdate = TRUE );
+    void ShGetFcs( sal_Bool bUpdate = sal_True );
 
     // PageDescriptor-interface
     void   ChgCurPageDesc( const SwPageDesc& );
-    USHORT GetCurPageDesc( const BOOL bCalcFrm = TRUE ) const;
-    USHORT GetMousePageDesc( const Point &rPt ) const;
-    USHORT GetPageDescCnt() const;
+    sal_uInt16 GetCurPageDesc( const sal_Bool bCalcFrm = sal_True ) const;
+    sal_uInt16 GetMousePageDesc( const Point &rPt ) const;
+    sal_uInt16 GetPageDescCnt() const;
     SwPageDesc* FindPageDescByName( const String& rName,
-                                    BOOL bGetFromPool = FALSE,
-                                    USHORT* pPos = 0 );
+                                    sal_Bool bGetFromPool = sal_False,
+                                    sal_uInt16* pPos = 0 );
 
-    const SwPageDesc& GetPageDesc( USHORT i ) const;
-    void  ChgPageDesc( USHORT i, const SwPageDesc& );
+    const SwPageDesc& GetPageDesc( sal_uInt16 i ) const;
+    void  ChgPageDesc( sal_uInt16 i, const SwPageDesc& );
     // if inside all selection only one PageDesc, return this.
     // Otherwise return 0 pointer
     const SwPageDesc* GetSelectedPageDescs() const;
@@ -569,36 +584,36 @@ public:
 
 
     // Page number of the page containing Point, O if no page.
-    USHORT GetPageNumber( const Point &rPoint ) const;
-    BOOL GetPageNumber( long nYPos, BOOL bAtCrsrPos, USHORT& rPhyNum, USHORT& rVirtNum, String &rDisplay ) const;
+    sal_uInt16 GetPageNumber( const Point &rPoint ) const;
+    sal_Bool GetPageNumber( long nYPos, sal_Bool bAtCrsrPos, sal_uInt16& rPhyNum, sal_uInt16& rVirtNum, String &rDisplay ) const;
 
     SwFlyFrmFmt* InsertObject( const svt::EmbeddedObjectRef&,
                 const SfxItemSet* pFlyAttrSet = 0,
                 const SfxItemSet* pGrfAttrSet = 0,
                 SwFrmFmt* = 0 );
-    BOOL    FinishOLEObj(); //Shutdown server.
+    sal_Bool    FinishOLEObj(); //Shutdown server.
 
     void GetTblAttr( SfxItemSet & ) const;
     void SetTblAttr( const SfxItemSet & );
 
-    BOOL HasWholeTabSelection() const;
+    sal_Bool HasWholeTabSelection() const;
 
     // Is content of a table cell or at least a table cell completely selected?
-    BOOL HasBoxSelection() const;
+    sal_Bool HasBoxSelection() const;
 
-    BOOL InsertRow( USHORT nCnt, BOOL bBehind );
-    BOOL InsertCol( USHORT nCnt, BOOL bBehind );  // 0 == at the end.
-    BOOL DeleteCol();
-    BOOL DeleteRow();
+    sal_Bool InsertRow( sal_uInt16 nCnt, sal_Bool bBehind );
+    sal_Bool InsertCol( sal_uInt16 nCnt, sal_Bool bBehind );  // 0 == at the end.
+    sal_Bool DeleteCol();
+    sal_Bool DeleteRow();
 
-    BOOL DeleteTblSel();        // Current selection, may be whole table.
+    sal_Bool DeleteTblSel();        // Current selection, may be whole table.
 
-    USHORT MergeTab();          // Merge selected parts of table.
+    sal_uInt16 MergeTab();          // Merge selected parts of table.
                                 // Return error via enum.
 
     // Split cell vertically or horizontally.
-    BOOL SplitTab( BOOL nVert = TRUE, USHORT nCnt = 1, BOOL bSameHeight = FALSE );
-    BOOL Sort(const SwSortOptions&);
+    sal_Bool SplitTab( sal_Bool nVert = sal_True, sal_uInt16 nCnt = 1, sal_Bool bSameHeight = sal_False );
+    sal_Bool Sort(const SwSortOptions&);    //Sortieren.
 
     void SetRowHeight( const SwFmtFrmSize &rSz );
 
@@ -608,115 +623,115 @@ public:
     void SetRowSplit( const SwFmtRowSplit &rSz );
     void GetRowSplit( SwFmtRowSplit *&rpSz ) const;
 
-    void   SetBoxAlign( USHORT nOrient );
-    USHORT GetBoxAlign() const;         // USHRT_MAX if ambiguous.
+    void   SetBoxAlign( sal_uInt16 nOrient );
+    sal_uInt16 GetBoxAlign() const;         // USHRT_MAX if ambiguous.
 
     // Adjustment of Rowheights. Determine via bTstOnly if more than one row is selected.
-    BOOL BalanceRowHeight( BOOL bTstOnly );
+    sal_Bool BalanceRowHeight( sal_Bool bTstOnly );
 
     void SetTabBorders( const SfxItemSet& rSet );
     void GetTabBorders(       SfxItemSet& rSet) const;
-    void SetTabLineStyle(const Color* pColor, BOOL bSetLine = FALSE, const SvxBorderLine* pBorderLine = NULL);
+    void SetTabLineStyle(const Color* pColor, sal_Bool bSetLine = sal_False, const SvxBorderLine* pBorderLine = NULL);
 
     void SetTabBackground( const SvxBrushItem &rNew );
     void GetTabBackground( SvxBrushItem &rToFill ) const;
 
     void SetBoxBackground( const SvxBrushItem &rNew );
-    BOOL GetBoxBackground( SvxBrushItem &rToFill ) const; //FALSE ambiguous.
+    sal_Bool GetBoxBackground( SvxBrushItem &rToFill ) const; //FALSE ambiguous.
 
     void SetBoxDirection( const SvxFrameDirectionItem& rNew );
-    BOOL GetBoxDirection( SvxFrameDirectionItem& rToFill ) const; //FALSE ambiguous.
+    sal_Bool GetBoxDirection( SvxFrameDirectionItem& rToFill ) const; //FALSE ambiguous.
 
     void SetRowBackground( const SvxBrushItem &rNew );
-    BOOL GetRowBackground( SvxBrushItem &rToFill ) const; //FALSE ambiguous.
+    sal_Bool GetRowBackground( SvxBrushItem &rToFill ) const; //FALSE ambiguous.
 
-    BYTE WhichMouseTabCol( const Point &rPt ) const;
+    sal_uInt8 WhichMouseTabCol( const Point &rPt ) const;
     void GetTabCols( SwTabCols &rToFill ) const; // Info about columns and margins.
-    void SetTabCols( const SwTabCols &rNew, BOOL bCurRowOnly = TRUE );
+    void SetTabCols( const SwTabCols &rNew, sal_Bool bCurRowOnly = sal_True );
     void GetMouseTabCols( SwTabCols &rToFill, const Point &rPt ) const;
-    void SetMouseTabCols( const SwTabCols &rNew, BOOL bCurRowOnly,
+    void SetMouseTabCols( const SwTabCols &rNew, sal_Bool bCurRowOnly,
                           const Point &rPt );
 
     // pEnd will be used during MouseMove
     bool SelTblRowCol( const Point& rPt, const Point* pEnd = 0, bool bRowDrag = false );
 
     void GetTabRows( SwTabCols &rToFill ) const;
-    void SetTabRows( const SwTabCols &rNew, BOOL bCurColOnly );
+    void SetTabRows( const SwTabCols &rNew, sal_Bool bCurColOnly );
     void GetMouseTabRows( SwTabCols &rToFill, const Point &rPt ) const;
-    void SetMouseTabRows( const SwTabCols &rNew, BOOL bCurColOnly, const Point &rPt );
+    void SetMouseTabRows( const SwTabCols &rNew, sal_Bool bCurColOnly, const Point &rPt );
 
     void ProtectCells();    // If a table selection exists it is destroyed in case
                             // cursor is not allowed in readonly.
     void UnProtectCells();  // Refers to table selection.
     void UnProtectTbls();   // Unprotect all tables in selection.
-    BOOL HasTblAnyProtection( const String* pTblName = 0,
-                                BOOL* pFullTblProtection = 0 );
-    BOOL CanUnProtectCells() const;
+    sal_Bool HasTblAnyProtection( const String* pTblName = 0,
+                                sal_Bool* pFullTblProtection = 0 );
+    sal_Bool CanUnProtectCells() const;
 
-    USHORT GetRowsToRepeat() const;
-    void SetRowsToRepeat( USHORT nNumOfRows );
-    USHORT GetVirtPageNum( const BOOL bCalcFrm = TRUE );
+    sal_uInt16 GetRowsToRepeat() const;
+    void SetRowsToRepeat( sal_uInt16 nNumOfRows );
+    sal_uInt16 GetVirtPageNum( const sal_Bool bCalcFrm = sal_True );
 
     //Returns the number of table rows currently selected
     //if the selection start at the top of the table.
-    USHORT    GetRowSelectionFromTop() const;
+    sal_uInt16    GetRowSelectionFromTop() const;
 
-    BOOL IsInRepeatedHeadline() const { return CheckHeadline( true ); }
-    BOOL IsInHeadline() const { return CheckHeadline( false ); }
+    sal_Bool IsInRepeatedHeadline() const { return CheckHeadline( true ); }
+    sal_Bool IsInHeadline() const { return CheckHeadline( false ); }
 
     // Adjusts cell widths in such a way, that their content
     // does not need to be wrapped (if possible).
     // bBalance provides for adjustment of selected columns.
-    void AdjustCellWidth( BOOL bBalance = FALSE );
+    void AdjustCellWidth( sal_Bool bBalance = sal_False );
 
     // Not allowed if only empty cells are selected.
-    BOOL IsAdjustCellWidthAllowed( BOOL bBalance = FALSE ) const;
+    sal_Bool IsAdjustCellWidthAllowed( sal_Bool bBalance = sal_False ) const;
 
     // Adjustment of cell-widths; determine via bTstOnly if more than one cell is selected.
-    BOOL BalanceCellWidth( BOOL bTstOnly );
+    sal_Bool BalanceCellWidth( sal_Bool bTstOnly );
 
     // AutoFormat for table/ table selection.
-    BOOL SetTableAutoFmt( const SwTableAutoFmt& rNew );
+    sal_Bool SetTableAutoFmt( const SwTableAutoFmt& rNew );
 
-    BOOL GetTableAutoFmt( SwTableAutoFmt& rGet );
+    sal_Bool GetTableAutoFmt( SwTableAutoFmt& rGet );
 
-    BOOL SetColRowWidthHeight( USHORT eType, USHORT nDiff = 283 );
+    sal_Bool SetColRowWidthHeight( sal_uInt16 eType, sal_uInt16 nDiff = 283 );
 
-    BOOL GetAutoSum( String& rFml ) const;
+    sal_Bool GetAutoSum( String& rFml ) const;
 
     // Phy: real page count.
     // Virt: consider offset that may have been set by user.
-    USHORT  GetPhyPageNum();
+    sal_uInt16  GetPhyPageNum();
 
-    void SetNewPageOffset( USHORT nOffset );
-    void SetPageOffset( USHORT nOffset );   //Changes last page offset.
-    USHORT GetPageOffset() const;           //Returns last page offset.
+    void SetNewPageOffset( sal_uInt16 nOffset );
+    void SetPageOffset( sal_uInt16 nOffset );   //Changes last page offset.
+    sal_uInt16 GetPageOffset() const;           //Returns last page offset.
 
     void InsertLabel( const SwLabelType eType, const String &rTxt, const String& rSeparator,
                       const String& rNumberSeparator,
-                      const BOOL bBefore, const USHORT nId,
+                      const sal_Bool bBefore, const sal_uInt16 nId,
                       const String& rCharacterStyle,
-                      const BOOL bCpyBrd = TRUE );
+                      const sal_Bool bCpyBrd = sal_True );
 
     // The ruler needs some information too.
-    USHORT GetCurColNum( SwGetCurColNumPara* pPara = 0 ) const; //0 == not in any column.
-    USHORT GetCurMouseColNum( const Point &rPt,
+    sal_uInt16 GetCurColNum( SwGetCurColNumPara* pPara = 0 ) const; //0 == not in any column.
+    sal_uInt16 GetCurMouseColNum( const Point &rPt,
                             SwGetCurColNumPara* pPara = 0 ) const;
-    USHORT GetCurTabColNum() const;     //0 == not in any table.
-    USHORT GetCurMouseTabColNum( const Point &rPt ) const;
-    USHORT GetCurOutColNum( SwGetCurColNumPara* pPara = 0 ) const;  // Current outer column.
+    sal_uInt16 GetCurTabColNum() const;     //0 == not in any table.
+    sal_uInt16 GetCurMouseTabColNum( const Point &rPt ) const;
+    sal_uInt16 GetCurOutColNum( SwGetCurColNumPara* pPara = 0 ) const;  // Current outer column.
 
-    BOOL IsTableRightToLeft() const;
-    BOOL IsMouseTableRightToLeft( const Point &rPt ) const;
-    BOOL IsTableVertical() const;
+    sal_Bool IsTableRightToLeft() const;
+    sal_Bool IsMouseTableRightToLeft( const Point &rPt ) const;
+    sal_Bool IsTableVertical() const;
 
-    BOOL IsLastCellInRow() const;
+    sal_Bool IsLastCellInRow() const;
 
     // Width of current range for column-dialog.
     long GetSectionWidth( SwFmt& rFmt ) const;
 
     void GetConnectableFrmFmts
-    (SwFrmFmt & rFmt, const String & rReference, BOOL bSuccessors,
+    (SwFrmFmt & rFmt, const String & rReference, sal_Bool bSuccessors,
      ::std::vector< String > & aPrevPageVec,
      ::std::vector< String > & aThisPageVec,
      ::std::vector< String > & aNextPageVec,
@@ -752,7 +767,7 @@ public:
     void ParkCursorInTab();
 
     SwTxtNode * GetNumRuleNodeAtPos(const Point &rPot);
-    BOOL IsNumLabel( const Point &rPt, int nMaxOffset = -1 );
+    sal_Bool IsNumLabel( const Point &rPt, int nMaxOffset = -1 );
 
     bool IsVerticalModeAtNdAndPos( const SwTxtNode& _rTxtNode,
                                    const Point& _rDocPos ) const;