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
502 lines
15 KiB
C++
502 lines
15 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*************************************************************************
|
|
*
|
|
* 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
|
|
*
|
|
* This file is part of OpenOffice.org.
|
|
*
|
|
* OpenOffice.org is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Lesser General Public License version 3
|
|
* only, as published by the Free Software Foundation.
|
|
*
|
|
* OpenOffice.org is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License version 3 for more details
|
|
* (a copy is included in the LICENSE file that accompanied this code).
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
* version 3 along with OpenOffice.org. If not, see
|
|
* <http://www.openoffice.org/license.html>
|
|
* for a copy of the LGPLv3 License.
|
|
*
|
|
************************************************************************/
|
|
|
|
// MARKER(update_precomp.py): autogen include statement, do not remove
|
|
#include "precompiled_sw.hxx"
|
|
|
|
#include <UndoSection.hxx>
|
|
|
|
#include <sfx2/linkmgr.hxx>
|
|
#include <fmtcntnt.hxx>
|
|
#include <doc.hxx>
|
|
#include <docary.hxx>
|
|
#include <swundo.hxx> // fuer die UndoIds
|
|
#include <pam.hxx>
|
|
#include <ndtxt.hxx>
|
|
#include <UndoCore.hxx>
|
|
#include <section.hxx>
|
|
#include <rolbck.hxx>
|
|
#include <redline.hxx>
|
|
#include <doctxm.hxx>
|
|
#include <ftnidx.hxx>
|
|
#include <editsh.hxx>
|
|
/// OD 04.10.2002 #102894#
|
|
/// class Calc needed for calculation of the hidden condition of a section.
|
|
#include <calc.hxx>
|
|
|
|
|
|
SfxItemSet* lcl_GetAttrSet( const SwSection& rSect )
|
|
{
|
|
// Attribute des Formate sichern (Spalten, Farbe, ... )
|
|
// Cntnt- und Protect- Items interessieren nicht (stehen schon in der
|
|
// Section), muessen also entfernen werden
|
|
SfxItemSet* pAttr = 0;
|
|
if( rSect.GetFmt() )
|
|
{
|
|
sal_uInt16 nCnt = 1;
|
|
if( rSect.IsProtect() )
|
|
++nCnt;
|
|
|
|
if( nCnt < rSect.GetFmt()->GetAttrSet().Count() )
|
|
{
|
|
pAttr = new SfxItemSet( rSect.GetFmt()->GetAttrSet() );
|
|
pAttr->ClearItem( RES_PROTECT );
|
|
pAttr->ClearItem( RES_CNTNT );
|
|
if( !pAttr->Count() )
|
|
delete pAttr, pAttr = 0;
|
|
}
|
|
}
|
|
return pAttr;
|
|
}
|
|
|
|
|
|
////////////////////////////////////////////////////////////////////////////
|
|
|
|
SwUndoInsSection::SwUndoInsSection(
|
|
SwPaM const& rPam, SwSectionData const& rNewData,
|
|
SfxItemSet const*const pSet, SwTOXBase const*const pTOXBase)
|
|
: SwUndo( UNDO_INSSECTION ), SwUndRng( rPam )
|
|
, m_pSectionData(new SwSectionData(rNewData))
|
|
, m_pTOXBase( (pTOXBase) ? new SwTOXBase(*pTOXBase) : 0 )
|
|
, m_pAttrSet( (pSet && pSet->Count()) ? new SfxItemSet( *pSet ) : 0 )
|
|
, m_pHistory(0)
|
|
, m_pRedlData(0)
|
|
, m_nSectionNodePos(0)
|
|
, m_bSplitAtStart(false)
|
|
, m_bSplitAtEnd(false)
|
|
, m_bUpdateFtn(false)
|
|
{
|
|
SwDoc& rDoc = *(SwDoc*)rPam.GetDoc();
|
|
if( rDoc.IsRedlineOn() )
|
|
{
|
|
m_pRedlData.reset(new SwRedlineData( nsRedlineType_t::REDLINE_INSERT,
|
|
rDoc.GetRedlineAuthor() ));
|
|
SetRedlineMode( rDoc.GetRedlineMode() );
|
|
}
|
|
|
|
|
|
if( !rPam.HasMark() )
|
|
{
|
|
const SwCntntNode* pCNd = rPam.GetPoint()->nNode.GetNode().GetCntntNode();
|
|
if( pCNd && pCNd->HasSwAttrSet() && (
|
|
!rPam.GetPoint()->nContent.GetIndex() ||
|
|
rPam.GetPoint()->nContent.GetIndex() == pCNd->Len() ))
|
|
{
|
|
SfxItemSet aBrkSet( rDoc.GetAttrPool(), aBreakSetRange );
|
|
aBrkSet.Put( *pCNd->GetpSwAttrSet() );
|
|
if( aBrkSet.Count() )
|
|
{
|
|
m_pHistory.reset( new SwHistory );
|
|
m_pHistory->CopyFmtAttr( aBrkSet, pCNd->GetIndex() );
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
SwUndoInsSection::~SwUndoInsSection()
|
|
{
|
|
}
|
|
|
|
void SwUndoInsSection::UndoImpl(::sw::UndoRedoContext & rContext)
|
|
{
|
|
SwDoc & rDoc = rContext.GetDoc();
|
|
|
|
RemoveIdxFromSection( rDoc, m_nSectionNodePos );
|
|
|
|
SwSectionNode *const pNd =
|
|
rDoc.GetNodes()[ m_nSectionNodePos ]->GetSectionNode();
|
|
OSL_ENSURE( pNd, "wo ist mein SectionNode?" );
|
|
|
|
if( IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() ))
|
|
rDoc.DeleteRedline( *pNd, true, USHRT_MAX );
|
|
|
|
// lag keine Selektion vor ??
|
|
SwNodeIndex aIdx( *pNd );
|
|
if( ( !nEndNode && STRING_MAXLEN == nEndCntnt ) ||
|
|
( nSttNode == nEndNode && nSttCntnt == nEndCntnt ))
|
|
// loesche einfach alle Nodes
|
|
rDoc.GetNodes().Delete( aIdx, pNd->EndOfSectionIndex() -
|
|
aIdx.GetIndex() );
|
|
else
|
|
// einfach das Format loeschen, der Rest erfolgt automatisch
|
|
rDoc.DelSectionFmt( pNd->GetSection().GetFmt() );
|
|
|
|
// muessen wir noch zusammenfassen ?
|
|
if (m_bSplitAtStart)
|
|
{
|
|
Join( rDoc, nSttNode );
|
|
}
|
|
|
|
if (m_bSplitAtEnd)
|
|
{
|
|
Join( rDoc, nEndNode );
|
|
}
|
|
|
|
if (m_pHistory.get())
|
|
{
|
|
m_pHistory->TmpRollback( &rDoc, 0, false );
|
|
}
|
|
|
|
if (m_bUpdateFtn)
|
|
{
|
|
rDoc.GetFtnIdxs().UpdateFtn( aIdx );
|
|
}
|
|
|
|
AddUndoRedoPaM(rContext);
|
|
}
|
|
|
|
void SwUndoInsSection::RedoImpl(::sw::UndoRedoContext & rContext)
|
|
{
|
|
SwDoc & rDoc = rContext.GetDoc();
|
|
SwPaM & rPam( AddUndoRedoPaM(rContext) );
|
|
|
|
const SwTOXBaseSection* pUpdateTOX = 0;
|
|
if (m_pTOXBase.get())
|
|
{
|
|
pUpdateTOX = rDoc.InsertTableOf( *rPam.GetPoint(),
|
|
*m_pTOXBase, m_pAttrSet.get(), true);
|
|
}
|
|
else
|
|
{
|
|
rDoc.InsertSwSection(rPam, *m_pSectionData, 0, m_pAttrSet.get(), true);
|
|
}
|
|
|
|
if (m_pHistory.get())
|
|
{
|
|
m_pHistory->SetTmpEnd( m_pHistory->Count() );
|
|
}
|
|
|
|
SwSectionNode *const pSectNd =
|
|
rDoc.GetNodes()[ m_nSectionNodePos ]->GetSectionNode();
|
|
if (m_pRedlData.get() &&
|
|
IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode()))
|
|
{
|
|
RedlineMode_t eOld = rDoc.GetRedlineMode();
|
|
rDoc.SetRedlineMode_intern((RedlineMode_t)(eOld & ~nsRedlineMode_t::REDLINE_IGNORE));
|
|
|
|
SwPaM aPam( *pSectNd->EndOfSectionNode(), *pSectNd, 1 );
|
|
rDoc.AppendRedline( new SwRedline( *m_pRedlData, aPam ), true);
|
|
rDoc.SetRedlineMode_intern( eOld );
|
|
}
|
|
else if( !( nsRedlineMode_t::REDLINE_IGNORE & GetRedlineMode() ) &&
|
|
rDoc.GetRedlineTbl().Count() )
|
|
{
|
|
SwPaM aPam( *pSectNd->EndOfSectionNode(), *pSectNd, 1 );
|
|
rDoc.SplitRedline( aPam );
|
|
}
|
|
|
|
if( pUpdateTOX )
|
|
{
|
|
// Formatierung anstossen
|
|
SwEditShell* pESh = rDoc.GetEditShell();
|
|
if( pESh )
|
|
pESh->CalcLayout();
|
|
|
|
// Seitennummern eintragen
|
|
((SwTOXBaseSection*)pUpdateTOX)->UpdatePageNum();
|
|
}
|
|
}
|
|
|
|
void SwUndoInsSection::RepeatImpl(::sw::RepeatContext & rContext)
|
|
{
|
|
SwDoc & rDoc = rContext.GetDoc();
|
|
if (m_pTOXBase.get())
|
|
{
|
|
rDoc.InsertTableOf(*rContext.GetRepeatPaM().GetPoint(),
|
|
*m_pTOXBase, m_pAttrSet.get(), true);
|
|
}
|
|
else
|
|
{
|
|
rDoc.InsertSwSection(rContext.GetRepeatPaM(),
|
|
*m_pSectionData, 0, m_pAttrSet.get());
|
|
}
|
|
}
|
|
|
|
void SwUndoInsSection::Join( SwDoc& rDoc, sal_uLong nNode )
|
|
{
|
|
SwNodeIndex aIdx( rDoc.GetNodes(), nNode );
|
|
SwTxtNode* pTxtNd = aIdx.GetNode().GetTxtNode();
|
|
OSL_ENSURE( pTxtNd, "wo ist mein TextNode?" );
|
|
|
|
{
|
|
RemoveIdxRel( nNode + 1, SwPosition( aIdx,
|
|
SwIndex( pTxtNd, pTxtNd->GetTxt().Len() )));
|
|
}
|
|
pTxtNd->JoinNext();
|
|
|
|
if (m_pHistory.get())
|
|
{
|
|
SwIndex aCntIdx( pTxtNd, 0 );
|
|
pTxtNd->RstAttr( aCntIdx, pTxtNd->Len(), 0, 0, true );
|
|
}
|
|
}
|
|
|
|
|
|
void
|
|
SwUndoInsSection::SaveSplitNode(SwTxtNode *const pTxtNd, bool const bAtStart)
|
|
{
|
|
if( pTxtNd->GetpSwpHints() )
|
|
{
|
|
if (!m_pHistory.get())
|
|
{
|
|
m_pHistory.reset( new SwHistory );
|
|
}
|
|
m_pHistory->CopyAttr( pTxtNd->GetpSwpHints(), pTxtNd->GetIndex(), 0,
|
|
pTxtNd->GetTxt().Len(), false );
|
|
}
|
|
|
|
if (bAtStart)
|
|
{
|
|
m_bSplitAtStart = true;
|
|
}
|
|
else
|
|
{
|
|
m_bSplitAtEnd = true;
|
|
}
|
|
}
|
|
|
|
|
|
////////////////////////////////////////////////////////////////////////////
|
|
|
|
class SwUndoDelSection
|
|
: public SwUndo
|
|
{
|
|
private:
|
|
::std::auto_ptr<SwSectionData> const m_pSectionData; /// section not TOX
|
|
::std::auto_ptr<SwTOXBase> const m_pTOXBase; /// set iff section is TOX
|
|
::std::auto_ptr<SfxItemSet> const m_pAttrSet;
|
|
::boost::shared_ptr< ::sfx2::MetadatableUndo > const m_pMetadataUndo;
|
|
sal_uLong const m_nStartNode;
|
|
sal_uLong const m_nEndNode;
|
|
|
|
public:
|
|
SwUndoDelSection(
|
|
SwSectionFmt const&, SwSection const&, SwNodeIndex const*const);
|
|
|
|
virtual ~SwUndoDelSection();
|
|
|
|
virtual void UndoImpl( ::sw::UndoRedoContext & );
|
|
virtual void RedoImpl( ::sw::UndoRedoContext & );
|
|
};
|
|
|
|
SW_DLLPRIVATE SwUndo * MakeUndoDelSection(SwSectionFmt const& rFormat)
|
|
{
|
|
return new SwUndoDelSection(rFormat, *rFormat.GetSection(),
|
|
rFormat.GetCntnt().GetCntntIdx());
|
|
}
|
|
|
|
SwUndoDelSection::SwUndoDelSection(
|
|
SwSectionFmt const& rSectionFmt, SwSection const& rSection,
|
|
SwNodeIndex const*const pIndex)
|
|
: SwUndo( UNDO_DELSECTION )
|
|
, m_pSectionData( new SwSectionData(rSection) )
|
|
, m_pTOXBase( rSection.ISA( SwTOXBaseSection )
|
|
? new SwTOXBase(static_cast<SwTOXBaseSection const&>(rSection))
|
|
: 0 )
|
|
, m_pAttrSet( ::lcl_GetAttrSet(rSection) )
|
|
, m_pMetadataUndo( rSectionFmt.CreateUndo() )
|
|
, m_nStartNode( pIndex->GetIndex() )
|
|
, m_nEndNode( pIndex->GetNode().EndOfSectionIndex() )
|
|
{
|
|
}
|
|
|
|
SwUndoDelSection::~SwUndoDelSection()
|
|
{
|
|
}
|
|
|
|
void SwUndoDelSection::UndoImpl(::sw::UndoRedoContext & rContext)
|
|
{
|
|
SwDoc & rDoc = rContext.GetDoc();
|
|
|
|
if (m_pTOXBase.get())
|
|
{
|
|
rDoc.InsertTableOf(m_nStartNode, m_nEndNode-2, *m_pTOXBase,
|
|
m_pAttrSet.get());
|
|
}
|
|
else
|
|
{
|
|
SwNodeIndex aStt( rDoc.GetNodes(), m_nStartNode );
|
|
SwNodeIndex aEnd( rDoc.GetNodes(), m_nEndNode-2 );
|
|
SwSectionFmt* pFmt = rDoc.MakeSectionFmt( 0 );
|
|
if (m_pAttrSet.get())
|
|
{
|
|
pFmt->SetFmtAttr( *m_pAttrSet );
|
|
}
|
|
|
|
/// OD 04.10.2002 #102894#
|
|
/// remember inserted section node for further calculations
|
|
SwSectionNode* pInsertedSectNd = rDoc.GetNodes().InsertTextSection(
|
|
aStt, *pFmt, *m_pSectionData, 0, & aEnd);
|
|
|
|
if( SFX_ITEM_SET == pFmt->GetItemState( RES_FTN_AT_TXTEND ) ||
|
|
SFX_ITEM_SET == pFmt->GetItemState( RES_END_AT_TXTEND ))
|
|
{
|
|
rDoc.GetFtnIdxs().UpdateFtn( aStt );
|
|
}
|
|
|
|
/// OD 04.10.2002 #102894#
|
|
/// consider that section is hidden by condition.
|
|
/// If section is hidden by condition,
|
|
/// recalculate condition and update hidden condition flag.
|
|
/// Recalculation is necessary, because fields, on which the hide
|
|
/// condition depends, can be changed - fields changes aren't undoable.
|
|
/// NOTE: setting hidden condition flag also creates/deletes corresponding
|
|
/// frames, if the hidden condition flag changes.
|
|
SwSection& aInsertedSect = pInsertedSectNd->GetSection();
|
|
if ( aInsertedSect.IsHidden() &&
|
|
aInsertedSect.GetCondition().Len() > 0 )
|
|
{
|
|
SwCalc aCalc( rDoc );
|
|
rDoc.FldsToCalc(aCalc, pInsertedSectNd->GetIndex(), USHRT_MAX);
|
|
bool bRecalcCondHidden =
|
|
aCalc.Calculate( aInsertedSect.GetCondition() ).GetBool() ? true : false;
|
|
aInsertedSect.SetCondHidden( bRecalcCondHidden );
|
|
}
|
|
|
|
pFmt->RestoreMetadata(m_pMetadataUndo);
|
|
}
|
|
}
|
|
|
|
void SwUndoDelSection::RedoImpl(::sw::UndoRedoContext & rContext)
|
|
{
|
|
SwDoc & rDoc = rContext.GetDoc();
|
|
|
|
SwSectionNode *const pNd =
|
|
rDoc.GetNodes()[ m_nStartNode ]->GetSectionNode();
|
|
OSL_ENSURE( pNd, "wo ist mein SectionNode?" );
|
|
// einfach das Format loeschen, der Rest erfolgt automatisch
|
|
rDoc.DelSectionFmt( pNd->GetSection().GetFmt() );
|
|
}
|
|
|
|
|
|
////////////////////////////////////////////////////////////////////////////
|
|
|
|
class SwUndoUpdateSection
|
|
: public SwUndo
|
|
{
|
|
private:
|
|
::std::auto_ptr<SwSectionData> m_pSectionData;
|
|
::std::auto_ptr<SfxItemSet> m_pAttrSet;
|
|
sal_uLong const m_nStartNode;
|
|
bool const m_bOnlyAttrChanged;
|
|
|
|
public:
|
|
SwUndoUpdateSection(
|
|
SwSection const&, SwNodeIndex const*const, bool const bOnlyAttr);
|
|
|
|
virtual ~SwUndoUpdateSection();
|
|
|
|
virtual void UndoImpl( ::sw::UndoRedoContext & );
|
|
virtual void RedoImpl( ::sw::UndoRedoContext & );
|
|
};
|
|
|
|
SW_DLLPRIVATE SwUndo *
|
|
MakeUndoUpdateSection(SwSectionFmt const& rFormat, bool const bOnlyAttr)
|
|
{
|
|
return new SwUndoUpdateSection(*rFormat.GetSection(),
|
|
rFormat.GetCntnt().GetCntntIdx(), bOnlyAttr);
|
|
}
|
|
|
|
SwUndoUpdateSection::SwUndoUpdateSection(
|
|
SwSection const& rSection, SwNodeIndex const*const pIndex,
|
|
bool const bOnlyAttr)
|
|
: SwUndo( UNDO_CHGSECTION )
|
|
, m_pSectionData( new SwSectionData(rSection) )
|
|
, m_pAttrSet( ::lcl_GetAttrSet(rSection) )
|
|
, m_nStartNode( pIndex->GetIndex() )
|
|
, m_bOnlyAttrChanged( bOnlyAttr )
|
|
{
|
|
}
|
|
|
|
SwUndoUpdateSection::~SwUndoUpdateSection()
|
|
{
|
|
}
|
|
|
|
void SwUndoUpdateSection::UndoImpl(::sw::UndoRedoContext & rContext)
|
|
{
|
|
SwDoc & rDoc = rContext.GetDoc();
|
|
SwSectionNode *const pSectNd =
|
|
rDoc.GetNodes()[ m_nStartNode ]->GetSectionNode();
|
|
OSL_ENSURE( pSectNd, "wo ist mein SectionNode?" );
|
|
|
|
SwSection& rNdSect = pSectNd->GetSection();
|
|
SwFmt* pFmt = rNdSect.GetFmt();
|
|
|
|
SfxItemSet* pCur = ::lcl_GetAttrSet( rNdSect );
|
|
if (m_pAttrSet.get())
|
|
{
|
|
// das Content- und Protect-Item muss bestehen bleiben
|
|
const SfxPoolItem* pItem;
|
|
m_pAttrSet->Put( pFmt->GetFmtAttr( RES_CNTNT ));
|
|
if( SFX_ITEM_SET == pFmt->GetItemState( RES_PROTECT, sal_True, &pItem ))
|
|
{
|
|
m_pAttrSet->Put( *pItem );
|
|
}
|
|
pFmt->DelDiffs( *m_pAttrSet );
|
|
m_pAttrSet->ClearItem( RES_CNTNT );
|
|
pFmt->SetFmtAttr( *m_pAttrSet );
|
|
}
|
|
else
|
|
{
|
|
// dann muessen die alten entfernt werden
|
|
pFmt->ResetFmtAttr( RES_FRMATR_BEGIN, RES_BREAK );
|
|
pFmt->ResetFmtAttr( RES_HEADER, RES_OPAQUE );
|
|
pFmt->ResetFmtAttr( RES_SURROUND, RES_FRMATR_END-1 );
|
|
}
|
|
m_pAttrSet.reset(pCur);
|
|
|
|
if (!m_bOnlyAttrChanged)
|
|
{
|
|
const bool bUpdate =
|
|
(!rNdSect.IsLinkType() && m_pSectionData->IsLinkType())
|
|
|| ( m_pSectionData->GetLinkFileName().Len()
|
|
&& (m_pSectionData->GetLinkFileName() !=
|
|
rNdSect.GetLinkFileName()));
|
|
|
|
// swap stored section data with live section data
|
|
SwSectionData *const pOld( new SwSectionData(rNdSect) );
|
|
rNdSect.SetSectionData(*m_pSectionData);
|
|
m_pSectionData.reset(pOld);
|
|
|
|
if( bUpdate )
|
|
rNdSect.CreateLink( CREATE_UPDATE );
|
|
else if( CONTENT_SECTION == rNdSect.GetType() && rNdSect.IsConnected() )
|
|
{
|
|
rNdSect.Disconnect();
|
|
rDoc.GetLinkManager().Remove( &rNdSect.GetBaseLink() );
|
|
}
|
|
}
|
|
}
|
|
|
|
void SwUndoUpdateSection::RedoImpl(::sw::UndoRedoContext & rContext)
|
|
{
|
|
UndoImpl(rContext);
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|