Merge remote branch 'stage/ooo/dev300_m98_fixed' into integration/dev300_m98

Conflicts:
	starmath/inc/dialog.hxx
	starmath/inc/format.hxx
	starmath/inc/node.hxx
	starmath/inc/parse.hxx
	starmath/inc/starmath.hrc
	starmath/inc/symbol.hxx
	starmath/inc/view.hxx
	starmath/prj/build.lst
	starmath/qa/unoapi/knownissues.xcl
	starmath/sdi/smslots.sdi
	starmath/source/cfgitem.cxx
	starmath/source/cfgitem.hxx
	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/mathmlexport.hxx
	starmath/source/mathmlimport.cxx
	starmath/source/mathmlimport.hxx
	starmath/source/menu_tmpl.src
	starmath/source/node.cxx
	starmath/source/parse.cxx
	starmath/source/smdll.cxx
	starmath/source/smmod.cxx
	starmath/source/smres.src
	starmath/source/symbol.cxx
	starmath/source/toolbox.cxx
	starmath/source/types.cxx
	starmath/source/unomodel.cxx
	starmath/source/view.cxx
	starmath/uiconfig/smath/menubar/menubar.xml
	sw/Module_sw.mk
	sw/Package_xml.mk
	sw/inc/AnnotationWin.hxx
	sw/inc/IDocumentLinksAdministration.hxx
	sw/inc/IDocumentSettingAccess.hxx
	sw/inc/IMark.hxx
	sw/inc/PostItMgr.hxx
	sw/inc/SidebarWin.hxx
	sw/inc/SidebarWindowsTypes.hxx
	sw/inc/SwNumberTree.hxx
	sw/inc/accmap.hxx
	sw/inc/anchoreddrawobject.hxx
	sw/inc/chpfld.hxx
	sw/inc/cmdid.h
	sw/inc/comcore.hrc
	sw/inc/crsrsh.hxx
	sw/inc/dbfld.hxx
	sw/inc/ddefld.hxx
	sw/inc/doc.hxx
	sw/inc/docsh.hxx
	sw/inc/docufld.hxx
	sw/inc/editsh.hxx
	sw/inc/expfld.hxx
	sw/inc/fesh.hxx
	sw/inc/fldbas.hxx
	sw/inc/flddat.hxx
	sw/inc/fmtcol.hxx
	sw/inc/frmfmt.hxx
	sw/inc/helpid.h
	sw/inc/hintids.hxx
	sw/inc/lineinfo.hxx
	sw/inc/makefile.mk
	sw/inc/ndarr.hxx
	sw/inc/ndgrf.hxx
	sw/inc/ndole.hxx
	sw/inc/ndtxt.hxx
	sw/inc/numrule.hxx
	sw/inc/pagedesc.hxx
	sw/inc/pagepreviewlayout.hxx
	sw/inc/pch/precompiled_sw.hxx
	sw/inc/postithelper.hxx
	sw/inc/printdata.hxx
	sw/inc/reffld.hxx
	sw/inc/rolbck.hxx
	sw/inc/section.hxx
	sw/inc/swabstdlg.hxx
	sw/inc/swprtopt.hxx
	sw/inc/swtable.hxx
	sw/inc/tblafmt.hxx
	sw/inc/tox.hxx
	sw/inc/txtfld.hxx
	sw/inc/undobj.hxx
	sw/inc/unobaseclass.hxx
	sw/inc/unobookmark.hxx
	sw/inc/unocrsrhelper.hxx
	sw/inc/unofootnote.hxx
	sw/inc/unoframe.hxx
	sw/inc/unoidx.hxx
	sw/inc/unoparaframeenum.hxx
	sw/inc/unoparagraph.hxx
	sw/inc/unoprnms.hxx
	sw/inc/unoredline.hxx
	sw/inc/unoredlines.hxx
	sw/inc/unorefmark.hxx
	sw/inc/unosection.hxx
	sw/inc/unostyle.hxx
	sw/inc/unotext.hxx
	sw/inc/unotextbodyhf.hxx
	sw/inc/unotextcursor.hxx
	sw/inc/unotextrange.hxx
	sw/inc/unotxdoc.hxx
	sw/inc/usrfld.hxx
	sw/inc/viewsh.hxx
	sw/inc/warnpassword.hxx
	sw/prj/build.lst
	sw/prj/d.lst
	sw/qa/complex/indeterminateState/makefile.mk
	sw/qa/complex/writer/TextPortionEnumerationTest.java
	sw/qa/complex/writer/makefile.mk
	sw/qa/core/makefile.mk
	sw/qa/unoapi/knownissues.xcl
	sw/sdi/makefile.mk
	sw/source/core/SwNumberTree/SwNodeNum.cxx
	sw/source/core/SwNumberTree/SwNumberTree.cxx
	sw/source/core/SwNumberTree/makefile.mk
	sw/source/core/access/acccell.cxx
	sw/source/core/access/acccontext.cxx
	sw/source/core/access/accframe.cxx
	sw/source/core/access/accfrmobj.cxx
	sw/source/core/access/accfrmobj.hxx
	sw/source/core/access/accfrmobjmap.cxx
	sw/source/core/access/accfrmobjslist.cxx
	sw/source/core/access/accfrmobjslist.hxx
	sw/source/core/access/accmap.cxx
	sw/source/core/access/accpara.cxx
	sw/source/core/access/accselectionhelper.cxx
	sw/source/core/access/acctable.cxx
	sw/source/core/access/makefile.mk
	sw/source/core/access/parachangetrackinginfo.cxx
	sw/source/core/access/parachangetrackinginfo.hxx
	sw/source/core/access/textmarkuphelper.cxx
	sw/source/core/attr/cellatr.cxx
	sw/source/core/attr/hints.cxx
	sw/source/core/attr/makefile.mk
	sw/source/core/bastyp/breakit.cxx
	sw/source/core/bastyp/calc.cxx
	sw/source/core/bastyp/init.cxx
	sw/source/core/bastyp/makefile.mk
	sw/source/core/crsr/bookmrk.cxx
	sw/source/core/crsr/callnk.cxx
	sw/source/core/crsr/findtxt.cxx
	sw/source/core/crsr/makefile.mk
	sw/source/core/crsr/pam.cxx
	sw/source/core/doc/SwStyleNameMapper.cxx
	sw/source/core/doc/doc.cxx
	sw/source/core/doc/doccomp.cxx
	sw/source/core/doc/docdraw.cxx
	sw/source/core/doc/docedt.cxx
	sw/source/core/doc/docfld.cxx
	sw/source/core/doc/docglbl.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/doctxm.cxx
	sw/source/core/doc/makefile.mk
	sw/source/core/doc/notxtfrm.cxx
	sw/source/core/doc/number.cxx
	sw/source/core/doc/tblrwcl.cxx
	sw/source/core/docnode/makefile.mk
	sw/source/core/docnode/ndsect.cxx
	sw/source/core/docnode/ndtbl.cxx
	sw/source/core/docnode/section.cxx
	sw/source/core/docnode/swbaslnk.cxx
	sw/source/core/draw/dflyobj.cxx
	sw/source/core/draw/dview.cxx
	sw/source/core/draw/makefile.mk
	sw/source/core/edit/acorrect.cxx
	sw/source/core/edit/autofmt.cxx
	sw/source/core/edit/edattr.cxx
	sw/source/core/edit/edfld.cxx
	sw/source/core/edit/edlingu.cxx
	sw/source/core/edit/edsect.cxx
	sw/source/core/edit/edtox.cxx
	sw/source/core/edit/makefile.mk
	sw/source/core/except/dbgloop.cxx
	sw/source/core/except/makefile.mk
	sw/source/core/fields/cellfml.cxx
	sw/source/core/fields/dbfld.cxx
	sw/source/core/fields/docufld.cxx
	sw/source/core/fields/fldbas.cxx
	sw/source/core/fields/makefile.mk
	sw/source/core/fields/postithelper.cxx
	sw/source/core/fields/tblcalc.cxx
	sw/source/core/fields/usrfld.cxx
	sw/source/core/frmedt/fefly1.cxx
	sw/source/core/frmedt/feshview.cxx
	sw/source/core/frmedt/fetab.cxx
	sw/source/core/frmedt/makefile.mk
	sw/source/core/frmedt/tblsel.cxx
	sw/source/core/graphic/makefile.mk
	sw/source/core/inc/bookmrk.hxx
	sw/source/core/inc/layfrm.hxx
	sw/source/core/inc/scriptinfo.hxx
	sw/source/core/inc/swfont.hxx
	sw/source/core/inc/tabfrm.hxx
	sw/source/core/inc/txmsrt.hxx
	sw/source/core/inc/unoclbck.hxx
	sw/source/core/inc/viewimp.hxx
	sw/source/core/layout/atrfrm.cxx
	sw/source/core/layout/dbg_lay.cxx
	sw/source/core/layout/fly.cxx
	sw/source/core/layout/flyincnt.cxx
	sw/source/core/layout/layact.cxx
	sw/source/core/layout/laycache.cxx
	sw/source/core/layout/makefile.mk
	sw/source/core/layout/paintfrm.cxx
	sw/source/core/layout/tabfrm.cxx
	sw/source/core/layout/trvlfrm.cxx
	sw/source/core/layout/wsfrm.cxx
	sw/source/core/makefile.mk
	sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx
	sw/source/core/objectpositioning/makefile.mk
	sw/source/core/ole/makefile.mk
	sw/source/core/ole/ndole.cxx
	sw/source/core/para/makefile.mk
	sw/source/core/sw3io/makefile.mk
	sw/source/core/swg/makefile.mk
	sw/source/core/table/makefile.mk
	sw/source/core/table/swtable.cxx
	sw/source/core/text/frmpaint.cxx
	sw/source/core/text/inftxt.cxx
	sw/source/core/text/inftxt.hxx
	sw/source/core/text/itrform2.cxx
	sw/source/core/text/makefile.mk
	sw/source/core/text/porfld.cxx
	sw/source/core/text/portxt.cxx
	sw/source/core/text/txtfld.cxx
	sw/source/core/text/txtfly.cxx
	sw/source/core/text/txtio.cxx
	sw/source/core/text/txttab.cxx
	sw/source/core/tox/makefile.mk
	sw/source/core/tox/txmsrt.cxx
	sw/source/core/txtnode/atrfld.cxx
	sw/source/core/txtnode/fmtatr2.cxx
	sw/source/core/txtnode/fntcap.cxx
	sw/source/core/txtnode/makefile.mk
	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/makefile.mk
	sw/source/core/undo/rolbck.cxx
	sw/source/core/undo/undel.cxx
	sw/source/core/undo/unmove.cxx
	sw/source/core/undo/unnum.cxx
	sw/source/core/undo/unsect.cxx
	sw/source/core/unocore/SwXTextDefaults.cxx
	sw/source/core/unocore/makefile.mk
	sw/source/core/unocore/unobkm.cxx
	sw/source/core/unocore/unocoll.cxx
	sw/source/core/unocore/unocrsrhelper.cxx
	sw/source/core/unocore/unofield.cxx
	sw/source/core/unocore/unoflatpara.cxx
	sw/source/core/unocore/unoframe.cxx
	sw/source/core/unocore/unoftn.cxx
	sw/source/core/unocore/unoidx.cxx
	sw/source/core/unocore/unoobj.cxx
	sw/source/core/unocore/unoobj2.cxx
	sw/source/core/unocore/unoparagraph.cxx
	sw/source/core/unocore/unoportenum.cxx
	sw/source/core/unocore/unoprnms.cxx
	sw/source/core/unocore/unoredline.cxx
	sw/source/core/unocore/unoredlines.cxx
	sw/source/core/unocore/unorefmk.cxx
	sw/source/core/unocore/unosect.cxx
	sw/source/core/unocore/unosrch.cxx
	sw/source/core/unocore/unostyle.cxx
	sw/source/core/unocore/unotbl.cxx
	sw/source/core/unocore/unotext.cxx
	sw/source/core/view/makefile.mk
	sw/source/core/view/printdata.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/vprint.cxx
	sw/source/filter/ascii/ascatr.cxx
	sw/source/filter/ascii/makefile.mk
	sw/source/filter/basflt/fltini.cxx
	sw/source/filter/basflt/makefile.mk
	sw/source/filter/html/css1atr.cxx
	sw/source/filter/html/htmlcss1.cxx
	sw/source/filter/html/htmlfldw.cxx
	sw/source/filter/html/htmlgrin.cxx
	sw/source/filter/html/htmltab.cxx
	sw/source/filter/html/htmltabw.cxx
	sw/source/filter/html/makefile.mk
	sw/source/filter/html/parcss1.cxx
	sw/source/filter/html/swhtml.cxx
	sw/source/filter/makefile.mk
	sw/source/filter/rtf/makefile.mk
	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/wrtswtbl.cxx
	sw/source/filter/ww1/fltshell.cxx
	sw/source/filter/ww1/makefile.mk
	sw/source/filter/ww1/w1filter.cxx
	sw/source/filter/ww1/w1sprm.cxx
	sw/source/filter/ww8/README-rtf.txt
	sw/source/filter/ww8/WW8Sttbf.cxx
	sw/source/filter/ww8/WW8TableInfo.cxx
	sw/source/filter/ww8/attributeoutputbase.hxx
	sw/source/filter/ww8/docxattributeoutput.cxx
	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/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/writerhelper.hxx
	sw/source/filter/ww8/writerwordglue.cxx
	sw/source/filter/ww8/wrtw8esh.cxx
	sw/source/filter/ww8/wrtw8nds.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/ww8graf.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/xml/XMLRedlineImportHelper.cxx
	sw/source/filter/xml/makefile.mk
	sw/source/filter/xml/xmlexp.cxx
	sw/source/filter/xml/xmlexp.hxx
	sw/source/filter/xml/xmliteme.cxx
	sw/source/filter/xml/xmlitemi.cxx
	sw/source/filter/xml/xmltble.cxx
	sw/source/ui/app/app.src
	sw/source/ui/app/appenv.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/docstyle.cxx
	sw/source/ui/app/makefile.mk
	sw/source/ui/app/mn.src
	sw/source/ui/app/swmodule.cxx
	sw/source/ui/cctrl/makefile.mk
	sw/source/ui/chrdlg/chardlg.cxx
	sw/source/ui/chrdlg/drpcps.cxx
	sw/source/ui/chrdlg/makefile.mk
	sw/source/ui/chrdlg/swuiccoll.cxx
	sw/source/ui/config/cfgitems.cxx
	sw/source/ui/config/makefile.mk
	sw/source/ui/config/modcfg.cxx
	sw/source/ui/config/optdlg.src
	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/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/mmgreetingspage.cxx
	sw/source/ui/dbui/mmlayoutpage.cxx
	sw/source/ui/dbui/mmoutputpage.cxx
	sw/source/ui/dialog/SwSpellDialogChildWindow.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/makefile.mk
	sw/source/ui/dochdl/swdtflvr.cxx
	sw/source/ui/docvw/AnchorOverlayObject.cxx
	sw/source/ui/docvw/AnchorOverlayObject.hxx
	sw/source/ui/docvw/AnnotationMenuButton.cxx
	sw/source/ui/docvw/AnnotationMenuButton.hxx
	sw/source/ui/docvw/AnnotationWin.cxx
	sw/source/ui/docvw/PostItMgr.cxx
	sw/source/ui/docvw/ShadowOverlayObject.cxx
	sw/source/ui/docvw/ShadowOverlayObject.hxx
	sw/source/ui/docvw/SidebarTxtControl.cxx
	sw/source/ui/docvw/SidebarTxtControl.hxx
	sw/source/ui/docvw/SidebarTxtControlAcc.cxx
	sw/source/ui/docvw/SidebarTxtControlAcc.hxx
	sw/source/ui/docvw/SidebarWin.cxx
	sw/source/ui/docvw/SidebarWinAcc.cxx
	sw/source/ui/docvw/SidebarWinAcc.hxx
	sw/source/ui/docvw/annotation.hrc
	sw/source/ui/docvw/annotation.src
	sw/source/ui/docvw/edtdd.cxx
	sw/source/ui/docvw/edtwin.cxx
	sw/source/ui/docvw/edtwin2.cxx
	sw/source/ui/docvw/frmsidebarwincontainer.cxx
	sw/source/ui/docvw/frmsidebarwincontainer.hxx
	sw/source/ui/docvw/makefile.mk
	sw/source/ui/docvw/srcedtw.cxx
	sw/source/ui/envelp/envfmt.cxx
	sw/source/ui/envelp/makefile.mk
	sw/source/ui/fldui/changedb.cxx
	sw/source/ui/fldui/flddinf.cxx
	sw/source/ui/fldui/fldmgr.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/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/frmdlg/wrap.hrc
	sw/source/ui/globdoc/makefile.mk
	sw/source/ui/inc/SidebarWindowsConsts.hxx
	sw/source/ui/inc/app.hrc
	sw/source/ui/inc/column.hxx
	sw/source/ui/inc/dbtree.hxx
	sw/source/ui/inc/envlop.hxx
	sw/source/ui/inc/frmpage.hxx
	sw/source/ui/inc/javaedit.hxx
	sw/source/ui/inc/navipi.hxx
	sw/source/ui/inc/optpage.hxx
	sw/source/ui/inc/regionsw.hxx
	sw/source/ui/inc/split.hxx
	sw/source/ui/inc/swmn_tmpl.hrc
	sw/source/ui/inc/swuicnttab.hxx
	sw/source/ui/inc/swuiidxmrk.hxx
	sw/source/ui/inc/tbxmgr.hxx
	sw/source/ui/inc/utlui.hrc
	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/cnttab.hrc
	sw/source/ui/index/cnttab.src
	sw/source/ui/index/makefile.mk
	sw/source/ui/index/swuiidxmrk.cxx
	sw/source/ui/lingu/hhcwrp.cxx
	sw/source/ui/lingu/makefile.mk
	sw/source/ui/lingu/olmenu.cxx
	sw/source/ui/makefile.mk
	sw/source/ui/misc/glossary.cxx
	sw/source/ui/misc/insrule.cxx
	sw/source/ui/misc/makefile.mk
	sw/source/ui/misc/pggrid.cxx
	sw/source/ui/ribbar/concustomshape.cxx
	sw/source/ui/ribbar/inputwin.cxx
	sw/source/ui/ribbar/makefile.mk
	sw/source/ui/ribbar/tblctrl.src
	sw/source/ui/ribbar/workctrl.cxx
	sw/source/ui/ribbar/workctrl.hrc
	sw/source/ui/ribbar/workctrl.src
	sw/source/ui/shells/annotsh.cxx
	sw/source/ui/shells/basesh.cxx
	sw/source/ui/shells/drwtxtex.cxx
	sw/source/ui/shells/drwtxtsh.cxx
	sw/source/ui/shells/frmsh.cxx
	sw/source/ui/shells/grfshex.cxx
	sw/source/ui/shells/langhelper.cxx
	sw/source/ui/shells/makefile.mk
	sw/source/ui/shells/slotadd.cxx
	sw/source/ui/shells/tabsh.cxx
	sw/source/ui/shells/textfld.cxx
	sw/source/ui/shells/textidx.cxx
	sw/source/ui/shells/textsh.cxx
	sw/source/ui/shells/textsh1.cxx
	sw/source/ui/shells/txtattr.cxx
	sw/source/ui/smartmenu/makefile.mk
	sw/source/ui/table/chartins.cxx
	sw/source/ui/table/makefile.mk
	sw/source/ui/table/swtablerep.cxx
	sw/source/ui/table/tabledlg.cxx
	sw/source/ui/table/tablepg.hxx
	sw/source/ui/uiview/makefile.mk
	sw/source/ui/uiview/pview.cxx
	sw/source/ui/uiview/pview.src
	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/view0.cxx
	sw/source/ui/uiview/view2.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/makefile.mk
	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/content.cxx
	sw/source/ui/utlui/glbltree.cxx
	sw/source/ui/utlui/makefile.mk
	sw/source/ui/utlui/navipi.cxx
	sw/source/ui/utlui/navipi.hrc
	sw/source/ui/utlui/uitool.cxx
	sw/source/ui/utlui/utlui.src
	sw/source/ui/vba/makefile.mk
	sw/source/ui/vba/service.cxx
	sw/source/ui/vba/vbaapplication.hxx
	sw/source/ui/vba/vbaborders.cxx
	sw/source/ui/vba/vbaeventshelper.cxx
	sw/source/ui/vba/vbaeventshelper.hxx
	sw/source/ui/vba/vbafield.cxx
	sw/source/ui/vba/vbafield.hxx
	sw/source/ui/vba/vbafind.cxx
	sw/source/ui/vba/vbafind.hxx
	sw/source/ui/vba/vbaglobals.hxx
	sw/source/ui/vba/vbaheaderfooter.cxx
	sw/source/ui/vba/vbaheaderfooterhelper.cxx
	sw/source/ui/vba/vbaheaderfooterhelper.hxx
	sw/source/ui/vba/vbarange.cxx
	sw/source/ui/vba/vbarange.hxx
	sw/source/ui/vba/vbaselection.cxx
	sw/source/ui/vba/vbasystem.cxx
	sw/source/ui/vba/vbatabstop.hxx
	sw/source/ui/vba/vbawindow.cxx
	sw/source/ui/vba/wordvbahelper.cxx
	sw/source/ui/web/makefile.mk
	sw/source/ui/web/wformsh.cxx
	sw/source/ui/wrtsh/makefile.mk
	sw/source/ui/wrtsh/wrtsh1.cxx
	sw/source/ui/wrtsh/wrtundo.cxx
	sw/uiconfig/sglobal/menubar/menubar.xml
	sw/uiconfig/sweb/menubar/menubar.xml
	sw/uiconfig/swform/menubar/menubar.xml
	sw/uiconfig/swreport/menubar/menubar.xml
	sw/uiconfig/swriter/menubar/menubar.xml
	sw/uiconfig/swxform/menubar/menubar.xml
	sw/util/hidother.src
	sw/util/makefile.mk
	sw/util/msword.map
	sw/util/swui.map

1 files changed, 7 insertions, 6 deletions

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 39b4c10ff9..8be211cabd 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -73,6 +73,7 @@ class SwList;
 #include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
 #include <rtl/ref.hxx>
 #include <svx/svdtypes.hxx>
+#include <sfx2/objsh.hxx>
 #include <svl/style.hxx>
 #include <editeng/numitem.hxx>
 #include "comphelper/implementationreference.hxx"
@@ -91,8 +92,6 @@ class SwList;
 
 #include <boost/scoped_ptr.hpp>
 
-class SfxObjectShell;
-class SfxObjectShellRef;
 class SvxForbiddenCharactersTable;
 class SwExtTextInput;
 class DateTime;
@@ -352,6 +351,8 @@ class SW_DLLPUBLIC SwDoc :
     SwDocShell		*pDocShell;         // Ptr to SfxDocShell of Doc.
     SfxObjectShellRef* pDocShRef;       // For copying OLE-nodes. (If no DocShell
                                         // is set, this Ref-Pointer must be set!!).
+    SfxObjectShellLock xTmpDocShell;    // A temporary shell that is used to copy OLE-Nodes
+
 
     sfx2::LinkManager	*pLinkMgr;      // List of linked stuff (graphics/DDE/OLE).
 
@@ -1775,8 +1776,8 @@ public:
 
     // If a DocShell has to be created during copying of OLE-Nodes
     // the Ref-Pointer MUST be set!
-    SfxObjectShellRef* GetRefForDocShell()            { return pDocShRef; }
-    void SetRefForDocShell( SfxObjectShellRef* p )    { pDocShRef = p; }
+    void SetTmpDocShell( SfxObjectShellLock rLock )    { xTmpDocShell = rLock; }
+    SfxObjectShellLock GetTmpDocShell()    { return xTmpDocShell; }
 
     // For Autotexts? (Textbausteine) They have only one SVPersist at their disposal.
     SfxObjectShell* GetPersist() const;
@@ -1841,7 +1842,7 @@ public:
     // Delete non-visible ::com::sun::star::ucb::Content from document, e.g.
     // hidden ranges, hidden paragraphes.
     sal_Bool RemoveInvisibleContent();
-
+    sal_Bool HasInvisibleContent() const;
     //restore the invisible content if it's available on the undo stack
     sal_Bool RestoreInvisibleContent();